diff options
1117 files changed, 47198 insertions, 31290 deletions
diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD new file mode 100644 index 000000000..8b57f4af2 --- /dev/null +++ b/community-staging/cclive/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 47638 2011-05-24 14:28:23Z tdziedzic $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: joyfulgirl@archlinux.us +# Contributor: nathan owe ndowens04 at gmail dot com + +pkgname=cclive +pkgver=0.7.3.1 +pkgrel=3 +pkgdesc='Commandline downloader for popular video websites.' +arch=('i686' 'x86_64') +url='http://cclive.sourceforge.net/' +license=('GPL3') +depends=('boost-libs' 'quvi') +makedepends=('cmake' 'boost') +source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") +md5sums=('de25297e9f34677d4d1920078d9cf254') + +build() { + cd ${pkgname}-${pkgver} + + cmake \ + -DCMAKE_BUILD_TYPE=debug \ + -DCMAKE_INSTALL_PREFIX=/usr +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD new file mode 100644 index 000000000..36ec36e3b --- /dev/null +++ b/community-staging/cegui/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 47894 2011-05-26 00:25:26Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com>, +# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> + +pkgname=cegui +pkgver=0.7.5 +pkgrel=3 +pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" +arch=('i686' 'x86_64') +url="http://crayzedsgui.sourceforge.net" +#options=('!libtool') +license=("MIT") +depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') +makedepends=('python2' 'doxygen') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('38c79d1fdfaaa10f481c99a2ac479516') + +build() { + cd $srcdir/CEGUI-${pkgver} + + sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-xerces-c \ + --enable-null-renderer + + make +} + +package() { + cd $srcdir/CEGUI-${pkgver} + + make DESTDIR=${pkgdir} install + + #build docs + cd doc/doxygen && doxygen + cd .. && make DESTDIR=${pkgdir} install-html + + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community-staging/clementine/PKGBUILD b/community-staging/clementine/PKGBUILD new file mode 100644 index 000000000..c276ec0d6 --- /dev/null +++ b/community-staging/clementine/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 47879 2011-05-25 20:42:25Z stephane $ +#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=clementine +pkgver=0.7.1 +pkgrel=4 +pkgdesc="A music player and library organizer" +url="http://www.clementine-player.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') +makedepends=('cmake' 'boost') +optdepends=('gstreamer0.10-base-plugins: for more open formats' + 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + clementine-0.7.1-fix-devicekit.patch) +sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' + 'd595e2746949363680e0d64fe2fb97b524c8d27c') +install=clementine.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch b/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch new file mode 100644 index 000000000..797a2c864 --- /dev/null +++ b/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch @@ -0,0 +1,11 @@ +diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in +--- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 ++++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 +@@ -29,6 +29,7 @@ + #cmakedefine HAVE_STATIC_SQLITE + + #cmakedefine HAVE_DBUS ++#cmakedefine HAVE_DEVICEKIT + #cmakedefine HAVE_GIO + #cmakedefine HAVE_IMOBILEDEVICE + #cmakedefine HAVE_LIBARCHIVE diff --git a/community-staging/clementine/clementine.install b/community-staging/clementine/clementine.install new file mode 100644 index 000000000..2d71a7563 --- /dev/null +++ b/community-staging/clementine/clementine.install @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..ceae766f1 --- /dev/null +++ b/community-staging/collectd/PKGBUILD @@ -0,0 +1,83 @@ +# $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 new file mode 100644 index 000000000..54cc0e1b3 --- /dev/null +++ b/community-staging/collectd/install @@ -0,0 +1,8 @@ +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 new file mode 100644 index 000000000..5ea67047a --- /dev/null +++ b/community-staging/collectd/libnotify-0.7.patch @@ -0,0 +1,12 @@ +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/testing/postfix/rc.d b/community-staging/collectd/rc.d index 94ccc2af0..442f2324a 100755..100644 --- a/testing/postfix/rc.d +++ b/community-staging/collectd/rc.d @@ -3,35 +3,37 @@ . /etc/rc.conf . /etc/rc.d/functions -name=postfix -PID=$(pidof -o %PPID /usr/lib/postfix/master) +name=collectd +prog="/usr/sbin/collectdmon" + +PID=$(pidof -o %PPID $prog) case "$1" in start) stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \ + [[ -z "$PID" ]] && $prog \ && { add_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \ + [[ -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 "Reloading $name daemon" + stat_busy "Sending SIGHUP to $name daemon" [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ && { stat_done; } \ || { stat_fail; exit 1; } ;; -restart) - $0 stop - sleep 1 - $0 start - ;; *) echo "usage: $0 {start|stop|restart|reload}" + exit 1 ;; esac -exit 0 diff --git a/community-staging/collectd/yajl-2.x.patch b/community-staging/collectd/yajl-2.x.patch new file mode 100644 index 000000000..b90543dfe --- /dev/null +++ b/community-staging/collectd/yajl-2.x.patch @@ -0,0 +1,57 @@ +--- 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 new file mode 100644 index 000000000..6ac1618dc --- /dev/null +++ b/community-staging/courier-mta/PKGBUILD @@ -0,0 +1,113 @@ +# $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 new file mode 100644 index 000000000..5856a5cda --- /dev/null +++ b/community-staging/courier-mta/courier-mta.conf.d @@ -0,0 +1,18 @@ +# +# 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 new file mode 100644 index 000000000..eac627867 --- /dev/null +++ b/community-staging/courier-mta/courier-mta.install @@ -0,0 +1,46 @@ +# 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 new file mode 100644 index 000000000..6c5fbc914 --- /dev/null +++ b/community-staging/courier-mta/courier-mta.rc.d @@ -0,0 +1,60 @@ +#!/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 new file mode 100644 index 000000000..6c541321e --- /dev/null +++ b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly @@ -0,0 +1,6 @@ +#!/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 new file mode 100644 index 000000000..d0920b18d --- /dev/null +++ b/community-staging/csfml/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 47932 2011-05-26 06:40:32Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=csfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110526 +fi + +pkgrel=1 +pkgdesc='C bindings for sfml' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('sfml') +makedepends=('git' 'cmake' 'doxygen') + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + cd bindings/c/ + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/bindings/c/build/" + + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD new file mode 100644 index 000000000..77a930762 --- /dev/null +++ b/community-staging/ekg2/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 47741 2011-05-25 05:00:38Z svenstaro $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=ekg2 +pkgver=0.3.0 +pkgrel=2 +pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +arch=('i686' 'x86_64') +url="http://ekg2.org/" +license=('GPL') +depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme') +optdepends=( 'xosd: for xosd support' + 'sqlite3: sqlite support' + 'gtk2: gtk support') +provides=('ekg2-unicode') +source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz) +md5sums=('652e492fcf72281a42c3e5960347516e') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod + mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld + rm -rf $pkgdir/usr/libexec + chmod -R 755 $pkgdir/usr/lib/perl5 +} diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD new file mode 100644 index 000000000..9bc1ae9d9 --- /dev/null +++ b/community-staging/encfs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $ +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Sven Kauber, <celeon@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=encfs +pkgver=1.7.4 +pkgrel=4 +pkgdesc='Encrypted filesystem in user-space' +arch=('i686' 'x86_64') +url='http://www.arg0.net/encfs' +license=('GPL') +depends=('rlog' 'openssl' 'fuse' 'boost-libs') +makedepends=('boost') +options=('!libtool') +source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz") +md5sums=('ac90cc10b2e9fc7e72765de88321d617') + +build(){ + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD new file mode 100644 index 000000000..7411fcd43 --- /dev/null +++ b/community-staging/fatrat/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=fatrat +pkgver=1.1.3 +pkgrel=4 +pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +arch=('i686' 'x86_64') +url="http://fatrat.dolezel.info/" +license=('GPL') +depends=('gloox' 'curl' 'qt' 'libtorrent-rasterbar') +optdepends=('geoip: GeoIP support') +makedepends=('asio' 'cmake') +source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) +md5sums=('6d4a00cdd0b59a05b1521184508d4637') + +build() { + cd $pkgname-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD index 3727a8cb3..1b3d364f0 100644 --- a/community-testing/freeradius/PKGBUILD +++ b/community-staging/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45793 2011-04-29 10:36:54Z spupykin $ +# $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=6 +pkgrel=7 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" diff --git a/community-testing/freeradius/freeradius.install b/community-staging/freeradius/freeradius.install index e50aa403d..e50aa403d 100644 --- a/community-testing/freeradius/freeradius.install +++ b/community-staging/freeradius/freeradius.install diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-staging/freeradius/krb5-build-fix.patch index 11dae7090..11dae7090 100644 --- a/community-testing/freeradius/krb5-build-fix.patch +++ b/community-staging/freeradius/krb5-build-fix.patch diff --git a/community-testing/freeradius/radiusd b/community-staging/freeradius/radiusd index bf872b6f2..bf872b6f2 100755 --- a/community-testing/freeradius/radiusd +++ b/community-staging/freeradius/radiusd diff --git a/community-staging/frogatto/PKGBUILD b/community-staging/frogatto/PKGBUILD new file mode 100644 index 000000000..434ddd9fb --- /dev/null +++ b/community-staging/frogatto/PKGBUILD @@ -0,0 +1,46 @@ +# $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 new file mode 100644 index 000000000..0d741e0de --- /dev/null +++ b/community-staging/frogatto/frogatto @@ -0,0 +1,3 @@ +#!/bin/sh +cd /opt/frogatto +exec /opt/frogatto/game $* diff --git a/community-staging/frogatto/frogatto.desktop b/community-staging/frogatto/frogatto.desktop new file mode 100644 index 000000000..b0795467a --- /dev/null +++ b/community-staging/frogatto/frogatto.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 000000000..45dee93f7 --- /dev/null +++ b/community-staging/gambas3/PKGBUILD @@ -0,0 +1,1080 @@ +# 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 new file mode 100644 index 000000000..c6aad0d55 --- /dev/null +++ b/community-staging/gambas3/gambas3-runtime.install @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..77c1aa52f --- /dev/null +++ b/community-staging/gambas3/gambas3-script.install @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..c6aad0d55 --- /dev/null +++ b/community-staging/gambas3/gambas3.install @@ -0,0 +1,12 @@ +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/gimmie/ChangeLog b/community-staging/gimmie/ChangeLog deleted file mode 100644 index 7fd5bbf99..000000000 --- a/community-staging/gimmie/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community-staging/gimmie/PKGBUILD b/community-staging/gimmie/PKGBUILD deleted file mode 100644 index 601d39576..000000000 --- a/community-staging/gimmie/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 44484 2011-04-07 20:23:57Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=gimmie -pkgver=0.2.8 -pkgrel=16 -pkgdesc="desktop organizer which allows interaction with applications, contacts, documents, etc" -arch=('i686' 'x86_64') -url="http://beatniksoftware.com/gimmie/" -license=('LGPL') -depends=('libgnomecups' 'dbus-python' 'python2-gconf' 'python-gnomeapplet' - 'python-gnomedesktop' 'python2-libgnome' 'python-wnck' 'pyxdg' - 'hicolor-icon-theme' 'xdg-utils') -makedepends=('findutils' 'perlxml' 'krb5') -options=(!libtool) -install=$pkgname.install -source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz) -md5sums=('721b8ec80f0247e1281aeb4aa5614c2f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's@^#!.*python$@#!/usr/bin/python2@' gimmie/gimmie_{threads,bar}.py - - export CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs glib-2.0`" - - export CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`" - - export CFLAGS="$CFLAGS `pkg-config --cflags pygtk-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs pygtk-2.0`" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir="/usr/lib/$pkgname" \ - --disable-static --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - PYTHON=/usr/bin/python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/community-staging/gimmie/gimmie.install b/community-staging/gimmie/gimmie.install deleted file mode 100644 index 015be0a4d..000000000 --- a/community-staging/gimmie/gimmie.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gimmie - -post_install() { - gconfpkg --install $pkgname - xdg-icon-resource forceupdate -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - xdg-icon-resource forceupdate -} diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD new file mode 100644 index 000000000..94754172b --- /dev/null +++ b/community-staging/glob2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> + +pkgname=glob2 +pkgver=0.9.4.4 +pkgrel=8 +pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" +arch=('i686' 'x86_64') +url="http://www.globulation2.org/" +license=('GPL3') +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ + 'fribidi' 'desktop-file-utils') +makedepends=('scons' 'boost') +install=glob2.install +source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz \ + glob2-0.9.4.1-gcc44.patch) +md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e') +sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" + scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons install + find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \; + install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png" +} diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch new file mode 100644 index 000000000..b425b25ec --- /dev/null +++ b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch @@ -0,0 +1,87 @@ +diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h +--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 +@@ -43,7 +43,7 @@ namespace GAGCore + virtual void flush(void) = 0; + virtual void read(void *data, size_t size) = 0; + virtual void putc(int c) = 0; +- virtual int getc(void) = 0; ++ virtual int get_c(void) = 0; + virtual void seekFromStart(int displacement) = 0; + virtual void seekFromEnd(int displacement) = 0; + virtual void seekRelative(int displacement) = 0; +@@ -67,7 +67,7 @@ namespace GAGCore + virtual void flush(void) { assert(fp); fflush(fp); } + virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } + virtual void putc(int c) { assert(fp); fputc(c, fp); } +- virtual int getc(void) { assert(fp); return fgetc(fp); } ++ virtual int get_c(void) { assert(fp); return fgetc(fp); } + virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } + virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } + virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } +@@ -92,7 +92,7 @@ namespace GAGCore + virtual void flush(void); + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +@@ -117,7 +117,7 @@ namespace GAGCore + virtual void flush(void) { } + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp +--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 +@@ -75,9 +75,9 @@ namespace GAGCore + buffer->putc(c); + } + +- int ZLibStreamBackend::getc(void) ++ int ZLibStreamBackend::get_c(void) + { +- return buffer->getc(); ++ return buffer->get_c(); + } + + void ZLibStreamBackend::seekFromStart(int displacement) +@@ -147,7 +147,7 @@ namespace GAGCore + write(&ch, 1); + } + +- int MemoryStreamBackend::getc(void) ++ int MemoryStreamBackend::get_c(void) + { + Uint8 ch; + read(&ch, 1); +diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp +--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 +@@ -60,7 +60,7 @@ namespace GAGCore
+ std::string s;
+ while (1)
+ {
+- int c = backend->getc();
++ int c = backend->get_c();
+ if(c=='\r')
+ continue;
+ if ((c >= 0) && (c != '\n'))
+diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp +--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 +@@ -150,7 +150,7 @@ namespace GAGCore + + int nextChar(void) + { +- next = stream->getc(); ++ next = stream->get_c(); + if (next == '\n') + { + column = 0; diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install new file mode 100644 index 000000000..7463b6e76 --- /dev/null +++ b/community-staging/glob2/glob2.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD new file mode 100644 index 000000000..e5251b1f4 --- /dev/null +++ b/community-staging/glom/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $ +# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=glom +pkgver=1.16.1 +pkgrel=6 +pkgdesc="An easy-to-use database designer and user interface" +arch=('i686' 'x86_64') +url="http://www.glom.org/" +license=('GPL') +depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk' + 'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc' + 'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info' + 'gtkmm' 'boost-libs' 'gettext') +makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # doctooldir is now owned by mm-common-util instead of glibmm + # the following sed line can be removed once (if) upstream provides a fixed + # configure script + sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure + + ./configure --prefix=/usr \ + --with-postgres-utils=/usr/bin \ + --disable-scrollkeeper \ + --disable-update-mime-database \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install new file mode 100644 index 000000000..1ad77f9aa --- /dev/null +++ b/community-staging/glom/glom.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + 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/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD new file mode 100644 index 000000000..f962211b1 --- /dev/null +++ b/community-staging/gnash/PKGBUILD @@ -0,0 +1,76 @@ +# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgbase=gnash +pkgname=(gnash-common gnash-gtk) +pkgver=0.8.9 +pkgrel=3 +arch=(i686 x86_64) +url="http://www.gnu.org/software/gnash/" +license=(GPL3) +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils + pkgconfig boost) +options=(!libtool !emptydirs) +source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2) +md5sums=('5b2be6b04a1bcc5fb404cc377034499e') + +build() { + cd "$srcdir/gnash-$pkgver" + + # Version is now in version.h + sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 + ./autogen.sh + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-plugins-install=system \ + --with-npapi-plugindir=/usr/lib/mozilla/plugins \ + --enable-gui=sdl,gtk \ + --enable-renderer=agg \ + --enable-media=gst,ffmpeg \ + --enable-hwaccel=vaapi + + make +} + +package_gnash-common() { + pkgdesc="A GNU Flash movie player" + depends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + boost-libs) + backup=(etc/gnashrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install + + # Split gnash-gtk + mkdir -p "$srcdir"/gtk/{bin,man1,share} + mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" + mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" + mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" + mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" +} + +package_gnash-gtk() { + pkgdesc="A GNU Flash movie player" + depends=("gnash-common=$pkgver" + gtk2 libldap hicolor-icon-theme desktop-file-utils) + install=gnash-gtk.install + backup=(etc/gnashpluginrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install-plugin + + install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} + mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" + mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" + mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" + mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" +} diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-staging/gnash/gnash-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD new file mode 100644 index 000000000..2c357a634 --- /dev/null +++ b/community-staging/gource/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 47914 2011-05-26 01:27:25Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> +# Contributor: Olivier Ramonat <olivier at ramonat dot fr> +pkgname=gource +pkgver=0.34 +pkgrel=2 +pkgdesc="software version control visualization" +license=(GPL3) +arch=(i686 x86_64) +url=http://code.google.com/p/gource/ +depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') +source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('292a62d687874e871067e985d717d71a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR=$pkgdir install +} +# vim: ts=2:sw=2 et: diff --git a/community-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD new file mode 100644 index 000000000..d7fafb285 --- /dev/null +++ b/community-staging/gpsdrive/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: damir <damir@archlinux.org> + +pkgname=gpsdrive +pkgver=2.11 +pkgrel=8 +pkgdesc="A car (bike, ship, plane) navigation system" +arch=("i686" "x86_64") +url="http://www.gpsdrive.de/" +license=('GPL2') +depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' + 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' + 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' + ) # already in core ('sqlite3') +makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') +install="gpsdrive.install" +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') + +build() { + cd "$srcdir" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + rm -rf build + mkdir build + cd build + + # fix the mapnik default values + sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + + export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + # see DefineOptions.cmake for a list of common options and defaults + # cmake -L for a more in-depth listing + cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ + -DWITH_SCRIPTS=ON \ + -DWITH_MAPNIK=ON \ + -DWITH_POSTGIS=ON \ + -DWITH_GDAL=ON \ + -DWITH_BASEMAPS=ON \ + -DWITH_FRIENDSD=ON \ + -DWITH_KISMET=ON \ + -DWITH_NAVIGATION=ON \ + -DWITH_SPEECH=OFF \ + -DWITH_DBUS=OFF \ + -DLIBGPS_OLD=OFF \ + "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/gpsdrive/gpsd-2.96.patch b/community-staging/gpsdrive/gpsd-2.96.patch new file mode 100644 index 000000000..bc6c7475f --- /dev/null +++ b/community-staging/gpsdrive/gpsd-2.96.patch @@ -0,0 +1,44 @@ +diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c +--- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 ++++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 +@@ -264,7 +264,8 @@ + #define GPS_TIMER 500 + + static gint gps_timeout_source = 0; +-static struct gps_data_t *gpsdata; ++static struct gps_data_t __gd; ++static struct gps_data_t *gpsdata = &__gd; + + /* SYMBOLS USED IN LIBGPS: + * +@@ -410,9 +411,10 @@ + */ + gps_query (gpsdata, "oys\n"); + #else +- if (gps_waiting(gpsdata)) ++ if (gps_waiting(gpsdata, 1000000)) + { +- gps_poll (gpsdata); ++ gps_read (gpsdata); ++ gps_hook_cb(gpsdata, NULL); + } + #endif + +@@ -447,7 +449,7 @@ + } + + /* try to open connection */ +- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); ++ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; + if (!gpsdata) + { + g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", +@@ -466,7 +468,7 @@ + gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); + + /* set hook function to handle gps data */ +- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); ++// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); + + #ifndef LIBGPS_OLD + /* enable watch mode to get data stream from gpsd */ diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install new file mode 100644 index 000000000..8ea63912e --- /dev/null +++ b/community-staging/gpsdrive/gpsdrive.install @@ -0,0 +1,4 @@ +post_install() { + echo "Don't forget to generate geoinfo.db with geoinfo.pl script" + echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" +} diff --git a/community-staging/kvirc/PKGBUILD b/community-staging/kvirc/PKGBUILD new file mode 100644 index 000000000..a53dbed2c --- /dev/null +++ b/community-staging/kvirc/PKGBUILD @@ -0,0 +1,25 @@ +# $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 new file mode 100644 index 000000000..8f76d007f --- /dev/null +++ b/community-staging/kvirc/kvirc.install @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..c942a6761 --- /dev/null +++ b/community-staging/libmicrohttpd/PKGBUILD @@ -0,0 +1,37 @@ +# $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/testing/binutils/binutils.install b/community-staging/libmicrohttpd/libmicrohttpd.install index 8bf9f3a47..dc0d2b996 100644 --- a/testing/binutils/binutils.install +++ b/community-staging/libmicrohttpd/libmicrohttpd.install @@ -1,17 +1,20 @@ infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) +filelist=(microhttpd.info microhttpd-tutorial.info) -post_upgrade() { +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 new file mode 100644 index 000000000..d1a23e996 --- /dev/null +++ b/community-staging/lightspark/PKGBUILD @@ -0,0 +1,38 @@ +# 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/testing/xfprint/xfprint.install b/community-staging/lightspark/lightspark.install index 21b79d2d4..75e2b7b55 100644 --- a/testing/xfprint/xfprint.install +++ b/community-staging/lightspark/lightspark.install @@ -1,4 +1,5 @@ post_install() { + update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -7,5 +8,6 @@ post_upgrade() { } post_remove() { + update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD new file mode 100644 index 000000000..bcfc24c68 --- /dev/null +++ b/community-staging/mapnik/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: David Dent <thewinch@gmail.com> +# Contributor: orbisvicis <orbisvicis@gmail.com> + +pkgname=mapnik +pkgver=0.7.1 +pkgrel=9 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') + # already in core ('zlib' 'sqlite3') +optdepends=('libxslt: Web Map Service' + 'python-lxml: Web Map Service' + 'python-imaging: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fastcgi: Web Map Service - or:' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi: Web Map Service' + ) +makedepends=('scons' 'boost') # already in core ('pkg-config') +conflicts=('mapnik-svn') +install="mapnik.install" +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8f65fda2a792518d6f6be8a85f62fc73') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 + sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct + + sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct + + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" + scons install + + # fix permissions on SCons-autogenerated files + chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" +} diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install new file mode 100644 index 000000000..46f265d5b --- /dev/null +++ b/community-staging/mapnik/mapnik.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD new file mode 100644 index 000000000..c3e44c8fa --- /dev/null +++ b/community-staging/mongodb/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Mathias Stearn <mathias@10gen.com> +# Contributor: Alec Thomas + +pkgname=mongodb +pkgver=1.8.1 +pkgrel=2 +pkgdesc='A high-performance, open source, schema-free document-oriented database.' +arch=('i686' 'x86_64') +url='http://www.mongodb.org' +license=('AGPL3') +depends=('boost-libs' 'spidermonkey' 'pcre') +makedepends=('scons' 'boost') +optdepends=('libpcap: needed for mongosniff') +backup=('etc/mongodb.conf') +install="mongodb.install" +source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" + 'mongodb.rc' + 'mongodb.conf' + 'gcc46fixes.diff' + 'gcc46fixes2.diff') +md5sums=('e75a5cae641a53760df8cb866ad5d929' + '859f8f9bb32ef2bd21fec55ae9a87d0a' + '9e0ea3f96732bb7811f0b64dace56440' + 'e90c78350e25df2d24f98e4767677d4b' + '5097de6ce2c347c3703ab8cf5a611052') + +build() { + export SCONSFLAGS="$MAKEFLAGS" + + cd ${pkgname}-src-r${pkgver} + + patch -Np1 -i ${srcdir}/gcc46fixes.diff + patch -Np1 -i ${srcdir}/gcc46fixes2.diff + + # scons is "special" + sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct + + scons \ + all \ + --full +} + +package() { + cd ${pkgname}-src-r${pkgver} + + scons \ + install \ + --full \ + --prefix=${pkgdir}/usr + + install -D -m755 ${srcdir}/mongodb.rc \ + ${pkgdir}/etc/rc.d/mongodb + install -D -m644 ${srcdir}/mongodb.conf \ + ${pkgdir}/etc/mongodb.conf + install -d -m700 ${pkgdir}/var/state/mongodb + + if [ -d ${pkgdir}/usr/lib64 ]; then + mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib + fi +} diff --git a/community-staging/mongodb/gcc46fixes.diff b/community-staging/mongodb/gcc46fixes.diff new file mode 100644 index 000000000..487c88f16 --- /dev/null +++ b/community-staging/mongodb/gcc46fixes.diff @@ -0,0 +1,132 @@ +commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e +Author: Mathias Stearn <redbeard0531@gmail.com> +Date: Sun Apr 3 19:10:36 2011 -0400 + + g++ 4.6 compile (new -Wunused-but-set-variable warning) + +diff --git a/db/btree.cpp b/db/btree.cpp +index 2758f72..4162d6a 100644 +--- a/db/btree.cpp ++++ b/db/btree.cpp +@@ -1226,8 +1226,6 @@ namespace mongo { + out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' ' + << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl; + +- DiskLoc oldLoc = thisLoc; +- + if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) { + // If basicInsert() fails, the bucket will be packed as required by split(). + thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx); +diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp +index 2580f86..56c0fce 100644 +--- a/db/dbcommands.cpp ++++ b/db/dbcommands.cpp +@@ -1460,7 +1460,7 @@ namespace mongo { + uassert( 13049, "godinsert must specify a collection", !coll.empty() ); + string ns = dbname + "." + coll; + BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck(); +- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); ++ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); + return true; + } + } cmdGodInsert; +diff --git a/db/index.cpp b/db/index.cpp +index c696e27..218ecb3 100644 +--- a/db/index.cpp ++++ b/db/index.cpp +@@ -127,7 +127,6 @@ namespace mongo { + void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) { + int z = d.nIndexesBeingBuilt(); + v.resize(z); +- NamespaceDetails::IndexIterator i = d.ii(); + for( int i = 0; i < z; i++ ) { + IndexDetails& idx = d.idx(i); + BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 } +diff --git a/db/update.cpp b/db/update.cpp +index e173902..85c3f9c 100644 +--- a/db/update.cpp ++++ b/db/update.cpp +@@ -992,7 +992,7 @@ namespace mongo { + BSONObj newObj = mss->createNewFromMods(); + checkTooLarge(newObj); + assert(nsdt); +- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); ++ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); + } + + if ( logop ) { +diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp +index acf9217..2d6f752 100644 +--- a/dbtests/queryoptimizertests.cpp ++++ b/dbtests/queryoptimizertests.cpp +@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests { + theDataFileMgr.insertWithObjMod( ns(), temp ); + } + BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); +- BSONElement hintElt = hint.firstElement(); + auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) ); + QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); + boost::shared_ptr<Cursor> c = qp.newCursor(); +@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests { + theDataFileMgr.insertWithObjMod( ns(), temp ); + } + BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); +- BSONElement hintElt = hint.firstElement(); + auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) ); + QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); + boost::shared_ptr<Cursor> c = qp.newCursor(); +diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp +index 6c398ef..53484fd 100644 +--- a/shell/shell_utils.cpp ++++ b/shell/shell_utils.cpp +@@ -260,7 +260,7 @@ namespace mongo { + BSONElement e = oneArg(args); + bool found = false; + +- path root( args.firstElement().valuestrsafe() ); ++ path root( e.valuestrsafe() ); + if ( boost::filesystem::exists( root ) ) { + found = true; + boost::filesystem::remove_all( root ); +diff --git a/tools/tool.cpp b/tools/tool.cpp +index 92a4bd4..150481b 100644 +--- a/tools/tool.cpp ++++ b/tools/tool.cpp +@@ -413,14 +413,14 @@ namespace mongo { + ProgressMeter m( fileLength ); + + while ( read < fileLength ) { +- int readlen = fread(buf, 4, 1, file); ++ fread(buf, 4, 1, file); + int size = ((int*)buf)[0]; + if ( size >= BUF_SIZE ) { + cerr << "got an object of size: " << size << " terminating..." << endl; + } + uassert( 10264 , "invalid object size" , size < BUF_SIZE ); + +- readlen = fread(buf+4, size-4, 1, file); ++ fread(buf+4, size-4, 1, file); + + BSONObj o( buf ); + if ( _objcheck && ! o.valid() ) { +diff --git a/util/ramlog.h b/util/ramlog.h +index fc588e6..b2f3aa0 100644 +--- a/util/ramlog.h ++++ b/util/ramlog.h +@@ -108,7 +108,6 @@ namespace mongo { + vector<const char*> v; + get( v ); + +- bool first = true; + s << "<pre>\n"; + for( int i = 0; i < (int)v.size(); i++ ) { + assert( strlen(v[i]) > 20 ); +@@ -126,7 +125,7 @@ namespace mongo { + stringstream r; + if( nr == 1 ) r << "repeat last line"; + else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15); +- first = false; s << html::a("", r.str(), clean(v,i,x.str())); ++ s << html::a("", r.str(), clean(v,i,x.str())); + } + else s << x.str(); + s << '\n'; diff --git a/community-staging/mongodb/gcc46fixes2.diff b/community-staging/mongodb/gcc46fixes2.diff new file mode 100644 index 000000000..17257b136 --- /dev/null +++ b/community-staging/mongodb/gcc46fixes2.diff @@ -0,0 +1,26 @@ +commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb +Author: Eliot Horowitz <eliot@10gen.com> +Date: Wed Mar 30 01:01:18 2011 -0400 + + remove unused variable + +diff --git a/db/commands.cpp b/db/commands.cpp +index c301fb3..0bbd765 100644 +--- a/db/commands.cpp ++++ b/db/commands.cpp +@@ -127,7 +127,6 @@ namespace mongo { + if ( strcmp(p, ".$cmd") != 0 ) return false; + + bool ok = false; +- bool valid = false; + + BSONElement e = jsobj.firstElement(); + map<string,Command*>::iterator i; +@@ -138,7 +137,6 @@ namespace mongo { + migrated over to the command object format. + */ + else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) { +- valid = true; + string errmsg; + Command *c = i->second; + if ( c->adminOnly() && !startsWith(ns, "admin.") ) { diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf new file mode 100644 index 000000000..60d73eae8 --- /dev/null +++ b/community-staging/mongodb/mongodb.conf @@ -0,0 +1,6 @@ +# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details +# Run mongod --help to see a list of options + +bind_ip = 127.0.0.1 +quiet = true +dbpath = /var/state/mongodb diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install new file mode 100755 index 000000000..152f36515 --- /dev/null +++ b/community-staging/mongodb/mongodb.install @@ -0,0 +1,31 @@ +# vim: syntax=sh + +show_msg(){ + if [ "$(arch)" != "x86_64" ] + then + cat <<END +########################################################################### +# Warning: the 32 bit version of MongoDB is limited to about 2GB of data. # +# See http://blog.mongodb.org/post/137788967/32-bit-limitations # +########################################################################### +END + fi +} + +post_install() { + useradd -r -g daemon -d /var/state/mongodb -s /bin/false mongodb + chown -R mongodb:daemon /var/state/mongodb + + show_msg +} + +post_upgrade() { + chown -R mongodb:daemon /var/state/mongodb + + show_msg +} + +pre_remove() { + /etc/rc.d/mongodb stop + userdel mongodb +} diff --git a/testing/cups/cups b/community-staging/mongodb/mongodb.rc index 4afaf5a7c..b808a2fb0 100755 --- a/testing/cups/cups +++ b/community-staging/mongodb/mongodb.rc @@ -1,35 +1,36 @@ #!/bin/bash +# vim: syntax=sh . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/cupsd` +PID=`pidof /usr/bin/mongod` case "$1" in start) - stat_busy "Starting CUPS Daemon" - [ -z "$PID" ] && /usr/sbin/cupsd + stat_busy "Starting mongodb" + [ -z "$PID" ] && /bin/su mongodb -s /bin/bash -c "/usr/bin/mongod --config /etc/mongodb.conf &" > /var/log/mongod 2>&1 if [ $? -gt 0 ]; then stat_fail else - echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid - add_daemon cups + add_daemon mongodb stat_done fi ;; stop) - stat_busy "Stopping CUPS Daemon" + stat_busy "Stopping mongodb" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm /var/run/cups.pid - rm_daemon cups + rm_daemon mongodb + while [ ! -z "$(pidof /usr/bin/mongod)" ]; do + sleep 1; + done stat_done fi ;; restart) $0 stop - sleep 1 $0 start ;; *) diff --git a/community-staging/ogre/PKGBUILD b/community-staging/ogre/PKGBUILD new file mode 100644 index 000000000..28e1c7066 --- /dev/null +++ b/community-staging/ogre/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgbase=ogre +pkgname=('ogre' 'ogre-docs') +pkgver=1.7.3 +pkgrel=2 +pkgdesc="A scene-oriented, flexible 3D engine written in C++" +arch=('i686' 'x86_64') +url='http://www.ogre3d.org' +license=('custom:MIT') +depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' + 'nvidia-cg-toolkit' 'mesa' 'zziplib' 'ois') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu') +optdepends=('cppunit: unit testing' + 'intel-tbb: better threading support' + 'poco: portability' + 'boost: for developing using ogre') +install=ogre.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2") +md5sums=('7a85d3b8f0d64debd186e48ebe9556aa') + +build() { + cd ${srcdir}/${pkgname}_src_v${pkgver//./-} + + # get a clean build dir + [[ -d build ]] && rm -rf build + mkdir build + cd build + + # generate CMake Makefile + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ + -DOGRE_INSTALL_SAMPLES=TRUE \ + -DOGRE_INSTALL_DOCS=TRUE \ + -DOGRE_INSTALL_MEDIA=TRUE \ + -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + + # compile + make + + # generate docs + if [[ $(which dot) && $(which doxygen) ]]; then + make doc + fi +} + +package_ogre() { + optdepends=('ogre-docs: documentation') + + cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build + + # install the bugger + make DESTDIR=${pkgdir} install + + # fix up samples + install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/ + mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/ + mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/ + + # make sample launcher + echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser + echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser + chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser + + # install license + install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html + + # move docs out of this package + mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs +} + +package_ogre-docs() { + pkgdesc="Documentation for ogre" + depends=() + + cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build + + # move docs into this package + install -dm755 ${pkgdir}/usr/share/doc + mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/ + + # symlink for docs + install -dm755 ${pkgdir}/usr/share/OGRE/ + cd ${pkgdir}/usr/share + ln -s doc/OGRE/ OGRE/docs +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/ogre/ogre.install b/community-staging/ogre/ogre.install new file mode 100644 index 000000000..5db668d9e --- /dev/null +++ b/community-staging/ogre/ogre.install @@ -0,0 +1,4 @@ +post_install() { + echo "To view the OGRE samples just run OgreSampleBrowser or launch" + echo "it directly in /opt/OGRE/samples/" +} diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD new file mode 100644 index 000000000..01aab85d1 --- /dev/null +++ b/community-staging/performous/PKGBUILD @@ -0,0 +1,40 @@ +# $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 new file mode 100644 index 000000000..2476eaf71 --- /dev/null +++ b/community-staging/perl-berkeleydb/PKGBUILD @@ -0,0 +1,28 @@ +# $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 new file mode 100644 index 000000000..279d6da79 --- /dev/null +++ b/community-staging/perl-class-data-inheritable/PKGBUILD @@ -0,0 +1,23 @@ +# 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 new file mode 100644 index 000000000..d22f619c9 --- /dev/null +++ b/community-staging/perl-class-factory-util/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..9896a9d33 --- /dev/null +++ b/community-staging/perl-class-methodmaker/PKGBUILD @@ -0,0 +1,24 @@ +# $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 new file mode 100644 index 000000000..ede090293 --- /dev/null +++ b/community-staging/perl-clone/PKGBUILD @@ -0,0 +1,32 @@ +# 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 new file mode 100644 index 000000000..204a0d0f9 --- /dev/null +++ b/community-staging/perl-crypt-blowfish/PKGBUILD @@ -0,0 +1,22 @@ +# $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 new file mode 100644 index 000000000..ae854b92b --- /dev/null +++ b/community-staging/perl-crypt-des/PKGBUILD @@ -0,0 +1,19 @@ +#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 new file mode 100644 index 000000000..33f382066 --- /dev/null +++ b/community-staging/perl-crypt-openssl-bignum/PKGBUILD @@ -0,0 +1,23 @@ +# $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 new file mode 100644 index 000000000..b9a8adb52 --- /dev/null +++ b/community-staging/perl-crypt-openssl-random/PKGBUILD @@ -0,0 +1,23 @@ +# $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 new file mode 100644 index 000000000..23151f63e --- /dev/null +++ b/community-staging/perl-crypt-openssl-rsa/PKGBUILD @@ -0,0 +1,24 @@ +# $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 new file mode 100644 index 000000000..629c01041 --- /dev/null +++ b/community-staging/perl-curses/PKGBUILD @@ -0,0 +1,25 @@ +# $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 new file mode 100644 index 000000000..765098374 --- /dev/null +++ b/community-staging/perl-data-structure-util/PKGBUILD @@ -0,0 +1,22 @@ +# $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 new file mode 100644 index 000000000..094777a66 --- /dev/null +++ b/community-staging/perl-datetime-format-builder/PKGBUILD @@ -0,0 +1,30 @@ +# $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 new file mode 100644 index 000000000..dc6c69605 --- /dev/null +++ b/community-staging/perl-datetime-format-mail/PKGBUILD @@ -0,0 +1,26 @@ +# 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 new file mode 100644 index 000000000..b5c86bd7f --- /dev/null +++ b/community-staging/perl-datetime/PKGBUILD @@ -0,0 +1,37 @@ +# $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 new file mode 100644 index 000000000..d787e37b5 --- /dev/null +++ b/community-staging/perl-dbd-odbc/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 47750 2011-05-25 13:23:38Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-odbc +pkgver=1.29 +pkgrel=1 +pkgdesc="ODBC Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-ODBC/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi' 'perl' 'unixodbc') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") +md5sums=('66fee532cab75a1e5ffa81dfd26b2367') + +build() { + cd DBD-ODBC-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-ODBC-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-pg/PKGBUILD b/community-staging/perl-dbd-pg/PKGBUILD new file mode 100644 index 000000000..7af282d37 --- /dev/null +++ b/community-staging/perl-dbd-pg/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 47753 2011-05-25 13:27:50Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-pg +pkgver=2.18.1 +pkgrel=1 +pkgdesc="Postgres Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-Pg" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.52' 'postgresql-libs') +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") +md5sums=('1f4a837b3d79789ad6854443fce7a901') + +build() { + cd DBD-Pg-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-Pg-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-sqlite2/PKGBUILD b/community-staging/perl-dbd-sqlite2/PKGBUILD new file mode 100644 index 000000000..314f129d4 --- /dev/null +++ b/community-staging/perl-dbd-sqlite2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 47756 2011-05-25 13:30:12Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Charles Mauch <cmauch@gmail.com> + +pkgname=perl-dbd-sqlite2 +pkgver=0.33 +pkgrel=7 +pkgdesc="Perl/CPAN Module DBD::SQLite2" +arch=("i686" "x86_64") +url="http://search.cpan.org/dist/DBD-SQLite2" +license=("GPL" "PerlArtistic") +depends=("perl-dbi") +source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") +md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') + +build() { + cd DBD-SQLite2-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-SQLite2-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-sybase/PKGBUILD b/community-staging/perl-dbd-sybase/PKGBUILD new file mode 100644 index 000000000..a33488520 --- /dev/null +++ b/community-staging/perl-dbd-sybase/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 47759 2011-05-25 13:32:36Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-dbd-sybase +pkgver=1.12 +pkgrel=1 +pkgdesc="Sybase Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-Sybase/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") +md5sums=('fc01efe30102e801f6fdc1c96352fcde') + +build() { + cd $srcdir/DBD-Sybase-${pkgver} + + export SYBASE=/usr + + echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd $srcdir/DBD-Sybase-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-fuse/PKGBUILD b/community-staging/perl-fuse/PKGBUILD new file mode 100644 index 000000000..079721841 --- /dev/null +++ b/community-staging/perl-fuse/PKGBUILD @@ -0,0 +1,28 @@ +# $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 new file mode 100644 index 000000000..b29f364b0 --- /dev/null +++ b/community-staging/perl-gd/PKGBUILD @@ -0,0 +1,29 @@ +# 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 new file mode 100644 index 000000000..25e0df822 --- /dev/null +++ b/community-staging/perl-gnome2-wnck/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 47727 2011-05-25 02:44:57Z tdziedzic $ +# Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> + +pkgname=perl-gnome2-wnck +pkgver=0.16 +pkgrel=4 +pkgdesc="Perl interface to the Window Navigator Construction Kit" +arch=('i686' 'x86_64') +license=("GPL" "Artistic") +url="http://search.cpan.org/dist/Gnome2-Wnck" +depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz") +md5sums=('439f4569ffd7af96ef1d3feaab23760e') + +build() { + cd Gnome2-Wnck-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd Gnome2-Wnck-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-testing/perl-gssapi/PKGBUILD b/community-staging/perl-gssapi/PKGBUILD index ec1e50684..714407586 100644 --- a/community-testing/perl-gssapi/PKGBUILD +++ b/community-staging/perl-gssapi/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 45801 2011-04-29 10:49:42Z spupykin $ +# $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=3 +pkgrel=4 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64") url="http://search.cpan.org/dist/GSSAPI" license=("GPL" "PerlArtistic") depends=('krb5') -source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-${pkgver}.tar.gz") md5sums=('65f00a0749212af064289c8a05e59b3f') build() { - cd $srcdir/GSSAPI-$pkgver + cd GSSAPI-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } package() { - cd $srcdir/GSSAPI-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete + 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 new file mode 100644 index 000000000..61a9b62e6 --- /dev/null +++ b/community-staging/perl-gstreamer-interfaces/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..84f62fa75 --- /dev/null +++ b/community-staging/perl-gstreamer/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..bc2a503a0 --- /dev/null +++ b/community-staging/perl-gtk2-mozembed/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..6b4789bd2 --- /dev/null +++ b/community-staging/perl-gtk2-sexy/PKGBUILD @@ -0,0 +1,34 @@ +# $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 new file mode 100644 index 000000000..a4cdb9e76 --- /dev/null +++ b/community-staging/perl-gtk2-trayicon/PKGBUILD @@ -0,0 +1,33 @@ +# $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 new file mode 100644 index 000000000..269e6080a --- /dev/null +++ b/community-staging/perl-gtk2-webkit/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..2f93db01f --- /dev/null +++ b/community-staging/perl-html-strip/PKGBUILD @@ -0,0 +1,27 @@ +# $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 new file mode 100644 index 000000000..d9396fc00 --- /dev/null +++ b/community-staging/perl-inline-java/PKGBUILD @@ -0,0 +1,29 @@ +# $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 new file mode 100644 index 000000000..7fe7b0b0d --- /dev/null +++ b/community-staging/perl-io-tty/PKGBUILD @@ -0,0 +1,26 @@ +# 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 new file mode 100644 index 000000000..0c935e5ca --- /dev/null +++ b/community-staging/perl-json-xs/PKGBUILD @@ -0,0 +1,29 @@ +# $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 new file mode 100644 index 000000000..21d49f90f --- /dev/null +++ b/community-staging/perl-libapreq2/PKGBUILD @@ -0,0 +1,34 @@ +# $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 new file mode 100644 index 000000000..fc399b9a7 --- /dev/null +++ b/community-staging/perl-list-moreutils/PKGBUILD @@ -0,0 +1,27 @@ +# 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 new file mode 100644 index 000000000..cf1fc16f4 --- /dev/null +++ b/community-staging/perl-mail-box-parser-c/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..15244af54 --- /dev/null +++ b/community-staging/perl-mail-transport-dbx/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..a7307c2a8 --- /dev/null +++ b/community-staging/perl-net-dbus/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..1d2f41001 --- /dev/null +++ b/community-staging/perl-net-libidn/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..2dd4124e8 --- /dev/null +++ b/community-staging/perl-params-validate/PKGBUILD @@ -0,0 +1,30 @@ +# 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 new file mode 100644 index 000000000..de3d39177 --- /dev/null +++ b/community-staging/perl-string-crc32/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..db2e6d27a --- /dev/null +++ b/community-staging/perl-text-charwidth/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..0a469fdff --- /dev/null +++ b/community-staging/perl-text-kakasi/ChangeLog @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000..78b522c7c --- /dev/null +++ b/community-staging/perl-text-kakasi/PKGBUILD @@ -0,0 +1,33 @@ +# $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 new file mode 100644 index 000000000..687e000c1 --- /dev/null +++ b/community-staging/perl-tie-hash-indexed/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..8f9dd8986 --- /dev/null +++ b/community-staging/perl-tk-tablematrix/PKGBUILD @@ -0,0 +1,33 @@ +# $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 new file mode 100644 index 000000000..ba9fcc3f1 --- /dev/null +++ b/community-staging/perl-www-curl/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..38d4fd63f --- /dev/null +++ b/community-staging/perl-xml-libxml/PKGBUILD @@ -0,0 +1,32 @@ +# 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 new file mode 100644 index 000000000..43c29a245 --- /dev/null +++ b/community-staging/perl-xml-libxml/perl-xml-libxml.install @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..de58675ec --- /dev/null +++ b/community-staging/perl-xml-libxslt/PKGBUILD @@ -0,0 +1,30 @@ +# 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 new file mode 100644 index 000000000..053086167 --- /dev/null +++ b/community-staging/perl-xmms/PKGBUILD @@ -0,0 +1,31 @@ +# $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/pingus/ChangeLog b/community-staging/pingus/ChangeLog new file mode 100644 index 000000000..c182f92eb --- /dev/null +++ b/community-staging/pingus/ChangeLog @@ -0,0 +1,21 @@ +2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * pingus 0.7.2-8 + * Rebuilt against boost 1.41.0 + +2010-02-23 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-7 + * Rebuilt against boost 1.42.0 + +2010-01-20 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-6 + * Rebuilt against libpng 1.4/libjpeg 8 + +2009-07-13 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-2 + * Rebuilt against boost 1.39 + * Added gcc 4.4 patch + * Added ChangeLog diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD new file mode 100644 index 000000000..bba3aea9e --- /dev/null +++ b/community-staging/pingus/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=pingus +pkgver=0.7.3 +pkgrel=4 +pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." +arch=('i686' 'x86_64') +url="http://pingus.seul.org" +license=('GPL') +depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs>=1.46') +makedepends=('scons' 'boost>=1.46') +source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) +md5sums=('7d1a0b0d658cc46dd09d6274f39acc7d' + 'b94efaa6e2de959de7fdb50cfc7dbdea') +sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2' + 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54') + +build() { + cd ${pkgname}-${pkgver} + + scons prefix=/usr +} + +package() { + cd ${pkgname}-${pkgver} + + ./install.sh "${pkgdir}/usr" + + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" +} diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop new file mode 100644 index 000000000..158eaa820 --- /dev/null +++ b/community-staging/pingus/pingus.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Pingus +Comment=A free Lemmings[tm] clone +Exec=pingus +Terminal=false +Type=Application +Categories=Application;Game;LogicGame +Icon=/usr/share/pingus/data/images/core/editor/actions.png diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD new file mode 100644 index 000000000..040111905 --- /dev/null +++ b/community-staging/pokerth/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: Vasco Costa <vasco.costa@meiodigital.com> + +pkgname=pokerth +_realname=PokerTH +pkgver=0.8.3 +pkgrel=4 +pkgdesc="Poker game written in C++/QT4" +arch=('i686' 'x86_64') +url="http://www.pokerth.net/" +license=('GPL' 'custom') +depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' 'qt' 'sdl_mixer') +makedepends=('boost') +source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) +md5sums=('adbe56ad5f547eb255dad91de564bf1c') + +build() { + cd $_realname-$pkgver-src + + sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro + + + # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' + sed \ + -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ + -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + + qmake $pkgname.pro + + make +} + +package() { + cd $_realname-$pkgver-src + + make INSTALL_ROOT="$pkgdir" install + + install -D $pkgname "$pkgdir/usr/bin/$pkgname" + install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" + + install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" + rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" +} diff --git a/community-staging/pork/PKGBUILD b/community-staging/pork/PKGBUILD new file mode 100644 index 000000000..53946b6e1 --- /dev/null +++ b/community-staging/pork/PKGBUILD @@ -0,0 +1,29 @@ +# $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/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD new file mode 100644 index 000000000..ae549bae2 --- /dev/null +++ b/community-staging/qbittorrent/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=qbittorrent +pkgver=2.7.3 +pkgrel=2 +pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org/" +license=('GPL') +depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') +makedepends=('boost' 'geoip') +optdepends=('python2: needed for search' + 'geoip: improves peer country resolution') +install='qbittorrent.install' +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/${pkgname}-${pkgver}.tar.gz" + 'python2.patch') +md5sums=('ff1b294133f8dadc781c8f0df50d248d' + 'db0d79fee8ce3470ad3741d36b02a94c') + +build() { + cd ${pkgname}-${pkgver} + + sed -i \ + -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + + patch -Np1 -i ${srcdir}/python2.patch + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make INSTALL_ROOT=${pkgdir} install +} diff --git a/community-staging/qbittorrent/python2.patch b/community-staging/qbittorrent/python2.patch new file mode 100644 index 000000000..24ab742db --- /dev/null +++ b/community-staging/qbittorrent/python2.patch @@ -0,0 +1,33 @@ +diff -Nur qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp qbittorrent-2.4.8/src/searchengine.cpp +--- qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp 2010-10-01 13:52:53.000000000 -0700 ++++ qbittorrent-2.4.8/src/searchengine/searchengine.cpp 2010-10-25 01:20:20.046700620 -0700 +@@ -354,7 +354,7 @@ + //on change le texte du label courrant + currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:"); + // Launch search +- searchProcess->start("python", params, QIODevice::ReadOnly); ++ searchProcess->start("python2", params, QIODevice::ReadOnly); + searchTimeout->start(180000); // 3min + } + +@@ -421,7 +421,7 @@ + params << engine_url; + params << torrent_url; + // Launch search +- downloadProcess->start("python", params, QIODevice::ReadOnly); ++ downloadProcess->start("python2", params, QIODevice::ReadOnly); + } + } + +diff -Nur qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h qbittorrent-2.4.8/src/supportedengines.h +--- qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h 2010-10-24 01:32:39.000000000 -0700 ++++ qbittorrent-2.4.8/src/searchengine/supportedengines.h 2010-10-25 01:18:42.230032834 -0700 +@@ -144,7 +144,7 @@ + QStringList params; + params << misc::searchEngineLocation()+QDir::separator()+"nova2.py"; + params << "--capabilities"; +- nova.start("python", params, QIODevice::ReadOnly); ++ nova.start("python2", params, QIODevice::ReadOnly); + nova.waitForStarted(); + nova.waitForFinished(); + QString capabilities = QString(nova.readAll()); diff --git a/extra/kmldonkey/kmldonkey.install b/community-staging/qbittorrent/qbittorrent.install index e70c054ec..e70c054ec 100644 --- a/extra/kmldonkey/kmldonkey.install +++ b/community-staging/qbittorrent/qbittorrent.install diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD new file mode 100644 index 000000000..4f46232cf --- /dev/null +++ b/community-staging/root/PKGBUILD @@ -0,0 +1,78 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Sebastian Voecking <voeck@web.de> + +pkgname=root +pkgver=5.28.00d +pkgrel=2 +pkgdesc='C++ data analysis framework and interpreter from CERN.' +arch=('i686' 'x86_64') +url='http://root.cern.ch' +license=('LGPL2.1') +depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' + 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') +makedepends=('fftw') +install='root.install' +source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" + 'root.sh' + 'rootd' + 'root.desktop' + 'root.xml') +md5sums=('53505fcb256df38526d446916e6efc15' + '0e883ad44f99da9bc7c23bc102800b62' + 'efd06bfa230cc2194b38e0c8939e72af' + 'ac61b17395d75a2705fefa2ef841a6bf' + 'e2cf69b204192b5889ceb5b4dedc66f7') + +build() { + cd ${pkgname} + + if [ ${CARCH} == 'i686' ]; then + TARGET=linux; + else + TARGET=linuxx8664gcc; + fi + + # python2 switch + find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; + sed -i 's/python 2/python2 2/g' configure + + ./configure \ + ${TARGET} \ + --prefix=/usr \ + --disable-builtin-glew \ + --disable-builtin-freetype \ + --disable-builtin-ftgl \ + --disable-builtin-pcre \ + --disable-builtin-zlib \ + --enable-gdml \ + --enable-gsl-shared \ + --enable-minuit2 \ + --enable-soversion \ + --enable-roofit \ + --enable-python \ + --with-python-incdir=/usr/include/python2.7 \ + --with-python-libdir=/usr/lib + #--disable-krb5 + # disable krb5 because of compile error + + # move from aur + #--disable-builtin-afterimage \ + + #--with-python-incdir=/usr/include/python2.7/Python.h \ + #--with-python-libdir=/usr/lib/libpython2.7.so + + make +} + +package() { + cd ${pkgname} + + make DESTDIR=${pkgdir} install + + install -D ${srcdir}/root.sh ${pkgdir}/etc/profile.d/root.sh + install -D ${srcdir}/rootd ${pkgdir}/etc/rc.d/rootd + install -D -m644 ${srcdir}/root.desktop ${pkgdir}/usr/share/applications/root.desktop + install -D -m644 ${srcdir}/root.xml ${pkgdir}/usr/share/mime/packages/root.xml + + rm -rf ${pkgdir}/etc/root/daemons +} diff --git a/community-staging/root/root.desktop b/community-staging/root/root.desktop new file mode 100644 index 000000000..ca382111c --- /dev/null +++ b/community-staging/root/root.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=root +Terminal=true +Name=ROOT +Name[de]=ROOT +Comment=An object-oriented data analysis framework +Comment[de]=Ein objektorientiertes Framework zur Datenanalyse +StartupNotify=true +MimeType=application/x-root;text/x-c++src +Categories=Science;Development;Application; diff --git a/community-staging/root/root.install b/community-staging/root/root.install new file mode 100644 index 000000000..457af7314 --- /dev/null +++ b/community-staging/root/root.install @@ -0,0 +1,17 @@ +post_install() { + if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then + echo "/usr/lib/root" >> etc/ld.so.conf + sbin/ldconfig -r . + fi + + update-desktop-database >/dev/null + + update-mime-database /usr/share/mime >/dev/null +} + +pre_remove() { + cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot + mv /tmp/.pacroot etc/ld.so.conf + chmod 644 etc/ld.so.conf + sbin/ldconfig -r . +} diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh new file mode 100644 index 000000000..685e6036b --- /dev/null +++ b/community-staging/root/root.sh @@ -0,0 +1,5 @@ +if [ $PYTHONPATH ]; then + export PYTHONPATH=$PYTHONPATH:/usr/lib/root; +else + export PYTHONPATH=/usr/lib/root; +fi diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml new file mode 100644 index 000000000..af8dd69c5 --- /dev/null +++ b/community-staging/root/root.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-root"> + <comment>ROOT file</comment> + <comment xml:lang="de">ROOT-Datei</comment> + <glob pattern="*.root"/> + <magic priority="80"> + <match value="root" type="string" offset="0:64"/> + </magic> + </mime-type> +</mime-info> diff --git a/community-staging/root/rootd b/community-staging/root/rootd new file mode 100755 index 000000000..fb2c3388c --- /dev/null +++ b/community-staging/root/rootd @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/rootd` +case "$1" in + start) + stat_busy "Starting ROOT file server daemon" + [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + PID=`pidof -o %PPID /usr/sbin/rootd` + echo $PID >/var/run/rootd.pid + add_daemon rootd + stat_done + fi + ;; + stop) + stat_busy "Stopping ROOT file server daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon rootd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD new file mode 100644 index 000000000..949227809 --- /dev/null +++ b/community-staging/schroot/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> + +pkgname=schroot +pkgver=1.4.22 +pkgrel=1 +pkgdesc="Allows users to execute shell commands under different root filesystems. \ + (Successor to dchroot)." +url="http://packages.qa.debian.org/s/schroot.html" +license=('GPL3') +depends=('pam' 'lockdev' 'boost' 'e2fsprogs') +optdepends=('btrfs-progs-unstable' 'lvm2') +arch=('i686' 'x86_64') +conflicts=('dchroot') +replaces=('dchroot') +provides=('schroot' 'sbuild' 'dchroot') +backup=('etc/schroot/schroot.conf' + 'etc/schroot/script-arch32' + 'etc/schroot/mount-arch32' + 'etc/schroot/copyfiles-arch32') +options=(!libtool) +source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" + 'script-arch32' + 'copyfiles-arch32' + 'mount-arch32') +md5sums=('0dde4c76b1623cc277d92f8dc06109d1' + '8e86445e188129232e1782d978dfc967' + 'd4558d5691fbdaa46ce669e8f327133b' + 'f0d5d5b5e34a860f6f90b5628c680f46') + +build() { + cd ${pkgname}-${pkgver} + + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + + ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \ + --enable-dchroot --enable-lvm-snapshot --enable-btrfs-snapshot \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove +# --enable-csbuild + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=$pkgdir install + + install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot + install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot + install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot + cat >> $pkgdir/etc/schroot/schroot.conf << EOF + +[Arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +priority=1 +#users=username +groups=users +root-groups=root +script-config=script-arch32 +personality=linux32 +aliases=32,default + +EOF +} diff --git a/community-staging/schroot/copyfiles-arch32 b/community-staging/schroot/copyfiles-arch32 new file mode 100644 index 000000000..7dd32b7d9 --- /dev/null +++ b/community-staging/schroot/copyfiles-arch32 @@ -0,0 +1,8 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/rc.conf +/etc/localtime +/etc/locale.gen +/etc/profile.d/locale.sh
\ No newline at end of file diff --git a/community-staging/schroot/mount-arch32 b/community-staging/schroot/mount-arch32 new file mode 100644 index 000000000..075d6e451 --- /dev/null +++ b/community-staging/schroot/mount-arch32 @@ -0,0 +1,12 @@ +# mount.defaults: static file system information for chroots. +# Note that the mount point will be prefixed by the chroot path +# (CHROOT_PATH) +# +# <file system> <mount point> <type> <options> <dump> <pass> +proc /proc proc defaults 0 0 +/dev /dev none rw,bind 0 0 +#/dev/pts /dev/pts none rw,bind 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +/sys /sys none rw,bind 0 0 +/tmp /tmp none rw,bind 0 0 +/home /home none rw,bind 0 0 diff --git a/community-staging/schroot/script-arch32 b/community-staging/schroot/script-arch32 new file mode 100644 index 000000000..fb87b4822 --- /dev/null +++ b/community-staging/schroot/script-arch32 @@ -0,0 +1,15 @@ +# Default settings for chroot setup and exec scripts. +# See schroot-script-config(5) for further details. + +# Filesystems to mount inside the chroot. +FSTAB="/etc/schroot/mount-arch32" + +# Files to copy from the host system into the chroot. +COPYFILES="/etc/schroot/copyfiles-arch32" + +# Is sbuild installed? +if [ -x /usr/bin/sbuild ]; then + SBUILD="true" +else + SBUILD="false" +fi diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD new file mode 100644 index 000000000..806e373d4 --- /dev/null +++ b/community-staging/sfml/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 47923 2011-05-26 03:12:35Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ondrej Martinak <omartinak@gmail.com> + +pkgname=sfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110526 +fi + +pkgrel=1 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('git' 'mesa' 'cmake' 'doxygen') + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true \ + -DBUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/build" + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install new file mode 100644 index 000000000..9d18b5251 --- /dev/null +++ b/community-staging/sfml/sfml.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the SFML samples, go to /opt/SFML/samples/bin and run them individually" +} diff --git a/community-staging/sfml/use-system-libs.patch b/community-staging/sfml/use-system-libs.patch new file mode 100644 index 000000000..5d3200225 --- /dev/null +++ b/community-staging/sfml/use-system-libs.patch @@ -0,0 +1,70 @@ +Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6 +Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ +Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ +Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ +diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp +--- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200 +@@ -28,10 +28,10 @@ + #include <SFML/Graphics/ImageLoader.hpp>
+ extern "C"
+ {
+- #include <SFML/Graphics/libjpeg/jpeglib.h>
+- #include <SFML/Graphics/libjpeg/jerror.h>
++ #include <jpeglib.h>
++ #include <jerror.h>
+ }
+-#include <SFML/Graphics/libpng/png.h>
++#include <png.h>
+ #include <SFML/Graphics/SOIL/SOIL.h>
+ #include <iostream>
+
+Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej +diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile +--- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200 +@@ -1,15 +1,5 @@ + SRC = $(wildcard *.cpp)
+-SRCGLEW = $(wildcard ./GLEW/*.c)
+-SRCJPEG = $(wildcard ./libjpeg/*.c)
+-SRCPNG = $(wildcard ./libpng/*.c)
+-SRCSOIL = $(wildcard ./SOIL/*.c)
+-SRCZLIB = $(wildcard ./zlib/*.c)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+-OBJJPEG = $(SRCJPEG:.c=.o)
+-OBJPNG = $(SRCPNG:.c=.o)
+-OBJSOIL = $(SRCSOIL:.c=.o)
+-OBJZLIB = $(SRCZLIB:.c=.o)
+
+ ifeq ($(STATIC), yes)
+ LIB = libsfml-graphics-s.a
+@@ -23,22 +13,19 @@ +
+ all: $(LIB)
+
+-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++libsfml-graphics-s.a: $(OBJ)
++ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
+
+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
++libsfml-graphics.so: $(OBJ)
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+
+-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
+- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
+-
+ .PHONY: clean mrproper
+
+ clean:
+- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++ @rm -rf $(OBJ)
+
+ mrproper: clean
+ @rm -rf $(LIBNAME)
+Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD new file mode 100644 index 000000000..a3fe89406 --- /dev/null +++ b/community-staging/smc/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $ +# Maintainer: +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Kritoke <typeolinux@yahoo.com> + +pkgname=smc +pkgver=1.9 +pkgrel=11 +pkgdesc="Secret Maryo Chronicles" +arch=('i686' 'x86_64') +url="http://www.secretmaryo.org/" +license=('GPL3') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') +source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 + smc-for-cegui-v0-7.diff + smc.desktop + smc.png) +md5sums=('75ab7826303c49aec25b052a8b90287f' + '51dfea21b741ad19df14e738df52f1cf' + '80fe208132ff41dd7677a53ee429ecdb' + 'efca7580e28748625eb676c9d24ee122') + +build() { + cd $srcdir/$pkgname-$pkgver + + # to remove when smc will be compatible with cegui-0.7.x + patch -Np1 -i ${srcdir}/smc-for-cegui-v0-7.diff + # fix for boost-1.46 + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + ./autogen.sh + ./configure --prefix=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make install DESTDIR=$pkgdir + # install some freedesktop.org compatibility + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + + rm -rf $pkgdir/usr/share/smc/ +} diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff new file mode 100644 index 000000000..a99cbce6c --- /dev/null +++ b/community-staging/smc/smc-for-cegui-v0-7.diff @@ -0,0 +1,437 @@ +diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac +--- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 ++++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 +@@ -53,7 +53,7 @@ + AC_MSG_ERROR([SDL_ttf library not found])) + + # Check for the CEGUI library +-PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) ++PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) + CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" + LIBS="$LIBS $CEGUI_LIBS" + +diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp +--- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 ++++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 +@@ -118,16 +118,10 @@ + return tmp;
+ }
+
+-void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
++void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
+ {
+ // draw text
+- list_text->draw( position, alpha, clipper );
+-}
+-
+-void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
+-{
+- // draw text
+- list_text->draw( cache, targetRect, zBase, alpha, clipper );
++ list_text->draw( buffer, targetRect, alpha, clipper );
+ }
+
+ void cEditor_Item_Object :: Draw_Image( void )
+@@ -533,12 +527,12 @@ + if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
+ {
+ // Listbox dimension
+- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
+- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
++ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
++ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
+ // Vertical ScrollBar Position
+ float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
+ // font height
+- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
++ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
+
+ // draw items
+ for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
+diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h +--- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 ++++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 +@@ -62,8 +62,7 @@ + */
+ virtual CEGUI::Size getPixelSize( void ) const;
+ // draw
+- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
+- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
++ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
+ // draw image
+ void Draw_Image( void );
+
+diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp +--- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 ++++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 +@@ -265,7 +265,7 @@ +
+
+ // align text
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ // fixme : Can't handle multiple lines of text
+ float text_width = font->getTextExtent( text ) * global_downscalex;
+
+@@ -1182,7 +1182,7 @@ + text_default->setText( gui_text );
+
+ // align text
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+
+ text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
+@@ -1190,7 +1190,7 @@ + text_default->moveToFront();
+
+ // set window height
+- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
++ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
+
+ while( draw )
+ {
+diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp +--- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 ++++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 +@@ -444,13 +444,15 @@ + + if( pGuiSystem ) + { +- delete pGuiSystem; ++ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); ++ pGuiSystem->destroy(); + pGuiSystem = NULL; ++ delete rp; + } + + if( pGuiRenderer ) + { +- delete pGuiRenderer; ++ pGuiRenderer->destroy( *pGuiRenderer ); + pGuiRenderer = NULL; + } + +@@ -507,7 +509,7 @@ + } + case SDL_VIDEORESIZE: + { +- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); + break; + } + case SDL_KEYDOWN: +diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp +--- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 ++++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 +@@ -946,7 +946,7 @@ + m_text_debug_text->setVisible( 1 );
+
+ // update position
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+
+ if( text_width > 800.0f )
+diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp +--- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 ++++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -432,17 +432,12 @@ +
+ void cMouseCursor :: Render( void ) const
+ {
+- if( !m_active )
+- {
++ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
++
++ if ( m_active == mouse->isVisible() )
+ return;
+- }
+
+- // Render CEGUI Mouse
+- pGuiRenderer->setQueueingEnabled( 0 );
+- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
+- mouse->setVisible( 1 );
+- mouse->draw();
+- mouse->setVisible( 0 );
++ mouse->setVisible( m_active );
+ }
+
+ void cMouseCursor :: Update_Position( void )
+diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp +--- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 ++++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 +@@ -163,8 +163,8 @@ + editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
+ // preview window
+ CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
+- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
++ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
++ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
+
+ Update_BG_Colors( CEGUI::EventArgs() );
+
+@@ -555,8 +555,8 @@ +
+ // set default rect
+ CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
+- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
++ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
++ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
+
+ if( !File_Exists( filename ) )
+ {
+diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp +--- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 ++++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -1663,7 +1663,7 @@ + window_name->setText( name );
+ window_name->setTooltipText( tooltip );
+ // get text width
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
+ // all names should have the same width
+ if( text_width > m_editor_window_name_width )
+diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp +--- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 ++++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 +@@ -103,15 +103,15 @@ +
+ /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
+
+-cFake_Renderer :: cFake_Renderer( void )
+-{
+- d_identifierString = "Fake Renderer";
+-}
++//cFake_Renderer :: cFake_Renderer( void )
++//{
++// d_identifierString = "Fake Renderer";
++//}
+
+-cFake_Renderer :: ~cFake_Renderer( void )
+-{
++//cFake_Renderer :: ~cFake_Renderer( void )
++//{
+
+-}
++//}
+
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
+
+@@ -158,7 +158,7 @@ + std::string log_dump_dir = "/dev/null";
+ #endif
+ // create fake system and renderer
+- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
++ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
+ }
+
+ void cVideo :: Delete_CEGUI_Fake( void ) const
+@@ -166,7 +166,7 @@ + CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
+ CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
+
+- delete pGuiSystem;
++ pGuiSystem->destroy();
+ pGuiSystem = NULL;
+ delete renderer;
+ delete rp;
+@@ -177,7 +177,7 @@ + // create renderer
+ try
+ {
+- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
++ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -186,10 +186,10 @@ + exit( EXIT_FAILURE );
+ }
+
+- /* create Resource Provider
+- * no need to destroy it later since it is handled by the CEGUI renderer
+- */
+- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
++ pGuiRenderer->enableExtraStateSettings(true);
++
++ // create Resource Provider
++ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
+
+ // set Resource Provider directories
+ rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
+@@ -215,7 +215,7 @@ + // create system
+ try
+ {
+- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
++ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -242,7 +242,7 @@ + // load the scheme file, which auto-loads the imageset
+ try
+ {
+- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
++ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -254,9 +254,7 @@ + // default mouse cursor
+ pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
+ // force new mouse image
+- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
+- // hide CEGUI mouse always because we render it manually
+- CEGUI::MouseCursor::getSingleton().hide();
++ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
+ // default tooltip
+ pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
+ // create default root window
+@@ -553,7 +551,7 @@ + pFont->Restore_Textures();
+
+ // send new size to CEGUI
+- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
+
+ // check if CEGUI is initialized
+ bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
+diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h +--- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 ++++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 +@@ -23,7 +23,7 @@ + #include "SDL_opengl.h"
+ // CEGUI
+ #include "CEGUI.h"
+-#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
+
+ namespace SMC
+ {
+@@ -129,31 +129,100 @@ + EFFECT_IN_AMOUNT
+ };
+
+-/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
++/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
++// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
++class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
++{
++ void draw() const {}
++ void setTranslation(const CEGUI::Vector3&) {}
++ void setRotation(const CEGUI::Vector3&) {}
++ void setPivot(const CEGUI::Vector3&) {}
++ void setClippingRegion(const CEGUI::Rect&) {}
++ void appendVertex(const CEGUI::Vertex&) {}
++ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
++ void setActiveTexture(CEGUI::Texture*) {}
++ void reset() {}
++ CEGUI::Texture* getActiveTexture() const { return 0; }
++ CEGUI::uint getVertexCount() const { return 0; }
++ CEGUI::uint getBatchCount() const { return 0; }
++ void setRenderEffect(CEGUI::RenderEffect*) {}
++ CEGUI::RenderEffect* getRenderEffect() { return 0; }
++};
+
+-class cFake_Renderer : public CEGUI::Renderer
++class cFake_Texture : public CEGUI::Texture
++{
++public:
++ cFake_Texture() :
++ m_size(1, 1),
++ m_scaling(1, 1) {}
++
++ const CEGUI::Size& getSize() const { return m_size; }
++ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
++ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
++ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
++ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
++ void saveToMemory(void*) {}
++
++private:
++ CEGUI::Size m_size;
++ CEGUI::Vector2 m_scaling;
++};
++
++class cFake_RenderTarget : public CEGUI::RenderTarget
+ {
+ public:
+- cFake_Renderer( void );
+- virtual ~cFake_Renderer( void );
++ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
++ void draw(const CEGUI::GeometryBuffer&) {}
++ void draw(const CEGUI::RenderQueue&) {}
++ void setArea(const CEGUI::Rect&) {}
++ const CEGUI::Rect& getArea() const { return m_area; }
++ bool isImageryCache() const { return false; }
++ void activate() {}
++ void deactivate() {}
++ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
++
++private:
++ CEGUI::Rect m_area;
++};
+
+- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
+- virtual void doRender(void) {};
+- virtual void clearRenderList(void) {};
+- virtual void setQueueingEnabled(bool setting) {};
+- virtual CEGUI::Texture *createTexture(void) { return NULL; };
+- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
+- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
+- virtual void destroyTexture(CEGUI::Texture* texture) {};
+- virtual void destroyAllTextures(void) {};
+- virtual bool isQueueingEnabled(void) const { return 0; };
+- virtual float getWidth(void) const { return 0; };
+- virtual float getHeight(void) const { return 0; };
+- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
+- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
+- virtual unsigned int getMaxTextureSize(void) const { return 0; };
+- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
+- virtual unsigned int getVertScreenDPI(void) const { return 0; };
++class cFake_Renderer : public CEGUI::Renderer
++{
++public:
++ cFake_Renderer( void ) :
++ m_size(0, 0),
++ m_dpi(0, 0),
++ m_identifierString("Fake Renderer"),
++ m_root(m_target) {}
++ ~cFake_Renderer( void ) {}
++
++ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
++ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
++ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
++ void destroyAllGeometryBuffers() {}
++ CEGUI::TextureTarget* createTextureTarget() { return 0; }
++ void destroyTextureTarget(CEGUI::TextureTarget*) {}
++ void destroyAllTextureTargets() {}
++ CEGUI::Texture& createTexture() { return m_texture; }
++ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
++ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
++ void destroyTexture(CEGUI::Texture&) {}
++ void destroyAllTextures() {}
++ void beginRendering() {}
++ void endRendering() {}
++ void setDisplaySize(const CEGUI::Size&) {}
++ const CEGUI::Size& getDisplaySize() const { return m_size; }
++ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
++ CEGUI::uint getMaxTextureSize() const { return 0; }
++ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
++
++private:
++ CEGUI::Size m_size;
++ CEGUI::Vector2 m_dpi;
++ CEGUI::String m_identifierString;
++ cFake_GeometryBuffer m_geometry;
++ cFake_Texture m_texture;
++ cFake_RenderTarget m_target;
++ CEGUI::RenderingRoot m_root;
+ };
+
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop new file mode 100644 index 000000000..6cfe5b018 --- /dev/null +++ b/community-staging/smc/smc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry]
+Name=Secret Maryo Chronicles
+GenericName=Arcade Game
+Exec=smc
+Icon=smc.png
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;KidsGame;
+StartupNotify=false
\ No newline at end of file diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png Binary files differnew file mode 100644 index 000000000..f02af1bfc --- /dev/null +++ b/community-staging/smc/smc.png diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD new file mode 100644 index 000000000..38ce61979 --- /dev/null +++ b/community-staging/spring/PKGBUILD @@ -0,0 +1,45 @@ +# $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 new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community-staging/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD new file mode 100644 index 000000000..2ccb51e50 --- /dev/null +++ b/community-staging/springlobby/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: DuGi <dugi@irc.pl> + +pkgname=springlobby +pkgver=0.131 +pkgrel=2 +pkgdesc="A free cross-platform lobby client for the Spring RTS project." +arch=('i686' 'x86_64') +url="http://springlobby.info/" +license=('GPL2') +depends=('wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') +optdepends=('sdl' 'sdl_sound' 'sdl_mixer') +makedepends=('boost' 'asio' 'cmake') +source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 + springlobby.desktop + springlobby.png) +md5sums=('ea25f376a3fc48e3f3ff4de6d6637b5d' + '45f8b59d033931d02e734fe3bd7777dd' + '1f388187539aeb0358b51995e26ed890') + +build() { + cd $srcdir/${pkgname}-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + cp $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak + sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk + + sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPTION_SOUND=false + make +} + +package() { + cd $srcdir/${pkgname}-$pkgver + + make DESTDIR=$pkgdir install + + install -m755 -d $pkgdir/usr/share/applications + install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications + + install -m755 -d -p $pkgdir/usr/share/pixmaps + install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps +} + +# vim: sw=2:ts=2 et: diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop new file mode 100644 index 000000000..1dce96b90 --- /dev/null +++ b/community-staging/springlobby/springlobby.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=SpringLobby +Comment=Lobby for Spring. An open source RTS with similar gameplay to TA +Exec=springlobby +Icon=springlobby.png +Terminal=false +Type=Application +Categories=Application;Game;StrategyGame; diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png Binary files differnew file mode 100644 index 000000000..89c7ab0ac --- /dev/null +++ b/community-staging/springlobby/springlobby.png diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD new file mode 100644 index 000000000..dbcd690af --- /dev/null +++ b/community-staging/supertux/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: vande198 +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=supertux +pkgver=0.3.3 +pkgrel=3 +pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" +arch=('i686' 'x86_64') +url="http://super-tux.sourceforge.net/" +license=('GPL') +depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') +makedepends=('cmake' 'boost') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) +md5sums=('f3f803e629ee51a9de0b366a036e393d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/supertux/compile.patch b/community-staging/supertux/compile.patch new file mode 100644 index 000000000..05376fe91 --- /dev/null +++ b/community-staging/supertux/compile.patch @@ -0,0 +1,67 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 ++++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-staging/supertux/gcc44.patch b/community-staging/supertux/gcc44.patch new file mode 100644 index 000000000..b58d9c29d --- /dev/null +++ b/community-staging/supertux/gcc44.patch @@ -0,0 +1,90 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp +--- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 +@@ -18,7 +18,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #include <config.h> +- ++#include <cstdio> + #include "lisp.hpp" + + namespace lisp +diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp +--- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 +@@ -39,6 +39,7 @@ + #include <stdexcept> + #include <time.h> + #include <cassert> ++#include <cstdio> + #include "random_generator.hpp" + + RandomGenerator systemRandom; // global random number generator +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 ++++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD new file mode 100644 index 000000000..246a92e12 --- /dev/null +++ b/community-staging/tagpy/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Callan Barrett <wizzomafizzo@gmail.com> +# Contributor: Scott Horowitz <stonecrest@gmail.com> + +pkgname=tagpy +pkgver=0.94.8 +pkgrel=4 +pkgdesc="Python bindings for TagLib" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/tagpy" +license=('MIT') +depends=('python2' 'taglib' 'boost-libs') +makedepends=('python2-distribute' 'boost') +source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('6baff63318cf90b9bc5a2497a0597802') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + ./configure.py --taglib-lib-dir=/usr/lib/ \ + --taglib-inc-dir=/usr/include/taglib/ \ + --boost-inc-dir=/usr/include/boost/ \ + --boost-lib-dir=/usr/lib/ \ + --boost-python-libname=boost_python + python2 setup.py build +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + python2 setup.py install --root="${pkgdir}" --optimize=1 + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-staging/twinkle/PKGBUILD b/community-staging/twinkle/PKGBUILD new file mode 100644 index 000000000..02e37d080 --- /dev/null +++ b/community-staging/twinkle/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $ +# Maintainer: +# Contributor: Jeff Mickey <jeff@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> + +pkgname=twinkle +pkgver=1.4.2 +pkgrel=10 +pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" +arch=('i686' 'x86_64') +url="http://www.twinklephone.com/" +license=('GPL') +depends=('file' 'speex' 'boost-libs' 'libsndfile' 'commoncpp2' 'libxml2' 'libx11' + 'qt3' 'libzrtpcpp') +makedepends=('pkg-config' 'boost') +source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz) +md5sums=('d70c8972f296ffd998c7fb698774705b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + . /etc/profile.d/qt3.sh + ./configure --prefix=/usr \ + --without-kde \ + --with-speex + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 twinkle.desktop ${pkgdir}/usr/share/applications/twinkle.desktop +} diff --git a/community-staging/twinkle/twinkle.desktop b/community-staging/twinkle/twinkle.desktop new file mode 100644 index 000000000..e85a32e51 --- /dev/null +++ b/community-staging/twinkle/twinkle.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Twinkle +Comment=A SIP softphone for Qt +Icon=/usr/share/twinkle/twinkle48.png +Exec=twinkle +Terminal=false +Type=Application +Categories=Network; +StartupNotify=false diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD new file mode 100644 index 000000000..41dab8d90 --- /dev/null +++ b/community-staging/vdrift/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 47904 2011-05-26 00:55:30Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf lonewolf@xs4all.nl + +pkgname=vdrift +pkgver=2010.06.30 +pkgrel=3 +pkgdesc="An open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') +url="http://vdrift.net/" +license=('GPL') +depends=('sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +makedepends=('scons' 'boost' 'asio') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-${pkgver//./-}/$pkgname-${pkgver//./-}.tar.bz2 + $pkgname.desktop) +md5sums=('ddcaf90bb25f9ce9cc084d7f467d7b56' + '8bb429f37bcb4aed5e7ab1d80c5a4f93') + +build() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + # select arch + if [ `uname -m` = "x86_64" ]; then + _sconsarch="a64" + else + _sconsarch="686" + fi + + # patch for crashing with bad drivers + sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + + # build and install + scons \ + "destdir"="$pkgdir" \ + "arch"=$_sconsarch \ + "release"=1 \ + "force_feedback"=1 \ + "prefix"=/usr \ + "datadir"=share/$pkgname/data || return 1 +} + +package() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + scons install || return 1 + + # remove some unneeded files + find "$pkgdir"/usr/share/$pkgname -name SConscript -delete + + # install icons + install -Dm644 data/textures/icons/$pkgname-16x16.png \ + "$pkgdir"/usr/share/icons/hicolor/16x16/apps/$pkgname.png + install -Dm644 data/textures/icons/$pkgname-32x32.png \ + "$pkgdir"/usr/share/icons/hicolor/32x32/apps/$pkgname.png + install -Dm644 data/textures/icons/$pkgname-64x64.png \ + "$pkgdir"/usr/share/icons/hicolor/64x64/apps/$pkgname.png + + # install .desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop + + # delete installed data (will be provided by -data package) + rm -r "$pkgdir"/usr/share/$pkgname +} +# vim: sw=2:ts=2 et: diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop new file mode 100644 index 000000000..7078f0d9c --- /dev/null +++ b/community-staging/vdrift/vdrift.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=VDrift +Version=2009-06-15 +GenericName=Racing Simulation +Comment=An open source driving simulation made with drift racing in mind +Exec=vdrift +Icon=vdrift.png +Terminal=false +Categories=Game;Simulation; diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD new file mode 100644 index 000000000..e2a882999 --- /dev/null +++ b/community-staging/widelands/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 47900 2011-05-26 00:39:20Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> + +pkgname=widelands +pkgver=16 +_realver=build16 +pkgrel=2 +pkgdesc="A realtime strategy game with emphasis on economy and transport" +arch=('i686' 'x86_64') +url="http://widelands.org/" +license=('GPL') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') +makedepends=('cmake' 'boost') +source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 + $pkgname.desktop + $pkgname.png + $pkgname.sh) +md5sums=('3d8c28e145b73c64d8ed1625319d25a2' + '15820bf099fd6f16251fe70a75c534bb' + '3dfda7e9ca76ca00dd98d745d0ceb328' + '7cae50aba5ed0cd2cfeea79124637b46') + +build() { + cd $srcdir/$pkgname-$_realver-src + + mkdir -p build/compile && cd build/compile + + cmake ../.. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_DATADIR=share/$pkgname \ + -DWL_INSTALL_BINDIR=bin + make +} + +package() { + cd $srcdir/$pkgname-$_realver-src/build/compile + + make DESTDIR="$pkgdir" install + + # Install bin, icon and desktop file + #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname + #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/community-staging/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch new file mode 100644 index 000000000..6ba313358 --- /dev/null +++ b/community-staging/widelands/widelands-build15-gcc-4.5-patch @@ -0,0 +1,51 @@ +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 +@@ -272,7 +272,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -343,7 +343,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop new file mode 100644 index 000000000..9715d816c --- /dev/null +++ b/community-staging/widelands/widelands.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Widelands +GenericName=Widelands +Comment=Realtime strategy game +Icon=widelands +Exec=widelands +Type=Application +Categories=Game;StrategyGame; diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png Binary files differnew file mode 100644 index 000000000..c329cf667 --- /dev/null +++ b/community-staging/widelands/widelands.png diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh new file mode 100644 index 000000000..0b21a1694 --- /dev/null +++ b/community-staging/widelands/widelands.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/share/widelands +./widelands $* diff --git a/community-staging/wml/PKGBUILD b/community-staging/wml/PKGBUILD new file mode 100644 index 000000000..2f7a3781f --- /dev/null +++ b/community-staging/wml/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 47762 2011-05-25 13:41:49Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=wml +pkgver=2.0.11 +pkgrel=6 +pkgdesc="The Website Meta Language" +arch=('i686' 'x86_64') +url="http://thewml.org/" +license=('GPL') +depends=('perl' 'libpng' 'gdbm' 'db' 'ncurses') +makedepends=('lynx') +source=("http://thewml.org/distrib/${pkgname}-${pkgver}.tar.gz") +md5sums=('a26feebf4e59e9a6940f54c69dde05b5') +build() { + cd ${pkgname}-${pkgver} + + # missing Perl modules fix + sed -i 's/PREFIX=$(libdir)\/perl/DESTDIR=\.\.\/\.\.\/\.\.\/\.\.\/pkg\/ PREFIX=$(libdir)\/perl/' wml_common/Makefile.in + sed -i 's/$(MAKE) pure_perl_install $(MM_INSTALL_OPTS)/$(MAKE) pure_perl_install/' wml_common/Makefile.in + + unset LDFLAGS + ./configure \ + --prefix=/usr + + # compile fixhack + sed -i 's#/usr/lib/perl5/core_perl/auto/DynaLoader/DynaLoader.a##' wml_backend/p3_eperl/Makefile + sed -i 's/extern struct option options\[\]\;//' ${srcdir}/${pkgname}-${pkgver}/wml_backend/p3_eperl/eperl_proto.h + sed -i 's|strip $dsttmp|#strip $dsttmp|' etc/shtool + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib/wml/exec ${pkgdir}/usr/man/man{1,3,7} ${pkgdir}/usr/man/cat{1,7} + +# make clean + make +} + +package() { + cd ${pkgname}-${pkgver} + + make prefix=${pkgdir}/usr install + + [ -d ${pkgdir}/usr/man ] && mkdir -p ${pkgdir}/usr/share && mv ${pkgdir}/usr/man ${pkgdir}/usr/share +} diff --git a/community-staging/znc/PKGBUILD b/community-staging/znc/PKGBUILD new file mode 100644 index 000000000..0bc108944 --- /dev/null +++ b/community-staging/znc/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mickael9 <mickael9 at gmail dot com> + +pkgname=znc +pkgver=0.098 +pkgrel=3 +pkgdesc='An IRC bouncer with modules & scripts support' +url='http://en.znc.in/wiki/index.php/ZNC' +license=('GPL2') +arch=('i686' 'x86_64') + +depends=('c-ares' 'gcc-libs' 'openssl') +makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl') +optdepends=('tcl: modtcl module' + 'python: modpython module' + 'perl: modperl module' + 'cyrus-sasl: saslauth module') + +source=("http://znc.in/releases/znc-${pkgver}.tar.gz") +md5sums=('5667b4acb1f01309d6eded77abac700c') + +build() { + cd znc-${pkgver} + + ./configure --prefix=/usr \ + --enable-sasl \ + --enable-tcl \ + --enable-python \ + --enable-perl \ + --enable-extra + + make +} + +package() { + cd znc-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/arch/PKGBUILD b/community-testing/arch/PKGBUILD deleted file mode 100644 index 2be3a270a..000000000 --- a/community-testing/arch/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 46342 2011-05-05 11:48:15Z spupykin $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> - -pkgname='arch' -pkgver=1.3.5 -pkgrel=8 -pkgdesc="a modern and remarkable revision control system" -arch=('i686' 'x86_64') -license=('GPL') -url="http://regexps.srparish.net/www/#Gnu-arch" -depends=('zlib' 'expat' 'krb5') -options=('!makeflags') -source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz) -md5sums=('db31ee89bc4788eef1eba1cee6c176ef') - -build() { - cd "${srcdir}/tla-$pkgver/src" - mkdir =build - cd =build - ../configure --prefix /usr - make -} - -package() { - cd "${srcdir}/tla-$pkgver/src/=build" - make prefix="${pkgdir}/usr" install -} diff --git a/community-testing/autofs/PKGBUILD b/community-testing/autofs/PKGBUILD deleted file mode 100644 index 11ac57ec1..000000000 --- a/community-testing/autofs/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=autofs -pkgver=5.0.5 -pkgrel=6 -pkgdesc='A kernel-based automounter for Linux.' -arch=('i686' 'x86_64') -url='http://freshmeat.net/projects/autofs' -license=('GPL2') -depends=('libldap' 'libxml2' 'krb5') -backup=('etc/autofs/auto.master' - 'etc/autofs/auto.misc' - 'etc/conf.d/autofs') -options=(!makeflags) -install='autofs.install' -source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'autofs' - 'autofs.conf.d' - 'auto.master' - 'auto.misc') -md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' - 'e307bf6d2638e46eeb916cf42fe029b2' - '47f597c870410055e0fdb66103daf928' - 'a6cefb591e77b31b79dbb7243646c96b' - 'd8a15ec9186c5c0b36e5cea1e2739e8a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ - Makefile.rules - - ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ - --enable-ignore-busy - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make INSTALLROOT="${pkgdir}" install - - install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master" - install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" - install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs" - install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs" -} diff --git a/community-testing/autofs/auto.master b/community-testing/autofs/auto.master deleted file mode 100644 index be4ea73ae..000000000 --- a/community-testing/autofs/auto.master +++ /dev/null @@ -1,6 +0,0 @@ -# Sample auto.master file -# Format of this file: -# mountpoint map options -# For details of the format look at autofs(5). - -#/media /etc/autofs/auto.media diff --git a/community-testing/autofs/auto.misc b/community-testing/autofs/auto.misc deleted file mode 100644 index 569156626..000000000 --- a/community-testing/autofs/auto.misc +++ /dev/null @@ -1,7 +0,0 @@ -# This is an automounter map and it has the following format -# key [ -mount-options-separated-by-comma ] location -# Details may be found in the autofs(5) manpage - -cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom -floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl -usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1 diff --git a/community-testing/autofs/autofs b/community-testing/autofs/autofs deleted file mode 100644 index 08bd3e133..000000000 --- a/community-testing/autofs/autofs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -daemon_name=autofs - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs - -if [ ! -z "$TIMEOUT" ]; then - daemonoptions="--timeout=$TIMEOUT $daemonoptions" -fi - -PID=`cat /var/run/autofs-running 2> /dev/null` -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon_name - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemon_name daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon_name - stat_done - fi - ;; - restart) - stat_busy "Restarting $daemon_name daemon" - $0 stop - sleep 1 - $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/community-testing/autofs/autofs.conf.d b/community-testing/autofs/autofs.conf.d deleted file mode 100644 index bc82491e7..000000000 --- a/community-testing/autofs/autofs.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -#localoptions='rsize=8192,wsize=8192' - -# e.g. --timeout=60 -daemonoptions='' diff --git a/community-testing/autofs/autofs.install b/community-testing/autofs/autofs.install deleted file mode 100644 index 34ae75f1e..000000000 --- a/community-testing/autofs/autofs.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install(){ - echo "> In autofs5 --ghost option isn't valid. In order to start autofs you" - echo "> must remove that option from your /etc/conf.d/autofs." -} diff --git a/community-testing/autofs/heimdal.patch b/community-testing/autofs/heimdal.patch deleted file mode 100644 index 4aa321834..000000000 --- a/community-testing/autofs/heimdal.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 -+++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 -@@ -66,6 +66,15 @@ - #endif - #endif - -+/** -+ * The type of a principal is different for MIT Krb5 and Heimdal. -+ * These macros are provided by Heimdal, and introduced here for MIT. -+ */ -+#ifndef krb5_realm_length -+#define krb5_realm_length(r) ((r).length) -+#define krb5_realm_data(r) ((r).data) -+#endif -+ - /* - * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME - * environment variable so that the library knows where to find it. -@@ -452,11 +452,11 @@ - - /* setup a principal for the ticket granting service */ - ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - 0); - if (ret) { - error(logopt, ---- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 -+++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 -@@ -43,7 +43,7 @@ - ifeq ($(SASL), 1) - SASL_OBJ = cyrus-sasl.o - LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE -- LIBLDAP += $(LIBSASL) $(XML_LIBS) -+ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 - endif - endif
\ No newline at end of file diff --git a/community-testing/cadaver/ChangeLog b/community-testing/cadaver/ChangeLog deleted file mode 100644 index d22a5592c..000000000 --- a/community-testing/cadaver/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-07-02 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community-testing/cadaver/PKGBUILD b/community-testing/cadaver/PKGBUILD deleted file mode 100644 index ec11fd70f..000000000 --- a/community-testing/cadaver/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 46500 2011-05-07 23:09:15Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: William Rea <sillywilly@gmail.com> - -pkgname=cadaver -pkgver=0.23.3 -pkgrel=2 -pkgdesc="Command-line WebDAV client for Unix" -arch=('i686' 'x86_64') -url="http://www.webdav.org/cadaver" -license=('GPL') -depends=('neon') -source=(http://www.webdav.org/cadaver/cadaver-$pkgver.tar.gz) -md5sums=('502ecd601e467f8b16056d2acca39a6f') - -build() { - cd $srcdir/cadaver-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/cadaver-$pkgver - make prefix=$pkgdir/usr install -} diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD deleted file mode 100644 index e6f9c227c..000000000 --- a/community-testing/calibre/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 46560 2011-05-09 06:22:55Z andrea $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Petrov Roman <nwhisper@gmail.com> -# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> - -pkgname=calibre -pkgver=0.7.59 -pkgrel=3 -pkgdesc="Ebook management application" -arch=('i686' 'x86_64') -url="http://calibre-ebook.com/" -license=('GPL3') -depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' - 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' - 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' - 'python-imaging' 'desktop-file-utils' 'shared-mime-info' - 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') -makedepends=('python2-pycountry') -optdepends=('ipython: to use calibre-debug') -install=calibre.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - desktop_integration.patch) -md5sums=('78ebed5248758b9be1d135ae018b8dfe' - 'bcc538a3b004429bf8f5a0ac1d89a37f') - -build() { - cd "${srcdir}/${pkgname}" - - rm -rf src/{cherrypy,pyPdf} - sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py - sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ - $(find . -regex ".*.py\|.*.recipe") - - python2 setup.py build - python2 setup.py resources - python2 setup.py translations -} - -package() { - cd "${srcdir}/${pkgname}" - - patch -Np1 -i "${srcdir}/desktop_integration.patch" - - # More on desktop integration (e.g. enforce arch defaults) - sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ - -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ - -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ - -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py - - # Fix the environment module location - sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - - install -d "${pkgdir}/usr/lib/python2.7/site-packages" - python2 setup.py install --root="${pkgdir}" --prefix=/usr \ - --staging-bindir="${pkgdir}/usr/bin" \ - --staging-libdir="${pkgdir}/usr/lib" \ - --staging-sharedir="${pkgdir}/usr/share" - - find "${pkgdir}" -type d -empty -delete - - # Decompress the man pages so makepkg will do it for us. - for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do - bzip2 -d "${decom}" - done -} diff --git a/community-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch deleted file mode 100644 index fa58443ed..000000000 --- a/community-testing/calibre/desktop_integration.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py ---- calibre.orig//src/calibre/linux.py 2010-09-17 22:38:02.000000000 +0200 -+++ calibre/src/calibre/linux.py 2010-09-19 15:50:15.029705851 +0200 -@@ -334,52 +323,39 @@ class PostInstall: - - with TemporaryDirectory() as tdir: - with CurrentDir(tdir): -- render_img('mimetypes/lrf.png', 'calibre-lrf.png') -- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) -- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrs', -- '128')) -- render_img('lt.png', 'calibre-gui.png') -- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True) -- self.icon_resources.append(('apps', 'calibre-gui', '128')) -- render_img('viewer.png', 'calibre-viewer.png') -- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) -- self.icon_resources.append(('apps', 'calibre-viewer', '128')) -+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') -+ os.mkdir(dir) -+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) -+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) -+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) - - mimetypes = set([]) - for x in all_input_formats(): - mt = guess_type('dummy.'+x)[0] -- if mt and 'chemical' not in mt: -+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: - mimetypes.add(mt) - - def write_mimetypes(f): - f.write('MimeType=%s;\n'%';'.join(mimetypes)) - -- f = open('calibre-lrfviewer.desktop', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../applications') -+ os.mkdir(dir) -+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') - f.write(VIEWER) - f.close() -- f = open('calibre-ebook-viewer.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') - f.write(EVIEWER) - write_mimetypes(f) - f.close() -- f = open('calibre-gui.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') - f.write(GUI) - write_mimetypes(f) - f.close() -- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop') -- for x in des: -- cmd = ['xdg-desktop-menu', 'install', './'+x] -- if x != des[-1]: -- cmd.insert(2, '--noupdate') -- check_call(' '.join(cmd), shell=True) -- self.menu_resources.append(x) -- f = open('calibre-mimetypes', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') -+ os.makedirs(dir) -+ f = open(os.path.join(dir, 'calibre.xml'), 'wb') - f.write(MIME) - f.close() -- self.mime_resources.append('calibre-mimetypes') -- check_call('xdg-mime install ./calibre-mimetypes', shell=True) - except Exception: - if self.opts.fatal_errors: - raise diff --git a/community-testing/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD deleted file mode 100644 index f845453fe..000000000 --- a/community-testing/freerdp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 45796 2011-04-29 10:42:30Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> - -pkgname=freerdp -pkgver=0.8.2 -pkgrel=2 -pkgdesc="Free RDP client" -arch=('i686' 'x86_64') -url="http://freerdp.sourceforge.net" -license=('GPL') -depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib') -makedepends=('krb5') -conflicts=('freerdp-git') -changelog=${pkgname}.changelog -options=('!libtool') -source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cde590336292c977dfc1b4b7badf24d2') - -build() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - [ -x configure ] || sh ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog deleted file mode 100644 index d47f165c3..000000000 --- a/community-testing/freerdp/freerdp.changelog +++ /dev/null @@ -1,2 +0,0 @@ -0.7.1-1 to 0.7.1-2 -* Added x86_64 to supported architectures (tested by figue). diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD new file mode 100644 index 000000000..5a4b5206d --- /dev/null +++ b/community-testing/gambas3/PKGBUILD @@ -0,0 +1,1080 @@ +# 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=2 +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-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install new file mode 100644 index 000000000..c6aad0d55 --- /dev/null +++ b/community-testing/gambas3/gambas3-runtime.install @@ -0,0 +1,12 @@ +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-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install new file mode 100644 index 000000000..77c1aa52f --- /dev/null +++ b/community-testing/gambas3/gambas3-script.install @@ -0,0 +1,15 @@ +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-testing/gambas3/gambas3.install b/community-testing/gambas3/gambas3.install new file mode 100644 index 000000000..c6aad0d55 --- /dev/null +++ b/community-testing/gambas3/gambas3.install @@ -0,0 +1,12 @@ +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-testing/gitg/PKGBUILD b/community-testing/gitg/PKGBUILD new file mode 100644 index 000000000..19c71018e --- /dev/null +++ b/community-testing/gitg/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Blaž Tomžič <blaz.tomazic@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> +# Contributor: M Rawash <mrawash@gmail.com> +# Contributor: DonVla <donvla@users.sourceforge.net> + +pkgname=gitg +pkgver=0.2.2 +pkgrel=1 +pkgdesc='A GIT repository viewer based on GTK+' +arch=('i686' 'x86_64') +url='http://trac.novowork.com/gitg/' +license=('GPL') +depends=('gconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') +makedepends=('intltool') +install="${pkgname}.install" +source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/gitg/gitg.install b/community-testing/gitg/gitg.install new file mode 100644 index 000000000..787d6085e --- /dev/null +++ b/community-testing/gitg/gitg.install @@ -0,0 +1,17 @@ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: DonVla <donvla@users.sourceforge.net> +# gitg install file + +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} diff --git a/community-testing/gsasl/PKGBUILD b/community-testing/gsasl/PKGBUILD deleted file mode 100644 index 01c39c725..000000000 --- a/community-testing/gsasl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 45799 2011-04-29 10:48:15Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Orivej Desh <smpuj@bk.ru> -# Maintainer: Orivej Desh <smpuj@bk.ru> - -pkgname=gsasl -pkgver=1.5.4 -pkgrel=2 -pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" -arch=("i686" "x86_64") -url="http://josefsson.org/gsasl/" -license=("GPL") -depends=('gnutls' 'libidn' 'krb5') -source=("ftp://alpha.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") -md5sums=('44cf5073a6ee2d77d526605bd6ab3904') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" -} diff --git a/community-testing/ipsec-tools/PKGBUILD b/community-testing/ipsec-tools/PKGBUILD deleted file mode 100644 index 77a72f6df..000000000 --- a/community-testing/ipsec-tools/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 45815 2011-04-29 12:08:18Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Allan Henriksen <allan.henriksen@gmail.com> - -pkgname=ipsec-tools -pkgver=0.8.0 -pkgrel=2 -pkgdesc="KAME IPSec tools ported to Linux" -arch=('i686' 'x86_64') -url="http://ipsec-tools.sourceforge.net/" -depends=('readline' 'openssl' 'krb5') -license=('GPL') -options=('!makeflags' '!libtool') -source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 - racoon.rc - ipsec.rc) -md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' - '416b8e362d86987b8c55f7153cdafbeb' - '90d0810267cbd847383ae3101699b192') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's#-Werror##' configure - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport --enable-gssapi - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon - install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec -} diff --git a/community-testing/ipsec-tools/racoon.rc b/community-testing/ipsec-tools/racoon.rc deleted file mode 100755 index 1a67dcac5..000000000 --- a/community-testing/ipsec-tools/racoon.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/racoon` -case "$1" in - start) - stat_busy "Starting Racoon IPSec daemon" - [ -z "$PID" ] && /usr/sbin/racoon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon racoon - stat_done - fi - ;; - stop) - stat_busy "Stopping Racoon IPSec daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon racoon - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/pam-krb5/PKGBUILD b/community-testing/pam-krb5/PKGBUILD deleted file mode 100644 index 5c9798514..000000000 --- a/community-testing/pam-krb5/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 46339 2011-05-05 11:43:20Z spupykin $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Ryan Corder <ryanc@greengrey.org> - -pkgname=pam-krb5 -pkgver=4.4 -pkgrel=2 -pkgdesc='A PAM module providing Kerberos v5 support.' -arch=('i686' 'x86_64') -url='http://www.eyrie.org/~eagle/software/pam-krb5/' -license=('custom') -options=('!libtool') -depends=('krb5' 'pam') -source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") -md5sums=('a3f9a414fef102cd815a763c965b315c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-reduced-depends - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-testing/pgadmin3/ChangeLog b/community-testing/pgadmin3/ChangeLog deleted file mode 100644 index 76de01d7d..000000000 --- a/community-testing/pgadmin3/ChangeLog +++ /dev/null @@ -1,28 +0,0 @@ -2008-08-21 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 1.8.5 - -2008-06-24 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.8.4 - -2008-02-21 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.8.2 - -2008-01-05 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for x86_64 - 1.8.1 - * Updated for i686 - 1.8.1 - -2007-10-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated version - -2007-10-11 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated version - -2007-06-28 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 diff --git a/community-testing/pgadmin3/PKGBUILD b/community-testing/pgadmin3/PKGBUILD deleted file mode 100644 index 117eb7521..000000000 --- a/community-testing/pgadmin3/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 46331 2011-05-05 10:45:23Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Benjamin Andresen <benny@klapmuetz.org> -# Contributor: bekks <eduard.warkentin@gmx.de> - -pkgname=pgadmin3 -pkgver=1.12.3 -_realver=1.12.3 -pkgrel=1 -pkgdesc="A comprehensive design and management interface for PostgreSQL database" -arch=('i686' 'x86_64') -url="http://www.pgadmin.org" -license=('custom') -depends=('wxgtk' 'postgresql-libs>=8.4.1' 'libxslt') -makedepends=('libpqxx' 'krb5') -source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${_realver}/src/pgadmin3-${_realver}.tar.gz - pgadmin3.desktop) -md5sums=('0ff7a970a14757ee951a4e8b1a246a70' - 'd07ba4df54baead30b66d19d7450bcad') - -build() { - cd $srcdir/pgadmin3-${_realver} - unset LDFLAGS - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/pgadmin3-${_realver} - make DESTDIR=$pkgdir/ install - - install -D -m 644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n - install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - mkdir -p $pkgdir/usr/share/pgadmin3/pixmaps/ - mkdir -p $pkgdir/usr/share/applications/ - - install -D -m 644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico - install -D -m 644 $srcdir/pgadmin3.desktop $pkgdir/usr/share/applications/ -} diff --git a/community-testing/pgadmin3/pgadmin3.desktop b/community-testing/pgadmin3/pgadmin3.desktop deleted file mode 100644 index 2e0864f60..000000000 --- a/community-testing/pgadmin3/pgadmin3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=pgadmin3 -Comment=A comprehensive design and management interface for PostgreSQL database -Exec=pgadmin3 -Terminal=false -Type=Application -StartupNotify=true -Icon=/usr/share/pgadmin3/pixmaps/pgAdmin3.ico -Categories=Application;Development; diff --git a/community-testing/python-cherrypy/837.2049.patch b/community-testing/python-cherrypy/837.2049.patch deleted file mode 100644 index 20cc0dd36..000000000 --- a/community-testing/python-cherrypy/837.2049.patch +++ /dev/null @@ -1,554 +0,0 @@ -Index: cherrypy/test/test_tools.py -=================================================================== ---- cherrypy/test/test_tools.py (revision 2049) -+++ cherrypy/test/test_tools.py (working copy) -@@ -3,6 +3,7 @@ - import gzip - import StringIO - import sys -+from httplib import IncompleteRead - import time - timeout = 0.2 - -@@ -272,8 +273,12 @@ - # Because this error is raised after the response body has - # started, and because it's chunked output, an error is raised by - # the HTTP client when it encounters incomplete output. -- self.assertRaises(ValueError, self.getPage, -- "/demo/errinstream?id=5") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/demo/errinstream?id=5") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/demo/errinstream?id=5") - # If this fails, then on_end_request isn't being called at all. - time.sleep(0.1) - self.getPage("/demo/ended/5") -Index: cherrypy/test/webtest.py -=================================================================== ---- cherrypy/test/webtest.py (revision 2049) -+++ cherrypy/test/webtest.py (working copy) -@@ -491,7 +491,7 @@ - # IN6ADDR_ANY, which should respond on localhost. - host = "::1" - conn = http_conn(host, port) -- -+ - conn._http_vsn_str = protocol - conn._http_vsn = int("".join([x for x in protocol if x.isdigit()])) - -Index: cherrypy/test/test_encoding.py -=================================================================== ---- cherrypy/test/test_encoding.py (revision 2049) -+++ cherrypy/test/test_encoding.py (working copy) -@@ -1,7 +1,9 @@ - from cherrypy.test import test - test.prefer_parent_path() - -+import sys - import gzip, StringIO -+from httplib import IncompleteRead - import cherrypy - europoundUnicode = u'\x80\xa3' - europoundUtf8 = u'\x80\xa3'.encode('utf-8') -@@ -160,10 +162,13 @@ - else: - # The wsgiserver will simply stop sending data, and the HTTP client - # will error due to an incomplete chunk-encoded stream. -- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -- headers=[("Accept-Encoding", "gzip")]) -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) -+ else: -+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) - -- - if __name__ == "__main__": - setup_server() - helper.testmain() -Index: cherrypy/test/test_core.py -=================================================================== ---- cherrypy/test/test_core.py (revision 2049) -+++ cherrypy/test/test_core.py (working copy) -@@ -7,6 +7,7 @@ - localDir = os.path.dirname(__file__) - import sys - import types -+from httplib import IncompleteRead - - import cherrypy - from cherrypy import _cptools, tools -@@ -760,8 +761,12 @@ - else: - # Under HTTP/1.1, the chunked transfer-coding is used. - # The HTTP client will choke when the output is incomplete. -- self.assertRaises(ValueError, self.getPage, -- "/error/page_streamed") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/error/page_streamed") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/error/page_streamed") - - # No traceback should be present - self.getPage("/error/cause_err_in_finalize") -Index: cherrypy/wsgiserver/__init__.py -=================================================================== ---- cherrypy/wsgiserver/__init__.py (revision 2049) -+++ cherrypy/wsgiserver/__init__.py (working copy) -@@ -713,148 +713,325 @@ - """Exception raised when the SSL implementation signals a fatal alert.""" - pass - -+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2): -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" - --class CP_fileobject(socket._fileobject): -- """Faux file object attached to a socket object.""" -- -- def sendall(self, data): -- """Sendall for non-blocking sockets.""" -- while data: -- try: -- bytes_sent = self.send(data) -- data = data[bytes_sent:] -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def send(self, data): -- return self._sock.send(data) -- -- def flush(self): -- if self._wbuf: -- buffer = "".join(self._wbuf) -- self._wbuf = [] -- self.sendall(buffer) -- -- def recv(self, size): -- while True: -- try: -- return self._sock.recv(size) -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def read(self, size=-1): -- if size < 0: -- # Read until EOF -- buffers = [self._rbuf] -- self._rbuf = "" -- if self._rbufsize <= 1: -- recv_size = self.default_bufsize -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): -+ while True: -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def read(self, size=-1): -+ # Use max, disallow tiny reads in a loop as they are very inefficient. -+ # We never leave read() with any leftover data from a new recv() call -+ # in our internal buffer. -+ rbufsize = max(self._rbufsize, self.default_bufsize) -+ # Our use of StringIO rather than lists of string objects returned by -+ # recv() minimizes memory usage and fragmentation that occurs when -+ # rbufsize is large compared to the typical return value of recv(). -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if size < 0: -+ # Read until EOF -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(rbufsize) -+ if not data: -+ break -+ buf.write(data) -+ return buf.getvalue() - else: -- recv_size = self._rbufsize -- -+ # Read until size bytes or EOF seen, whichever comes first -+ buf_len = buf.tell() -+ if buf_len >= size: -+ # Already have size bytes in our buffer? Extract and return. -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ left = size - buf_len -+ # recv() will malloc the amount of memory given as its -+ # parameter even though it often returns much less data -+ # than that. The returned data string is short lived -+ # as we copy it into a StringIO and free it. This avoids -+ # fragmentation issues on many platforms. -+ data = self.recv(left) -+ if not data: -+ break -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid buffer data copies when: -+ # - We have no data in our buffer. -+ # AND -+ # - Our call to recv returned exactly the -+ # number of bytes we were asked to read. -+ return data -+ if n == left: -+ buf.write(data) -+ del data # explicit free -+ break -+ assert n <= left, "recv(%d) returned %d bytes" % (left, n) -+ buf.write(data) -+ buf_len += n -+ del data # explicit free -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+ def readline(self, size=-1): -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if buf.tell() > 0: -+ # check if we already have it in our buffer -+ buf.seek(0) -+ bline = buf.readline(size) -+ if bline.endswith('\n') or len(bline) == size: -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return bline -+ del bline -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ buf.seek(0) -+ buffers = [buf.read()] -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ data = None -+ recv = self.recv -+ while data != "\n": -+ data = recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ -+ buf.seek(0, 2) # seek end -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ buf.write(data[:nl]) -+ self._rbuf.write(data[nl:]) -+ del data -+ break -+ buf.write(data) -+ return buf.getvalue() -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ buf.seek(0, 2) # seek end -+ buf_len = buf.tell() -+ if buf_len >= size: -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ left = size - buf_len -+ # did we just receive a newline? -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ # save the excess data to _rbuf -+ self._rbuf.write(data[nl:]) -+ if buf_len: -+ buf.write(data[:nl]) -+ break -+ else: -+ # Shortcut. Avoid data copy through buf when returning -+ # a substring of our first recv(). -+ return data[:nl] -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid data copy through buf when -+ # returning exactly all of our first recv(). -+ return data -+ if n >= left: -+ buf.write(data[:left]) -+ self._rbuf.write(data[left:]) -+ break -+ buf.write(data) -+ buf_len += n -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+else: -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" -+ -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): - while True: -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- return "".join(buffers) -- else: -- # Read until size bytes or EOF seen, whichever comes first -- data = self._rbuf -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- left = size - buf_len -- recv_size = max(self._rbufsize, left) -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise - -- def readline(self, size=-1): -- data = self._rbuf -- if size < 0: -- # Read until \n or EOF, whichever comes first -- if self._rbufsize <= 1: -- # Speed up unbuffered case -- assert data == "" -+ def read(self, size=-1): -+ if size < 0: -+ # Read until EOF -+ buffers = [self._rbuf] -+ self._rbuf = "" -+ if self._rbufsize <= 1: -+ recv_size = self.default_bufsize -+ else: -+ recv_size = self._rbufsize -+ -+ while True: -+ data = self.recv(recv_size) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ else: -+ # Read until size bytes or EOF seen, whichever comes first -+ data = self._rbuf -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] - buffers = [] -- while data != "\n": -- data = self.recv(1) -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ left = size - buf_len -+ recv_size = max(self._rbufsize, left) -+ data = self.recv(recv_size) - if not data: - break - buffers.append(data) -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n - return "".join(buffers) -- nl = data.find('\n') -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -+ -+ def readline(self, size=-1): -+ data = self._rbuf -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ assert data == "" -+ buffers = [] -+ while data != "\n": -+ data = self.recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) - nl = data.find('\n') - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- return "".join(buffers) -- else: -- # Read until size bytes or \n or EOF seen, whichever comes first -- nl = data.find('\n', 0, size) -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -- left = size - buf_len -- nl = data.find('\n', 0, left) -+ return data[:nl] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ return "".join(buffers) -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ nl = data.find('\n', 0, size) - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ return data[:nl] -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ left = size - buf_len -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n -+ return "".join(buffers) - - - class SSL_fileobject(CP_fileobject): diff --git a/community-testing/python-cherrypy/ChangeLog b/community-testing/python-cherrypy/ChangeLog deleted file mode 100644 index 90276417c..000000000 --- a/community-testing/python-cherrypy/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ - -2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.2 - -2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.1 - -2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for python 2.6 - * Thanks to David Moore - -2008-07-09 Mateusz Herych <heniekk@gmail.com> - - * Updating for x86_64: 3.1.0 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 3.1.0 - -2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updating in i686: 3.0.3 - diff --git a/community-testing/python-cherrypy/PKGBUILD b/community-testing/python-cherrypy/PKGBUILD deleted file mode 100644 index 75af39b55..000000000 --- a/community-testing/python-cherrypy/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 45860 2011-04-30 05:41:24Z kchen $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Armando M. Baratti <amblistas@ajato.com.br> -# Contributor: Florian Richter <Florian_Richter@gmx.de> -pkgname=python-cherrypy -pkgver=3.2.0 -pkgrel=1 -pkgdesc="A pythonic, object-oriented web development framework" -arch=('i686' 'x86_64') -url="http://www.cherrypy.org" -license=('BSD') -depends=('python3') -source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz - license) -md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f' - '22365dc6b0e6835b53da009aa36af017') - -build() { - cd $srcdir/CherryPy-$pkgver - python ./setup.py install --root=$pkgdir - install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license -} diff --git a/community-testing/python-cherrypy/license b/community-testing/python-cherrypy/license deleted file mode 100644 index 32e9cf6bd..000000000 --- a/community-testing/python-cherrypy/license +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2004, CherryPy Team (team@cherrypy.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * 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. - * Neither the name of the CherryPy Team nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community-testing/python2-cherrypy/837.2049.patch b/community-testing/python2-cherrypy/837.2049.patch deleted file mode 100644 index 20cc0dd36..000000000 --- a/community-testing/python2-cherrypy/837.2049.patch +++ /dev/null @@ -1,554 +0,0 @@ -Index: cherrypy/test/test_tools.py -=================================================================== ---- cherrypy/test/test_tools.py (revision 2049) -+++ cherrypy/test/test_tools.py (working copy) -@@ -3,6 +3,7 @@ - import gzip - import StringIO - import sys -+from httplib import IncompleteRead - import time - timeout = 0.2 - -@@ -272,8 +273,12 @@ - # Because this error is raised after the response body has - # started, and because it's chunked output, an error is raised by - # the HTTP client when it encounters incomplete output. -- self.assertRaises(ValueError, self.getPage, -- "/demo/errinstream?id=5") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/demo/errinstream?id=5") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/demo/errinstream?id=5") - # If this fails, then on_end_request isn't being called at all. - time.sleep(0.1) - self.getPage("/demo/ended/5") -Index: cherrypy/test/webtest.py -=================================================================== ---- cherrypy/test/webtest.py (revision 2049) -+++ cherrypy/test/webtest.py (working copy) -@@ -491,7 +491,7 @@ - # IN6ADDR_ANY, which should respond on localhost. - host = "::1" - conn = http_conn(host, port) -- -+ - conn._http_vsn_str = protocol - conn._http_vsn = int("".join([x for x in protocol if x.isdigit()])) - -Index: cherrypy/test/test_encoding.py -=================================================================== ---- cherrypy/test/test_encoding.py (revision 2049) -+++ cherrypy/test/test_encoding.py (working copy) -@@ -1,7 +1,9 @@ - from cherrypy.test import test - test.prefer_parent_path() - -+import sys - import gzip, StringIO -+from httplib import IncompleteRead - import cherrypy - europoundUnicode = u'\x80\xa3' - europoundUtf8 = u'\x80\xa3'.encode('utf-8') -@@ -160,10 +162,13 @@ - else: - # The wsgiserver will simply stop sending data, and the HTTP client - # will error due to an incomplete chunk-encoded stream. -- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -- headers=[("Accept-Encoding", "gzip")]) -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) -+ else: -+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) - -- - if __name__ == "__main__": - setup_server() - helper.testmain() -Index: cherrypy/test/test_core.py -=================================================================== ---- cherrypy/test/test_core.py (revision 2049) -+++ cherrypy/test/test_core.py (working copy) -@@ -7,6 +7,7 @@ - localDir = os.path.dirname(__file__) - import sys - import types -+from httplib import IncompleteRead - - import cherrypy - from cherrypy import _cptools, tools -@@ -760,8 +761,12 @@ - else: - # Under HTTP/1.1, the chunked transfer-coding is used. - # The HTTP client will choke when the output is incomplete. -- self.assertRaises(ValueError, self.getPage, -- "/error/page_streamed") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/error/page_streamed") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/error/page_streamed") - - # No traceback should be present - self.getPage("/error/cause_err_in_finalize") -Index: cherrypy/wsgiserver/__init__.py -=================================================================== ---- cherrypy/wsgiserver/__init__.py (revision 2049) -+++ cherrypy/wsgiserver/__init__.py (working copy) -@@ -713,148 +713,325 @@ - """Exception raised when the SSL implementation signals a fatal alert.""" - pass - -+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2): -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" - --class CP_fileobject(socket._fileobject): -- """Faux file object attached to a socket object.""" -- -- def sendall(self, data): -- """Sendall for non-blocking sockets.""" -- while data: -- try: -- bytes_sent = self.send(data) -- data = data[bytes_sent:] -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def send(self, data): -- return self._sock.send(data) -- -- def flush(self): -- if self._wbuf: -- buffer = "".join(self._wbuf) -- self._wbuf = [] -- self.sendall(buffer) -- -- def recv(self, size): -- while True: -- try: -- return self._sock.recv(size) -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def read(self, size=-1): -- if size < 0: -- # Read until EOF -- buffers = [self._rbuf] -- self._rbuf = "" -- if self._rbufsize <= 1: -- recv_size = self.default_bufsize -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): -+ while True: -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def read(self, size=-1): -+ # Use max, disallow tiny reads in a loop as they are very inefficient. -+ # We never leave read() with any leftover data from a new recv() call -+ # in our internal buffer. -+ rbufsize = max(self._rbufsize, self.default_bufsize) -+ # Our use of StringIO rather than lists of string objects returned by -+ # recv() minimizes memory usage and fragmentation that occurs when -+ # rbufsize is large compared to the typical return value of recv(). -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if size < 0: -+ # Read until EOF -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(rbufsize) -+ if not data: -+ break -+ buf.write(data) -+ return buf.getvalue() - else: -- recv_size = self._rbufsize -- -+ # Read until size bytes or EOF seen, whichever comes first -+ buf_len = buf.tell() -+ if buf_len >= size: -+ # Already have size bytes in our buffer? Extract and return. -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ left = size - buf_len -+ # recv() will malloc the amount of memory given as its -+ # parameter even though it often returns much less data -+ # than that. The returned data string is short lived -+ # as we copy it into a StringIO and free it. This avoids -+ # fragmentation issues on many platforms. -+ data = self.recv(left) -+ if not data: -+ break -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid buffer data copies when: -+ # - We have no data in our buffer. -+ # AND -+ # - Our call to recv returned exactly the -+ # number of bytes we were asked to read. -+ return data -+ if n == left: -+ buf.write(data) -+ del data # explicit free -+ break -+ assert n <= left, "recv(%d) returned %d bytes" % (left, n) -+ buf.write(data) -+ buf_len += n -+ del data # explicit free -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+ def readline(self, size=-1): -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if buf.tell() > 0: -+ # check if we already have it in our buffer -+ buf.seek(0) -+ bline = buf.readline(size) -+ if bline.endswith('\n') or len(bline) == size: -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return bline -+ del bline -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ buf.seek(0) -+ buffers = [buf.read()] -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ data = None -+ recv = self.recv -+ while data != "\n": -+ data = recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ -+ buf.seek(0, 2) # seek end -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ buf.write(data[:nl]) -+ self._rbuf.write(data[nl:]) -+ del data -+ break -+ buf.write(data) -+ return buf.getvalue() -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ buf.seek(0, 2) # seek end -+ buf_len = buf.tell() -+ if buf_len >= size: -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ left = size - buf_len -+ # did we just receive a newline? -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ # save the excess data to _rbuf -+ self._rbuf.write(data[nl:]) -+ if buf_len: -+ buf.write(data[:nl]) -+ break -+ else: -+ # Shortcut. Avoid data copy through buf when returning -+ # a substring of our first recv(). -+ return data[:nl] -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid data copy through buf when -+ # returning exactly all of our first recv(). -+ return data -+ if n >= left: -+ buf.write(data[:left]) -+ self._rbuf.write(data[left:]) -+ break -+ buf.write(data) -+ buf_len += n -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+else: -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" -+ -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): - while True: -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- return "".join(buffers) -- else: -- # Read until size bytes or EOF seen, whichever comes first -- data = self._rbuf -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- left = size - buf_len -- recv_size = max(self._rbufsize, left) -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise - -- def readline(self, size=-1): -- data = self._rbuf -- if size < 0: -- # Read until \n or EOF, whichever comes first -- if self._rbufsize <= 1: -- # Speed up unbuffered case -- assert data == "" -+ def read(self, size=-1): -+ if size < 0: -+ # Read until EOF -+ buffers = [self._rbuf] -+ self._rbuf = "" -+ if self._rbufsize <= 1: -+ recv_size = self.default_bufsize -+ else: -+ recv_size = self._rbufsize -+ -+ while True: -+ data = self.recv(recv_size) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ else: -+ # Read until size bytes or EOF seen, whichever comes first -+ data = self._rbuf -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] - buffers = [] -- while data != "\n": -- data = self.recv(1) -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ left = size - buf_len -+ recv_size = max(self._rbufsize, left) -+ data = self.recv(recv_size) - if not data: - break - buffers.append(data) -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n - return "".join(buffers) -- nl = data.find('\n') -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -+ -+ def readline(self, size=-1): -+ data = self._rbuf -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ assert data == "" -+ buffers = [] -+ while data != "\n": -+ data = self.recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) - nl = data.find('\n') - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- return "".join(buffers) -- else: -- # Read until size bytes or \n or EOF seen, whichever comes first -- nl = data.find('\n', 0, size) -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -- left = size - buf_len -- nl = data.find('\n', 0, left) -+ return data[:nl] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ return "".join(buffers) -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ nl = data.find('\n', 0, size) - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ return data[:nl] -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ left = size - buf_len -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n -+ return "".join(buffers) - - - class SSL_fileobject(CP_fileobject): diff --git a/community-testing/python2-cherrypy/ChangeLog b/community-testing/python2-cherrypy/ChangeLog deleted file mode 100644 index 90276417c..000000000 --- a/community-testing/python2-cherrypy/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ - -2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.2 - -2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.1 - -2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for python 2.6 - * Thanks to David Moore - -2008-07-09 Mateusz Herych <heniekk@gmail.com> - - * Updating for x86_64: 3.1.0 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 3.1.0 - -2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updating in i686: 3.0.3 - diff --git a/community-testing/python2-cherrypy/PKGBUILD b/community-testing/python2-cherrypy/PKGBUILD deleted file mode 100644 index 98665d8eb..000000000 --- a/community-testing/python2-cherrypy/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 45860 2011-04-30 05:41:24Z kchen $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Armando M. Baratti <amblistas@ajato.com.br> -# Contributor: Florian Richter <Florian_Richter@gmx.de> -pkgname=python2-cherrypy -pkgver=3.2.0 -pkgrel=1 -pkgdesc="A pythonic, object-oriented web development framework" -arch=('i686' 'x86_64') -url="http://www.cherrypy.org" -license=('BSD') -replaces=('cherrypy') -depends=('python2') -source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz - license) -md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f' - '22365dc6b0e6835b53da009aa36af017') - -build() { - cd $srcdir/CherryPy-$pkgver - python2 ./setup.py install --root=$pkgdir - install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license -} diff --git a/community-testing/python2-cherrypy/license b/community-testing/python2-cherrypy/license deleted file mode 100644 index 32e9cf6bd..000000000 --- a/community-testing/python2-cherrypy/license +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2004, CherryPy Team (team@cherrypy.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * 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. - * Neither the name of the CherryPy Team nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community-testing/splix/PKGBUILD b/community-testing/splix/PKGBUILD deleted file mode 100644 index 9b8061ad5..000000000 --- a/community-testing/splix/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 45807 2011-04-29 11:10:15Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Francis Carroll (franciscarroll at gmail dot com) - -pkgname=splix -pkgver=2.0.0 -pkgrel=9 -pkgdesc="CUPS drivers for SPL (Samsung Printer Language) printers" -arch=('i686' 'x86_64') -url="http://splix.ap2c.org/" -license=('GPL') -depends=('libcups' 'gcc-libs' 'ghostscript>=9.02') -makedepends=('libcups' 'jbigkit' 'krb5') -install=splix.install -source=(http://downloads.sourceforge.net/splix/$pkgname-$pkgver.tar.bz2) -md5sums=('f3aa735c22a926818b3d8b26c9964186') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's#const PPDFile::Value::Value #const PPDFile::Value #' src/ppdfile.cpp - - make PSTORASTER=gstoraster -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -d "$pkgdir/usr/lib/cups/filter" - install -d "$pkgdir/usr/share/cups/model/samsung" - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/splix/splix.install b/community-testing/splix/splix.install deleted file mode 100644 index ee1eb78a3..000000000 --- a/community-testing/splix/splix.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - cat <<EOF -Installation of the color profile for color printers: ------------------------------------------------------ - - Color printers needs color profile files to get better results. These -files are provided by your printer manufacturer and you have to install them -manually. To do that, download the linux official drivers and locate the "cms" -directory. Install this directory to "/usr/share/cups/model/\$MANUFACTURER/cms". - - Samsung color profile files are available at: - (Then use MANUFACTURER=samsung) - http://splix.ap2c.org/samsung_cms.tar.bz2 -EOF -} - -post_upgrade() { - post_install -} diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules new file mode 100644 index 000000000..37403ae2f --- /dev/null +++ b/community-testing/virtualbox/10-vboxdrv.rules @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..4a28b93b6 --- /dev/null +++ b/community-testing/virtualbox/18-system-xorg.patch @@ -0,0 +1,277 @@ +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 new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/community-testing/virtualbox/60-vboxguest.rules @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..d0e939ad4 --- /dev/null +++ b/community-testing/virtualbox/LocalConfig.kmk @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..d989f61e0 --- /dev/null +++ b/community-testing/virtualbox/PKGBUILD @@ -0,0 +1,217 @@ +# $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 new file mode 100644 index 000000000..71930f062 --- /dev/null +++ b/community-testing/virtualbox/change_default_driver_dir.patch @@ -0,0 +1,18 @@ +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 new file mode 100644 index 000000000..e7a9179a9 --- /dev/null +++ b/community-testing/virtualbox/vboxdrv-reference.patch @@ -0,0 +1,45 @@ +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 new file mode 100755 index 000000000..8de14b97f --- /dev/null +++ b/community-testing/virtualbox/vboxdrv.sh @@ -0,0 +1,80 @@ +#!/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 new file mode 100644 index 000000000..e1fcb8c2f --- /dev/null +++ b/community-testing/virtualbox/virtualbox-4-makeself-check.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..8b0d59123 --- /dev/null +++ b/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..ae05bd1ba --- /dev/null +++ b/community-testing/virtualbox/virtualbox-guest-modules.install @@ -0,0 +1,24 @@ +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 new file mode 100644 index 000000000..e70757685 --- /dev/null +++ b/community-testing/virtualbox/virtualbox.install @@ -0,0 +1,65 @@ +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/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 65727809c..b3851c4b6 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 46952 2011-05-13 20:41:04Z andrea $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=1 -pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink" +pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') -url="http://aria2.sourceforge.net/" +url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') -source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) -md5sums=('da785645a6d92450b0a54f384202ba6b') -sha1sums=('b3b37cc7363305d55e86dcd74a73dc493ecfa530') +source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") +sha1sums=('db4761fa311e6d1f9526d1ee25461c2db84750ff') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + cd aria2-${pkgver} + + ./configure \ + --prefix=/usr \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd aria2-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch new file mode 100644 index 000000000..572ca97fd --- /dev/null +++ b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch @@ -0,0 +1,206 @@ +From e467755fac27630730be25c4b41e5d0cfcd89c67 Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Tue, 10 Aug 2010 15:48:21 +0800 +Subject: [PATCH 1/2] autofs-5.0.5 - include krb5 library + +Since the Cyrus SASL module calls Kerberos directly we should be +linking against the Kerberos librarys. +--- + Makefile.conf.in | 2 + + aclocal.m4 | 19 +++++++++++++++ + configure | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 5 +++- + modules/Makefile | 4 +- + 5 files changed, 93 insertions(+), 4 deletions(-) + +diff --git a/Makefile.conf.in b/Makefile.conf.in +index f0287c3..a9bcf8c 100644 +--- a/Makefile.conf.in ++++ b/Makefile.conf.in +@@ -31,6 +31,8 @@ XML_FLAGS = @XML_FLAGS@ + SASL = @HAVE_SASL@ + LIBSASL= @LIBSASL@ + SASL_FLAGS = @SASL_FLAGS@ ++KRB5_LIBS=@KRB5_LIBS@ ++KRB5_FLAGS=@KRB5_FLAGS@ + + # NIS+ support: yes (1) no (0) + NISPLUS = @HAVE_NISPLUS@ +diff --git a/aclocal.m4 b/aclocal.m4 +index e7f1a30..750a159 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -215,6 +215,25 @@ else + fi]) + + dnl -------------------------------------------------------------------------- ++dnl AF_CHECK_KRB5 ++dnl ++dnl Check for Kerberos 5 ++dnl -------------------------------------------------------------------------- ++AC_DEFUN([AF_CHECK_KRB5], ++[AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no) ++AC_MSG_CHECKING(for Kerberos library) ++if test "$KRB5_CONFIG" = "no" ++then ++ AC_MSG_RESULT(no) ++ HAVE_KRB5=0 ++else ++ AC_MSG_RESULT(yes) ++ HAVE_KRB5=1 ++ KRB5_LIBS=`$KRB5_CONFIG --libs` ++ KRB5_FLAGS=`$KRB5_CONFIG --cflags` ++fi]) ++ ++dnl -------------------------------------------------------------------------- + dnl AF_CHECK_LIBHESIOD + dnl + dnl Check for lib hesiod +diff --git a/configure b/configure +index 159f25f..500411c 100755 +--- a/configure ++++ b/configure +@@ -640,6 +640,8 @@ ac_subst_vars='LTLIBOBJS + LIBOBJS + DAEMON_LDFLAGS + DAEMON_CFLAGS ++KRB5_FLAGS ++KRB5_LIBS + LIBSASL + HAVE_SASL + SASL_FLAGS +@@ -657,6 +659,7 @@ LIBHESIOD + HAVE_HESIOD + LIBRESOLV + LIBNSL ++KRB5_CONFIG + XML_CONFIG + PATH_RPCGEN + RPCGEN +@@ -3723,7 +3726,7 @@ $as_echo "no" >&6; } + fi + fi + +-# LDAP SASL auth need libxml ++# LDAP SASL auth needs libxml and Kerberos + for ac_prog in xml2-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -3801,6 +3804,66 @@ _ACEOF + fi + fi + fi ++for ac_prog in krb5-config ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ case $KRB5_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG ++if test -n "$KRB5_CONFIG"; then ++ { $as_echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5 ++$as_echo "$KRB5_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$KRB5_CONFIG" && break ++done ++test -n "$KRB5_CONFIG" || KRB5_CONFIG="no" ++ ++{ $as_echo "$as_me:$LINENO: checking for Kerberos library" >&5 ++$as_echo_n "checking for Kerberos library... " >&6; } ++if test "$KRB5_CONFIG" = "no" ++then ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_KRB5=0 ++else ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_KRB5=1 ++ KRB5_LIBS=`$KRB5_CONFIG --libs` ++ KRB5_FLAGS=`$KRB5_CONFIG --cflags` ++fi + + # + # glibc/libc 6 new libraries +@@ -5178,6 +5241,8 @@ fi + + + ++ ++ + LDFLAGS="${AF_tmp_ldflags}" + + # +diff --git a/configure.in b/configure.in +index f649a58..70b45e8 100644 +--- a/configure.in ++++ b/configure.in +@@ -144,8 +144,9 @@ AF_CHECK_PROG(RPCGEN, rpcgen, , $searchpath) + # + AF_SLOPPY_MOUNT() + +-# LDAP SASL auth need libxml ++# LDAP SASL auth needs libxml and Kerberos + AF_CHECK_LIBXML() ++AF_CHECK_KRB5() + + # + # glibc/libc 6 new libraries +@@ -274,6 +275,8 @@ AC_SUBST(XML_LIBS) + AC_SUBST(SASL_FLAGS) + AC_SUBST(HAVE_SASL) + AC_SUBST(LIBSASL) ++AC_SUBST(KRB5_LIBS) ++AC_SUBST(KRB5_FLAGS) + LDFLAGS="${AF_tmp_ldflags}" + + # +diff --git a/modules/Makefile b/modules/Makefile +index 13b3bd8..2389196 100644 +--- a/modules/Makefile ++++ b/modules/Makefile +@@ -42,8 +42,8 @@ ifeq ($(LDAP), 1) + MODS += lookup_ldap.so + ifeq ($(SASL), 1) + SASL_OBJ = cyrus-sasl.o +- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE +- LIBLDAP += $(LIBSASL) $(XML_LIBS) ++ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE ++ LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS) + endif + endif + +-- +1.7.5.1 + diff --git a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch new file mode 100644 index 000000000..e4e480e82 --- /dev/null +++ b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch @@ -0,0 +1,59 @@ +From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Wed, 11 Aug 2010 09:33:09 +0800 +Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call + +autofs should never have had to use ERR_remove_state() so remove that call. + +Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry +picking Kerberos related patches from the 5.0.6 development branch. + +Conflicts: + + CHANGELOG + +Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> +--- + CHANGELOG | 4 ++++ + modules/lookup_ldap.c | 12 +----------- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index e734cb3..1a20a81 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++??/??/20?? autofs-5.0.6 ++----------------------- ++- remove ERR_remove_state() openssl call. ++ + 03/09/2009 autofs-5.0.5 + ----------------------- + - fix dumb libxml2 check +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ecf5fe..1221c2c 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c + int rv; + + #ifdef WITH_SASL +- /* +- * The OpenSSL library can't handle having its message and error +- * string database loaded multiple times and segfaults if the +- * TLS environment is not reset at the right times. As there +- * is no ldap_stop_tls call in the openldap library we have +- * to do the job ourselves, here and in lookup_done when the +- * module is closed. +- */ +- if (ctxt->use_tls == LDAP_TLS_RELEASE) { +- ERR_remove_state(0); ++ if (ctxt->use_tls == LDAP_TLS_RELEASE) + ctxt->use_tls = LDAP_TLS_INIT; +- } + autofs_sasl_unbind(ctxt); + #endif + +-- +1.7.5.1 + diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 26894dd02..743fde93c 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ +# $Id: PKGBUILD 47057 2011-05-15 17:16:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.5 -pkgrel=6 +pkgrel=7 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://freshmeat.net/projects/autofs' @@ -18,11 +18,15 @@ backup=('etc/autofs/auto.master' options=(!makeflags) install='autofs.install' source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" + "0001-${pkgname}-5.0.5-include-krb5-library.patch" + "0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch" 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc') md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + '478737b8e3e79365a0e183aa95aab307' + 'e347999e5dffe142e7e57b067d3d9e9f' 'e307bf6d2638e46eeb916cf42fe029b2' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' @@ -34,6 +38,9 @@ build() { sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules + patch -p1 -i "../0001-${pkgname}-5.0.5-include-krb5-library.patch" + patch -p1 -i "../0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch" + ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ --enable-ignore-busy make diff --git a/community/autofs/heimdal.patch b/community/autofs/heimdal.patch deleted file mode 100644 index 4aa321834..000000000 --- a/community/autofs/heimdal.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 -+++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 -@@ -66,6 +66,15 @@ - #endif - #endif - -+/** -+ * The type of a principal is different for MIT Krb5 and Heimdal. -+ * These macros are provided by Heimdal, and introduced here for MIT. -+ */ -+#ifndef krb5_realm_length -+#define krb5_realm_length(r) ((r).length) -+#define krb5_realm_data(r) ((r).data) -+#endif -+ - /* - * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME - * environment variable so that the library knows where to find it. -@@ -452,11 +452,11 @@ - - /* setup a principal for the ticket granting service */ - ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - 0); - if (ret) { - error(logopt, ---- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 -+++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 -@@ -43,7 +43,7 @@ - ifeq ($(SASL), 1) - SASL_OBJ = cyrus-sasl.o - LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE -- LIBLDAP += $(LIBSASL) $(XML_LIBS) -+ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 - endif - endif
\ No newline at end of file diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index e6f9c227c..9ec165ff9 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 46560 2011-05-09 06:22:55Z andrea $ +# $Id: PKGBUILD 47955 2011-05-26 11:34:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.7.59 -pkgrel=3 +pkgver=0.8.2 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" license=('GPL3') -depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' +depends=('python-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 'python-imaging' 'desktop-file-utils' 'shared-mime-info' @@ -20,13 +20,14 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('78ebed5248758b9be1d135ae018b8dfe' +md5sums=('e64c92ccf29ac17bfaf4a296e17a38ba' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { cd "${srcdir}/${pkgname}" - rm -rf src/{cherrypy,pyPdf} + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ $(find . -regex ".*.py\|.*.recipe") diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index c7c273d5d..4acbcb555 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 43777 2011-03-29 18:26:08Z lfleischer $ +# $Id: PKGBUILD 47638 2011-05-24 14:28:23Z tdziedzic $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive pkgver=0.7.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' @@ -16,11 +16,15 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pk md5sums=('de25297e9f34677d4d1920078d9cf254') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr + cd ${pkgname}-${pkgver} + + cmake \ + -DCMAKE_BUILD_TYPE=debug \ + -DCMAKE_INSTALL_PREFIX=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD index 9ec615de8..e50fdefcc 100644 --- a/community/ccrtp/PKGBUILD +++ b/community/ccrtp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 33232 2010-11-23 12:15:12Z spupykin $ +# $Id: PKGBUILD 47033 2011-05-14 10:27:41Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=ccrtp -pkgver=1.7.1 +pkgver=1.8.0 pkgrel=1 pkgdesc="GNU ccRTP" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,13 @@ url="http://www.gnu.org/software/ccrtp" license=('GPL' 'custom') depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt') options=('!libtool') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('9f5d34a18f2c1c779d2e5818cc4987f8') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz gcc46.patch) +md5sums=('3410d2f43a6a28679bd091ed8b2ed228' + '17ce9c79c4518f35f484b539bcff570d') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/gcc46.patch # arch64 fix from Mandriva [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr diff --git a/community/ccrtp/gcc46.patch b/community/ccrtp/gcc46.patch new file mode 100644 index 000000000..a4b25b369 --- /dev/null +++ b/community/ccrtp/gcc46.patch @@ -0,0 +1,11 @@ +diff -aur ccrtp-1.8.0.old//src/ccrtp/sources.h ccrtp-1.8.0.new//src/ccrtp/sources.h +--- ccrtp-1.8.0.old//src/ccrtp/sources.h 2011-05-14 03:15:35.993564505 -0700 ++++ ccrtp-1.8.0.new//src/ccrtp/sources.h 2011-05-14 03:19:02.033569568 -0700 +@@ -46,6 +46,7 @@ + + #include <string> + #include <ccrtp/rtcppkt.h> ++#include <stddef.h> + + #ifdef CCXX_NAMESPACES + namespace ost { diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 091e9dfa9..e312ba5ef 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42879 2011-03-22 02:06:35Z foutrelis $ +# $Id: PKGBUILD 47874 2011-05-25 20:20:57Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.98 +pkgrel=1 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -25,7 +25,7 @@ options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc cherokee.logrotate) -md5sums=('6450f0aa116966227c477a1930292e53' +md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb' 'a2d2b69c6220fab57cda4f531b680f9f' '8d69341bd4002bffd69c6e82ff6c905f') @@ -38,10 +38,15 @@ build() { # Use Python 2 in cherokee-admin sed -i 's/"python"/"python2"/' cherokee/main_admin.c - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-wwwroot=/srv/http --disable-static \ - --with-wwwuser=http --with-wwwgroup=http \ - --enable-os-string="Arch Linux" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --with-wwwroot=/srv/http \ + --with-wwwuser=http \ + --with-wwwgroup=http \ + --enable-os-string="Arch Linux" make } diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index f8def59e5..aeb5968f6 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.3.0 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.3.1.1 +pkgrel=1 +arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license="GPL" -depends=('xulrunner' 'libglade' 'chmlib') +depends=('xulrunner>=2.0' 'libglade' 'chmlib') makedepends=('intltool' 'cmake') source=(http://chmsee.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('5ba68ccee32ba782486badc025842ccf') +md5sums=('7c226e6f518284a040ad3b9433d5e218') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index caaba4ce1..e54fb7dd5 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75457 2010-04-01 16:36:45Z giovanni $ +# $Id: PKGBUILD 47569 2011-05-23 20:05:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap -pkgver=4.9.1 +pkgver=4.9.3 pkgrel=1 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 courier-imap.conf.d courier-imap.rc.d) -md5sums=('780929e509c4e9199d5efc68d9158ba1' +md5sums=('703ddbb090569436dbda61d0d62b1eb8' '3e08f017f6c5a52dea28f6f0dbd50b86' '3e4910c5a34af68dfdeed932e573a9f9') diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index 3ded9fd3b..e0706c442 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -5,7 +5,7 @@ pkgname=courier-maildrop _srcname=maildrop -pkgver=2.5.3 +pkgver=2.5.4 pkgrel=1 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('courier-authlib>=0.63.0' 'fam' 'pcre' 'gdbm') conflicts=('courier-mta') options=(!libtool) source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) -md5sums=('5ba52236cec2947e75fafcd6146fd8cd') +md5sums=('5770345cdceae28bdc24809e7adb3426') build() { cd ${srcdir}/${_srcname}-${pkgver} diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index fee376514..c4c21332d 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 36041 2010-12-25 20:18:47Z lfleischer $ +# $Id: PKGBUILD 47194 2011-05-18 15:41:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.4.4 +pkgver=0.5.0 pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' license=('GPL2') -depends=('gtk2' 'libsamplerate' 'alsa-lib') -makedepends=('gtk2' 'libsamplerate' 'libvorbis' 'libmad' 'flac' 'curl' 'alsa-lib' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse') +depends=('gtk2' 'libsamplerate' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' + 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip') optdepends=('libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' 'flac: for FLAC playback' @@ -28,7 +29,7 @@ optdepends=('libvorbis: for Ogg Vorbis playback' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('546e63d456d6a5625461019b15501e38') +md5sums=('713c47c5e7bb9a29cd0de877aff04ae6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index bb01f18f4..39157f110 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32958 2010-11-20 11:22:07Z ttopper $ +# $Id: PKGBUILD 47199 2011-05-18 20:06:50Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=dmenu -pkgver=4.2.1 +pkgver=4.3.1 pkgrel=1 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" @@ -14,7 +14,7 @@ license=('MIT') depends=('sh' 'libxinerama') #source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") source=("$pkgname-$pkgver.tar.gz::http://hg.suckless.org/dmenu/archive/tip.tar.gz") -md5sums=('48b1e63cbf0ae7993cc68d365412d5e5') +md5sums=('a0e253e2a38c96f7bfd80b23a9ba6a12') build(){ # cd $srcdir/$pkgname-$pkgver diff --git a/community/docky/bzr-1798.diff b/community/docky/bzr-1798.diff deleted file mode 100644 index 4fcfb9fa2..000000000 --- a/community/docky/bzr-1798.diff +++ /dev/null @@ -1,170 +0,0 @@ -=== modified file 'Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs' ---- Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs 2010-12-29 15:35:31 +0000 -+++ Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs 2011-03-13 17:16:18 +0000 -@@ -150,7 +150,7 @@ - { - DockySurface result = new DockySurface (area.Width, area.Height, this); - -- Internal.Show (result.Context, 0 - area.X, 0 - area.Y); -+ Internal.Show (result.Context, -area.X, -area.Y); - - return result; - } - -=== modified file 'Docky.Items/Docky.Painters/PagingDockPainter.cs' ---- Docky.Items/Docky.Painters/PagingDockPainter.cs 2011-01-26 04:43:08 +0000 -+++ Docky.Items/Docky.Painters/PagingDockPainter.cs 2011-03-13 17:16:18 +0000 -@@ -117,7 +117,7 @@ - ShowBuffer (surface, LastPage, offset); - } else { - ShowBuffer (surface, Page, Allocation.Width - offset); -- ShowBuffer (surface, LastPage, 0 - offset); -+ ShowBuffer (surface, LastPage, -offset); - } - - // fade out the edges during a slide - -=== modified file 'Docky/Docky/CairoHelper/DockySurface_Extensions.cs' ---- Docky/Docky/CairoHelper/DockySurface_Extensions.cs 2010-12-29 08:12:28 +0000 -+++ Docky/Docky/CairoHelper/DockySurface_Extensions.cs 2011-03-13 17:16:18 +0000 -@@ -44,15 +44,15 @@ - double cos, sin; - cos = Math.Cos (rotation); - sin = Math.Sin (rotation); -- Matrix m = new Matrix (cos, sin, 0 - sin, cos, point.X, point.Y); -+ Matrix m = new Matrix (cos, sin, -sin, cos, point.X, point.Y); - cr.Transform (m); - - if (zoom != 1) - cr.Scale (zoom, zoom); - - cr.SetSource (self.Internal, -- 0 - self.Width / 2, -- 0 - self.Height / 2); -+ -self.Width / 2, -+ -self.Height / 2); - - cr.PaintWithAlpha (opacity); - -@@ -85,7 +85,7 @@ - double cos, sin; - cos = Math.Cos (rotation); - sin = Math.Sin (rotation); -- Matrix m = new Matrix (cos, sin, 0 - sin, cos, point.X, point.Y); -+ Matrix m = new Matrix (cos, sin, -sin, cos, point.X, point.Y); - cr.Transform (m); - - if (zoom != 1) -@@ -97,8 +97,8 @@ - cr.Scale (1, -1); - - cr.SetSource (self.Internal, -- 0 - self.Width / 2, -- 0 - self.Height / 2); -+ -self.Width / 2, -+ -self.Height / 2); - - cr.PaintWithAlpha (opacity * .3); - - -=== modified file 'Docky/Docky/Interface/DockWindow.cs' ---- Docky/Docky/Interface/DockWindow.cs 2011-03-03 08:59:59 +0000 -+++ Docky/Docky/Interface/DockWindow.cs 2011-03-13 17:16:18 +0000 -@@ -2749,10 +2749,10 @@ - } else { - switch (Position) { - case DockPosition.Top: -- cr.SetSource (main_buffer.Internal, 0, 0 - HideOffset * ZoomedDockHeight); -+ cr.SetSource (main_buffer.Internal, 0, -HideOffset * ZoomedDockHeight); - break; - case DockPosition.Left: -- cr.SetSource (main_buffer.Internal, 0 - HideOffset * ZoomedDockHeight, 0); -+ cr.SetSource (main_buffer.Internal, -HideOffset * ZoomedDockHeight, 0); - break; - case DockPosition.Right: - cr.SetSource (main_buffer.Internal, HideOffset * ZoomedDockHeight, 0); - -=== modified file 'Docky/Docky/Menus/DockMenu.cs' ---- Docky/Docky/Menus/DockMenu.cs 2010-10-15 15:32:36 +0000 -+++ Docky/Docky/Menus/DockMenu.cs 2011-03-13 17:16:18 +0000 -@@ -543,15 +543,15 @@ - switch (Orientation) { - case DockPosition.Top: - cr.Scale (1, -1); -- cr.Translate (0, 0 - background_buffer.Height); -+ cr.Translate (0, -background_buffer.Height); - break; - case DockPosition.Left: - cr.Rotate (Math.PI * .5); -- cr.Translate (0, 0 - background_buffer.Height); -+ cr.Translate (0, -background_buffer.Height); - break; - case DockPosition.Right: - cr.Rotate (Math.PI * -0.5); -- cr.Translate (0 - background_buffer.Width, 0); -+ cr.Translate (-background_buffer.Width, 0); - break; - } - - -=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs' ---- StandardPlugins/Clock/src/ClockDockItem.cs 2010-11-21 22:19:54 +0000 -+++ StandardPlugins/Clock/src/ClockDockItem.cs 2011-03-13 17:16:18 +0000 -@@ -388,20 +388,20 @@ - double minuteRotation = 2 * Math.PI * (DateTime.Now.Minute / 60.0) + Math.PI; - cr.Rotate (minuteRotation); - cr.MoveTo (0, radius - radius * .35); -- cr.LineTo (0, 0 - radius * .15); -+ cr.LineTo (0, -radius * .15); - cr.Stroke (); -- cr.Rotate (0 - minuteRotation); -+ cr.Rotate (-minuteRotation); - - cr.Color = new Cairo.Color (0, 0, 0); - double hourRotation = 2 * Math.PI * (DateTime.Now.Hour / (ShowMilitary ? 24.0 : 12.0)) + - Math.PI + (Math.PI / (ShowMilitary ? 12.0 : 6.0)) * DateTime.Now.Minute / 60.0; - cr.Rotate (hourRotation); - cr.MoveTo (0, radius - radius * .5); -- cr.LineTo (0, 0 - radius * .15); -+ cr.LineTo (0, -radius * .15); - cr.Stroke (); -- cr.Rotate (0 - hourRotation); -+ cr.Rotate (-hourRotation); - -- cr.Translate (0 - center, 0 - center); -+ cr.Translate (-center, -center); - - RenderFileOntoContext (cr, System.IO.Path.Combine (ThemePath, "clock-glass.svg"), radius * 2); - RenderFileOntoContext (cr, System.IO.Path.Combine (ThemePath, "clock-frame.svg"), radius * 2); - -=== modified file 'Docky/Docky/ConfigurationWindow.cs' ---- Docky/Docky/ConfigurationWindow.cs 2011-02-05 08:06:51 +0000 -+++ Docky/Docky/ConfigurationWindow.cs 2011-03-15 07:48:42 +0000 -@@ -94,9 +94,10 @@ - this.SetCompositeColormap (); - Stick (); - -- // why 1? because Compiz sucks... thats why! -- Move (0, 1); -- SetSizeRequest (Screen.Width, Screen.Height - 1); -+ // make the window extend off screen in all directions -+ // to work around problems with struts -+ Move (-50, -50); -+ SetSizeRequest (Screen.Width + 100, Screen.Height + 100); - } - - void HandleRealized (object sender, EventArgs e) - -=== modified file 'Docky/Docky/Interface/DockDragTracker.cs' ---- Docky/Docky/Interface/DockDragTracker.cs 2011-03-10 10:48:09 +0000 -+++ Docky/Docky/Interface/DockDragTracker.cs 2011-03-15 07:49:42 +0000 -@@ -539,7 +539,7 @@ - EnableDragTo (); - } else if ((Owner.CursorTracker.Modifier & ModifierType.Button1Mask) == ModifierType.Button1Mask) { - Gdk.Window bestProxy = BestProxyWindow (); -- if (proxy_window != bestProxy) { -+ if (bestProxy != null && proxy_window != bestProxy) { - proxy_window = bestProxy; - Gtk.Drag.DestSetProxy (Owner, proxy_window, DragProtocol.Xdnd, true); - } - diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD index 0411750a5..d93e15ab6 100644 --- a/community/elinks/PKGBUILD +++ b/community/elinks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40826 2011-02-28 13:59:43Z spupykin $ +# $Id: PKGBUILD 47522 2011-05-23 18:32:02Z kkeen $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,22 +6,38 @@ pkgname=elinks pkgver=0.13 -pkgrel=4 +_commit="fe83703714fd5e16401dcd152d9bdcec6036424d" +pkgrel=5 pkgdesc="An advanced and well-established feature-rich text mode web browser." arch=("i686" "x86_64" 'mips64el') url="http://elinks.or.cz" license=('GPL') depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'spidermonkey>=1.7.0' 'gc' 'tre' 'smbclient') -_commit="dfc666dd754491a9c986fbd19179b354acde30b9" -#source=("elinks-$pkgver-${_commit}.tar.gz::http://repo.or.cz/w/elinks.git/snapshot/${_commit}.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/elinks-$pkgver-${_commit}.tar.gz" - "${pkgname}.desktop") -md5sums=('c41d66285654d72c197a99973393bf06' - 'ef70f6bb7457799a979fb201615369e6') +source=() +md5sums=() + +__gitroot="http://elinks.cz/elinks.git" +__gitname="elinks" build() { - cd elinks || cd `find $srcdir -maxdepth 1 -type d -name elinks-$pkgver\*` + 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 + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + git checkout "$_commit" [ -x configure ] || sh autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man \ @@ -30,9 +46,13 @@ build() { --enable-leds --enable-256-colors --enable-html-highlight \ --with-zlib make - make DESTDIR=${pkgdir} install - rm -f ${pkgdir}/usr/share/locale/locale.alias +} + +package() { + cd "$srcdir/$__gitname-build" + make DESTDIR="$pkgdir" install + rm -f "$pkgdir/usr/share/locale/locale.alias" - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 "$srcdir/$__gitname-build/contrib/debian/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" } diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD index decc78a79..b996779ba 100644 --- a/community/encfs/PKGBUILD +++ b/community/encfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40979 2011-03-02 23:44:42Z tdziedzic $ +# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber, <celeon@gmail.com> @@ -6,7 +6,7 @@ pkgname=encfs pkgver=1.7.4 -pkgrel=3 +pkgrel=4 pkgdesc='Encrypted filesystem in user-space' arch=('i686' 'x86_64' 'mips64el') url='http://www.arg0.net/encfs' diff --git a/community/eterm/PKGBUILD b/community/eterm/PKGBUILD index ea705b225..332dfcd9b 100644 --- a/community/eterm/PKGBUILD +++ b/community/eterm/PKGBUILD @@ -1,10 +1,11 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=eterm -pkgver=0.9.5 -pkgrel=4 +pkgver=0.9.6 +pkgrel=1 pkgdesc="A vt102 terminal emulator intended as a replacement for xterm." arch=('i686' 'x86_64' 'mips64el') url="http://www.eterm.org/" @@ -12,7 +13,7 @@ license=('custom') depends=('freetype2>=2.3.5' 'libast>=0.7' 'libxmu' 'libxres') options=('!libtool') source=(http://www.eterm.org/download/Eterm-${pkgver}.tar.gz) -md5sums=('87220a61f763d111a4f5fc88ef9e50f1') +md5sums=('90e424584c22d4050496874d14f78bb1') build() { cd ${srcdir}/Eterm-${pkgver} @@ -32,3 +33,4 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } + diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 55ee84975..e3d246e34 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 40982 2011-03-03 00:04:39Z tdziedzic $ +# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" @@ -14,16 +14,20 @@ source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) md5sums=('6d4a00cdd0b59a05b1521184508d4637') build() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - cmake -DWITH_EVERYTHING=ON -DCMAKE_INSTALL_PREFIX=/usr . + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + make } package() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 8667a63bb..ba65abe77 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 43810 2011-03-29 21:55:24Z jelle $ +# $Id: PKGBUILD 47441 2011-05-23 10:00:33Z jelle $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') url="http://filezilla-project.org/" license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme') +depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3') install=filezilla.install source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") md5sums=('25617d75167d07c0d3cfced69a4cf7cc') @@ -32,4 +32,4 @@ package() { make DESTDIR=${pkgdir} install } -md5sums=('837fbea08366b9f9de02b1671994697e') +md5sums=('6a83c3afe99c2679d5a3aa73607d80a7') diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 74c1461cd..531c49b97 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 40273 2011-02-22 18:15:11Z spupykin $ +# $Id: PKGBUILD 47404 2011-05-22 20:37:23Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion -pkgver=0.8.0 -pkgrel=6 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.8.1 +pkgrel=1 +arch=('i686' 'x86_64') pkgdesc="A streaming media server" url="http://www.flumotion.net" options=('!libtool') @@ -16,10 +16,8 @@ backup=(etc/flumotion/workers/default.xml depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs') makedepends=('perlxml') -source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2 - python27.patch) -md5sums=('1df1f8fc47ca4cc6d3ead912f2ac76af' - '623a41a985d2b114c58db701c6d5d13e') +source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('8970bb126a1720ae3f0b2d02924e5700') build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,9 +29,6 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - # python2.7 patch - patch -Np0 -i "$srcdir/python27.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var install -d "$pkgdir/etc/$pkgname" diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD index b4da0526c..fb3b6553d 100644 --- a/community/frogatto/PKGBUILD +++ b/community/frogatto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46852 2011-05-12 23:55:35Z svenstaro $ +# $Id: PKGBUILD 47675 2011-05-24 19:05:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Tom Wambold <tom5760@gmail.com> pkgname='frogatto' arch=('i686' 'x86_64') pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" url="http://www.frogatto.com" license=('GPL') diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 692b8894b..54a07dce9 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -7,12 +7,12 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba '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-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' + '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=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -21,15 +21,12 @@ 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' 'omniorb' + '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.desktop' 'gambas3.png' 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('a888b85a926e713a953d6b0b261f820d' - '98472c78df490dec171851d81ddc495f' - 'ffc75028b45bd48f5cd79d36f3859cd2' +md5sums=('ab4c182b9d7dfec06b3a42bb002a779a' 'b284be39d147ec799f1116a6abc068b4' 'a8ec8e5a6aba7a7e453ce7a35c1800a9') @@ -96,9 +93,9 @@ package_gambas3-ide() { make XDG_UTILS='' DESTDIR="${pkgdir}" install #!! with the ide !! - install -D -m644 ${srcdir}/gambas3.desktop \ + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/gambas3.png \ + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ ${pkgdir}/usr/share/pixmaps/gambas3.png rm -r ${pkgdir}/usr/bin/gb* @@ -697,6 +694,24 @@ package_gambas3-gb-opengl() { ## } +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" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 7a291ddb0..433981d5d 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45665 2011-04-26 21:32:06Z ibiru $ +# $Id: PKGBUILD 47971 2011-05-26 16:56:27Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2) -sha256sums=('7152d3f5639258a0b5fb873521d36fc9919dee4c00ce9fb414045a2d8b0c06f6') +sha256sums=('d574accc1238fb45759c7b088154f934cdd1ef8f7dcb42420db02ee73a46af4b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index 9fc2ca432..053da0ecd 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40961 2011-03-02 21:23:41Z lcarlier $ +# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=7 +pkgrel=8 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" arch=('i686' 'x86_64' 'mips64el') url="http://www.globulation2.org/" license=('GPL3') -depends=('boost-libs>=1.46' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ 'fribidi' 'desktop-file-utils') -makedepends=('scons' 'boost>=1.46') +makedepends=('scons' 'boost') install=glob2.install source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz \ glob2-0.9.4.1-gcc44.patch) diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 6200c084a..4dbef2056 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 41025 2011-03-03 06:39:10Z svenstaro $ +# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom pkgver=1.16.1 -pkgrel=5 +pkgrel=6 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" license=('GPL') -depends=('libgdamm>=3.99.21' 'libxml++>=2.30.1' 'gconfmm>=2.28.2' 'pygtk' +depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk' 'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc' 'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info' - 'gtkmm>=2.22.0' 'boost-libs>=1.45' 'gettext') -makedepends=('intltool' 'gnome-doc-utils>=0.20.2' 'boost>=1.45' 'python-sphinx' 'glibmm-docs') + 'gtkmm' 'boost-libs' 'gettext') +makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) @@ -22,6 +22,12 @@ md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9') build() { cd "$srcdir/$pkgname-$pkgver" + + # doctooldir is now owned by mm-common-util instead of glibmm + # the following sed line can be removed once (if) upstream provides a fixed + # configure script + sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure + ./configure --prefix=/usr \ --with-postgres-utils=/usr/bin \ --disable-scrollkeeper \ diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 557c1edd1..f962211b1 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgrel=3 +arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool @@ -20,6 +20,10 @@ md5sums=('5b2be6b04a1bcc5fb404cc377034499e') build() { cd "$srcdir/gnash-$pkgver" + # Version is now in version.h + sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 + ./autogen.sh + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 549571f5b..a435daaaa 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 46877 2011-05-13 10:25:53Z lfleischer $ +# $Id: PKGBUILD 47944 2011-05-26 08:59:17Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') url='http://gnome-mplayer.googlecode.com/' license=('GPL') -depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme') +depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") @@ -19,7 +19,7 @@ md5sums=('72a1c7d640a67eb2d60f2671108919c2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install --without-gconf + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install make } diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index cd517d218..20c933ec7 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 47009 2011-05-14 01:24:52Z jconder $ +# $Id: PKGBUILD 48001 2011-05-26 23:17:43Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') url='http://www.packagekit.org/' license=('GPL') depends=('dconf' 'desktop-file-utils' 'gnome-menus' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') -makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') +makedepends=('gconf' 'gtk-doc' 'gnome-common' 'intltool' 'libcanberra' 'upower') optdepends=('gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" 'arch.patch') -sha256sums=('838ca07168dbf7f29fc83ff3c0ef570e7703082d44f5607b09af01972fc52a49' +sha256sums=('faaae52d839a66d0bcb7d7cf97ef62d11bccf558e6aa9fdb0dbc8d61dbaf714f' '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') build() { @@ -26,7 +26,8 @@ build() { sed -i 's@python@python2@' 'python/enum-convertor.py' export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr \ + # TODO: remove gnome-common dependency and switch back to configure + gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --disable-gtk-doc \ --disable-schemas-compile \ diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 26279b4aa..e1c0348e9 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46899 2011-05-13 15:02:09Z jconder $ +# $Id: PKGBUILD 48006 2011-05-26 23:21:11Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') install=$_pkgname.install source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" 'arch.patch') -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117' +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec' '91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134') build() { diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index d823e9fc6..5c834fe41 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42923 2011-03-22 18:17:04Z svenstaro $ +# $Id: PKGBUILD 47420 2011-05-23 01:24:33Z 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.32 +pkgver=0.34 pkgrel=1 pkgdesc="software version control visualization" license=(GPL3) @@ -11,7 +11,7 @@ arch=(i686 x86_64 'mips64el') 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=('7aed2fcf8f0c09b8cea5b19a418b0724') +md5sums=('292a62d687874e871067e985d717d71a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index f3f104163..b8b6efcc2 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ +# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -pkgrel=7 +pkgrel=8 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index e639dc22a..442493585 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 47888 2011-05-25 23:35:15Z ebelanger $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc="Japanese input method Anthy IMEngine for IBus Framework" arch=('i686' 'x86_64' 'mips64el') @@ -11,28 +12,22 @@ license=('LGPL') url="http://ibus.googlecode.com" depends=('ibus' 'anthy' 'python2') makedepends=('swig' 'intltool') -provides=('ibus-anthy') options=('!libtool') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('00b44c874616d797a0117d087cf33341') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('894c7311f4d5c96b1fdb8b3795446ead') build() { - cd ${pkgname}-${pkgver} - - # python2 fix + cd "${srcdir}/${pkgname}-${pkgver}" +# python2 fix for file in setup/ibus-setup-anthy.in engine/ibus-engine-anthy.in; do sed -i 's_exec python_exec python2_' $file done - ./configure \ - --prefix=/usr \ - --libexec=/usr/lib/ibus - + ./configure --prefix=/usr --libexec=/usr/lib/ibus make } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index a18f124fe..5d18ef625 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 44325 2011-04-05 15:37:14Z stativ $ +# $Id: PKGBUILD 47243 2011-05-19 13:26:51Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=10.0.3 -_pkgver=103.255 +pkgver=10.5 +_pkgver=107.105 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('0309a9583febf6d9bfc803c386efcad4') +md5sums=('365d1a5ee9255175065c764d634b3698') build() { cd "$srcdir" diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index bed806c4e..db91491a9 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=john -pkgver=1.7.6 -pkgrel=3 +pkgver=1.7.7 +pkgrel=1 pkgdesc="John The Ripper - A fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included." arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -14,18 +14,18 @@ license=('GPL2' 'custom') depends=('openssl') backup=('etc/john/john.conf') source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 - http://www.openwall.com/john/g/john-$pkgver-jumbo-12.diff.gz + http://www.openwall.com/john/g/john-$pkgver-jumbo-1.diff.gz ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) -md5sums=('321ac0793f1aa4f0603b33a393133756' - '405750a1d8f5c62d434e97cd2775843b' +md5sums=('be316618de834a58573a21225d4a2674' + 'ee776d17726e7c15e90f2cf7ca85492f' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') build() { # jumbo patch cd ${srcdir}/$pkgname-$pkgver - patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-12.diff + patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-1.diff cd ${srcdir}/john-$pkgver/src/ # patch default params diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index f48350f9e..7b452c180 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 44782 2011-04-11 20:09:55Z mherych $ +# $Id: PKGBUILD 47304 2011-05-21 11:51:25Z mherych $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 -pkgdesc="A Qt-based Gadu-Gadu client" -arch=('i686' 'x86_64' 'mips64el') +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') url="http://www.kadu.net/" license=('GPL') depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('99cb6e9d4acea6dbb15ff98dfe44dff9') +md5sums=('e23d39a2233a0585febe5a8ab50274dc') build() { cd $srcdir/kadu-$pkgver diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD index ff90d44f9..c2b2b6d0c 100644 --- a/community/libexosip2/PKGBUILD +++ b/community/libexosip2/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 29647 2010-10-18 08:56:03Z spupykin $ +# $Id: PKGBUILD 47119 2011-05-17 07:23:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=libexosip2 -pkgver=3.3.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/exosip/" license=('GPL') -depends=('libosip2>=3.1.0' 'openssl') +depends=('libosip2>=3.5.0' 'openssl') options=(!libtool) source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz) -md5sums=('a2739067b51c1e417c5aef9606b285b2') +md5sums=('51e85725571870614e448f63c33c8996') build() { cd "$srcdir/libeXosip2-${pkgver/_/-}" ./configure --prefix=/usr make +} +package() { + cd "$srcdir/libeXosip2-${pkgver/_/-}" make DESTDIR="$pkgdir" install } diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD new file mode 100644 index 000000000..a95ab380d --- /dev/null +++ b/community/libfaketime/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 47438 2011-05-23 06:26:34Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Dan Serban +# Contributor: Ross Melin <rdmelin@gmail.com> + +pkgname=libfaketime +pkgver=0.8.1 +pkgrel=1 +pkgdesc='Report fake dates and times to programs without having to change the system-wide time.' +arch=('i686' 'x86_64') +url='http://www.code-wizards.com/projects/libfaketime/' +license=('GPL2') +source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('113d75d73e39f0f5022dc7385628d57c') + +build() { + cd "${pkgname}-${pkgver}" + make +} + +package() { + cd "${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD index 15b725432..5ab3ef63f 100644 --- a/community/libosip2/PKGBUILD +++ b/community/libosip2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 19146 2010-06-21 08:41:34Z spupykin $ +# $Id: PKGBUILD 47083 2011-05-16 14:18:27Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Hybner <dta081@gmail.com> pkgname=libosip2 -pkgver=3.3.0 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="oSIP is an implementation of SIP" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/osip/" @@ -12,7 +12,7 @@ license=('LGPL') depends=(glibc) options=(!emptydirs !libtool) source=(http://ftp.gnu.org/gnu/osip/libosip2-${pkgver/_/-}.tar.gz) -md5sums=('81493bb4d4ae6d55b71a0d4369339125') +md5sums=('7691546f6b3349d10007fc1aaff0f4e0') build() { cd $srcdir/libosip2-${pkgver/_/-}/ @@ -39,6 +39,6 @@ diff -wbBur libosip2-3.1.0/src/osip2/port_sema.c libosip2-3.1.0.my/src/osip2/por EOF ./configure --prefix=/usr --disable-semaphore --enable-sysv - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD index e4a1ee0b5..415edc81a 100644 --- a/community/libzrtpcpp/PKGBUILD +++ b/community/libzrtpcpp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32643 2010-11-16 09:56:02Z spupykin $ +# $Id: PKGBUILD 47218 2011-05-19 07:44:23Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> @@ -6,7 +6,7 @@ pkgname=libzrtpcpp pkgver=1.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)" arch=('i686' 'x86_64' 'mips64el') url="http://zfoneproject.com" diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 84aa865ff..e8bac217b 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lightspark pkgver=0.4.7.1 -pkgrel=2 +pkgrel=3 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 3a257f3c3..2d502fa73 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 43994 2011-04-01 15:09:07Z spupykin $ +# $Id: PKGBUILD 47124 2011-05-17 07:27:45Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Darwin Bautista <djclue917@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone pkgver=3.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng" @@ -30,5 +29,9 @@ build() { --libexecdir=/usr/lib/$pkgname \ --enable-external-mediastreamer --enable-external-ortp make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 3ccc1e039..e60fdd628 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -5,7 +5,7 @@ pkgname=luxrender pkgver=0.7.1 _pkgver=9206b3ba7011 _luxblend=f93faf8189c1 -pkgrel=4 +pkgrel=5 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 6b7e96899..25f922cd8 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41028 2011-03-03 07:23:21Z tdziedzic $ +# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=8 +pkgrel=9 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -42,6 +42,9 @@ build() { INPUT_PLUGINS=all \ DESTDIR="$pkgdir" scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" scons install # fix permissions on SCons-autogenerated files diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog new file mode 100644 index 000000000..a3097076c --- /dev/null +++ b/community/mednafen/ChangeLog @@ -0,0 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Updated to 0.8.D.3 + * Removed fix_build patch + * Cleaned PKGBUILD + * Adding ChangeLog + diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index ea13f23d5..5a9120418 100755 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> pkgname=mednafen -pkgver=0.8.D +pkgver=0.8.D.3 pkgrel=1 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net/" @@ -10,14 +10,17 @@ license=(GPL) arch=('i686' 'x86_64' 'mips64el') depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') makedepends=('pkgconfig' 'mesa') -source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 fix_build.diff) -md5sums=('4c3f337f80bf54d2df0f3a0f24203141' - '0f44ef41b0220b66579626548d044f15') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) +md5sums=('57d22805071becd81858b0c088a275e5') build() { cd $srcdir/$pkgname - patch -Np1 -i $srcdir/fix_build.diff || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname make DESTDIR=$pkgdir install } diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index 4bf9bd33e..d7248698e 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44211 2011-04-04 13:30:46Z lfleischer $ +# $Id: PKGBUILD 47062 2011-05-15 17:37:33Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64' 'mips64el') url='http://minbif.im/' @@ -24,7 +24,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ - ENABLE_VIDEO=ON ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF + ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF } package() { diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 0d3c48c5a..3e20e38ea 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mongodb pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -16,16 +16,23 @@ backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf') + 'mongodb.conf' + 'gcc46fixes.diff' + 'gcc46fixes2.diff') md5sums=('e75a5cae641a53760df8cb866ad5d929' '859f8f9bb32ef2bd21fec55ae9a87d0a' - '9e0ea3f96732bb7811f0b64dace56440') + '9e0ea3f96732bb7811f0b64dace56440' + 'e90c78350e25df2d24f98e4767677d4b' + '5097de6ce2c347c3703ab8cf5a611052') build() { export SCONSFLAGS="$MAKEFLAGS" cd ${pkgname}-src-r${pkgver} + patch -Np1 -i ${srcdir}/gcc46fixes.diff + patch -Np1 -i ${srcdir}/gcc46fixes2.diff + # scons is "special" sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct diff --git a/community/mongodb/gcc46fixes.diff b/community/mongodb/gcc46fixes.diff new file mode 100644 index 000000000..487c88f16 --- /dev/null +++ b/community/mongodb/gcc46fixes.diff @@ -0,0 +1,132 @@ +commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e +Author: Mathias Stearn <redbeard0531@gmail.com> +Date: Sun Apr 3 19:10:36 2011 -0400 + + g++ 4.6 compile (new -Wunused-but-set-variable warning) + +diff --git a/db/btree.cpp b/db/btree.cpp +index 2758f72..4162d6a 100644 +--- a/db/btree.cpp ++++ b/db/btree.cpp +@@ -1226,8 +1226,6 @@ namespace mongo { + out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' ' + << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl; + +- DiskLoc oldLoc = thisLoc; +- + if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) { + // If basicInsert() fails, the bucket will be packed as required by split(). + thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx); +diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp +index 2580f86..56c0fce 100644 +--- a/db/dbcommands.cpp ++++ b/db/dbcommands.cpp +@@ -1460,7 +1460,7 @@ namespace mongo { + uassert( 13049, "godinsert must specify a collection", !coll.empty() ); + string ns = dbname + "." + coll; + BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck(); +- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); ++ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); + return true; + } + } cmdGodInsert; +diff --git a/db/index.cpp b/db/index.cpp +index c696e27..218ecb3 100644 +--- a/db/index.cpp ++++ b/db/index.cpp +@@ -127,7 +127,6 @@ namespace mongo { + void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) { + int z = d.nIndexesBeingBuilt(); + v.resize(z); +- NamespaceDetails::IndexIterator i = d.ii(); + for( int i = 0; i < z; i++ ) { + IndexDetails& idx = d.idx(i); + BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 } +diff --git a/db/update.cpp b/db/update.cpp +index e173902..85c3f9c 100644 +--- a/db/update.cpp ++++ b/db/update.cpp +@@ -992,7 +992,7 @@ namespace mongo { + BSONObj newObj = mss->createNewFromMods(); + checkTooLarge(newObj); + assert(nsdt); +- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); ++ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); + } + + if ( logop ) { +diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp +index acf9217..2d6f752 100644 +--- a/dbtests/queryoptimizertests.cpp ++++ b/dbtests/queryoptimizertests.cpp +@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests { + theDataFileMgr.insertWithObjMod( ns(), temp ); + } + BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); +- BSONElement hintElt = hint.firstElement(); + auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) ); + QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); + boost::shared_ptr<Cursor> c = qp.newCursor(); +@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests { + theDataFileMgr.insertWithObjMod( ns(), temp ); + } + BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); +- BSONElement hintElt = hint.firstElement(); + auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) ); + QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); + boost::shared_ptr<Cursor> c = qp.newCursor(); +diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp +index 6c398ef..53484fd 100644 +--- a/shell/shell_utils.cpp ++++ b/shell/shell_utils.cpp +@@ -260,7 +260,7 @@ namespace mongo { + BSONElement e = oneArg(args); + bool found = false; + +- path root( args.firstElement().valuestrsafe() ); ++ path root( e.valuestrsafe() ); + if ( boost::filesystem::exists( root ) ) { + found = true; + boost::filesystem::remove_all( root ); +diff --git a/tools/tool.cpp b/tools/tool.cpp +index 92a4bd4..150481b 100644 +--- a/tools/tool.cpp ++++ b/tools/tool.cpp +@@ -413,14 +413,14 @@ namespace mongo { + ProgressMeter m( fileLength ); + + while ( read < fileLength ) { +- int readlen = fread(buf, 4, 1, file); ++ fread(buf, 4, 1, file); + int size = ((int*)buf)[0]; + if ( size >= BUF_SIZE ) { + cerr << "got an object of size: " << size << " terminating..." << endl; + } + uassert( 10264 , "invalid object size" , size < BUF_SIZE ); + +- readlen = fread(buf+4, size-4, 1, file); ++ fread(buf+4, size-4, 1, file); + + BSONObj o( buf ); + if ( _objcheck && ! o.valid() ) { +diff --git a/util/ramlog.h b/util/ramlog.h +index fc588e6..b2f3aa0 100644 +--- a/util/ramlog.h ++++ b/util/ramlog.h +@@ -108,7 +108,6 @@ namespace mongo { + vector<const char*> v; + get( v ); + +- bool first = true; + s << "<pre>\n"; + for( int i = 0; i < (int)v.size(); i++ ) { + assert( strlen(v[i]) > 20 ); +@@ -126,7 +125,7 @@ namespace mongo { + stringstream r; + if( nr == 1 ) r << "repeat last line"; + else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15); +- first = false; s << html::a("", r.str(), clean(v,i,x.str())); ++ s << html::a("", r.str(), clean(v,i,x.str())); + } + else s << x.str(); + s << '\n'; diff --git a/community/mongodb/gcc46fixes2.diff b/community/mongodb/gcc46fixes2.diff new file mode 100644 index 000000000..17257b136 --- /dev/null +++ b/community/mongodb/gcc46fixes2.diff @@ -0,0 +1,26 @@ +commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb +Author: Eliot Horowitz <eliot@10gen.com> +Date: Wed Mar 30 01:01:18 2011 -0400 + + remove unused variable + +diff --git a/db/commands.cpp b/db/commands.cpp +index c301fb3..0bbd765 100644 +--- a/db/commands.cpp ++++ b/db/commands.cpp +@@ -127,7 +127,6 @@ namespace mongo { + if ( strcmp(p, ".$cmd") != 0 ) return false; + + bool ok = false; +- bool valid = false; + + BSONElement e = jsobj.firstElement(); + map<string,Command*>::iterator i; +@@ -138,7 +137,6 @@ namespace mongo { + migrated over to the command object format. + */ + else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) { +- valid = true; + string errmsg; + Command *c = i->second; + if ( c->adminOnly() && !startsWith(ns, "admin.") ) { diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD new file mode 100644 index 000000000..828951df8 --- /dev/null +++ b/community/mplayer2/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 46583 2011-05-09 18:34:40Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Bartek Piotrowski <barthalion@gmail.com> + +pkgname=mplayer2 +pkgver=2.0 +pkgrel=12 +pkgdesc="A movie player" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.mplayer2.org/" +depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123') +makedepends=('live-media' 'mesa' 'unzip' 'yasm') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +provides=('mplayer') +conflicts=('mplayer') +source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz + mplayer2-remove-mp3lib.patch) +sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' + 'c55128a99406a5e01ab077555b7b24aa7b54110c') +options=('!emptydirs') + +build() { + # Custom CFLAGS break the mplayer build + unset CFLAGS LDFLAGS + + cd "${srcdir}/${pkgname}-${pkgver}" + + # Drop internal mp3lib (FS#24149) + # Default decoder for mp3 will be mpg123 + rm -fr mp3lib + patch -Np1 -i ../mplayer2-remove-mp3lib.patch + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-arts \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --enable-xvmc \ + --language=all \ + --enable-translation \ + --confdir=/etc/mplayer + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ + install -dm755 "${pkgdir}"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf +} diff --git a/community/mplayer2/mplayer2-remove-mp3lib.patch b/community/mplayer2/mplayer2-remove-mp3lib.patch new file mode 100644 index 000000000..057a91295 --- /dev/null +++ b/community/mplayer2/mplayer2-remove-mp3lib.patch @@ -0,0 +1,297 @@ +diff -Naur mplayer2-2.0.ori/configure mplayer2-2.0/configure +--- mplayer2-2.0.ori/configure 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/configure 2011-05-09 14:11:10.717630210 -0400 +@@ -376,7 +376,6 @@ + --disable-mad disable libmad (MPEG audio) support [autodetect] + --enable-xmms enable XMMS input plugin support [disabled] + --enable-libdca enable libdca support [autodetect] +- --disable-mp3lib disable builtin mp3lib [autodetect] + --disable-liba52 disable liba52 [autodetect] + --enable-musepack enable libmpcdec support (deprecated, libavcodec + Musepack decoder is preferred) [disabled] +@@ -610,7 +609,6 @@ + _speex=auto + _theora=auto + _mpg123=auto +-_mp3lib=auto + _liba52=auto + _libdca=auto + _faad=auto +@@ -965,8 +963,6 @@ + --disable-theora) _theora=no ;; + --enable-mpg123) _mpg123=yes ;; + --disable-mpg123) _mpg123=no ;; +- --enable-mp3lib) _mp3lib=yes ;; +- --disable-mp3lib) _mp3lib=no ;; + --enable-liba52) _liba52=yes ;; + --disable-liba52) _liba52=no ;; + --enable-libdca) _libdca=yes ;; +@@ -5731,19 +5727,6 @@ + fi + echores "$_theora" + +-echocheck "mp3lib support" +-if test "$_mp3lib" = auto ; then +- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes +-fi +-if test "$_mp3lib" = yes ; then +- def_mp3lib='#define CONFIG_MP3LIB 1' +- codecmodules="mp3lib(internal) $codecmodules" +-else +- def_mp3lib='#undef CONFIG_MP3LIB' +- nocodecmodules="mp3lib(internal) $nocodecmodules" +-fi +-echores "$_mp3lib" +- + # Any version of libmpg123 shall be fine. + echocheck "mpg123 support" + def_mpg123='#undef CONFIG_MPG123' +@@ -6823,7 +6806,6 @@ + MD5SUM = $_md5sum + MGA = $_mga + MNG = $_mng +-MP3LIB = $_mp3lib + MPG123 = $_mpg123 + MUSEPACK = $_musepack + NAS = $_nas +@@ -7084,7 +7066,6 @@ + $def_libdca + $def_libdv + $def_mad +-$def_mp3lib + $def_mpg123 + $def_musepack + $def_speex +diff -Naur mplayer2-2.0.ori/etc/codecs.conf mplayer2-2.0/etc/codecs.conf +--- mplayer2-2.0.ori/etc/codecs.conf 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/etc/codecs.conf 2011-05-09 14:11:10.717630210 -0400 +@@ -4220,23 +4220,6 @@ + driver ffmpeg + dll "sonic" + +-audiocodec mp3 +- ; this is preferred over ffmp2/ffmp3 since it is faster due to using +- ; floating point and there are even broken mkv files where the audio +- ; needs to be parsed, making this codec work more reliably +- info "mp3lib MPEG layer-2, layer-3" +- status working +- comment "Optimized to MMX/SSE/3Dnow!" +- format 0x50 ; layer-1 && layer-2 +- format 0x55 ; layer-3 +- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) +- format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) +- format 0x55005354 ; broken file +- fourcc ".mp3" ; CBR/VBR MP3 (MOV files) +- fourcc "MP3 " ; used in .nsv files +- fourcc "LAME" ; used in mythtv .nuv files +- driver mp3lib +- + audiocodec mpg123 + ; this is preferred over ffmp2/ffmp3 since it is faster, generally + info "MPEG 1.0/2.0/2.5 layers I, II, III" +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad.c mplayer2-2.0/libmpcodecs/ad.c +--- mplayer2-2.0.ori/libmpcodecs/ad.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad.c 2011-05-09 14:11:10.717630210 -0400 +@@ -32,7 +32,6 @@ + /* Missed vorbis, mad, dshow */ + + extern const ad_functions_t mpcodecs_ad_mpg123; +-extern const ad_functions_t mpcodecs_ad_mp3lib; + extern const ad_functions_t mpcodecs_ad_ffmpeg; + extern const ad_functions_t mpcodecs_ad_liba52; + extern const ad_functions_t mpcodecs_ad_hwac3; +@@ -63,9 +62,6 @@ + #ifdef CONFIG_MPG123 + &mpcodecs_ad_mpg123, + #endif +-#ifdef CONFIG_MP3LIB +- &mpcodecs_ad_mp3lib, +-#endif + #ifdef CONFIG_LIBA52 + &mpcodecs_ad_liba52, + #endif +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c mplayer2-2.0/libmpcodecs/ad_mp3lib.c +--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.c 2011-05-09 14:11:10.717630210 -0400 +@@ -1,100 +0,0 @@ +-/* +- * This file is part of MPlayer. +- * +- * MPlayer 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. +- * +- * MPlayer is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with MPlayer; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +- +-#include "config.h" +- +-#include "ad_internal.h" +-#include "ad_mp3lib.h" +- +-static const ad_info_t info = +-{ +- "MPEG layer-2, layer-3", +- "mp3lib", +- "Nick Kurshev", +- "mpg123", +- "Optimized to MMX/SSE/3Dnow!" +-}; +- +-LIBAD_EXTERN(mp3lib) +- +-#include "mp3lib/mp3.h" +- +-extern int fakemono; +- +-static sh_audio_t* dec_audio_sh=NULL; +- +-// MP3 decoder buffer callback: +-int mplayer_audio_read(char *buf,int size){ +- return demux_read_data(dec_audio_sh->ds,buf,size); +-} +- +-static int preinit(sh_audio_t *sh) +-{ +- sh->audio_out_minsize=32*36*2*2; //4608; +- return 1; +-} +- +-static int init(sh_audio_t *sh) +-{ +- // MPEG Audio: +- dec_audio_sh=sh; // save sh_audio for the callback: +-// MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!! +-#ifdef CONFIG_FAKE_MONO +- MP3_Init(fakemono); +-#else +- MP3_Init(); +-#endif +- MP3_samplerate=MP3_channels=0; +- sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1); +- if(!sh->a_buffer_len) return 0; // unsupported layer/format +- sh->channels=2; // hack +- sh->samplesize=2; +- sh->samplerate=MP3_samplerate; +- sh->i_bps=MP3_bitrate*(1000/8); +- MP3_PrintHeader(); +- return 1; +-} +- +-static void uninit(sh_audio_t *sh) +-{ +-} +- +-static int control(sh_audio_t *sh,int cmd,void* arg, ...) +-{ +- switch(cmd) +- { +- case ADCTRL_RESYNC_STREAM: +- MP3_DecodeFrame(NULL,-2); // resync +- MP3_DecodeFrame(NULL,-2); // resync +- MP3_DecodeFrame(NULL,-2); // resync +- return CONTROL_TRUE; +- case ADCTRL_SKIP_FRAME: +- MP3_DecodeFrame(NULL,-2); // skip MPEG frame +- return CONTROL_TRUE; +- } +- return CONTROL_UNKNOWN; +-} +- +-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) +-{ +- return MP3_DecodeFrame(buf,-1); +-} +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h mplayer2-2.0/libmpcodecs/ad_mp3lib.h +--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.h 2011-05-09 14:11:10.717630210 -0400 +@@ -1,24 +0,0 @@ +-/* +- * This file is part of MPlayer. +- * +- * MPlayer 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. +- * +- * MPlayer is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with MPlayer; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#ifndef MPLAYER_AD_MP3LIB_H +-#define MPLAYER_AD_MP3LIB_H +- +-int mplayer_audio_read(char *buf, int size); +- +-#endif /* MPLAYER_AD_MP3LIB_H */ +diff -Naur mplayer2-2.0.ori/Makefile mplayer2-2.0/Makefile +--- mplayer2-2.0.ori/Makefile 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/Makefile 2011-05-09 14:11:10.714296876 -0400 +@@ -122,21 +122,6 @@ + SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c + SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c + +-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ +- mp3lib/dct64_3dnow.c +-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ +- mp3lib/dct64_k7.c +-SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c +-SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \ +- $(SRCS_MP3LIB-X86-yes) +-SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c +-SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c +-SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c +-SRCS_MP3LIB += mp3lib/sr1.c \ +- $(SRCS_MP3LIB-yes) +-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \ +- $(SRCS_MP3LIB) +- + SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ + libmpdemux/demux_mpc.c + SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ +@@ -578,7 +563,6 @@ + loader/dshow \ + loader/dmo \ + loader/wine \ +- mp3lib \ + osdep \ + stream \ + stream/freesdp \ +@@ -675,8 +659,6 @@ + #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT + loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) + +-mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer +- + stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) + + +@@ -767,9 +749,7 @@ + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) + +-mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) +- +-TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2 ++TESTS = codecs2html codec-cfg-test libvo/aspecttest + + ifdef ARCH_X86 + TESTS += loader/qtx/list loader/qtx/qtxload diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index 8e5cc26b7..fa2ace03d 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 41759 2011-03-08 20:17:20Z spupykin $ +# $Id: PKGBUILD 47074 2011-05-16 14:01:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://mypaint.intilinux.com/" license=('GPL' 'LGPL') depends=('pygtk' 'python-numpy' 'protobuf-python' 'python2') makedepends=('scons>=0.97' 'swig>=1.3.39') +install=mypaint.install source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('6249a16359a438d6dc658f5765b35515') diff --git a/community/mypaint/mypaint.install b/community/mypaint/mypaint.install new file mode 100644 index 000000000..5f0358791 --- /dev/null +++ b/community/mypaint/mypaint.install @@ -0,0 +1,13 @@ +post_install() { + [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + [ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + /bin/true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 5934210e6..240bf0076 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $ +# $Id: PKGBUILD 47963 2011-05-26 13:44:42Z ibiru $ # Maintainer: # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: totoloco <totoloco at gmail _dot_com> pkgname=mysql-workbench epoch=1 -pkgver=5.2.33b +pkgver=5.2.34 pkgrel=1 pkgdesc="A cross-platform, visual database design tool developed by MySQL" arch=('i686' 'x86_64' 'mips64el') url="http://wb.mysql.com/" license=('GPL2') -depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' +depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect') makedepends=('boost' 'curl' 'mesa') options=('!libtool') source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz ArchLinux.xml arch.patch python27.patch gcc46.patch) -md5sums=('850e081eeaea87a88c408483817e4b1f' +md5sums=('781a4e9f6b5573b06a838d53ddb9136d' 'c2f986cd5737413d020c55db32713c48' '23430d24400fd65c9fd872bd8e2411e5' '47bc4cdfaa035a0132392e94c462ebf7' - '8e7a6d5aa59b73727e862724f115d90a') + '43917ebc79794ba15a64f7ba820fa20b') build() { - cd "${srcdir}/${pkgname}-gpl-5.2.33-src" + cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" cp "${srcdir}/ArchLinux.xml" res/mysql.profiles patch -Np1 -i ${srcdir}/arch.patch patch -Np0 -i ${srcdir}/python27.patch - patch -p1 -i ${srcdir}/gcc46.patch + patch -Np1 -i ${srcdir}/gcc46.patch #we use System provided libraries rm -rf ext/curl @@ -46,8 +46,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-gpl-5.2.33-src" + cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" make DESTDIR="${pkgdir}" install sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py + sed -i -e "s|python|python2|" $pkgdir/usr/lib/mysql-workbench/modules/wb_utils_grt.py } diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch index 9daa162c8..6a0d2cd97 100644 --- a/community/mysql-workbench/gcc46.patch +++ b/community/mysql-workbench/gcc46.patch @@ -1,108 +1,6 @@ -diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp ---- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 2011-03-23 17:05:33.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp 2011-03-23 17:06:02.000000000 +0100 -@@ -23,7 +23,7 @@ - #include "grts/structs.workbench.model.reporting.h"
- #include "grts/structs.workbench.physical.h"
-
--
-+namespace wb {
- void register_all_metaclasses()
- {
- register_structs_app_xml();
-@@ -46,3 +46,6 @@ void register_all_metaclasses()
- register_structs_workbench_model_reporting_xml();
- register_structs_workbench_physical_xml();
- }
-+// end of namespace wb
-+}
-+
-diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp ---- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 2011-03-23 16:56:16.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-03-23 17:07:36.000000000 +0100 -@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo - } - - Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns); -- Gtk::ComboBox *combo= new Gtk::ComboBox(model); -+ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model); - - combo->pack_start(color_combo_columns->image); - -diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp ---- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 2011-03-23 17:04:17.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp 2011-03-23 17:04:40.000000000 +0100 -@@ -32,10 +32,11 @@ - #include <math.h> - #include "base/log.h" - ENABLE_LOG("mforms.utils") -- - using namespace mforms; - -+namespace mforms { - GThread *_mforms_main_thread=0; -+} - - static std::map<std::string, int> remembered_message_answers; - static std::string remembered_message_answer_file; -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 2011-03-17 13:48:45.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp 2011-03-23 16:44:22.000000000 +0100 -@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP - - //============================================================================ - -+namespace grt { -+ - static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd) - { - MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group; -@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g - } - } - -+// End of namspace grt -+} -+ -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 2011-03-17 13:48:41.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp 2011-03-23 16:44:22.000000000 +0100 -@@ -187,7 +187,7 @@ NL - }; - - --void grt_shell_show_python_help(grt::GRT *grt, const char *command) -+void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command) - { - if (!command || !*command) - grt->send_output( -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 2011-03-17 13:48:39.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h 2011-03-23 16:44:22.000000000 +0100 -@@ -21,6 +21,8 @@ - #ifndef __grtpp_shell_python_help_h__ - #define __grtpp_shell_python_help_h__ - -+namespace grt { - void grt_shell_show_python_help(grt::GRT *grt, const char *command); -+} - --#endif /* __grtpp_shell_python_help_h__ */ -\ Pas de fin de ligne à la fin du fichier. -+#endif /* __grtpp_shell_python_help_h__ */ -diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h ---- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 2011-03-23 16:51:30.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h 2011-03-23 16:52:33.000000000 +0100 -@@ -10,6 +10,7 @@ - #include "config.h" - #endif - -+#include <cstddef> - #include "ctemplate/template.h" - - #include "grt/common.h" ---- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~ 2011-05-04 00:57:31.029029610 -0700 -+++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-04 00:57:45.162361700 -0700 +diff -Nur mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in +--- mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:33:54.128803186 +0000 ++++ mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:34:45.312611839 +0000 @@ -54,6 +54,7 @@ #include <map> #include <string> diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 874021e5a..e3ec00716 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42515 2011-03-17 12:34:35Z andrea $ +# $Id: PKGBUILD 47935 2011-05-26 08:19:27Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,20 +14,21 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.24 +pkgver=0.24.1 pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +epoch=1 +arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') -makedepends=("mythtv>=$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' - 'python-imaging' 'libexif' 'perl-date-manip' 'zlib' 'cdparanoia' - 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'sdl' 'taglib' - 'python2-oauth' 'python-pycurl' 'mplayer' 'perl-date-manip' - 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' - 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') +makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' + 'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv' + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' + 'perl-xml-xpath' 'python2-oauth' 'python-imaging' 'python-pycurl' + 'sdl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'mtd.rc') -md5sums=('2bcb195a82475648040910d7afd054d1' +md5sums=('76aeefeff70b550b2d35c2d9d751df18' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -43,7 +44,7 @@ build() { package_mythplugins-mytharchive() { pkgdesc="Create DVDs or archive recorded shows in MythTV" - depends=("mythtv>=$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' + depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' 'python-imaging') cd "$srcdir/$pkgbase-$pkgver/mytharchive" @@ -52,7 +53,7 @@ package_mythplugins-mytharchive() { package_mythplugins-mythbrowser() { pkgdesc="Mini web browser for MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythbrowser" make INSTALL_ROOT="$pkgdir" install @@ -60,7 +61,7 @@ package_mythplugins-mythbrowser() { package_mythplugins-mythgallery() { pkgdesc="Image gallery plugin for MythTV" - depends=("mythtv>=$pkgver" 'libexif') + depends=('libexif' 'mythtv') cd "$srcdir/$pkgbase-$pkgver/mythgallery" make INSTALL_ROOT="$pkgdir" install @@ -68,7 +69,7 @@ package_mythplugins-mythgallery() { package_mythplugins-mythgame() { pkgdesc="Game emulator plugin for MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythgame" make INSTALL_ROOT="$pkgdir" install @@ -76,8 +77,8 @@ package_mythplugins-mythgame() { package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=("mythtv>=$pkgver" 'cdparanoia' 'flac' 'libcdaudio' 'libvisual' - 'libvorbis' 'sdl' 'taglib') + depends=('cdparanoia' 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'mythtv' + 'sdl' 'taglib') cd "$srcdir/$pkgbase-$pkgver/mythmusic" make INSTALL_ROOT="$pkgdir" install @@ -85,7 +86,7 @@ package_mythplugins-mythmusic() { package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" - depends=("mythtv>=$pkgver" 'python2-oauth' 'python-pycurl') + depends=('mythtv' 'python2-oauth' 'python-pycurl') cd "$srcdir/$pkgbase-$pkgver/mythnetvision" make INSTALL_ROOT="$pkgdir" install @@ -93,7 +94,7 @@ package_mythplugins-mythnetvision() { package_mythplugins-mythnews() { pkgdesc="News checking plugin for MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythnews" make INSTALL_ROOT="$pkgdir" install @@ -101,7 +102,7 @@ package_mythplugins-mythnews() { package_mythplugins-mythvideo() { pkgdesc="Video playback and browsing plugin for MythTV" - depends=("mythtv>=$pkgver" 'mplayer') + depends=('mplayer' 'mythtv') cd "$srcdir/$pkgbase-$pkgver/mythvideo" make INSTALL_ROOT="$pkgdir" install @@ -111,9 +112,9 @@ package_mythplugins-mythvideo() { package_mythplugins-mythweather() { pkgdesc="Weather checking plugin for MythTV" - depends=("mythtv>=$pkgver" 'perl-date-manip' 'perl-libwww' 'perl-soap-lite' - 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' - 'perl-datetime-format-iso8601') + depends=('mythtv' 'perl-date-manip' 'perl-libwww' + 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' + 'perl-image-size' 'perl-datetime-format-iso8601') cd "$srcdir/$pkgbase-$pkgver/mythweather" make INSTALL_ROOT="$pkgdir" install @@ -121,19 +122,19 @@ package_mythplugins-mythweather() { package_mythplugins-mythweb() { pkgdesc="Web interface for the MythTV scheduler" - depends=("mythtv>=$pkgver") - optdepends=('php-apache' - 'lighttpd') + depends=('mythtv') + optdepends=('lighttpd' + 'php-apache') mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb" chown -R http:http "$pkgdir/srv/http/mythweb" - chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions,data} + chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} } package_mythplugins-mythzoneminder() { pkgdesc="View CCTV footage from zoneminder in MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') install='mythplugins-mythzoneminder.install' cd "$srcdir/$pkgbase-$pkgver/mythzoneminder" diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 6628b9001..45b18a7bd 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46888 2011-05-13 13:31:23Z jconder $ +# $Id: PKGBUILD 47228 2011-05-19 08:27:51Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.24 -pkgrel=2 +pkgver=0.24.1 +pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf') -md5sums=('1abe1d3cc72fdbde6daa4247dedbf29a' +md5sums=('6870c679619ec58456e76839745411d8' 'feadcc9ad064d93d6dceab1efc0bd9ed' 'bb8e4033d82428d827570fae9ba15e6a') diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index 8da191d9c..629a4d257 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,45 +1,32 @@ -# $Id: PKGBUILD 23139 2010-08-07 06:55:11Z svenstaro $ +# $Id: PKGBUILD 47428 2011-05-23 01:57:56Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Johan Rehnberg <cleanrock@gmail.com> pkgname=naev -pkgver=0.4.2 -pkgrel=3 +pkgver=0.5.0beta2 +_pkgver=0.5.0-beta2 +pkgrel=1 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/naev/" license=('GPL3') depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') makedepends=('freeglut') -options=( ) -source=("http://naev.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" +source=("http://naev.googlecode.com/files/${pkgname}-${_pkgver}.tar.bz2" "naev.png" "naev.desktop") -md5sums=('307bec2704e98f0af6f13e50f2737b0c' +md5sums=('45d3abff357a347c3f2e9db93d184ba3' '5945aa4fa7c0b046ad48f2fb9cbbbdd3' '134032fb35eb2953e9a1bbee3a6dcf63') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_pkgver" - ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${pkgver} + ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${_pkgver} make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_pkgver" make DESTDIR="$pkgdir/" install - - install -m644 "$srcdir/$pkgname-$pkgver/conf.example" "$pkgdir/usr/share/doc/naev/" - - mkdir -p "$pkgdir/usr/share/naev/" - - mkdir -p "$pkgdir/usr/share/pixmaps/" - install -m644 "$srcdir/naev.png" "$pkgdir/usr/share/pixmaps/" - - mkdir -p "$pkgdir/usr/share/applications/" - install -m644 "$srcdir/naev.desktop" "$pkgdir/usr/share/applications/" - - mkdir -p "$pkgdir/usr/share/licenses/naev/" - install -m644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/naev/" } diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index baa835c84..afd7efdc3 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46806 2011-05-12 16:08:55Z ibiru $ +# $Id: PKGBUILD 47289 2011-05-20 18:44:43Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-actions -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('868c0f87cc80ee31074dcf4df736757655e396a9eafc19cd81b3dd05e4f940ac') +sha256sums=('d7cab5b1a75f4cbeb68e7d2bfe4834ee13890abf6cab9254326f871ee07c9924') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/nethogs/PKGBUILD b/community/nethogs/PKGBUILD new file mode 100644 index 000000000..3ed0be492 --- /dev/null +++ b/community/nethogs/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: ViNS <gladiator@fastwebnet.it> +# Contributor: Daenyth +pkgname=nethogs +pkgver=0.7.0 +pkgrel=4 +pkgdesc="A net top tool which displays traffic used per process instead of per IP or interface" +url="http://nethogs.sourceforge.net" +license=(GPL) +depends=(libpcap ncurses gcc-libs) +arch=(i686 x86_64) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc44.patch) +md5sums=('e5f04071571e469e14c89f637cfa34a2' + '62eb824fbbadd1c60d0749593c16d293') + +build() { + cd "$srcdir/$pkgname" + + sed -i '/sbin :=/ s/sbin/bin/g' Makefile + + # Patch the code to work with gcc 4.4 + patch -Np1 -i "$srcdir/gcc44.patch" + + make + install -d "$pkgdir/usr/bin" + install -d "$pkgdir/usr/share/man/man8" + make DESTDIR="$pkgdir/usr" install +} +# vim:set ts=2 sw=2 et: diff --git a/community/nethogs/gcc44.patch b/community/nethogs/gcc44.patch new file mode 100644 index 000000000..7fedbf978 --- /dev/null +++ b/community/nethogs/gcc44.patch @@ -0,0 +1,11 @@ +diff -ruN nethogs-old/conninode.cpp nethogs/conninode.cpp +--- nethogs-old/conninode.cpp 2009-05-17 09:05:32.000000000 -0400 ++++ nethogs/conninode.cpp 2009-05-17 09:06:47.000000000 -0400 +@@ -1,6 +1,7 @@ + #include <netinet/in.h> + #include <map> + #include <stdlib.h> ++#include <cstdio> + + #include "nethogs.h" + #include "conninode.h" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 52e644464..4baafd3d9 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46704 2011-05-10 20:38:51Z spupykin $ +# $Id: PKGBUILD 47990 2011-05-26 22:02:37Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,7 +11,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('8a528ccaab3ddba84e72443fa40b19e7' +md5sums=('eebf1e9c7e86f923923b828ae0156103' '837b010afcbdfe82d8e65ef00c4e14ba') build() { diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 70108db54..ba7d575b7 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=16.10 +pkgver=16.12 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('7b360d0cc7fed5361f1220385af7aa1b') +md5sums=('12b33ddad0e04ce1e3846fdcdd927dde') build() { cd ${pkgname}-${pkgver} diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD index f732f1646..39fa1917e 100644 --- a/community/ogre/PKGBUILD +++ b/community/ogre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46578 2011-05-09 16:26:46Z svenstaro $ +# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgbase=ogre pkgname=('ogre' 'ogre-docs') pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A scene-oriented, flexible 3D engine written in C++" arch=('i686' 'x86_64' 'mips64el') url='http://www.ogre3d.org' diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 9bf11948b..52e6d413e 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 38818 2011-02-01 11:50:23Z spupykin $ +# $Id: PKGBUILD 47048 2011-05-14 19:07:46Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=openscenegraph -pkgver=2.8.3 -pkgrel=5 +pkgver=2.8.4 +pkgrel=1 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64' 'mips64el') license=('custom:OSGPL') @@ -16,17 +16,23 @@ makedepends=('cmake' 'libvncserver') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - build-fix.diff) -md5sums=('dc43b9161555c4eab7f5a678dd4e01ab' - '0fbcd32f129f94ac4775de326775b3cf') +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +md5sums=('283215b4040f7c5b85d30862a8eba97c') build() { - cd "$srcdir/OpenSceneGraph-$pkgver" + cd OpenSceneGraph-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - patch -p1 <$srcdir/build-fix.diff || true + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true } diff --git a/community/openscenegraph/build-fix.diff b/community/openscenegraph/build-fix.diff deleted file mode 100644 index 7e9fb0baa..000000000 --- a/community/openscenegraph/build-fix.diff +++ /dev/null @@ -1,137 +0,0 @@ -diff -wbBur OpenSceneGraph-2.8.3/include/osg/AudioStream OpenSceneGraph-2.8.3.my/include/osg/AudioStream ---- OpenSceneGraph-2.8.3/include/osg/AudioStream 2010-03-19 09:14:12.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/include/osg/AudioStream 2011-02-01 10:50:20.000000000 +0000 -@@ -68,7 +68,7 @@ - virtual int audioFrequency() const = 0; - virtual int audioNbChannels() const = 0; - -- enum SampleFormat -+ enum XSampleFormat - { - SAMPLE_FORMAT_U8, - SAMPLE_FORMAT_S16, -@@ -76,8 +76,7 @@ - SAMPLE_FORMAT_S32, - SAMPLE_FORMAT_F32 - }; -- -- virtual SampleFormat audioSampleFormat() const = 0; -+ virtual XSampleFormat audioSampleFormat() const = 0; - }; - - } // namespace -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp 2010-03-19 08:48:34.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp 2011-02-01 10:52:42.000000000 +0000 -@@ -1,3 +1,10 @@ -+#include <stdint.h> -+ -+# if __WORDSIZE == 64 -+# define UINT64_C(c) c ## UL -+# else -+# define UINT64_C(c) c ## ULL -+# endif - - #include "FFmpegAudioStream.hpp" - -@@ -66,7 +71,7 @@ - - - --osg::AudioStream::SampleFormat FFmpegAudioStream::audioSampleFormat() const -+osg::AudioStream::XSampleFormat FFmpegAudioStream::audioSampleFormat() const - { - return m_decoder->audio_decoder().sampleFormat(); - } -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp 2010-03-19 08:48:36.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp 2011-02-01 10:52:33.000000000 +0000 -@@ -23,7 +23,7 @@ - - int audioFrequency() const; - int audioNbChannels() const; -- osg::AudioStream::SampleFormat audioSampleFormat() const; -+ osg::AudioStream::XSampleFormat audioSampleFormat() const; - - double duration() const; - -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2010-03-19 09:14:34.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2011-02-01 10:52:12.000000000 +0000 -@@ -80,7 +79,7 @@ - - m_frequency = m_context->sample_rate; - m_nb_channels = m_context->channels; -- m_sample_format = osg::AudioStream::SampleFormat(m_context->sample_fmt); -+ m_sample_format = osg::AudioStream::XSampleFormat(m_context->sample_fmt); - - // Check stream sanity - if (m_context->codec_id == CODEC_ID_NONE) -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp 2010-03-19 09:14:18.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp 2011-02-01 10:51:34.000000000 +0000 -@@ -13,8 +13,7 @@ - - #include "BoundedMessageQueue.hpp" - -- -- -+#include <libavcore/samplefmt.h> - - namespace osgFFmpeg { - -@@ -45,7 +42,7 @@ - bool validContext() const; - int frequency() const; - int nbChannels() const; -- osg::AudioStream::SampleFormat sampleFormat() const; -+ osg::AudioStream::XSampleFormat sampleFormat() const; - - private: - -@@ -71,7 +68,7 @@ - - int m_frequency; - int m_nb_channels; -- osg::AudioStream::SampleFormat m_sample_format; -+ osg::AudioStream::XSampleFormat m_sample_format; - - SinkPtr m_audio_sink; - -@@ -104,7 +101,7 @@ - } - - --inline osg::AudioStream::SampleFormat FFmpegDecoderAudio::sampleFormat() const -+inline osg::AudioStream::XSampleFormat FFmpegDecoderAudio::sampleFormat() const - { - return m_sample_format; - } -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp 2010-03-19 09:14:18.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp 2011-01-31 18:04:48.000000000 +0000 -@@ -1,3 +1,10 @@ -+#include <stdint.h> -+ -+# if __WORDSIZE == 64 -+# define UINT64_C(c) c ## UL -+# else -+# define UINT64_C(c) c ## ULL -+# endif - - #include "FFmpegImageStream.hpp" - #include "FFmpegAudioStream.hpp" -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp 2010-03-19 09:04:40.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp 2011-01-31 17:52:59.000000000 +0000 -@@ -1,3 +1,10 @@ -+#include <stdint.h> -+ -+# if __WORDSIZE == 64 -+# define UINT64_C(c) c ## UL -+# else -+# define UINT64_C(c) c ## ULL -+# endif - /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index ad0079971..e1161594c 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46893 2011-05-13 13:47:07Z jconder $ +# $Id: PKGBUILD 47014 2011-05-14 04:04:32Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' -pkgname=('packagekit' 'packagekit-qt' 'packagekit-python') +pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') pkgver=0.6.14 -pkgrel=1 +pkgrel=2 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') url="http://www.packagekit.org" @@ -84,6 +84,15 @@ package_packagekit-qt() { make DESTDIR="$pkgdir" install } +package_packagekit-qt2() { + depends=('packagekit' 'qt') + pkgdesc=('Qt bindings for PackageKit') + + cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2" + + make DESTDIR="$pkgdir" install +} + package_packagekit-python() { depends=('packagekit' 'python2') pkgdesc=('Python bindings for PackageKit') diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 929c59363..4a6694a29 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> pkgname=paraview -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc='Parallel Visualization Application using VTK.' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' @@ -15,7 +15,7 @@ source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" "${pkgname}.profile" "${pkgname}.png" "${pkgname}.desktop") -md5sums=('5369f05667f1ad8aaca7a879208aeb3c' +md5sums=('d8a9d4a997a720589ffd57568bcdd449' '534ef49689a7f630c98380f5ab4bf915' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5') @@ -23,6 +23,10 @@ md5sums=('5369f05667f1ad8aaca7a879208aeb3c' build() { cd ParaView-${pkgver} + sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx + sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx + sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx + # Paraview wants to be built out of source mkdir -p build cd build diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 87c07ae56..16518d9c9 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 40964 2011-03-02 22:24:28Z lcarlier $ +# $Id: PKGBUILD 47641 2011-05-24 14:35:06Z tdziedzic $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=4 +pkgrel=5 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64' 'mips64el') -url="http://$pkgname.org/" +arch=('i686' 'x86_64') +url="http://performous.org/" license=('GPL') depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index e2663d0f9..b843c710b 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46321 2011-05-05 10:16:29Z spupykin $ +# $Id: PKGBUILD 47204 2011-05-18 20:20:25Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.69 -pkgrel=2 +pkgver=0.70 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ 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=('d14c4439bd0b81446e54504db68fd64f') +md5sums=('228a3ca93b49e308fc7a3b7a47341ab3') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index 37cab9a15..bb201a4a4 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=0.95 -pkgrel=3 +pkgver=0.98 +pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" @@ -11,12 +11,15 @@ license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-$pkgver.tar.gz) -md5sums=('f544f12357ae4ba44044cd8cb2b83a9f') +md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') build() { cd $startdir/src/Params-Validate-$pkgver perl ./Build.PL --installdirs=vendor ./Build +} +package(){ + cd $startdir/src/Params-Validate-$pkgver ./Build install --destdir=$pkgdir find $startdir/pkg -name '.packlist' -delete find $startdir/pkg -name '*.pod' -delete diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 0e0c3ee7c..751711d03 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40956 2011-03-02 21:08:01Z lcarlier $ +# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" @@ -17,14 +17,15 @@ sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2' 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} scons prefix=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./install.sh "${pkgdir}/usr" + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" } diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index e34e02601..cc4df5fca 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45135 2011-04-17 08:17:41Z tdziedzic $ +# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> pkgname=pokerth _realname=PokerTH pkgver=0.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" @@ -16,16 +16,23 @@ source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver- md5sums=('adbe56ad5f547eb255dad91de564bf1c') build() { - cd "$srcdir/$_realname-$pkgver-src" + cd $_realname-$pkgver-src sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro + + # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' + sed \ + -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ + -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + qmake $pkgname.pro + make } package() { - cd "$srcdir/$_realname-$pkgver-src" + cd $_realname-$pkgver-src make INSTALL_ROOT="$pkgdir" install diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 591963f40..82b0f5e0b 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qbittorrent pkgver=2.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 3fa7ecf2b..8b63ff96f 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45140 2011-04-17 12:03:02Z andrea $ +# $Id: PKGBUILD 47374 2011-05-22 09:38:33Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" @@ -16,17 +16,13 @@ optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml - gpsd-2.96.patch) -sha256sums=('0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' - 'b641c94c6db4087c9ae1a79e31e2ea126830abf7ff1b05c27953edc6afebf8c7') + $pkgname-mimetypes.xml) +sha256sums=('8eedc414b4f89c9519e4b15c2ac7e5986b8e0834d237cde5fedc619c61ad0175' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/gpsd-2.96.patch - install -d ${srcdir}/$pkgname-$pkgver/build cd ${srcdir}/$pkgname-$pkgver/build diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index c832cc8d2..d7fb41e6f 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.1.2-1 + 2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.1.1-1 diff --git a/community/qlandkartegt/qlandkartegt.install b/community/qlandkartegt/qlandkartegt.install index aacc9e6a8..e55805570 100644 --- a/community/qlandkartegt/qlandkartegt.install +++ b/community/qlandkartegt/qlandkartegt.install @@ -1,7 +1,7 @@ post_install() { -update-mime-database usr/share/mime > /dev/null + update-mime-database usr/share/mime > /dev/null } post_remove() { -update-mime-database usr/share/mime > /dev/null + post_install $1 } diff --git a/community/qtmpc/PKGBUILD b/community/qtmpc/PKGBUILD new file mode 100644 index 000000000..95900ba1a --- /dev/null +++ b/community/qtmpc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 47054 2011-05-14 19:45:44Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Shaika-Dzari <shaikadzari at gmail dot com> + +pkgname=qtmpc +pkgver=0.6.1 +pkgrel=2 +pkgdesc="Qt4-based front-end for MPD" +arch=('i686' 'x86_64') +url="http://qtmpc.lowblog.nl/" +license=('GPL') +depends=('hicolor-icon-theme' 'kdebase-runtime' 'qt') +makedepends=('automoc4' 'cmake') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://files.lowblog.nl/$pkgname/QtMPC-$pkgver.tar.bz2) +sha256sums=('82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62') + +build() { + cd ${srcdir}/QtMPC + + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/QtMPC + + make DESTDIR=${pkgdir} install +} diff --git a/community/qtmpc/qtmpc.changelog b/community/qtmpc/qtmpc.changelog new file mode 100644 index 000000000..f4271103c --- /dev/null +++ b/community/qtmpc/qtmpc.changelog @@ -0,0 +1,3 @@ +2011-05-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qtmpc 0.6.1-2 + * moved to [community] with 109 votes diff --git a/community/qtmpc/qtmpc.install b/community/qtmpc/qtmpc.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/community/qtmpc/qtmpc.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 8e6536288..60f22d91b 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46370 2011-05-06 10:37:59Z spupykin $ +# $Id: PKGBUILD 47038 2011-05-14 10:40:55Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.6 +pkgver=2.2.7 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('0aa7dafe34faacf3303afc3c06e92548' +md5sums=('86937a61b9788d1d06fbfbd2bff03916' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index e9ce6ed22..6a0d17ffa 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.28.00c +pkgver=5.28.00d pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('0e997f14cb1c671987e1780d2b6375f8' +md5sums=('53505fcb256df38526d446916e6efc15' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 2c60c4f3e..3601e266b 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 43438 2011-03-26 08:44:13Z spupykin $ +# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.4.21 +pkgver=1.4.22 pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. \ (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') -depends=('pam' 'lockdev' 'boost>=1.41' 'e2fsprogs') +depends=('pam' 'lockdev' 'boost' 'e2fsprogs') optdepends=('btrfs-progs-unstable' 'lvm2') arch=('i686' 'x86_64' 'mips64el') conflicts=('dchroot') @@ -24,13 +24,13 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'script-arch32' 'copyfiles-arch32' 'mount-arch32') -md5sums=('fbbb65213e26a0a3e2e1bac04a24d20d' +md5sums=('0dde4c76b1623cc277d92f8dc06109d1' '8e86445e188129232e1782d978dfc967' 'd4558d5691fbdaa46ce669e8f327133b' 'f0d5d5b5e34a860f6f90b5628c680f46') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" @@ -43,7 +43,13 @@ build() { # --enable-csbuild make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index 960e3c262..acb31c73b 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 32586 2010-11-15 00:28:04Z lfleischer $ +# $Id: PKGBUILD 47379 2011-05-22 09:59:29Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 -pkgdesc='File system and media management forensic analysis tools.' -arch=('i686' 'x86_64' 'mips64el') +pkgdesc='File system and media management forensic analysis tools' +arch=('i686' 'x86_64') url='http://www.sleuthkit.org/sleuthkit' license=('GPL2' 'CPL' 'custom:"IBM Public Licence"') depends=('perl') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('05517963942aa92be77c05ca1c47f0de') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37') build() { - cd "${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --without-afflib --without-ewf --prefix=/usr make LDFLAGS+="-lpthread -ldl" } package() { - cd "${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install - # licenses - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -Dm0644 licenses/* "${pkgdir}/usr/share/licenses/${pkgname}" +# licenses + install -d ${pkgdir}/usr/share/licenses/${pkgname} + install -Dm0644 licenses/* ${pkgdir}/usr/share/licenses/${pkgname} } diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index 46c7da2e5..74b9e3bfc 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40953 2011-03-02 21:01:34Z lcarlier $ +# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=10 +pkgrel=11 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64' 'mips64el') url="http://www.secretmaryo.org/" license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui>=0.7' 'boost-libs>=1.46' 'smc-data') -makedepends=('autoconf' 'automake' 'boost>=1.46') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 smc-for-cegui-v0-7.diff smc.desktop diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 92cb5c5ed..7a32da2c9 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41178 2011-03-04 19:28:06Z svenstaro $ +# $Id: PKGBUILD 47736 2011-05-25 04:13:58Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=2 +pkgrel=3 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -14,8 +14,10 @@ depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment') optdepends=('python: python-based bots' 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma) -md5sums=('378cf0b18a5dd5b840964e5945778503') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma + gcc46.patch) +md5sums=('378cf0b18a5dd5b840964e5945778503' + 'e9586b611db1ed04fe4f0c5982fda7d2') build() { bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma @@ -24,6 +26,7 @@ build() { sed -i '1i\ #include <list>' rts/lib/lobby/Connection.h + patch -Np1 < $srcdir/gcc46.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index b7924959c..aeb542a56 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46590 2011-05-09 22:11:42Z svenstaro $ +# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby pkgver=0.131 -pkgrel=1 +pkgrel=2 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') url="http://springlobby.info/" diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD new file mode 100644 index 000000000..04e771c57 --- /dev/null +++ b/community/sxiv/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> + +pkgname=sxiv +pkgver=0.8.1 +pkgrel=2 +pkgdesc='simple x image viewer' +arch=('i686' 'x86_64') +license=('GPL2') +install=('sxiv.install') +url='https://github.com/muennich/sxiv' +depends=('libx11' 'xproto' 'imlib2') +source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" + 'sxiv.desktop' + 'config.h') +md5sums=('23006a1900690d46c0ff126c76cdbd02' + '0b6d43bd356aadc12537c010950e2272' + '8018e9f2f63b155098428be9dbaf8b5c') + +build() { + cd sxiv-${pkgver} + + cp ${srcdir}/config.h . + + make +} + +package() { + cd sxiv-${pkgver} + + make PREFIX=${pkgdir}/usr install + + install -D -m644 ${srcdir}/sxiv.desktop \ + ${pkgdir}/usr/share/applications/sxiv.desktop +} diff --git a/community/sxiv/config.h b/community/sxiv/config.h new file mode 100644 index 000000000..14a65bd4f --- /dev/null +++ b/community/sxiv/config.h @@ -0,0 +1,41 @@ +/* default window dimensions (overwritten via -g option): */ +#define WIN_WIDTH 800 +#define WIN_HEIGHT 600 + +/* default color for window background: * + * (see X(7) "COLOR NAMES" section for valid values) */ +#define BG_COLOR "#999999" +/* default color for thumbnail selection: */ +#define SEL_COLOR "#0040FF" + +/* how should images be scaled when they are loaded?: * + * (also controllable via -d/-s/-Z/-z options) * + * SCALE_DOWN: 100%, but fit large images into window, * + * SCALE_FIT: fit all images into window, * + * SCALE_ZOOM: use current zoom level, 100% at startup */ +#define SCALE_MODE SCALE_DOWN + +/* levels (percent) to use when zooming via '-' and '+': */ +static const float zoom_levels[] = { + 12.5, 25.0, 50.0, 75.0, + 100.0, 150.0, 200.0, 400.0, 800.0 +}; + +/* default dimension of thumbnails (width == height): */ +#define THUMB_SIZE 60 + +/* enable external commands (defined below)? 0=off, 1=on: */ +#define EXT_COMMANDS 0 + +/* external commands and corresponding key mappings: */ +#ifdef MAIN_C +#if EXT_COMMANDS +static const command_t commands[] = { + /* ctrl-... reload? command, '#' is replaced by filename */ + { XK_comma, True, "jpegtran -rotate 270 -copy all -outfile # #" }, + { XK_period, True, "jpegtran -rotate 90 -copy all -outfile # #" }, + { XK_less, True, "mogrify -rotate -90 #" }, + { XK_greater, True, "mogrify -rotate +90 #" } +}; +#endif +#endif diff --git a/community/sxiv/sxiv.desktop b/community/sxiv/sxiv.desktop new file mode 100644 index 000000000..f510d49ea --- /dev/null +++ b/community/sxiv/sxiv.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=sxiv +GenericName=Image Viewer +Exec=sxiv %f +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp; +NoDisplay=true diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install new file mode 100644 index 000000000..02fd31189 --- /dev/null +++ b/community/sxiv/sxiv.install @@ -0,0 +1,10 @@ +post_install () { + echo "* Look into config.h to customize sxiv to your needs." + echo " Use 'makepkg --skipinteg' to rebuild the package after changing config.h." + echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." + echo " See sxiv(1) for more information." +} + +post_upgrade () { + post_install ${1} +} diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 2eab37e96..325223225 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 45855 2011-04-30 03:24:21Z dreisner $ +# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=26 +pkgver=28 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') @@ -20,12 +20,14 @@ optdepends=('cryptsetup: required for encrypted block devices' groups=('systemd') options=('!libtool') backup=(etc/systemd/system.conf - etc/tmpfiles.d/systemd.conf - etc/tmpfiles.d/x11.conf) + etc/tmpfiles.d/console.conf + usr/lib/tmpfiles.d/legacy.conf + usr/lib/tmpfiles.d/systemd.conf + usr/lib/tmpfiles.d/x11.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('b7c468aa400c64d02d533eba6359e283' +md5sums=('be37500f576a0494f82fed7fa47cc306' '752636def0db3c03f121f8b4f44a63cd') build() { diff --git a/community/systemd/mqueue-signed-int.patch b/community/systemd/mqueue-signed-int.patch new file mode 100644 index 000000000..dc9ac3524 --- /dev/null +++ b/community/systemd/mqueue-signed-int.patch @@ -0,0 +1,38 @@ +diff --git a/src/dbus-common.c b/src/dbus-common.c +index fe7f84b..9bf0dab 100644 +--- a/src/dbus-common.c ++++ b/src/dbus-common.c +@@ -569,15 +569,15 @@ int bus_property_append_ul(DBusMessageIter *i, const char *property, void *data) + } + + int bus_property_append_long(DBusMessageIter *i, const char *property, void *data) { +- uint64_t u; ++ int64_t l; + + assert(i); + assert(property); + assert(data); + +- u = (int64_t) *(long*) data; ++ l = (int64_t) *(long*) data; + +- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &u)) ++ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &l)) + return -ENOMEM; + + return 0; +diff --git a/src/dbus-socket.c b/src/dbus-socket.c +index b81569d..7194611 100644 +--- a/src/dbus-socket.c ++++ b/src/dbus-socket.c +@@ -115,8 +115,8 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes + { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections }, + { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections }, + { "org.freedesktop.systemd1.Socket", "NAccepted", bus_property_append_unsigned, "u", &u->socket.n_accepted }, +- { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"t", &u->socket.mq_maxmsg }, +- { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"t", &u->socket.mq_msgsize }, ++ { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg }, ++ { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize }, + { NULL, NULL, NULL, NULL, NULL } + }; + diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD index bf1af0741..51c11eaf4 100644 --- a/community/tagpy/PKGBUILD +++ b/community/tagpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41005 2011-03-03 04:37:04Z tdziedzic $ +# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Callan Barrett <wizzomafizzo@gmail.com> # Contributor: Scott Horowitz <stonecrest@gmail.com> pkgname=tagpy pkgver=0.94.8 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for TagLib" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/tagpy" @@ -32,6 +32,5 @@ build() { package(){ cd ${srcdir}/${pkgname}-${pkgver} python2 setup.py install --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 9d7f46ce9..cafa11dc2 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44713 2011-04-11 12:23:03Z spupykin $ +# $Id: PKGBUILD 47317 2011-05-21 17:27:47Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=29.0.2 +pkgver=29.0.3 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/tea-editor/$pkgname-$pkgver.tar.bz2 tea.desktop) -md5sums=('7b93a54df1a699cb02b188d918ecc9e8' +md5sums=('1c900e7f57a0fe72fb4cc481450a5b32' '377ace3363124f4c086de0babb820761') build() { @@ -24,6 +24,9 @@ build() { qmake make +} +package(){ + cd ${srcdir}/$pkgname-$pkgver make INSTALL_ROOT=${pkgdir} install install -Dm755 ${pkgdir}/usr/local/bin/tea ${pkgdir}/usr/bin/tea diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD index 7909fc7e7..3bbc94879 100644 --- a/community/twinkle/PKGBUILD +++ b/community/twinkle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 41011 2011-03-03 04:44:11Z tdziedzic $ +# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $ # Maintainer: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ pkgname=twinkle pkgver=1.4.2 -pkgrel=8 +pkgrel=10 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.twinklephone.com/" diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index d7cb8de65..1c312b3d5 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/$pkgname-$pkgver.tar.gz" 'unbound.conf' 'rc.d') -sha1sums=('f2ac7b4ef1d1b330e2dd5e2eedeb6fd2bbad8478' +sha1sums=('ac9ab61a51e147ade69ca8b043fee2ed76336a62' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'a0c8c496d71d43ed9e09b170d3df836dfb096480') diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 1d7a68e1d..0e267725f 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $ +# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.6 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgver=4.0.8 +pkgrel=2 +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' +'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 +<<<<<<< HEAD 18-system-xorg.patch gcc46.patch) _kernver=2.6.38-LIBRE +======= + 18-system-xorg.patch + change_default_driver_dir.patch) +_kernver=2.6.38-ARCH +>>>>>>> 33feb015eb09eee76827f359e685fce981d88111 build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -25,7 +31,7 @@ build() { 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/gcc46.patch" + patch -Np1 -i "$srcdir/change_default_driver_dir.patch" cp "$srcdir/LocalConfig.kmk" . @@ -203,8 +209,8 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('cf274f0585c35c5c137e2bd9b48b462a' - '7d3ee86e998fa24b07a157add9fb7766' +md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' + '39712ccbc16b04c1cda209ae16446bf2' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' @@ -213,4 +219,4 @@ md5sums=('cf274f0585c35c5c137e2bd9b48b462a' 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' '8a22b33c9dfaf8fb79bb2d26304e650b' - 'a28b48ff01149acbca4bbe6a676a06da') + 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community/virtualbox/change_default_driver_dir.patch b/community/virtualbox/change_default_driver_dir.patch new file mode 100644 index 000000000..71930f062 --- /dev/null +++ b/community/virtualbox/change_default_driver_dir.patch @@ -0,0 +1,18 @@ +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/virtualbox/gcc46.patch b/community/virtualbox/gcc46.patch deleted file mode 100644 index 9786a7287..000000000 --- a/community/virtualbox/gcc46.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur VirtualBox-4.0.6_OSE.orig//configure VirtualBox-4.0.6_OSE/configure ---- VirtualBox-4.0.6_OSE.orig//configure 2011-04-21 03:29:30.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/configure 2011-04-21 11:42:57.517216676 -0700 -@@ -412,9 +412,9 @@ - elif [ $cc_maj -lt 3 \ - -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ - -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ -- -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \ -+ -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \ - -o $cc_maj -gt 4 ]; then -- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5" -+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6" - fail really - else - log_success "found version $cc_ver" diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index d4268ee38..3fd4f09a0 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45573 2011-04-24 16:51:07Z lcarlier $ +# $Id: PKGBUILD 47366 2011-05-22 06:58:10Z lcarlier $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux -pkgver=11.04 -pkgrel=2 +pkgver=11.04.1 +pkgrel=3 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64' 'mips64el') url="http://www.wormux.org/" @@ -13,22 +13,22 @@ license=('GPL') makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('668cd4c22afde352c566454e65fc4144') +md5sums=('26ff65c43a9bb61a3f0529c98b943e35') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.1/}" #gcc 4.6.0 fix - sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h + #sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h ./configure --prefix=/usr make } package() { - depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver}") + depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.1/}" make DESTDIR="${pkgdir}" install rm -r ${pkgdir}/usr/share/warmux diff --git a/community/wbar/PKGBUILD b/community/wbar/PKGBUILD index bc5e87290..ffed2afe7 100644 --- a/community/wbar/PKGBUILD +++ b/community/wbar/PKGBUILD @@ -1,21 +1,28 @@ -# $Id: PKGBUILD 38239 2011-01-23 22:13:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 47294 2011-05-21 08:20:51Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=wbar -pkgver=2.1.1 +pkgver=2.2.2 pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -depends=('imlib2' 'gcc-libs') -optdepends=('libglade') -pkgdesc="A quick launch bar developed with speed in mind." +pkgdesc="A quick launch bar developed with speed in mind" +arch=('i686' 'x86_64') url="http://code.google.com/p/wbar" license=('GPL') +depends=('libglade' 'imlib2' 'gcc-libs') +makedepends=('intltool') source=(http://wbar.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('637433fc2995a0e45e644fd992e970f6') +sha256sums=('0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0') build() { cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --exec_prefix=/usr --sysconfdir=/etc make +} + +package () { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/wbar/wbar.changelog b/community/wbar/wbar.changelog new file mode 100644 index 000000000..17916badd --- /dev/null +++ b/community/wbar/wbar.changelog @@ -0,0 +1,9 @@ +2011-05-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * wbar 2.2.2-1 + +2011-01-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * wbar 2.1.1-1 + +2008-10-13 Allan McRae <allan@archlinux.org> + * wbar 1.3.3-2 + * Moved to [community] repo diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 3552ea441..e060ead17 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42695 2011-03-19 21:22:32Z spupykin $ +# $Id: PKGBUILD 47322 2011-05-21 17:35:38Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.5.1 +pkgver=4.5.2 pkgrel=1 pkgdesc="A graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,6 @@ depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils') install=${pkgname}.install source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz 'xboard.desktop') -md5sums=('704cd7be87aada1f24c33e616b3ec2b5' - '1d9d4a7864465a703fe4a215e83f4806') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,3 +29,5 @@ package() { install -Dm644 ${srcdir}/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop } +md5sums=('2fa92fceeda344ef935bc97bef5f9fc5' + '1d9d4a7864465a703fe4a215e83f4806') diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index 748c9cc97..713475249 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=2.1.6 +pkgver=2.1.7 pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ license=('LGPL') depends=('gcc-libs' 'util-linux-ng') makedepends=() source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz) -md5sums=('77b9ca20e8f2426874022080f41d7b0b') +md5sums=('7d3120f8a8fb913a7e55c57c6eb024f3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index 35c6ba0c1..dd6ffd124 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 105458 2011-01-09 04:03:58Z stephane $ +# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.49 -pkgrel=2 +pkgver=2.2.51 +pkgrel=1 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/acl" license=('LGPL') -depends=('attr>=2.4.41') +depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') -source=(http://mirrors.zerg.biz/nongnu/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) -sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} export INSTALL_USER=root INSTALL_GROUP=root ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib @@ -28,6 +28,7 @@ package() { make DIST_ROOT="${pkgdir}" install install-lib install-dev - rm ${pkgdir}/lib/libacl.a + # tidy up + rm -f ${pkgdir}/lib/libacl.a chmod 0755 ${pkgdir}/lib/libacl.so.*.*.* } diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index 3a9ea3204..30f3ad81a 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 115738 2011-03-20 22:30:28Z allan $ +# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.44 -pkgrel=3 +pkgver=2.4.46 +pkgrel=1 pkgdesc="Extended attribute support library for ACL support" -arch=('i686' 'x86_64' 'mips64el') -url="http://oss.sgi.com/projects/xfs/" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/attr" license=('LGPL') depends=('glibc') makedepends=('gettext') @@ -13,32 +13,25 @@ replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz) -sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') build() { - cd $srcdir/attr-$pkgver + cd "${srcdir}"/${pkgname}-${pkgver} - # prevent binaries being owned by nobody:nobody - sed -i 's#-o $(PKG_USER) -g $(PKG_GROUP)##' include/buildmacros - - autoconf - ./configure --prefix=/usr - sed -i -e 's/man2//g' man/Makefile + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib make } package() { - cd $srcdir/attr-$pkgver - make prefix=${pkgdir}/usr install install-lib install-dev - - # tidy up - cd "${pkgdir}" + cd "${srcdir}"/${pkgname}-${pkgver} - install -dm755 lib - mv -v usr/lib/libattr.so* lib/ - ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so + make DIST_ROOT="${pkgdir}" install install-lib install-dev - mv -v usr/libexec/libattr.{a,la} usr/lib/ - rm -rvf usr/libexec + # tidy up + rm -f "${pkgdir}"/lib/libattr.a + chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.* + # remove conflicting manpages + rm -rf "${pkgdir}"/usr/share/man/man2 } diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index bf54f3bb2..8de32e57a 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 121290 2011-04-30 08:22:29Z allan $ +# $Id: PKGBUILD 123424 2011-05-11 10:41:25Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.21.51 -pkgrel=6 -_date=20110428 +pkgver=2.21 +pkgrel=8 +_date=20110430 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" @@ -16,9 +16,10 @@ depends=('glibc>=2.13' 'zlib') makedepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install -#source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -#md5sums=('884dcbc87d4722b152aea72312356da1') -source=(ftp://sourceware.org/pub/$pkgname/snapshots/$pkgname-$pkgver.tar.bz2) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 + binutils-2.21-strip-segfault.patch) +md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' + '98e8dfaf1c0ededa586823ebfb27825a') mksource() { mkdir ${pkgname}-${_date} @@ -31,18 +32,21 @@ mksource() { } 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} - ln -s binutils-$pkgver binutils - mkdir binutils-build - cd binutils-build + mkdir binutils-build + cd binutils-build [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" [[ $CARCH == "mips64el" ]] && CONFIGFLAG="--disable-multilib --disable-werror" - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG + ${srcdir}/binutils/configure --prefix=/usr \ + --enable-ld=default --enable-gold \ + --enable-plugins --enable-threads \ + --enable-shared $CONFIGFLAG # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. make configure-host @@ -85,5 +89,3 @@ package() { 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 } - -md5sums=('0d06cb7a0b58ff6108adeacc72be2972') diff --git a/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch b/core/binutils/binutils-2.21-strip-segfault.patch index 0133d879b..0133d879b 100644 --- a/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch +++ b/core/binutils/binutils-2.21-strip-segfault.patch diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 7c74491c8..9dc49b129 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 103928 2010-12-23 22:10:05Z thomas $ +# $Id: PKGBUILD 123894 2011-05-14 09:00:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea' +sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 17608e0fc..2038dd5b4 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $ +# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file pkgver=5.07 -pkgrel=1 +pkgrel=3 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -13,9 +13,11 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch) + file-5.05-zip64.patch + file-5.07-zip-detect.patch) md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' - '385f020467debd98bd2d8df6143f93d0') + '385f020467debd98bd2d8df6143f93d0' + 'bcbf2e152f38003a2736298bbd0f37f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +25,7 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - + patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch new file mode 100644 index 000000000..3e8f128d8 --- /dev/null +++ b/core/file/file-5.07-zip-detect.patch @@ -0,0 +1,13 @@ +--- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200 ++++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200 +@@ -654,6 +654,10 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + ++>26 byte x Zip archive data ++ ++ ++ + # StarView Metafile + # From Pierre Ducroquet <pinaraf@pinaraf.info> + 0 string VCLMTF StarView MetaFile diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 2302717db..a645abde4 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121304 2011-04-30 13:23:58Z allan $ +# $Id: PKGBUILD 123891 2011-05-14 08:26:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') pkgver=4.6.0 -pkgrel=4 -_snapshot=4.6-20110429 +pkgrel=5 +_snapshot=4.6-20110513 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" license=('GPL' 'LGPL' 'custom') @@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran, gcc_pure64.patch gcc_mips64el_lib.patch gcc-hash-style-both.patch) -md5sums=('fa586a5634ae3b462c5fb2d55160b14f' - '2591b1fad977f7bd6136c9ac1298ef04' - '366f93c1867f35c8860b42965efde955' - '21779792ef7e0ed7abef611160b0099c' - 'cf518c56b968925a2eca3aa2b4cdbd7b' - 'f66ef8597b99961eda7573df505ea354' - '3d89dd233ceb6a837d14ee6b940a43ed' +md5sums=('2be769db16ac02f30fb62423b4c50145' + 'a310d230945f4b3093dd3ca72839c649' + '361a10c5a5545c80fd271b18036dd00c' + 'f7db2f6ed34398361de62cb6b8eb53d2' + '9b69c1d8874e8496c1965ee3e32eaa6d' + '248e53b461078bf1c89528fb8e4ba051' + 'e15a01b0d02ff12e975e4c2649e71e55' '1e9fd2eaf0ee47ea64e82c48998f1999' '4030ee1c08dd1e843c0225b772360e76' '67e337993d821d72fccacbed52d48c34' diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 8ca822c20..ed77bbb82 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119742 2011-04-14 11:29:04Z ibiru $ +# $Id: PKGBUILD 124444 2011-05-21 07:53:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.28.6 +pkgver=2.28.7 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -14,7 +14,7 @@ options=('!libtool' '!docs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2 glib2.sh glib2.csh) -sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578' +sha256sums=('0e1b3816a8934371d4ea2313dfbe25d10d16c950f8d02e0a7879ae10d91b1631' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index 4f429109b..59f4cc42a 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105599 2011-01-10 18:34:30Z stephane $ +# $Id: PKGBUILD 123886 2011-05-14 03:40:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp -pkgver=5.0.1 -pkgrel=2 +pkgver=5.0.2 +pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') url="http://gmplib.org/" @@ -13,7 +13,7 @@ license=('LGPL3') options=(!libtool) install=gmp.install source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('6bac6df75c192a13419dfd71d19240a7') +md5sums=('0bbaedc82fb30315b06b1588b9077cd3') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,6 +23,10 @@ build() { --prefix=/usr --infodir=/usr/share/info \ --enable-cxx make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" make check } diff --git a/core/gmp/gmp.install b/core/gmp/gmp.install index 1c31ab365..cad3354f9 100644 --- a/core/gmp/gmp.install +++ b/core/gmp/gmp.install @@ -1,4 +1,4 @@ -info_dir=/usr/share/info +info_dir=usr/share/info info_files=(gmp.info gmp.info-1 gmp.info-2) post_install() { diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index fe0917909..e81bd6921 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91020 2010-09-21 03:26:36Z allan $ +# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64' 'mips64el') @@ -14,12 +14,16 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('6dd9931a52501519d7779a27cf953326') +md5sums=('b59003c42b330bdabd417e00d07102da') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } diff --git a/core/grep/grep.install b/core/grep/grep.install index ba97d8994..7cd31301f 100644 --- a/core/grep/grep.install +++ b/core/grep/grep.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(grep.info) post_install() { diff --git a/core/heimdal/001_all_heimdal-no_libedit.patch b/core/heimdal/001_all_heimdal-no_libedit.patch deleted file mode 100644 index a551bdce1..000000000 --- a/core/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/core/heimdal/002_all_heimal-fPIC.patch b/core/heimdal/002_all_heimal-fPIC.patch deleted file mode 100644 index c67dbae76..000000000 --- a/core/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/core/heimdal/003_all_heimdal-rxapps.patch b/core/heimdal/003_all_heimdal-rxapps.patch deleted file mode 100644 index 40fc05f08..000000000 --- a/core/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/core/heimdal/005_all_heimdal-suid_fix.patch b/core/heimdal/005_all_heimdal-suid_fix.patch deleted file mode 100644 index 35a9ed9f6..000000000 --- a/core/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/core/heimdal/012_all_heimdal-berkdb.patch b/core/heimdal/012_all_heimdal-berkdb.patch deleted file mode 100644 index 46762c220..000000000 --- a/core/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/core/heimdal/013_all_heimdal-pthread-lib.patch b/core/heimdal/013_all_heimdal-pthread-lib.patch deleted file mode 100644 index 19f879407..000000000 --- a/core/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/core/heimdal/014_all_heimdal-path.patch b/core/heimdal/014_all_heimdal-path.patch deleted file mode 100644 index 36a86f1f9..000000000 --- a/core/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/core/heimdal/PKGBUILD b/core/heimdal/PKGBUILD deleted file mode 100644 index 2951201d1..000000000 --- a/core/heimdal/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 101969 2010-12-03 09:59:28Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -# -### Attention: remove old pkg before building - it links against itself! ### -# - -pkgname=heimdal -pkgver=1.3.3 -pkgrel=4 -pkgdesc="Implementation of Kerberos V5 libraries" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.h5l.org/" -license=('custom') -depends=('db' 'openssl' 'sqlite3' 'e2fsprogs' 'libldap') -backup=(etc/krb5.conf) -options=('!libtool' '!emptydirs') -install=heimdal.install -source=(http://www.h5l.org/dist/src/${pkgname}-${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 - heimdal-kdc.rc - kadmind.rc - kpasswd.rc) -md5sums=('963c09f1b14c41660be70b55fae9f163' - '98e28f11f906c967aac22d6184102c9e' - '6d5571bdedba2e2423b90bccdbac2c0a' - '2feec3924ee5230b54175b4d4000c872' - '45aeb207f360f9f4e9e0fabc8bfeecbc' - '56f5d10d0ec40f2fda82ef144ffac1e0' - '1b8665b771c4eb6b56ea8582c96e56e3' - '8208ae8c0b6ff5ab4f64af1693e9e396' - 'e59650992b9541a30dfce727a194f6e0' - '1f2f86a67bbfddb7af581d35fdca9627' - 'f8f1eca95b9d3f2b4ebf2417b71b81cf') - -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 - - sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \ - doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \ - lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 - - sed -i 's|$(LIB_NDBM)|$(LIB_NDBM) $(LIB_db_create)|' lib/otp/Makefile.am - - libtoolize --force - aclocal -I cf - autoconf - automake - - ./configure --prefix=/usr --enable-shared=yes --without-x \ - --sysconfdir=/etc --mandir=/usr/share/man \ - --datadir=/var/lib/heimdal \ - --localstatedir=/var/lib/heimdal \ - --with-openssl=/usr \ - --with-readline-lib=/usr/lib \ - --with-readline-include=/usr/include/readline \ - --with-sqlite3-lib=/usr/lib \ - --with-sqlite3-include=/usr/include \ - --with-openldap=/usr \ - --libexecdir=/usr/sbin - - make -} - -package() { - cd ${srcdir}/heimdal-${pkgver} - make DESTDIR=${pkgdir} install - - # Rename daemons and their manpages - for i in telnetd ftpd rshd; do - mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 - mv ${pkgdir}/usr/sbin/{,k}${i} - done - - # Rename clients and their manpages - for i in rcp rsh telnet ftp su login; do - if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then - mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 - fi - mv ${pkgdir}/usr/bin/{,k}${i} - done - rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8} - - # Arch could be a KDC too - install -d ${pkgdir}/etc/rc.d - install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/ - for i in heimdal-kdc kadmind kpasswd; do - install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} - done - - # Remove conflicts - rm ${pkgdir}/usr/share/man/man5/ftpusers.5* # man-pages - rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}* # openssl (a bit overzealous...) - rm ${pkgdir}/usr/share/man/man3/os.3* # erlang - - # Install the license - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/core/heimdal/heimdal-kdc.rc b/core/heimdal/heimdal-kdc.rc deleted file mode 100644 index b2a3b5fcf..000000000 --- a/core/heimdal/heimdal-kdc.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kdc` -case "$1" in - start) - stat_busy "Starting heimdal kdc" - if [ -z "$PID" ]; then - /usr/sbin/kdc --detach - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon heimdal-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping heimdal kdc" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon heimdal-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/heimdal/heimdal.install b/core/heimdal/heimdal.install deleted file mode 100644 index b4fd19000..000000000 --- a/core/heimdal/heimdal.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(heimdal hx509) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.info.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.info.gz $infodir/dir 2> /dev/null - done -} diff --git a/core/heimdal/kadmind.rc b/core/heimdal/kadmind.rc deleted file mode 100644 index 0f3b8c7c4..000000000 --- a/core/heimdal/kadmind.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting heimdal admin server" - if [ -z "$PID" ]; then - /usr/sbin/kadmind & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping heimdal admin server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/heimdal/kpasswd.rc b/core/heimdal/kpasswd.rc deleted file mode 100644 index 3697322b9..000000000 --- a/core/heimdal/kpasswd.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kpasswdd` -case "$1" in - start) - stat_busy "Starting heimdal kpasswdd" - if [ -z "$PID" ]; then - /usr/sbin/kpasswdd & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kpasswd - stat_done - fi - ;; - stop) - stat_busy "Stopping heimdal kpasswdd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kpasswd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index 89ea988e5..e44659732 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 82650 2010-06-15 05:16:19Z allan $ +# $Id: PKGBUILD 123997 2011-05-15 19:12:02Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd -pkgver=1.15.2 +pkgver=1.15.3 pkgrel=1 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" license=('GPL') depends=('glibc') -source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz) -md5sums=('77d0b51454522bc6c170bbdc6e31202a') +source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz + fix-es.po.patch) +md5sums=('8143e179a0f3c25646ce5085e8777200') build() { cd ${srcdir}/${pkgname}-${pkgver} - + patch -Np1 -i ../fix-es.po.patch # rename keymap files with the same names # this is needed because when only name of keymap is specified # loadkeys loads the first keymap it can find, which is bad (see FS#13837) @@ -26,7 +27,11 @@ build() { mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man - make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1 + make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install # this is needed because initscripts call /bin/loadkeys @@ -35,3 +40,5 @@ build() { mkdir ${pkgdir}/bin ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys } +md5sums=('8143e179a0f3c25646ce5085e8777200' + '4ded3edb50fb7a3277bae6a870cee812') diff --git a/core/kbd/fix-es.po.patch b/core/kbd/fix-es.po.patch new file mode 100644 index 000000000..578f0a7b7 --- /dev/null +++ b/core/kbd/fix-es.po.patch @@ -0,0 +1,11 @@ +--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 ++++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 +@@ -1363,7 +1363,7 @@ + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/extra/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 0a0258b22..0a0258b22 100644 --- a/extra/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD index 86aecf1d9..da8133b37 100644 --- a/core/libgssglue/PKGBUILD +++ b/core/libgssglue/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102146 2010-12-06 09:49:56Z allan $ +# $Id: PKGBUILD 123644 2011-05-12 06:23:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libgssglue pkgver=0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" @@ -15,7 +15,7 @@ options=('!libtool') source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz gssapi_mech.conf) md5sums=('ce1b4c758e6de01b712d154c5c97e540' - '234b9cca75a33af98eda3f1683756879') + '080be866717e4e06fa6f7d6f43cb395a') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/libgssglue/gssapi_mech.conf b/core/libgssglue/gssapi_mech.conf index f71aca08e..9a832ee1b 100644 --- a/core/libgssglue/gssapi_mech.conf +++ b/core/libgssglue/gssapi_mech.conf @@ -15,8 +15,8 @@ # library initialization function # ================================ ========================== # The MIT K5 gssapi library, use special function for initialization. -#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init -/usr/lib/libgssapi.so mechglue_internal_krb5_init +/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init +#/usr/lib/libgssapi.so mechglue_internal_krb5_init # # The SPKM3 gssapi library function. Use the function spkm3_gss_initialize. # /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff index e75499e8e..e75499e8e 100644 --- a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff +++ b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 4cdd661af..eeea19970 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109502 2011-02-10 10:44:18Z eric $ +# $Id: PKGBUILD 123786 2011-05-13 00:53:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.84 +pkgver=2.02.85 _pkgverlvm=${pkgver} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -14,15 +14,21 @@ groups=('base') conflicts=('mkinitcpio<0.5.99') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install - lvm2_hook) -md5sums=('8b4e0897ee48f02c0dff11940e44e23b' 'e29bc80d636ed17b617d9b384a5f3aa0'\ - '7103e3fef1180478811ac4e32aec540d') -sha1sums=('6d92f4474f93c7d3824a0eb3469c7e4f9ef8f1d4' '662fc54ce291fd79bd09701e4c3e10854f325282'\ - '769767d84c73674cbb68c765460e57c428c314a0') + lvm2_hook + Be-quiet-on-removing-cache-on-read-only-fs.diff) +md5sums=('91785ca438e5ce679dd3a386b183d552' + 'e29bc80d636ed17b617d9b384a5f3aa0' + 'cf05f2c7281e24269ea9dcc6b4e106ba' + '6db89da27928d2415a8e26cd0a842712') +sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' + '662fc54ce291fd79bd09701e4c3e10854f325282' + '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' + '6d7dd04be291d7537235704c816a701fd5beacc0') build() { cd "${srcdir}/LVM2.${_pkgverlvm}" sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff unset LDFLAGS ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib \ diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index d6d1c1f94..86d2ea582 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -18,6 +18,7 @@ run_hook () [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET fi } diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD index dbbc4460c..7fe5bc88a 100644 --- a/core/lzo2/PKGBUILD +++ b/core/lzo2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 100405 2010-11-23 12:35:30Z stephane $ +# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $ # Contributor: Low Kian Seong <fastmail_low@speedymail.org> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=lzo2 -pkgver=2.04 +pkgver=2.05 pkgrel=1 pkgdesc="Portable lossless data compression library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc') source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) options=(!libtool) -sha1sums=('f5bf5c7ae4116e60513e5788d156ef78946677e7') +md5sums=('c67cda5fa191bab761c7cb06fe091e36') build() { cd "${srcdir}/lzo-${pkgver}" diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD index 002edf312..8cc4ccf94 100644 --- a/core/sqlite3/PKGBUILD +++ b/core/sqlite3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119736 2011-04-14 10:45:02Z andyrtr $ +# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite3" -pkgname=('sqlite3' 'sqlite3-tcl') -_amalgamationver=3070601 +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3070603 _amalgamationver2=${_amalgamationver/00/} _docver=3070600 pkgver=${_amalgamationver2//0/.} @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -md5sums=('a9b7327d6762652fe19caf68fb50849d') +md5sums=('7eb41eea5ffa5cbe359a48629084c425') build() { export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" diff --git a/core/udev/01-settle.patch b/core/udev/01-settle.patch new file mode 100644 index 000000000..88e23d2a2 --- /dev/null +++ b/core/udev/01-settle.patch @@ -0,0 +1,68 @@ +From 2738ec2cf721db0c0deac2ba0abdc73cf7739e9f Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay.sievers@vrfy.org> +Date: Mon, 16 May 2011 13:17:48 +0200 +Subject: [PATCH 1/7] udevd: create queue file before daemonizing to reliably + block 'settle' + +--- + udev/udevd.c | 22 ++++++++++++---------- + 1 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/udev/udevd.c b/udev/udevd.c +index be4b071..258d787 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -1408,6 +1408,13 @@ int main(int argc, char *argv[]) + + udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024); + ++ /* create queue file before signalling 'ready', to make sure we block 'settle' */ ++ udev_queue_export = udev_queue_export_new(udev); ++ if (udev_queue_export == NULL) { ++ err(udev, "error creating queue file\n"); ++ goto exit; ++ } ++ + if (daemonize) { + pid_t pid; + int fd; +@@ -1421,8 +1428,8 @@ int main(int argc, char *argv[]) + rc = 4; + goto exit; + default: +- rc = 0; +- goto exit; ++ rc = EXIT_SUCCESS; ++ goto exit_keep_queue; + } + + setsid(); +@@ -1521,12 +1528,6 @@ int main(int argc, char *argv[]) + goto exit; + } + +- udev_queue_export = udev_queue_export_new(udev); +- if (udev_queue_export == NULL) { +- err(udev, "error creating queue file\n"); +- goto exit; +- } +- + memset(&ep_ctrl, 0, sizeof(struct epoll_event)); + ep_ctrl.events = EPOLLIN; + ep_ctrl.data.fd = fd_ctrl; +@@ -1708,9 +1709,10 @@ int main(int argc, char *argv[]) + } + } + +- udev_queue_export_cleanup(udev_queue_export); +- rc = 0; ++ rc = EXIT_SUCCESS; + exit: ++ udev_queue_export_cleanup(udev_queue_export); ++exit_keep_queue: + if (fd_ep >= 0) + close(fd_ep); + worker_list_cleanup(udev); +-- +1.7.5.1 + diff --git a/core/udev/02-settle.patch b/core/udev/02-settle.patch new file mode 100644 index 000000000..4bcb7fdde --- /dev/null +++ b/core/udev/02-settle.patch @@ -0,0 +1,29 @@ +From 12f79fb0b9c919787d8a7d4307895d3d6b4b029b Mon Sep 17 00:00:00 2001 +From: Nix <nix@esperi.org.uk> +Date: Mon, 16 May 2011 22:51:38 +0200 +Subject: [PATCH 7/7] libudev: queue - accept NULL passed into + udev_queue_export_cleanup() + +--- + libudev/libudev-queue-private.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c +index 0dcf9b0..6e13d8a 100644 +--- a/libudev/libudev-queue-private.c ++++ b/libudev/libudev-queue-private.c +@@ -104,9 +104,10 @@ void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export) + { + char filename[UTIL_PATH_SIZE]; + ++ if (udev_queue_export == NULL) ++ return; + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL); + unlink(filename); +- + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL); + unlink(filename); + } +-- +1.7.5.1 + diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 12a482153..0e235adc6 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 122441 2011-05-04 07:04:25Z andrea $ +# $Id: PKGBUILD 124183 2011-05-17 13:17:56Z 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=167 +pkgver=168 pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -18,10 +19,15 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta 80-drivers.rules 81-arch.rules load-modules.sh - cdsymlinks.sh) + cdsymlinks.sh + 01-settle.patch + 02-settle.patch) build() { cd $srcdir/$pkgbase-$pkgver + # fix https://bugs.archlinux.org/task/24288 + patch -Np1 -i ../01-settle.patch + patch -Np1 -i ../02-settle.patch ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system make @@ -108,8 +114,10 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -md5sums=('4b37e1222f06c14c24147de346aa0bad' - '4427855146513a4703ab5c7eb8a0156e' - 'f17c99779173ddc79f866cf3a5de5e68' - 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769') +sha256sums=('9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2' + '0cb99cc7cea92238dd6b19a4c104c3b9e9f744c6b9d6b4382c7cd22be18c98f9' + '377c13f20de32776107dddc8324f599f31320e8dd1185e3282856aee5cb08499' + 'c6b41afb24e8f496064d8baad844697a6515cea1b7e0389054cd8a2053477377' + 'cc0d281926bf2f1ac816c0060a2afc59444ddf0f8dab6e2d9924a2a7c8de4a13' + '70d2fd079901bf9940c4811ec91634da0d8b3425ebcdbffeba5a73cb616be650' + 'fe9d1aafb1a620108790d82960577de4eb757450c35a146475aed3f5e9356f1a') diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 6c94c8c5b..5828eafd3 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123152 2011-05-09 00:21:36Z allan $ +# $Id: PKGBUILD 123897 2011-05-14 09:14:06Z tpowa $ # Maintainer: # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.19.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,16 @@ conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2 + mount-segfault-2.19.1.patch) optdepends=('perl: for chkdupexe support') -md5sums=('3eab06f05163dfa65479c44e5231932c') +md5sums=('3eab06f05163dfa65479c44e5231932c' + '3247b52f0e4b8044f23f2f7218e2fdea') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix https://bugs.archlinux.org/task/24261 + patch -Np1 -i ../mount-segfault-2.19.1.patch # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx diff --git a/core/util-linux/mount-segfault-2.19.1.patch b/core/util-linux/mount-segfault-2.19.1.patch new file mode 100644 index 000000000..7bcb3bc05 --- /dev/null +++ b/core/util-linux/mount-segfault-2.19.1.patch @@ -0,0 +1,84 @@ +From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 11 May 2011 16:57:27 +0200 +Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount + options) + + # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab + # mkdir /tmp/x + # mount -a + segfault + +Reported-by: Mike Frysinger <vapier@gentoo.org> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + mount/mount.c | 8 +++++--- + mount/mount_mntent.c | 5 +++-- + mount/sundries.c | 2 ++ + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/mount/mount.c b/mount/mount.c +index ba71149..29963c2 100644 +--- a/mount/mount.c ++++ b/mount/mount.c +@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long + res = loopfile_used_with((char *) mnt->m.mnt_fsname, + loopfile, offset); + +- else if ((p = strstr(mnt->m.mnt_opts, "loop="))) { ++ else if (mnt->m.mnt_opts && ++ (p = strstr(mnt->m.mnt_opts, "loop="))) ++ { + char *dev = xstrdup(p+5); + if ((p = strchr(dev, ','))) + *p = '\0'; +@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose) + goto yes; + + /* extra care for loop devices */ +- if ((strstr(mc->m.mnt_opts, "loop=") || +- (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) { ++ if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) || ++ (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) { + + char *p = get_option_value(mc->m.mnt_opts, "offset="); + uintmax_t offset = 0; +diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c +index d90def3..f42c0ad 100644 +--- a/mount/mount_mntent.c ++++ b/mount/mount_mntent.c +@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { + m1 = mangle(mnt->mnt_fsname); + m2 = mangle(mnt->mnt_dir); + m3 = mangle(mnt->mnt_type); +- m4 = mangle(mnt->mnt_opts); ++ m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw"; + + res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n", + m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno); +@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { + free(m1); + free(m2); + free(m3); +- free(m4); ++ if (mnt->mnt_opts) ++ free(m4); + return (res < 0) ? 1 : 0; + } + +diff --git a/mount/sundries.c b/mount/sundries.c +index ae4501a..2dec37f 100644 +--- a/mount/sundries.c ++++ b/mount/sundries.c +@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) { + + if (test_opts == NULL) + return 1; ++ if (options == NULL) ++ options = ""; + + len = strlen(test_opts); + q = alloca(len+1); +-- +1.7.5.1 + diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD index 4a5838529..cb1c045b3 100644 --- a/core/xz/PKGBUILD +++ b/core/xz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117397 2011-04-01 14:53:10Z pierre $ +# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> pkgname=xz -pkgver=5.0.2 +pkgver=5.0.3 pkgrel=1 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ provides=('lzma' 'lzma-utils' 'xz-utils') replaces=('lzma' 'lzma-utils' 'xz-utils') conflicts=('lzma' 'lzma-utils' 'xz-utils') options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('870d0e6fec3b710903371defb48a2fad') +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('fefe52f9ecd521de2a8ce38c21a27574') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 1541ff19c..5f0c6e93a 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 121312 2011-04-30 14:57:48Z ibiru $ +# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.10 +pkgver=0.6.12 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e43d0ea4c0cb9291e60f800d9c2d0ba4') +md5sums=('2fcf38a65d574dd2fe6ba182ff4de053') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD index a836d69f8..f6cefe7b7 100644 --- a/extra/acpid/PKGBUILD +++ b/extra/acpid/PKGBUILD @@ -1,42 +1,43 @@ -# $Id: PKGBUILD 65410 2010-01-28 20:47:17Z ibiru $ -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 124267 2011-05-18 16:31:02Z andrea $ +# Maintainer: +# Contributor: xduugu # Contributor: Manolis Tzanidakis -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=1.0.10 -pkgrel=3 -pkgdesc="A daemon for delivering ACPI power management events" -arch=('i686' 'x86_64' 'mips64el') -url="http://acpid.sourceforge.net" +pkgver=2.0.10 +pkgrel=1 +pkgdesc="A daemon for delivering ACPI power management events with netlink support" +arch=('i686' 'x86_64') +url="http://tedfelix.com/linux/acpid-netlink.html" license=('GPL') -depends=(glibc) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - acpid - acpid.conf.d - anything - handler.sh) +depends=('bash') +source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" + 'acpid' + 'anything' + 'handler.sh' + 'acpid.conf.d') +replaces=('acpid2') backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') build() { - cd $srcdir/$pkgname-$pkgver - /usr/bin/make || return 1 - /bin/install -d -m0755 $pkgdir/usr/bin || return 1 - /usr/bin/make INSTPREFIX=$pkgdir \ - MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1 + cd "${srcdir}"/$pkgname-$pkgver + make +} - # install our supplementary scripts - /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1 - /bin/install -D -m0644 $srcdir/acpid.conf.d $pkgdir/etc/conf.d/acpid || return 1 - /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1 - /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1 +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install - # set world readable bit on the acpid binary - /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1 -} + install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid" + install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything" + install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh" + install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid" -md5sums=('61156ef32015c56dc0f2e3317f4ae09e' - 'd9ca7f71f520238a0448fab105a23fe9' - '91fdb3709c878eed757d192a420251a1' + chmod 755 "${pkgdir}"/usr/sbin/acpid +} +md5sums=('d5dd88bcfaa4a0bf51905e95115da6df' + '955490c4db5233ec44461db694b873a4' '2d37b98d6e74bab815604b8b48c6cfd4' - '0e8dd13793b1baa79a745f4034888367') + '7b2e4c299af5eb87e1a81c07b6916c97' + '929c6d2e91295c22ed9ec6212d7eabef') diff --git a/extra/acpid/acpid b/extra/acpid/acpid index 9a4ab8ac7..9177c8207 100644 --- a/extra/acpid/acpid +++ b/extra/acpid/acpid @@ -19,7 +19,7 @@ case "$1" in ;; stop) stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/acpid/acpid.conf.d b/extra/acpid/acpid.conf.d index 25c9cc1ef..b60103a2d 100644 --- a/extra/acpid/acpid.conf.d +++ b/extra/acpid/acpid.conf.d @@ -3,4 +3,3 @@ # ACPID_ARGS="" - diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh index ad31d1aa9..518a62dea 100644 --- a/extra/acpid/handler.sh +++ b/extra/acpid/handler.sh @@ -26,7 +26,7 @@ case "$1" in ;; ac_adapter) case "$2" in - AC) + AC|ACAD|ADP0) case "$4" in 00000000) echo -n $minspeed >$setspeed diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 7b5d011c9..1e5037778 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122924 2011-05-07 10:20:40Z andrea $ +# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org/akonadi' diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index ea8f93893..7a8cf3780 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123337 2011-05-10 13:19:54Z giovanni $ +# $Id: PKGBUILD 124068 2011-05-16 14:49:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10552 +pkgver=10561 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('b3685a792e92c2900dbb3eaeba7cc65d') +md5sums=('1f8957c35e8bd2496aa83b5ba318f9bd') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index e8f8112bc..e161588d0 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $ +# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.0.1.0 -pkgrel=2 +pkgver=3.0.2.0 +pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261') +sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/extra/apache-ant/PKGBUILD b/extra/apache-ant/PKGBUILD deleted file mode 100644 index 313b6a754..000000000 --- a/extra/apache-ant/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 107828 2011-01-27 04:37:07Z paul $ -# Contributor: Andrew Wright <andreww@photism.org> -# Maintainer: Paul Mattal <paul@archlinux.org> - -pkgname=apache-ant -pkgver=1.8.2 -pkgrel=1 -pkgdesc="A java-based build tool." -arch=('i686' 'x86_64' 'mips64el') -license=('APACHE') -url="http://ant.apache.org/" -depends=('java-runtime') -optdepends=('junit: to jave junit on the classpath in javac tasks') -source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 - ${pkgname}.sh - ant_diagnostics.patch) -md5sums=('9e9ae9fc7352960191489a1286fb0928' - '593ee6ebd9b8ec321534a028e686880f' - 'cbaab423be40a6e63f0fde901b91eb50') - -build() { - # install profile.d script - install -dm755 ${pkgdir}/etc/profile.d || return 1 - install -m755 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/ || return 1 - - # Get the ANT_HOME env var - source ${srcdir}/${pkgname}.sh || return 1 - - cd ${srcdir}/${pkgname}-${pkgver} - install -dm755 ${pkgdir}/${ANT_HOME}/{bin,lib} || return 1 - - install -m644 ./lib/*.jar ${pkgdir}/${ANT_HOME}/lib || return 1 - cp -Rp ./etc ${pkgdir}/${ANT_HOME} || return 1 - - # Do not copy Windows .bat/.cmd files - find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ - -exec install -m755 {} ${pkgdir}/${ANT_HOME}/bin \; || return 1 - - # symlink to junit so it's on the javac build path for ant - # matches behavior on ubuntu 9 and makes sense for compatibility - # http://bugs.archlinux.org/task/15229 - cd $startdir/pkg/usr/share/java/apache-ant/lib || return 1 - ln -s ../../junit.jar . || return 1 - cd - || return 1 - - # The license says the NOTICE file should be redistributed for derivative - # works, so lets supply it. - install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} || return 1 - install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname} || return 1 -} - diff --git a/extra/apache-ant/ant_diagnostics.patch b/extra/apache-ant/ant_diagnostics.patch deleted file mode 100644 index 38148b45c..000000000 --- a/extra/apache-ant/ant_diagnostics.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/main/org/apache/tools/ant/Diagnostics.java -+++ b/src/main/org/apache/tools/ant/Diagnostics.java -@@ -179,7 +179,10 @@ - * @param clazz the class to get the information from.
- * @since Ant 1.8.0
- */
-- private static URL getClassLocation(Class clazz) {
-+ private static URL getClassLocation(Class clazz) { -+ if (clazz.getProtectionDomain().getCodeSource() == null) { -+ return null; -+ }
- return clazz.getProtectionDomain().getCodeSource().getLocation();
- }
-
-@@ -241,7 +244,7 @@ - }
- Transformer transformer = null;
- try {
-- transformer = transformerFactory.newTransformer();
-+ transformer = transformerFactory.newTransformer(); - } catch (Exception e) {
- // ignore
- ignoreThrowable(e);
diff --git a/extra/apache-ant/apache-ant.sh b/extra/apache-ant/apache-ant.sh deleted file mode 100644 index ab602fb28..000000000 --- a/extra/apache-ant/apache-ant.sh +++ /dev/null @@ -1,3 +0,0 @@ -export ANT_HOME=/usr/share/java/apache-ant -export PATH=$PATH:$ANT_HOME/bin - diff --git a/extra/aria2/PKGBUILD b/extra/aria2/PKGBUILD deleted file mode 100644 index e34ede3f5..000000000 --- a/extra/aria2/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 117352 2011-03-31 07:19:05Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=aria2 -pkgver=1.11.1 -pkgrel=1 -pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink" -arch=('i686' 'x86_64' 'mips64el') -url="http://aria2.sourceforge.net/" -license=('GPL') -depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') -source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) -md5sums=('da785645a6d92450b0a54f384202ba6b') -sha1sums=('b3b37cc7363305d55e86dcd74a73dc493ecfa530') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD index d62daea42..bf0a734bf 100644 --- a/extra/arj/PKGBUILD +++ b/extra/arj/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 49803 2009-08-16 14:37:35Z jgc $ -# Maintainer: Travis Willard <travisw@wmpub.ca> +# $Id: PKGBUILD 124090 2011-05-16 15:11:39Z andrea $ +# Maintainer: +# Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> pkgname=arj pkgver=3.10.22 -pkgrel=5 +pkgrel=6 pkgdesc="Free and portable clone of the ARJ archiver" url="http://arj.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') +options=('!makeflags') depends=('glibc') -makedepends=('autoconf') -options=(!makeflags) -source=(http://downloads.sourceforge.net/sourceforge/arj/$pkgname-$pkgver.tar.gz +source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" 001_arches_align.patch 002_no_remove_static_const.patch 003_64_bit_clean.patch @@ -22,33 +22,28 @@ md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' '395dfa8cc500ffae648777f8f241be88' '56b3cf96ec485b0d824761457417fcc0' '4630a7254dfc6c8d8c7e696aa4a58f4a') -sha1sums=('e8470f480e9eee14906e5485a8898e5c24738c8b' - '7f8904f8c89bacbbeec8c431d627efbb8da2f259' - '919a3c02a1e039803502c21175d69f7703d13026' - 'd506338e34b40ef5cac6ec14c858fd651a354aaf' - '4c9481a4b196c4f56fb44fcd3b9362222d6cbe58') build() { cd "${srcdir}/${pkgname}-${pkgver}" # Add gentoo patches - patch -Np1 -i "${srcdir}/001_arches_align.patch" || return 1 - patch -Np1 -i "${srcdir}/002_no_remove_static_const.patch" || return 1 - patch -Np1 -i "${srcdir}/003_64_bit_clean.patch" || return 1 - patch -Np1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" || return 1 + patch -p1 -i "${srcdir}/001_arches_align.patch" + patch -p1 -i "${srcdir}/002_no_remove_static_const.patch" + patch -p1 -i "${srcdir}/003_64_bit_clean.patch" + patch -p1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" - # Build! cd gnu - aclocal || return 1 - autoconf || return 1 + aclocal + autoconf rm -f config.{guess,sub} - _autover=$(automake --version | head -n1 | awk '{ print $4 }') - cp /usr/share/automake-${_autover}/config.{guess,sub} . || return 1 - ./configure --prefix=/usr || return 1 + cp /usr/share/automake-1.11/config.{guess,sub} . + ./configure --prefix=/usr cd .. - make prepare || return 1 - make || return 1 + make prepare + make +} - # Install! - make DESTDIR="${pkgdir}" install || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index e0034efe3..bc394106c 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120714 2011-04-26 05:27:06Z jgc $ +# $Id: PKGBUILD 124722 2011-05-24 07:05:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=at-spi2-atk.install options=('!libtool') groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d78a88067a53db479d3c7c1ce31f095b1d4962e44e653800a12599ade397dafc') +sha256sums=('4b958d3701afd0c8f83ecf297750032f06a07491007d85173997ce7371688725') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index f826d6763..c3dd97d41 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120767 2011-04-26 14:35:02Z ibiru $ +# $Id: PKGBUILD 124714 2011-05-24 07:02:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f0880d816a554c0560e9f6aea786614e8ab439e17189d383a83ed7eebd9e328b') +sha256sums=('15e13433d1923c96139c109568295313de636a83dbb3700c8467fcb9c5e4e6ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 0991e44fb..833881841 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119918 2011-04-16 22:59:51Z bisson $ +# $Id: PKGBUILD 124404 2011-05-20 15:01:13Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL3') depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz") -sha1sums=('df76909c83a69b42197dab0702e0846295eceb1f') +sha1sums=('886e1cde03069b3dee15a6df04e3e8f5934018f1') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 0e97d0b5c..93d71053f 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $ +# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64' 'mips64el') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') -depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy') +depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') makedepends=('cmake' 'boost') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('92c2702c1980f70fb6d87a1a58147911') diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index 3f97b8415..587b7abff 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $ +# $Id: PKGBUILD 124622 2011-05-23 14:30:18Z ibiru $ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://banshee.fm/" license=('MIT') -depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') +depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') makedepends=('intltool' 'gnome-doc-utils') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-ugly-plugins: Extra media codecs' diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index bb06cf506..5d3424581 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 95186 2010-10-16 23:03:07Z thomas $ +# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.1 +pkgver=3.4 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') @@ -10,30 +10,44 @@ url="http://bftpd.sourceforge.net/" license=('GPL') depends=('glibc' 'pam') install=bftpd.install -backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd) +backup=(etc/bftpd.conf + etc/logrotate.d/bftpd + etc/pam.d/bftpd + etc/xinetd.d/bftpd) source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz - bftpd.rc bftpd.logrotate bftpd.pam) -md5sums=('1aeda6f3da2b10dcf5dca1b1d8466c48' + bftpd.rc + bftpd.logrotate + bftpd.pam + bftpd.xinetd) +md5sums=('dcee04b5fad8c918e86c49712424fcdd' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' - '96f82c38f3f540b53f3e5144900acf17') + '96f82c38f3f540b53f3e5144900acf17' + 'ff70fd962666f4d74749a1c68167a966') build() { - cd ${srcdir}/$pkgname + cd "${srcdir}"/$pkgname + # The bftpd author keeps screwing up the release tarballs + rm -f config.{cache,status} ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man - make || return 1 + make } package() { - cd ${srcdir}/$pkgname - install -d -m755 ${pkgdir}/usr/{sbin,share/man/man8} - install -d -m755 ${pkgdir}/var/run/bftpd - install -d -m755 ${pkgdir}/var/log - install -D -m644 ${srcdir}/bftpd.logrotate ${pkgdir}/etc/logrotate.d/bftpd || return 1 - install -D -m755 ${srcdir}/bftpd.rc ${pkgdir}/etc/rc.d/bftpd || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/var/log/bftpd.log - rmdir ${pkgdir}/var/log - mkdir -p ${pkgdir}/etc/pam.d - cp ${srcdir}/bftpd.pam ${pkgdir}/etc/pam.d/bftpd || return 1 + cd "${srcdir}"/$pkgname + install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8} + install -d -m755 "${pkgdir}"/var/log + install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd + install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd + make DESTDIR="${pkgdir}" install + # Remove log file and /var/run from the package + rm -f "${pkgdir}"/var/log/bftpd.log + rmdir "${pkgdir}"/var/{run/bftpd,run,log,} + # Install PAM file + mkdir -p "${pkgdir}"/etc/pam.d + cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd + # Install xinetd file + install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd + # Fix default in config file + sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf } diff --git a/extra/bftpd/bftpd.xinetd b/extra/bftpd/bftpd.xinetd new file mode 100644 index 000000000..68c931243 --- /dev/null +++ b/extra/bftpd/bftpd.xinetd @@ -0,0 +1,11 @@ +service ftp +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/bftpd + server_args = -i + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 8878c6f26..173ddd0f4 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122962 2011-05-07 14:45:29Z bisson $ +# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -8,7 +8,7 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.8.0.P1 _pkgver=9.8.0-P1 -pkgrel=1 +pkgrel=3 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' arch=('i686' 'x86_64' 'mips64el') @@ -17,12 +17,11 @@ license=('custom:ISC') provides=('dns-server') backup=('etc/logrotate.d/named' 'etc/conf.d/named' - 'etc/named.conf' - 'etc/rndc.key') -depends=('openssl' 'libxml2') + 'etc/named.conf') +depends=('openssl' 'krb5' 'libxml2') options=('!makeflags' '!libtool') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" - 'ftp://ftp.rs.internic.net/domain/db.cache' + 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' 'so_bsdcompat.patch' 'notools.patch' 'named' @@ -35,7 +34,7 @@ sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29' 'ee52947062c1582858187716b776afa3613608fb' '2f737f4e81186447ac2ef370fa8dcea0b3abec31' '5277cf4d6fbc5728c55b51c77c9347d28393fb7c' - '02b0e20a542663d27af4faa4d2e397ae2764276e' + '46232e9db243c6c05e170a1781d7a7f413be5d03' '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' '7848edbfb9a848843f57c11c02b0289eefd42d00' '9ffb5c3f72390a517aeae557e32349d5d278cb63' @@ -51,9 +50,17 @@ build() { patch -p1 -i "${srcdir}"/notools.patch ./configure \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-libtool --enable-static=no --disable-linux-caps \ - --with-openssl=yes --with-libxml2=yes + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-gssapi \ + --with-libxml2 \ + --with-libtool \ + --with-dlz-dlopen \ + make } @@ -62,19 +69,18 @@ package() { make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - + rmdir "${pkgdir}/var/run" install -d "${pkgdir}"/usr/share/doc/bind - install ./doc/arm/*.html "${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 -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -d -m755 -o 40 -g 40 "${pkgdir}"/var/run/named - install -m640 -o 0 -g 40 ../db.cache "${pkgdir}"/var/named/root.hint - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ + 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/extra/bind/named b/extra/bind/named index 3be558f27..7907f9983 100755 --- a/extra/bind/named +++ b/extra/bind/named @@ -1,12 +1,16 @@ #!/bin/bash -NAMED_ARGS= -[ -f /etc/conf.d/named ] && . /etc/conf.d/named - . /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; } -PID=`pidof -o %PPID /usr/sbin/named` case "$1" in start) stat_busy "Starting BIND" diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 77394d336..7237e301b 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114691 2011-03-15 13:50:13Z andrea $ +# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -6,17 +6,17 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.46.0 +pkgver=1.46.1 _boostver=${pkgver//./_} -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=1 +arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz 4994-compile-fix-for-Python32-v2.patch boost-1.46.0-spirit.patch) license=('custom') -md5sums=('820393d5746553c192db7b81ba0e53fe' +md5sums=('341e5d993b19d099bf1a548495ea91ec' 'cb59e8adbf2a45ef9264a2f4ab92b849' '9d6e2f13fef23bf27d7bdddc104e182a') diff --git a/extra/bs/PKGBUILD b/extra/bs/PKGBUILD deleted file mode 100644 index 51b32a0b0..000000000 --- a/extra/bs/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 69354 2010-02-20 11:19:53Z allan $ -# Maintainer: -# Contributor damir <damir@archlinux.org> - -pkgname=bs -pkgver=2.7 -pkgrel=2 -pkgdesc="The classic game of Battleships against the computer. Ncurses." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.catb.org/~esr/bs/" -license=('GPL2') -depends=('ncurses') -source=($url/$pkgname-$pkgver.tar.gz) -md5sums=('5786c6006e503d100e65139dadb5d5a7') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -Dm755 bs $pkgdir/usr/bin/bs - install -Dm644 bs.6 $pkgdir/usr/share/man/man6/bs.6 -} diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index cd55d811d..7ae96eb77 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 119485 2011-04-11 18:46:01Z eric $ +# $Id: PKGBUILD 124960 2011-05-25 12:48:29Z andrea $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.3.1 +pkgver=2.3.3 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.bazaar-vcs.org" +arch=('i686' 'x86_64') +url="http://bazaar.canonical.com/en/" license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') -source=(http://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('1a4367ce59a2880f321ecb882e195856') -sha1sums=('49b9dfb5a01ffd87a120f8a7abf4833a482ba245') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +md5sums=('a8ca30af0431c691ce7e71a74497e31d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +22,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 # bash-completion install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr" diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD index 498fb790f..faa47880f 100644 --- a/extra/cairomm/PKGBUILD +++ b/extra/cairomm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109789 2011-02-12 19:30:52Z ibiru $ +# $Id: PKGBUILD 124057 2011-05-16 10:35:03Z jgc $ # Maintainer: Kevin <kevin@archlinux.org> # Contributor: criminy <criminy@gmail.com> pkgname=cairomm -pkgver=1.9.8 +pkgver=1.10.0 pkgrel=1 pkgdesc="C++ bindings to Cairo vector graphics library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('cairo' 'libsigc++') makedepends=('pkgconfig') source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool' '!emptydirs') -md5sums=('6d5ce1138dbb09c58038ab6f766d5e88') +sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 3637d7ef4..e6e328a7b 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121163 2011-04-29 06:26:08Z andyrtr $ +# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.9 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -20,12 +20,17 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + claws-notify-crash.patch) +md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3' + '9a2903449f679344b5f5f51c91825b45') build() { cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np0 -i $srcdir/claws-notify-crash.patch sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + ./configure --prefix=/usr --disable-static \ --enable-enchant \ --enable-gnutls \ diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch new file mode 100644 index 000000000..e1d4eb686 --- /dev/null +++ b/extra/claws-mail/claws-notify-crash.patch @@ -0,0 +1,18 @@ +Index: src/main.c +=================================================================== +RCS file: //claws/src/main.c,v +retrieving revision 1.115.2.237 +retrieving revision 1.115.2.238 +diff -u -r1.115.2.237 -r1.115.2.238 +--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 ++++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 +@@ -331,7 +331,7 @@ + gtk_widget_show(hack); + } + +- xdisplay = gdk_display_get_default(); ++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + sn_display = sn_display_new(xdisplay, + sn_error_trap_push, + sn_error_trap_pop); + diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD index d731a2ea4..736416bb2 100644 --- a/extra/curl/PKGBUILD +++ b/extra/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $ +# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> @@ -6,12 +6,12 @@ pkgname=curl pkgver=7.21.6 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') options=('!libtool') source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 curlbuild.h) diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index 9f3526178..5caa4b2f1 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,19 +1,24 @@ -# $Id: PKGBUILD 49847 2009-08-16 18:36:23Z jgc $ -# Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org> +# $Id: PKGBUILD 124095 2011-05-16 15:14:02Z andrea $ +# Maintainer: +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cvsps pkgver=2.1 -pkgrel=2 -pkgdesc="Generating 'patchset' information from a CVS repository." +pkgrel=3 +pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.cobite.com/cvsps/" license=('GPL') -arch=('x86_64' 'i686' 'mips64el') +arch=('i686' 'x86_64') depends=('zlib') -source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr || return 1 - make prefix="${pkgdir}/usr" install || return 1 + make prefix=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install } diff --git a/extra/dosbox/PKGBUILD b/extra/dosbox/PKGBUILD deleted file mode 100644 index b1132c8ef..000000000 --- a/extra/dosbox/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 80630 2010-05-20 16:06:03Z ibiru $ -# Maintainer : -# Contributor: James Rayner <james@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=dosbox -pkgver=0.74 -pkgrel=1 -pkgdesc="An emulator with builtin DOS for running DOS Games" -arch=('i686' 'x86_64' 'mips64el') -url="http://dosbox.sourceforge.net/" -license=('GPL') -depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' 'dosbox.desktop') -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8') - -build(){ - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1 - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1 - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 -} diff --git a/extra/dosbox/dosbox.desktop b/extra/dosbox/dosbox.desktop deleted file mode 100644 index dbaf05ced..000000000 --- a/extra/dosbox/dosbox.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=dosbox Emulator -GenericName=Emulator -Comment=An emulator to run old DOS games -Icon=dosbox -Exec=dosbox -Terminal=false -Categories=Emulator;Application; diff --git a/extra/dosbox/dosbox.png b/extra/dosbox/dosbox.png Binary files differdeleted file mode 100644 index b8a917986..000000000 --- a/extra/dosbox/dosbox.png +++ /dev/null diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD index 4c0c420ee..05eb23efb 100644 --- a/extra/ecasound/PKGBUILD +++ b/extra/ecasound/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88360 2010-08-23 02:57:44Z schiv $ +# $Id: PKGBUILD 124853 2011-05-24 19:44:26Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ecasound -pkgver=2.7.2 +pkgver=2.8.1 pkgrel=1 pkgdesc="A software package designed for multitrack audio processing" arch=('i686' 'x86_64' 'mips64el') @@ -25,8 +25,7 @@ optdepends=('python2: ecamonitor, ECI API' options=('!libtool') changelog=$pkgname.changelog source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz) -md5sums=('40498ceed9cc7622ee969c427f13921c') -sha1sums=('6d5236155e1a1f9a9bc9e63f989baebfb1645a49') +md5sums=('d9ded0074a8eeb59dd507c248220d010') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ecasound/ecasound.changelog b/extra/ecasound/ecasound.changelog index cfa010ca5..a735f70c1 100644 --- a/extra/ecasound/ecasound.changelog +++ b/extra/ecasound/ecasound.changelog @@ -1,3 +1,8 @@ +2011-05-14 Ray Rashif <schiv@archlinux.org> + + * ecasound 2.8.0 + * upstream release + 2010-08-22 Ray Rashif <schiv@archlinux.org> * ecasound 2.7.2-1 diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 731a5e78a..a8a00c533 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $ +# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index a42ae2bd2..ed67782cb 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $ +# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809') +sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index d59b6c7f7..bef0d5518 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 120414 2011-04-23 21:13:06Z ibiru $ +# $Id: PKGBUILD 124756 2011-05-24 07:54:16Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/" license=('GPL2') depends=('eog' 'libpeas' 'libchamplain' 'libexif') makedepends=('intltool') +install=eog-plugins.install +options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) sha256sums=('87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd') diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 44b11b962..4d6f58f5c 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $ +# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi' - 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme') + 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') makedepends=('gtk-doc' 'intltool') install=eog.install groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2') +sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ettercap-gtk/PKGBUILD b/extra/ettercap-gtk/PKGBUILD deleted file mode 100644 index fcbe61fe4..000000000 --- a/extra/ettercap-gtk/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 103538 2010-12-21 10:37:25Z andrea $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ettercap-gtk -pkgver=NG_0.7.3 -_origname=ettercap -_origver=NG-0.7.3 -pkgrel=8 -pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK" -arch=('i686' 'x86_64' 'mips64el') -url="http://ettercap.sourceforge.net/" -license=('GPL') -depends=('ettercap' 'gtk2' 'libtool') -makedepends=('libnet') -options=('!libtool') -source=(http://downloads.sourceforge.net/${_origname}/${_origname}-${_origver}.tar.gz - 'ettercap.desktop' - 'fix-segmentation-fault.patch') -md5sums=('28fb15cd024162c55249888fe1b97820' - '6ef18fdd114297d4ed9e5104d309f071' - 'e9cc99f13fd23edaba6cddffc4d0ef34') - -build() { - cd ${srcdir}/${_origname}-${_origver} - unset LDFLAGS - - # FS#21628 - patch -Np1 -i ${srcdir}/fix-segmentation-fault.patch - - libtoolize --force --copy - aclocal - autoconf - ./configure --prefix=/usr --sysconfdir=/etc --enable-plugins - sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c - make -} - -package() { - install -Dm755 ${srcdir}/${_origname}-${_origver}/src/ettercap \ - ${pkgdir}/usr/bin/ettercap-gtk - install -Dm644 ${srcdir}/ettercap.desktop \ - ${pkgdir}/usr/share/applications/ettercap.desktop -} diff --git a/extra/ettercap-gtk/ettercap.desktop b/extra/ettercap-gtk/ettercap.desktop deleted file mode 100644 index 1ac24e381..000000000 --- a/extra/ettercap-gtk/ettercap.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=Ettercap GTK -Exec=/usr/bin/ettercap-gtk --gtk -Terminal=false -Type=Application -Categories=Network;System;Security;GTK; diff --git a/extra/ettercap-gtk/fix-segmentation-fault.patch b/extra/ettercap-gtk/fix-segmentation-fault.patch deleted file mode 100644 index 3f0c7bf79..000000000 --- a/extra/ettercap-gtk/fix-segmentation-fault.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 8cdf08d401d368d5678f9d9c2cf36ddbdef03aec -Author: Timothy Redaelli <timothy@redaelli.eu> -Date: Tue Jun 23 09:16:27 2009 +0000 - - Fix a crash in 64 bit CPUs - -diff --git a/src/protocols/ec_tcp.c b/src/protocols/ec_tcp.c -index ea0c997..be8f3e0 100644 ---- a/src/protocols/ec_tcp.c -+++ b/src/protocols/ec_tcp.c -@@ -116,7 +116,7 @@ FUNC_DECODER(decode_tcp) - tcp = (struct tcp_header *)DECODE_DATA; - - opt_start = (u_char *)(tcp + 1); -- opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)(tcp + tcp->off * 4); - - DECODED_LEN = (u_int32)(tcp->off * 4); - diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 2ccc6a4e9..1532bce40 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $ +# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.0.0 -pkgrel=4 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 introspection-fix.patch) -sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b' +sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97' '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') build() { diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 195be21c6..040385490 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $ +# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0') +sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index 3dcb196d7..db3854d78 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $ +# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02') +sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 42e98b3ca..557c4b855 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $ +# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b') +sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD index 2a94fee02..031971dcd 100644 --- a/extra/fam/PKGBUILD +++ b/extra/fam/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 42581 2009-06-16 05:20:11Z tpowa $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 124073 2011-05-16 14:51:09Z andrea $ +# Maintainer: +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fam pkgver=2.7.0 -pkgrel=14 +pkgrel=15 pkgdesc="File Alteration Monitor" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') depends=('rpcbind' 'gcc-libs' 'bash') url="http://oss.sgi.com/projects/fam/" -backup=(etc/fam/fam.conf) +backup=('etc/fam/fam.conf') options=('!makeflags') # Don't !libtool source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz fam-2.7.0-dnotify.patch @@ -23,25 +24,29 @@ md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39' '47b41e0b0498793af004696a096d7da1' '2638b8ffacb9f03b6e438e08ea7b290a' 'fc0cabc0ac4f819680401eb3090c29c9' - '0b4dd9894ccc03f57787f9dfc0a7bd6f') + '92a37f9eb6ad0e60ded9c70e9ad93a88') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/fam-2.7.0-dnotify.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-largefiles.patch || return 1 - patch -Np0 -i ${srcdir}/fam-2.7.0-limits.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-buildfixes.patch || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fam-2.7.0-dnotify.patch + patch -p1 -i "${srcdir}"/fam-2.7.0-largefiles.patch + patch -p0 -i "${srcdir}"/fam-2.7.0-limits.patch + patch -p1 -i "${srcdir}"/fam-2.7.0-buildfixes.patch - chmod 755 configure || return 1 + chmod 755 configure - autoheader || return 1 - aclocal || return 1 - automake -a -c || return 1 - autoconf || return 1 - libtoolize --copy --force || return 1 + autoheader + aclocal + automake -a -c + autoconf + libtoolize --copy --force ./configure --prefix=/usr --sysconfdir=/etc/fam - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m755 ../fam ${pkgdir}/etc/rc.d/fam + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m755 "${srcdir}"/fam "${pkgdir}"/etc/rc.d/fam } diff --git a/extra/fam/fam b/extra/fam/fam index 53dd2a4a6..5fc54a6df 100755 --- a/extra/fam/fam +++ b/extra/fam/fam @@ -9,7 +9,7 @@ case "$1" in #Check for running portmap, start when not running ck_daemon rpcbind && /etc/rc.d/rpcbind start stat_busy "Starting File Alteration Monitor" - if [ ! -f /var/run/daemons/rpcbind ]; then + if ck_daemon rpcbind; then stat_fail echo "ERROR: rpcbind is not running" exit 1 diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD index 32004706a..a93979c58 100644 --- a/extra/farsight2/PKGBUILD +++ b/extra/farsight2/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 111877 2011-03-01 15:02:05Z ibiru $ +# $Id: PKGBUILD 124193 2011-05-17 15:41:27Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: William Díaz <wdiaz@archlinux.us> pkgname=farsight2 -pkgver=0.0.26 -pkgrel=1 +pkgver=0.0.28 +pkgrel=2 pkgdesc="Audio/Video conference software for Instant Messengers" arch=('i686' 'x86_64' 'mips64el') url="http://farsight.freedesktop.org" license=('LGPL') -depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-python' 'python2' 'pygobject') -optdepends=('gstreamer0.10-good-plugins: for RTP plugin' - 'gstreamer0.10-bad-plugins: for RTP plugin') +depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0.10-bad' 'gstreamer0.10-python' 'pygobject') +optdepends=('gstreamer0.10-ugly-plugins: h264 codec') options=('!libtool' '!emptydirs') source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('7756d910687dd2abd455fd68e83f125c') +md5sums=('38767e775067270754a32aaf8e3a7db1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's#python-config#python2-config#' python/Makefile.in ./configure --prefix=/usr \ --with-package-name='Arch Linux farsight2 package' \ --with-package-origin='http://archlinux.org' \ diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 3485bdb20..77bd376a2 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $ +# $Id: PKGBUILD 124340 2011-05-19 23:17:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.14 +pkgver=1.14.1 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907') +sha1sums=('4d35b14c41cd8a753e6d8d334bab216c69361688') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 80316e094..796d84761 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 102917 2010-12-13 01:30:42Z eric $ +# $Id: PKGBUILD 124586 2011-05-23 05:55:07Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=fetchmail pkgver=6.3.19 -pkgrel=1 +pkgrel=2 pkgdesc="A remote-mail retrieval utility" +arch=('i686' 'x86_64') url="http://fetchmail.berlios.de/" -arch=('i686' 'x86_64' 'mips64el') +license=('GPL') depends=('glibc' 'openssl' 'python2') -optdepends=('tk: fetchmailconf') +optdepends=('tk: for using fetchmailconf') +backup=('etc/conf.d/fetchmail') options=('!makeflags') -license=('GPL') install=fetchmail.install source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2 fetchmail.rc fetchmail.conf) -md5sums=('64519711c8533f5a34d20c9ff620d880' '6742e99d65a827bc2b9d6bc8efe269e6'\ +md5sums=('64519711c8533f5a34d20c9ff620d880' + '89fdde15bf81b3a5c065949322b5d138' '8fcd6a22dfbc247755fdd050c5c5c4d3') -sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' '13c7e3c538211c79c5b403f2bfa6712a2ad0ac30'\ - '30401729386d6f774c6c36ab8530842166de54a8') +sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' + '910ec21ad0a619db67e4665189dc46d2a0634ea5' + '30401729386d6f774c6c36ab8530842166de54a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py ./configure --prefix=/usr --with-ssl=/usr make } @@ -28,10 +32,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail" install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail" - - # "home" directory for pid file. - install -d -o 90 -g nobody -m700 "${pkgdir}/var/run/fetchmail" } diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc index 7c25f72b2..6d453a223 100644 --- a/extra/fetchmail/fetchmail.rc +++ b/extra/fetchmail/fetchmail.rc @@ -8,13 +8,12 @@ PID=`pidof -o %PPID /usr/bin/fetchmail` case "$1" in start) stat_busy "Starting fetchmail" + [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail [ -z "$PID" ] && su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail if [ $? -gt 0 ]; then stat_fail else - #Fetchmail does this for us: - #echo $PID > /var/run/fetchmail.pid add_daemon fetchmail stat_done fi diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD index 0e4f9d9a6..a27c424d2 100644 --- a/extra/file-roller/PKGBUILD +++ b/extra/file-roller/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $ +# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=file-roller -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') -optdepends=('nautilus: nautilus shell extension' - 'unrar: the RAR uncompression program' +optdepends=('unrar: the RAR uncompression program' 'zip: creates PKZIP-compatible .zip files' 'unzip: unpacks .zip archives' 'p7zip: 7zip compression utility' @@ -22,7 +21,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce') +sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index f99068d86..55401aa90 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110943 2011-02-23 09:57:15Z bisson $ +# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20110222 -pkgrel=1 +pkgrel=2 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64' 'mips64el') url='http://fontforge.sourceforge.net' @@ -23,11 +23,11 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --enable-type3 \ - --enable-double \ --enable-devicetables \ --with-regular-link \ --with-python=python2 \ - --enable-pyextension + --enable-pyextension \ + make } diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD index c397966ce..d242b0783 100644 --- a/extra/gcalctool/PKGBUILD +++ b/extra/gcalctool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120856 2011-04-26 21:28:12Z ibiru $ +# $Id: PKGBUILD 124701 2011-05-24 06:54:45Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gcalctool -pkgver=6.0.1 +pkgver=6.0.2 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gcalctool.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('be11a7c36a1ec20bd0b190e572aefedea13fb2cb8479b06673e182c7461cadfe') +sha256sums=('63190fde1be5202ab43774785b5521d8f11592c6a9e125673028c5ac235c9316') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index 608c11bd0..1c05d49c0 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $ +# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64 mips64el) @@ -12,7 +12,7 @@ depends=('gtk3') makedepends=('pkgconfig' 'intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09') +sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index bbb3b7622..323edc3c4 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $ +# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.0.0 -pkgrel=3 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -10,7 +10,7 @@ url="http://www.gnome.org" backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') groups=('gnome-extra') options=('!libtool') -depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit') +depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') conflicts=('fast-user-switch-applet') replaces=('fast-user-switch-applet') @@ -20,24 +20,19 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname gdm-vt-allocation-hack.patch gdm.pam gdm-autologin.pam - gdm - fix_crasher_with_gtk307.patch) -sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff' + gdm) +sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05' '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5' - '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9') + '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch" patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" - #https://bugzilla.gnome.org/show_bug.cgi?id=646498 - patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \ --with-at-spi-registryd-directory=/usr/lib/at-spi \ diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 42b189676..40699597b 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $ +# $Id: PKGBUILD 125557 2011-05-26 17:02:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.0.2 -pkgrel=1 +pkgver=3.0.3 +pkgrel=2 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' - 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject' 'dconf') makedepends=('gnome-doc-utils' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db') +sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/git/ChangeLog b/extra/git/ChangeLog index 8ed0884fe..76298e68f 100644 --- a/extra/git/ChangeLog +++ b/extra/git/ChangeLog @@ -1,4 +1,21 @@ -Simple version bumps are ommitted from the following ChangeLog. +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 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d6d9396da..e67522047 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122647 2011-05-05 13:19:03Z dan $ +# $Id: PKGBUILD 124414 2011-05-20 16:19:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.5.1 +pkgver=1.7.5.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -75,11 +75,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('a49291116e3b0564e069ae989e4db6fb' - 'cb0ec1095fbdf5b4935d5c43194b976a' +md5sums=('f79ab8fe79b35346b499f131cbf381a4' + '43fc5538f137231f5c96e7da5eb6c934' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c' - '9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e' +sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' + '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index f7c87770a..c789f208b 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $ +# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.28.6.1 -pkgrel=2 +pkgver=2.28.7 +pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -11,8 +11,8 @@ depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schema makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index cc82175f7..f1845aafe 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 123056 2011-05-07 20:58:12Z eric $ +# $Id: PKGBUILD 124019 2011-05-16 00:31:31Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=1.0.0 +pkgver=1.5 +_fmver=1.5 +_qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" arch=('i686' 'x86_64' 'mips64el') url="http://glsof.sourceforge.net/" license=('GPL3') -depends=('java-runtime' 'lsof') +depends=('sh' 'java-runtime' 'lsof') +source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz) if [ "$CARCH" = "i686" ]; then - source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux32.tar.gz \ - http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux32.tar.gz \ + source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('7a541ee8c432b78f9bfd36dd1707fb8d' - '895bcec79edea97ebde36d7f5eaa3ee9' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' + '895bcec79edea97ebde36d7f5eaa3ee9' + '7e43c1120e15e65bd1a12d6f188be4a0' + '980da4b39e1e3f4fbed08018dfd3be7b') elif [ "$CARCH" = "x86_64" ]; then - source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux64.tar.gz \ - http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux64.tar.gz \ + source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('9a6043b0b90fbc6de4db36967647dab0' - 'ed96ee2105428aa8b038f5fe13b8cd1d' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' + 'ed96ee2105428aa8b038f5fe13b8cd1d' + '7e43c1120e15e65bd1a12d6f188be4a0' + '980da4b39e1e3f4fbed08018dfd3be7b') fi package() { cd "${srcdir}" install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" - install -D -m644 filemonitor_linux??/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" - install -D -m644 filemonitor_linux??/filemonitor.pdf "${pkgdir}/usr/share/doc/glsof/filemonitor.pdf" + install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" } diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1b7fd44d0..945af2f09 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $ +# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') @@ -14,8 +14,8 @@ groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79') +source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD index c8e883a28..34681fe3f 100644 --- a/extra/gnome-desktop-sharp/PKGBUILD +++ b/extra/gnome-desktop-sharp/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 121043 2011-04-28 09:15:35Z heftig $ +# $Id: PKGBUILD 124614 2011-05-23 14:21:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=gnome-desktop-sharp +pkgbase=gnome-desktop-sharp +pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp') pkgver=2.26.0 -pkgrel=6 -pkgdesc="GNOME desktop bindings for C#" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=7 +arch=('i686' 'x86_64') license=(LGPL) url="http://gtk-sharp.sourceforge.net" -depends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2') -makedepends=('monodoc' 'libgnomeprintui') -optdepends=('libgnomeprintui') +makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 gnome-desktop-sharp-lib-target.patch) @@ -18,18 +16,72 @@ md5sums=('4bc990900bb318b2ba0b0e7998bb47d1' '980cd3adf5e745f4caee0a172a51dcc3') build() { - # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="$srcdir/wapi" - mkdir -p "$MONO_SHARED_DIR" + export MONO_SHARED_DIR="$srcdir/wapi" + mkdir -p "$MONO_SHARED_DIR" - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch - ./configure --prefix=/usr --sysconfdir=/etc - make + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch + ./configure --prefix=/usr --sysconfdir=/etc + make } -package() { - cd "$srcdir/$pkgname-$pkgver" - make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \ - DESTDIR="$pkgdir" install +package_gnome-desktop-sharp() { + pkgdesc="GNOME desktop bindings for C#" + depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp') +} + +package_libgnome-desktop-sharp() { + pkgdesc="Mono bindings for libgnome-desktop" + depends=('gtk-sharp-2' 'gnome-desktop2') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gnomedesktop install DESTDIR="$pkgdir" +} + +package_gnome-print-sharp() { + pkgdesc="Mono bindings for libgnomeprint and libgnomeprintui" + depends=('art-sharp' 'libgnomeprintui') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gnomeprint install DESTDIR="$pkgdir" +} + +package_gtkhtml-sharp() { + pkgdesc="Mono bindings for gtkhtml" + depends=('gtk-sharp-2' 'gtkhtml') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gtkhtml install DESTDIR="$pkgdir" +} + +package_gtksourceview2-sharp() { + pkgdesc="Mono bindings for gtksourceview2" + depends=('gtk-sharp-2' 'gtksourceview2') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gtksourceview install DESTDIR="$pkgdir" +} + +package_rsvg2-sharp() { + pkgdesc="Mono bindings for librsvg" + depends=('gtk-sharp-2' 'librsvg') + + cd "$srcdir/$pkgbase-$pkgver" + make -C rsvg install DESTDIR="$pkgdir" +} + +package_vte-sharp() { + pkgdesc="Mono bindings for libvte" + depends=('gtk-sharp-2' 'vte') + + cd "$srcdir/$pkgbase-$pkgver" + make -C vte install DESTDIR="$pkgdir" +} + +package_wnck-sharp() { + pkgdesc="Mono bindings for libwnck" + depends=('gtk-sharp-2' 'libwnck') + + cd "$srcdir/$pkgbase-$pkgver" + make -C wnck install DESTDIR="$pkgdir" } diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 3ba0e1161..ce09ddf4c 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $ +# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -12,16 +12,12 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - randr-fix.patch) -sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3' - '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/randr-fix.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --with-gnome-distributor="Arch Linux" \ diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index ff10f5bea..cac447e29 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $ +# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed') +depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') provides=('glchess') conflicts=('glchess') @@ -15,8 +15,8 @@ options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -38,4 +38,6 @@ package() { install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku } diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 6488fc2dd..cfa1dc390 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 120584 2011-04-25 17:40:10Z ibiru $ +#$Id: PKGBUILD 125542 2011-05-26 16:38:57Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -10,11 +10,11 @@ license=('GPL' 'LGPL') depends=('gtk3' 'dconf') makedepends=('intltool' 'pkgconfig' 'python2') groups=('gnome') -options=('!libtool' '!emptydirs' '!makeflags') +options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1b296fc58fb189c9632fdd8a8a8a2dbb0af97db1529af87d73e21a96c4b78c03') +sha256sums=('a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index c2c7931bd..2ecec8404 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $ +# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.0.0.1 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgver=3.0.2 +pkgrel=1 +arch=('i686' 'x86_64') license=('GPL') pkgdesc="The GNOME Panel" url="http://www.gnome.org" @@ -15,14 +15,11 @@ groups=('gnome') replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2 - fix-crasher-launchers.patch) -sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b' - '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-panel \ diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index c9161e142..61fa2a7a7 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117756 2011-04-04 17:41:50Z heftig $ +# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." arch=(i686 x86_64 'mips64el') @@ -13,9 +13,9 @@ depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower' makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center') options=(!emptydirs) install=gnome-power-manager.install -groups=(gnome-extra) +groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1') +sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 14916a6dd..3d62ff5bb 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $ +# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25') +sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index c3270d70e..38617dc2e 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $ +# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117') +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 34974115f..0c005f56e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $ +# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.0.1 -pkgrel=5 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -19,28 +19,19 @@ install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 arch.patch - network_fixes_up_to_5090a4ccce.patch - shell-xfixes-cursor_missing_free.patch - st-private_fix_memory_leak.patch - st-private_correct_fix_memory_leak.patch - 0001-Don-t-crash-when-removing-nameless-user.patch) -sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079' + bluetoothstatus-always-update-devices.patch + shell-recorder-missing-XFree.patch) +sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95' 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db' - '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822' - 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6' - '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718' - 'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074' - '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d') + 'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae' + '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/arch.patch" - patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch" - patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch" - patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch" - patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch" - patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch" + patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch" + patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch new file mode 100644 index 000000000..0272169f5 --- /dev/null +++ b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch @@ -0,0 +1,132 @@ +From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Wed, 13 Apr 2011 17:08:45 +0000 +Subject: BluetoothStatus: always update devices + +Previously, we skipped rebuilding device items in case the device +had already been seen, but this caused the connected switch not to +be updated. Now it has been refactored to update in case the device +changes, and to create only when the device is completely new. + +https://bugzilla.gnome.org/show_bug.cgi?id=647565 +--- +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js +index 070016a..cee2f90 100644 +--- a/js/ui/status/bluetooth.js ++++ b/js/ui/status/bluetooth.js +@@ -127,13 +127,6 @@ Indicator.prototype = { + } + }, + +- _deviceCompare: function(d1, d2) { +- return d1.device_path == d2.device_path && +- d1.bdaddr == d2.bdaddr && +- d1.can_connect == d2.can_connect && +- d1.capabilities == d2.capabilities; +- }, +- + _updateDevices: function() { + let devices = this._applet.get_devices(); + +@@ -142,12 +135,8 @@ Indicator.prototype = { + let item = this._deviceItems[i]; + let destroy = true; + for (let j = 0; j < devices.length; j++) { +- // we need to deep compare because BluetoothSimpleDevice is a boxed type +- // (but we take advantage of that, because _skip will disappear the next +- // time get_devices() is called) +- if (this._deviceCompare(item._device, devices[j])) { +- item.label.text = devices[j].alias; +- devices[j]._skip = true; ++ if (item._device.device_path == devices[j].device_path) { ++ this._updateDeviceItem(item, devices[j]); + destroy = false; + break; + } +@@ -162,7 +151,7 @@ Indicator.prototype = { + this._hasDevices = newlist.length > 0; + for (let i = 0; i < devices.length; i++) { + let d = devices[i]; +- if (d._skip) ++ if (d._item) + continue; + let item = this._createDeviceItem(d); + if (item) { +@@ -177,17 +166,55 @@ Indicator.prototype = { + this._deviceSep.actor.hide(); + }, + ++ _updateDeviceItem: function(item, device) { ++ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) { ++ item.destroy(); ++ return; ++ } ++ ++ let prevDevice = item._device; ++ let prevCapabilities = prevDevice.capabilities; ++ let prevCanConnect = prevDevice.can_connect; ++ ++ // adopt the new device object ++ item._device = device; ++ device._item = item; ++ ++ // update properties ++ item.label.text = device.alias; ++ ++ if (prevCapabilities != device.capabilities || ++ prevCanConnect != device.can_connect) { ++ // need to rebuild the submenu ++ item.menu.removeAll(); ++ this._buildDeviceSubMenu(item, device); ++ } ++ ++ // update connected property ++ if (device.can_connect) ++ item._connectedMenuitem.setToggleState(device.connected); ++ }, ++ + _createDeviceItem: function(device) { + if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) + return null; + let item = new PopupMenu.PopupSubMenuMenuItem(device.alias); ++ ++ // adopt the device object, and add a back link + item._device = device; ++ device._item = item; + ++ this._buildDeviceSubMenu(item, device); ++ ++ return item; ++ }, ++ ++ _buildDeviceSubMenu: function(item, device) { + if (device.can_connect) { + item._connected = device.connected; +- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); ++ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); + +- menuitem.connect('toggled', Lang.bind(this, function() { ++ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() { + if (item._connected > ConnectionState.CONNECTED) { + // operation already in progress, revert + menuitem.setToggleState(menuitem.state); +@@ -217,7 +244,7 @@ Indicator.prototype = { + } + })); + +- item.menu.addMenuItem(menuitem); ++ item.menu.addMenuItem(item._connectedMenuitem); + } + + if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) { +@@ -263,8 +290,6 @@ Indicator.prototype = { + default: + break; + } +- +- return item; + }, + + _updateFullMenu: function() { +-- +cgit v0.9 diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch new file mode 100644 index 000000000..a7329166f --- /dev/null +++ b/extra/gnome-shell/shell-recorder-missing-XFree.patch @@ -0,0 +1,22 @@ +From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001 +From: Maxim Ermilov <zaspire@rambler.ru> +Date: Tue, 24 May 2011 22:46:47 +0000 +Subject: shell-recorder: missing XFree + +https://bugzilla.gnome.org/show_bug.cgi?id=650934 +--- +diff --git a/src/shell-recorder.c b/src/shell-recorder.c +index 6555187..d297923 100644 +--- a/src/shell-recorder.c ++++ b/src/shell-recorder.c +@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder) + *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j]; + + cairo_surface_mark_dirty (recorder->cursor_image); ++ ++ XFree (cursor_image); + } + + /* Overlay the cursor image on the frame. We draw the cursor image +-- +cgit v0.9 diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index b383bb180..04172d277 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117833 2011-04-04 18:12:02Z heftig $ +# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24') +sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 0bc006cf1..12b8c7d90 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $ +# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2) -sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677') +sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index c8f8f333a..ab785b02e 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 116890 2011-03-26 01:00:08Z heftig $ +# $Id: PKGBUILD 124498 2011-05-22 15:36:35Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.10.14 +pkgver=1.10.15 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') -depends=('goffice' 'gconf' 'desktop-file-utils') +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' @@ -17,7 +17,7 @@ optdepends=('pygobject: for python plugin support' install=gnumeric.install options=('libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b655fa76dd2e6654b8543fbcd92982e9fdcb4c0ae113aa577ce114109deb1587') +sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 146b627a4..475cfafca 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123031 2011-05-07 16:07:34Z andyrtr $ +# $Id: PKGBUILD 123950 2011-05-14 15:29:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.12.4 +pkgver=2.12.5 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -10,9 +10,9 @@ license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3e17fc8cb1cf8272067f6b66baf02810') +md5sums=('2d0bd5ae11534074fcd78da6ea384e64') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index a91420fd4..cc3b434f1 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 116834 2011-03-25 22:19:46Z heftig $ +# $Id: PKGBUILD 124493 2011-05-22 15:24:56Z ibiru $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.8.14 +pkgver=0.8.15 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org" license=('GPL') options=('!libtool') -depends=('gconf' 'libgsf') +depends=('gtk2' 'gconf' 'libgsf') makedepends=('pkgconfig' 'intltool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6f86a5361ef49c60a4a87c0d5913b001f67782c2cc3eaa13c6557087bee976de') +sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index bfd548e0c..71cca0883 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112741 2011-03-06 12:56:57Z giovanni $ +# $Id: PKGBUILD 124848 2011-05-24 19:25:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=gparted -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -21,18 +21,18 @@ optdepends=('e2fsprogs: for ext2/ext3 partitions' 'gpart: for recovering corrupt partition tables') install=gparted.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('29adfe33df34c03b7f800ce5374e957a') +md5sums=('ba3a434a259ae2ddcfc7f7488ee648ef') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop || return 1 + make DESTDIR="${pkgdir}" install + sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop } diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index a4c3c3414..e5f2470f3 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 116996 2011-03-27 12:25:01Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org +# $Id: PKGBUILD 124135 2011-05-16 17:24:42Z foutrelis $ +# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> + pkgname=gptfdisk pkgver=0.7.1 -pkgrel=1 -pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.rodsbooks.com/gdisk" +pkgrel=2 +pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" +arch=('i686' 'x86_64') +url="http://www.rodsbooks.com/gdisk/" +license=('GPL2') depends=('gcc-libs' 'util-linux' 'popt' 'icu') +provides=('gdisk') +conflicts=('gdisk') replaces=('gdisk') -license=('GPL2') -source=(http://www.rodsbooks.com/gdisk/$pkgname-$pkgver.tgz) +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz) +md5sums=('7c8d810df61e81c821bef399b832e89e') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + make } package () { - cd $srcdir/$pkgname-$pkgver - install -D -m755 gdisk $pkgdir/sbin/gdisk - install -D -m755 sgdisk $pkgdir/sbin/sgdisk - install -D -m755 fixparts $pkgdir/sbin/fixparts - install -D -m644 gdisk.8 $pkgdir/usr/share/man/man8/gdisk.8 - install -D -m644 sgdisk.8 $pkgdir/usr/share/man/man8/sgdisk.8 - install -D -m644 README $pkgdir/usr/share/gdisk/README - install -D -m644 NEWS pkgdir/usr/share/gdisk/NEWS + cd "$srcdir/$pkgname-$pkgver" + + install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}} + install -t "$pkgdir/sbin" gdisk sgdisk fixparts + install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8 + install -m644 -t "$pkgdir/usr/share/gdisk" README NEWS } -md5sums=('7c8d810df61e81c821bef399b832e89e') + +# vim:set ts=2 sw=2 et: diff --git a/extra/gqmpeg/PKGBUILD b/extra/gqmpeg/PKGBUILD deleted file mode 100644 index 752a7e717..000000000 --- a/extra/gqmpeg/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 64726 2010-01-22 01:20:44Z eric $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=gqmpeg -pkgver=0.91.1 -pkgrel=4 -pkgdesc="A frontend to mpg123 with extensive themeability and playlist support" -arch=('i686' 'x86_64' 'mips64el') -url="http://gqmpeg.sourceforge.net/" -license=('GPL2') -depends=('bash' 'gtk2' 'imlib' 'mpg123') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('e22eda86fc3e59108c8d04abc37b3e56') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install -} diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index aa53373a3..f1bb35503 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 117562 2011-04-04 10:54:18Z jgc $ +# $Id: PKGBUILD 124029 2011-05-16 08:07:30Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') -pkgver=0.10.32 -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.10.34 +pkgrel=1 +arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.32' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'udev' 'gobject-introspection') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.34' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2) -md5sums=('2920af2b3162f3d9fbaa7fabc8ed4d38') +sha256sums=('7f347a60cd4317c7ea44c23e52d6e6233d2fa278b3fe3df7cbefe2bc2e253989') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" @@ -28,7 +28,7 @@ build() { package_gstreamer0.10-base() { pkgdesc="GStreamer Multimedia Framework Base plugin libraries" - depends=('gstreamer0.10>=0.10.32' 'orc' 'libxv' 'udev') + depends=('gstreamer0.10>=0.10.34' 'orc' 'libxv') cd "${srcdir}/gst-plugins-base-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index 88edd412f..9b5ddb8ac 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 119465 2011-04-11 17:28:14Z jgc $ +# $Id: PKGBUILD 124034 2011-05-16 08:41:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.28 +pkgver=0.10.29 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) -md5sums=('6ef1588921f59d85c44ee2e49a3c97a0') +sha256sums=('466a64dcb580d4feef701abfc90656abb3558a2e3fc1e40e43977034bebc354c') build() { cd "${srcdir}/gst-plugins-good-${pkgver}" @@ -29,9 +29,8 @@ build() { } package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.32' 'bzip2') + depends=('gstreamer0.10-base>=0.10.34' 'bzip2') pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - conflicts=('gstreamer0.10-bad<=0.10.17') cd "${srcdir}/gst-plugins-good-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install @@ -39,7 +38,7 @@ package_gstreamer0.10-good() { } package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse') + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index e83b2f165..4ab9fea99 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 117108 2011-03-28 19:26:10Z ibiru $ +# $Id: PKGBUILD 124039 2011-05-16 08:56:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.17 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.10.18 +pkgrel=1 +arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') url="http://gstreamer.freedesktop.org/" options=(!libtool) source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) -md5sums=('504ed6508c3a8f035a2002ed69d68506') +md5sums=('04a7009a4efea2844075949c111f5e4d') build() { cd "${srcdir}/gst-plugins-ugly-${pkgver}" @@ -25,7 +25,7 @@ build() { package_gstreamer0.10-ugly() { pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" - depends=('gstreamer0.10-base>=0.10.32') + depends=('gstreamer0.10-base>=0.10.34') cd "${srcdir}/gst-plugins-ugly-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD index b875f69ee..8a6739537 100644 --- a/extra/gstreamer0.10/PKGBUILD +++ b/extra/gstreamer0.10/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 109030 2011-02-05 14:26:26Z andyrtr $ +# $Id: PKGBUILD 124024 2011-05-16 07:21:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 -pkgver=0.10.32 +pkgver=0.10.34 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('libxml2>=2.7.8' 'glib2>=2.24.1') -optdepends=('sh: for feedback script') +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2) -md5sums=('442bc3d37b8511a73379143e7531d726') +sha256sums=('85348f70dc4b70ad1beb05c9a59a64175c5058f4ee5273f89230a3c1d11b26a3') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gtk-theme-switch2/PKGBUILD b/extra/gtk-theme-switch2/PKGBUILD deleted file mode 100644 index 32f61813f..000000000 --- a/extra/gtk-theme-switch2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 75632 2010-04-02 01:24:28Z dgriffiths $ -# Contributor: Eddie Lozon <almostlucky@attbi.com> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gtk-theme-switch2 -pkgver=2.1.0 -pkgrel=1 -pkgdesc="Gtk2 theme switcher" -url="http://muhri.net/nav.php3?node=gts" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -depends=('gtk2') -source=(http://ftp.de.debian.org/debian/pool/main/g/gtk-theme-switch/gtk-theme-switch_${pkgver}.orig.tar.gz) -md5sums=('a9e7e62701cd4fba4d277dc210cd4317') - -build() { - cd ${srcdir}/gtk-theme-switch-${pkgver} - - make || return 1 -} - -package() { - cd ${srcdir}/gtk-theme-switch-${pkgver} - - install -Dm755 gtk-theme-switch2 \ - ${pkgdir}/usr/bin/gtk-theme-switch2 || return 1 - install -Dm644 gtk-theme-switch2.1 \ - ${pkgdir}/usr/share/man/man1/gtk-theme-switch2.1 || return 1 -} diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 5550647fc..4cff80b52 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ +# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.9 +pkgver=3.0.10 pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') @@ -14,12 +14,15 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) -sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini + only_draw_resize_grip_if_its_window_exists.patch) +sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + 'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch new file mode 100644 index 000000000..a6514b550 --- /dev/null +++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch @@ -0,0 +1,28 @@ +From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Mon, 23 May 2011 13:46:59 +0000 +Subject: window: Only draw resize grip if its window exists + +Don't rely on priv->resize_grip_visible as the code comment in the +variable declaration indicates. +This fixes warnings with GtkPlug, which can cause resize_grip_visible to +be TRUE but grid_window to be NULL - running tests/teststatusicon +reproduces this. + +This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc +--- +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index b97418a..b1caa9b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget, + if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw) + ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr); + +- if (priv->resize_grip_visible && ++ if (priv->grip_window && + gtk_cairo_should_draw_window (cr, priv->grip_window)) + { + GdkRectangle rect; +-- +cgit v0.9 diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index fb98d197d..eec9417b7 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $ +# $Id: PKGBUILD 125532 2011-05-26 16:26:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2) -sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a') +sha256sums=('582765d4ff9ec2141eaaa96d52596bee71af798bf5bc1e5fed686c60331b6de7') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 40322ce77..48ee41746 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $ +# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7') +sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index 8fe42ce6e..aa432f086 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 116002 2011-03-22 15:28:48Z giovanni $ +# $Id: PKGBUILD 124968 2011-05-25 13:58:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.39.2 +pkgver=1.39.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/help2man/" license=('GPL') depends=('perl-locale-gettext') +install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('36659da3ba7a9a51813e1c4848900a28') +md5sums=('6b1160697451ba87067231d172285840') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gmp/gmp.install b/extra/help2man/help2man.install index cad3354f9..ab6585b91 100644 --- a/testing/gmp/gmp.install +++ b/extra/help2man/help2man.install @@ -1,8 +1,7 @@ -info_dir=usr/share/info -info_files=(gmp.info gmp.info-1 gmp.info-2) +info_dir=/usr/share/info +info_files=(help2man.info) post_install() { - [ -x usr/bin/install-info ] || return 0 for f in ${info_files[@]}; do install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done @@ -13,7 +12,6 @@ post_upgrade() { } pre_remove() { - [ -x usr/bin/install-info ] || return 0 for f in ${info_files[@]}; do install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog index 686b0e181..ea5776244 100644 --- a/extra/htop/ChangeLog +++ b/extra/htop/ChangeLog @@ -1,3 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Added patch to fix --sort-key (closes FS#23224) + 2009-09-21 Eric Belanger <eric@archlinux.org> * htop 0.8.3-1 diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD index 75cb3940d..447b035a7 100644 --- a/extra/htop/PKGBUILD +++ b/extra/htop/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 105144 2011-01-06 20:57:13Z angvp $ +# $Id: PKGBUILD 124246 2011-05-18 04:38:36Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=htop pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64' 'mips64el') url="http://htop.sourceforge.net/" @@ -12,13 +13,17 @@ license=('GPL') depends=('ncurses') makedepends=('python2') options=('!emptydirs') -source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz) -md5sums=('7c5507f35f363f3f40183a2ba3c561f8') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz + htop.c.patch) +md5sums=('7c5507f35f363f3f40183a2ba3c561f8' + '750e8ad8476c5d9738da2a2bc7a7c2b6') build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure sed -i 's|python|python2|' scripts/MakeHeader.py + patch -Np0 -i $srcdir/htop.c.patch ./configure --prefix=/usr --enable-unicode --enable-openvz \ --enable-vserver make diff --git a/extra/htop/htop.c.patch b/extra/htop/htop.c.patch new file mode 100644 index 000000000..41a2dd377 --- /dev/null +++ b/extra/htop/htop.c.patch @@ -0,0 +1,15 @@ +From: Roman Kosenko <madkite@gmail.com> +Date: Thu, 10 Mar 2011 16:23:53 +0200 +Subject: [PATCH] Fix stupid bug with --sort-key + +--- htop.c.old 2010-11-24 20:45:38.000000000 +0200 ++++ htop.c 2011-03-10 16:32:18.473716667 +0200 +@@ -282,7 +282,7 @@ + printVersionFlag(); + break; + case 's': +- if (strcmp(optarg, "help")) { ++ if (!strcmp(optarg, "help")) { + for (int j = 1; j < LAST_PROCESSFIELD; j++) + printf ("%s\n", Process_fieldNames[j]); + exit(0); diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 9d0759d68..6029c1ebe 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112014 2011-03-03 05:10:44Z eric $ +# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2010.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" @@ -14,13 +14,15 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') makedepends=('zip' 'cmake' 'boost') install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bfd716655461987312b2f2f00c90dcc5') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) +md5sums=('bfd716655461987312b2f2f00c90dcc5' + '4393c7b31da60f230c85e63a6a2e43a0') +sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' + '52798a155a037f853f41402f797e8a4cb6bb3e07') build() { cd "${srcdir}" - + (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) mkdir build && cd build cmake "${srcdir}/${pkgname}-${pkgver}" \ diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch new file mode 100644 index 000000000..98a70ad50 --- /dev/null +++ b/extra/hugin/hugin-gcc46.patch @@ -0,0 +1,16 @@ + +diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + + + + diff --git a/extra/icecast/PKGBUILD b/extra/icecast/PKGBUILD deleted file mode 100644 index 84c7d48c4..000000000 --- a/extra/icecast/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 109082 2011-02-05 20:09:03Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jason Chu <jchu@xentac.net> - -pkgname=icecast -pkgver=2.3.2 -pkgrel=5 -pkgdesc="Streaming audio over the Internet" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.icecast.org/" -depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') -backup=('etc/icecast.xml' - 'etc/logrotate.d/icecast') -source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'icecastd' 'icecast.logrotate' - 'start-by-nobody.patch') -md5sums=('ff516b3ccd2bcc31e68f460cd316093f' - 'e823c1fdb080aae3d0c54ef8be95f7cb' - '59c6552bcb1dd9fb542af8670dfabd3c' - 'd8e929d2214123a1954da4383bf16583') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i ${srcdir}/start-by-nobody.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # install man-page - sed -i -e 's/icecast2/icecast/g' debian/icecast2.1 - install -Dm644 debian/icecast2.1 \ - ${pkgdir}/usr/share/man/man1/icecast.1 - - # init file - install -Dm755 ${srcdir}/icecastd \ - ${pkgdir}/etc/rc.d/icecast - # rotate the logs (taken from Fedora) - install -Dm644 ${srcdir}/icecast.logrotate \ - ${pkgdir}/etc/logrotate.d/icecast - - # install log dir - install -d -g99 -o99 ${pkgdir}/var/log/icecast -} diff --git a/extra/icecast/icecast.logrotate b/extra/icecast/icecast.logrotate deleted file mode 100644 index 0fb014c06..000000000 --- a/extra/icecast/icecast.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/icecast/*log { - missingok - notifempty - sharedscripts - postrotate - endscript -} - diff --git a/extra/icecast/icecastd b/extra/icecast/icecastd deleted file mode 100644 index e6c91b08c..000000000 --- a/extra/icecast/icecastd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -timeo=30 - -getPID() { - pgrep -u nobody icecast 2>/dev/null -} - -case $1 in - start) - stat_busy "Starting Icecast Server" - if getPID >/dev/null; then - # already running - stat_fail - exit 1 - else - /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null - while (( timeo > 0 )); do - if getPID >/dev/null; then - add_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Icecast Server" - if ! getPID >/dev/null; then - # not running - stat_done - exit 1 - fi - if ! kill $(getPID) &> /dev/null; then - stat_fail - exit 1 - fi - while (( timeo > 0 )); do - if getPID >/dev/null; then - rm_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/icecast/start-by-nobody.patch b/extra/icecast/start-by-nobody.patch deleted file mode 100644 index d218e5afe..000000000 --- a/extra/icecast/start-by-nobody.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- icecast-2.3.2/conf/icecast.xml.in~ 2010-11-12 16:47:54.750000918 +0100 -+++ icecast-2.3.2/conf/icecast.xml.in 2010-11-12 16:48:08.086667585 +0100 -@@ -164,11 +164,9 @@ - - <security> - <chroot>0</chroot> -- <!-- - <changeowner> - <user>nobody</user> -- <group>nogroup</group> -+ <group>nobody</group> - </changeowner> -- --> - </security> - </icecast> diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 35cc5fa90..db4a0aba4 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 114609 2011-03-14 15:02:27Z jgc $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 125606 2011-05-26 21:06:33Z bisson $ +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.1 -pkgrel=2 +pkgrel=3 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') @@ -13,33 +14,40 @@ makedepends=('boost' 'pkg-config' 'intltool') depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('python2-numpy: some extensions' - 'python-lxml: some extensions and filters') + 'python-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -install=inkscape.install -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc46.patch') +sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91' + '7163f35978538a6e223005737e8707b6f847fab3') + +install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-python \ - --with-perl \ - --without-gnome-vfs \ - --with-xft \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|\<python -c |python2 -c|g' share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - make + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../gcc46.patch + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/gcc46.patch b/extra/inkscape/gcc46.patch new file mode 100644 index 000000000..d04914c87 --- /dev/null +++ b/extra/inkscape/gcc46.patch @@ -0,0 +1,849 @@ +diff -aur old/src/2geom/utils.h new/src/2geom/utils.h +--- old/src/2geom/utils.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/2geom/utils.h 2011-05-26 14:38:55.912288964 +0000 +@@ -35,6 +35,7 @@ + + #include <cmath> + #include <vector> ++#include <cstddef> + + namespace Geom { + +diff -aur old/src/arc-context.h new/src/arc-context.h +--- old/src/arc-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/arc-context.h 2011-05-26 14:37:30.814792031 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/connection.h> + + #include <2geom/point.h> +diff -aur old/src/box3d-context.h new/src/box3d-context.h +--- old/src/box3d-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/box3d-context.h 2011-05-26 14:37:30.814792031 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "proj_pt.h" +diff -aur old/src/conn-avoid-ref.h new/src/conn-avoid-ref.h +--- old/src/conn-avoid-ref.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/conn-avoid-ref.h 2011-05-26 14:37:30.814792031 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <glib/gslist.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + struct SPDesktop; +diff -aur old/src/connection-pool.h new/src/connection-pool.h +--- old/src/connection-pool.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/connection-pool.h 2011-05-26 14:37:30.814792031 +0000 +@@ -3,6 +3,7 @@ + + #include <glib-object.h> + #include <gtkmm.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape +diff -aur old/src/connector-context.h new/src/connector-context.h +--- old/src/connector-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/connector-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -12,6 +12,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <sigc++/connection.h> + #include "event-context.h" +diff -aur old/src/desktop.h new/src/desktop.h +--- old/src/desktop.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/desktop.h 2011-05-26 14:37:30.814792120 +0000 +@@ -27,6 +27,7 @@ + + #include <gdk/gdkevents.h> + #include <gtk/gtktypeutils.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include <2geom/matrix.h> +diff -aur old/src/dialogs/object-attributes.cpp new/src/dialogs/object-attributes.cpp +--- old/src/dialogs/object-attributes.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/dialogs/object-attributes.cpp 2011-05-26 14:37:30.814792120 +0000 +@@ -13,6 +13,7 @@ + #include <glibmm/i18n.h> + #include <string> + #include <cstring> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/ptr_fun.h> + #include <sigc++/adaptors/bind.h> +diff -aur old/src/display/canvas-temporary-item.h new/src/display/canvas-temporary-item.h +--- old/src/display/canvas-temporary-item.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/display/canvas-temporary-item.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + + #include "display/display-forward.h" + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/document.h new/src/document.h +--- old/src/document.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/document.h 2011-05-26 14:37:30.814792120 +0000 +@@ -17,6 +17,7 @@ + + #include <glib-object.h> + #include <gtk/gtksignal.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <sigc++/class_slot.h> + +diff -aur old/src/document-private.h new/src/document-private.h +--- old/src/document-private.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/document-private.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <map> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "xml/event-fns.h" + #include "sp-defs.h" +diff -aur old/src/document-subset.h new/src/document-subset.h +--- old/src/document-subset.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/document-subset.h 2011-05-26 14:37:30.814792120 +0000 +@@ -10,6 +10,7 @@ + #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H + #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + +diff -aur old/src/draw-context.h new/src/draw-context.h +--- old/src/draw-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/draw-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include <forward.h> +diff -aur old/src/extension/timer.h new/src/extension/timer.h +--- old/src/extension/timer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/extension/timer.h 2011-05-26 14:37:30.814792120 +0000 +@@ -13,6 +13,7 @@ + #ifndef INKSCAPE_EXTENSION_TIMER_H__ + #define INKSCAPE_EXTENSION_TIMER_H__ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/timeval.h> + #include "extension-forward.h" +diff -aur old/src/flood-context.h new/src/flood-context.h +--- old/src/flood-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/flood-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -11,6 +11,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtk/gtk.h> + #include "event-context.h" +diff -aur old/src/gc-alloc.h new/src/gc-alloc.h +--- old/src/gc-alloc.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc-alloc.h 2011-05-26 14:37:30.814792120 +0000 +@@ -16,6 +16,7 @@ + #define SEEN_INKSCAPE_GC_ALLOC_H + + #include <limits> ++#include <cstddef> + #include "gc-core.h" + + namespace Inkscape { +diff -aur old/src/gc.cpp new/src/gc.cpp +--- old/src/gc.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc.cpp 2011-05-26 14:37:30.814792120 +0000 +@@ -16,6 +16,7 @@ + #include <glib/gmessages.h> + #include <sigc++/functors/ptr_fun.h> + #include <glibmm/main.h> ++#include <cstddef> + + namespace Inkscape { + namespace GC { +diff -aur old/src/gc-finalized.h new/src/gc-finalized.h +--- old/src/gc-finalized.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc-finalized.h 2011-05-26 14:37:30.814792120 +0000 +@@ -17,6 +17,7 @@ + #define SEEN_INKSCAPE_GC_FINALIZED_H + + #include <new> ++#include <cstddef> + #include "gc-core.h" + + namespace Inkscape { +diff -aur old/src/gradient-context.h new/src/gradient-context.h +--- old/src/gradient-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gradient-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + +diff -aur old/src/gradient-drag.h new/src/gradient-drag.h +--- old/src/gradient-drag.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/gradient-drag.h 2011-05-26 14:37:30.814792120 +0000 +@@ -15,6 +15,7 @@ + */ + + #include <glib/gslist.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <vector> + +diff -aur old/src/knot.h new/src/knot.h +--- old/src/knot.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/knot.h 2011-05-26 14:37:30.814792120 +0000 +@@ -20,6 +20,7 @@ + #include "forward.h" + #include <2geom/point.h> + #include "knot-enums.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPKnot; +diff -aur old/src/libavoid/geomtypes.h new/src/libavoid/geomtypes.h +--- old/src/libavoid/geomtypes.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/libavoid/geomtypes.h 2011-05-26 14:37:30.814792120 +0000 +@@ -29,6 +29,7 @@ + #ifndef AVOID_GEOMTYPES_H + #define AVOID_GEOMTYPES_H + ++#include <cstddef> + #include <vector> + #include <utility> + +diff -aur old/src/live_effects/lpeobject-reference.h new/src/live_effects/lpeobject-reference.h +--- old/src/live_effects/lpeobject-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/lpeobject-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/live_effects/parameter/path.h new/src/live_effects/parameter/path.h +--- old/src/live_effects/parameter/path.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/parameter/path.h 2011-05-26 14:37:30.818124452 +0000 +@@ -16,6 +16,7 @@ + + #include "live_effects/parameter/parameter.h" + #include "live_effects/parameter/path-reference.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/live_effects/parameter/path-reference.h new/src/live_effects/parameter/path-reference.h +--- old/src/live_effects/parameter/path-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/parameter/path-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class Path; +diff -aur old/src/Makefile.am new/src/Makefile.am +--- old/src/Makefile.am 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/Makefile.am 2011-05-26 14:37:30.814792031 +0000 +@@ -205,7 +205,7 @@ + + inkscape_SOURCES += main.cpp $(win32_sources) + inkscape_LDADD = $(all_libs) +-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) ++inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows) + + inkview_SOURCES += inkview.cpp $(win32_sources) + inkview_LDADD = $(all_libs) +diff -aur old/src/message-stack.h new/src/message-stack.h +--- old/src/message-stack.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/message-stack.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H + #define SEEN_INKSCAPE_MESSAGE_STACK_H + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glib.h> + #include <stdarg.h> +diff -aur old/src/object-hierarchy.h new/src/object-hierarchy.h +--- old/src/object-hierarchy.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/object-hierarchy.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + + #include <exception> + #include <list> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/signal.h> + #include <glib/gmessages.h> +diff -aur old/src/persp3d-reference.h new/src/persp3d-reference.h +--- old/src/persp3d-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/persp3d-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + */ + + #include "uri-references.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "persp3d.h" + +diff -aur old/src/rect-context.h new/src/rect-context.h +--- old/src/rect-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/rect-context.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/selcue.h new/src/selcue.h +--- old/src/selcue.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selcue.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPDesktop; +diff -aur old/src/selection-describer.h new/src/selection-describer.h +--- old/src/selection-describer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selection-describer.h 2011-05-26 14:37:30.818124452 +0000 +@@ -12,6 +12,7 @@ + #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H + #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "message-context.h" + +diff -aur old/src/selection.h new/src/selection.h +--- old/src/selection.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selection.h 2011-05-26 14:37:30.818124452 +0000 +@@ -19,6 +19,7 @@ + #include <vector> + #include <map> + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + //#include "libnr/nr-rect.h" +diff -aur old/src/seltrans.h new/src/seltrans.h +--- old/src/seltrans.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/seltrans.h 2011-05-26 14:37:30.818124452 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <2geom/point.h> + #include <2geom/matrix.h> +diff -aur old/src/sp-conn-end.h new/src/sp-conn-end.h +--- old/src/sp-conn-end.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-conn-end.h 2011-05-26 14:37:30.818124452 +0000 +@@ -2,6 +2,7 @@ + #define SEEN_SP_CONN_END + + #include <glib/gtypes.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + #include "sp-use-reference.h" +diff -aur old/src/sp-conn-end-pair.h new/src/sp-conn-end-pair.h +--- old/src/sp-conn-end-pair.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-conn-end-pair.h 2011-05-26 14:37:30.818124452 +0000 +@@ -15,6 +15,7 @@ + + #include "forward.h" + #include "libnr/nr-point.h" ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + #include <sigc++/signal.h> +diff -aur old/src/sp-gradient.h new/src/sp-gradient.h +--- old/src/sp-gradient.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/sp-gradient.h 2011-05-26 14:37:30.818124452 +0000 +@@ -25,6 +25,7 @@ + #include "sp-gradient-units.h" + #include "sp-gradient-vector.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + struct SPGradientReference; +diff -aur old/src/spiral-context.h new/src/spiral-context.h +--- old/src/spiral-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/spiral-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -16,6 +16,7 @@ + */ + + #include <gtk/gtktypeutils.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/sp-object.h new/src/sp-object.h +--- old/src/sp-object.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-object.h 2011-05-26 14:37:30.818124452 +0000 +@@ -56,6 +56,7 @@ + + + #include <glib-object.h> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + #include <sigc++/signal.h> +diff -aur old/src/sp-offset.h new/src/sp-offset.h +--- old/src/sp-offset.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-offset.h 2011-05-26 14:37:30.818124452 +0000 +@@ -16,6 +16,7 @@ + + #include "sp-shape.h" + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #define SP_TYPE_OFFSET (sp_offset_get_type ()) +diff -aur old/src/sp-pattern.h new/src/sp-pattern.h +--- old/src/sp-pattern.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-pattern.h 2011-05-26 14:37:30.818124452 +0000 +@@ -32,6 +32,7 @@ + #include "sp-paint-server.h" + #include "uri-references.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + class SPPatternReference : public Inkscape::URIReference { +diff -aur old/src/sp-shape.h new/src/sp-shape.h +--- old/src/sp-shape.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-shape.h 2011-05-26 14:37:30.818124452 +0000 +@@ -19,6 +19,7 @@ + #include "sp-marker-loc.h" + #include <2geom/forward.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_SHAPE (sp_shape_get_type ()) +diff -aur old/src/sp-switch.h new/src/sp-switch.h +--- old/src/sp-switch.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-switch.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include "sp-item-group.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_SWITCH (CSwitch::getType()) +diff -aur old/src/sp-text.h new/src/sp-text.h +--- old/src/sp-text.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-text.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <glib/gtypes.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "sp-item.h" + #include "sp-string.h" +diff -aur old/src/sp-tref-reference.h new/src/sp-tref-reference.h +--- old/src/sp-tref-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-tref-reference.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include "util/share.h" +diff -aur old/src/sp-use.h new/src/sp-use.h +--- old/src/sp-use.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-use.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "svg/svg-length.h" + #include "sp-item.h" +diff -aur old/src/sp-use-reference.h new/src/sp-use-reference.h +--- old/src/sp-use-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-use-reference.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class Path; +diff -aur old/src/star-context.h new/src/star-context.h +--- old/src/star-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/star-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/style.h new/src/style.h +--- old/src/style.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/style.h 2011-05-26 14:37:30.821456796 +0000 +@@ -24,6 +24,7 @@ + #include "uri.h" + #include "sp-paint-server.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + namespace Inkscape { +diff -aur old/src/text-context.h new/src/text-context.h +--- old/src/text-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/text-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + */ + + /* #include <gdk/gdkic.h> */ ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtk/gtkimcontext.h> + +diff -aur old/src/ui/dialog/desktop-tracker.h new/src/ui/dialog/desktop-tracker.h +--- old/src/ui/dialog/desktop-tracker.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/desktop-tracker.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + #ifndef SEEN_DIALOG_DESKTOP_TRACKER + #define SEEN_DIALOG_DESKTOP_TRACKER + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <glib/gtypes.h> + +diff -aur old/src/ui/dialog/document-metadata.h new/src/ui/dialog/document-metadata.h +--- old/src/ui/dialog/document-metadata.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/document-metadata.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtkmm/notebook.h> + #include <glibmm/i18n.h> +diff -aur old/src/ui/dialog/document-properties.h new/src/ui/dialog/document-properties.h +--- old/src/ui/dialog/document-properties.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/document-properties.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h>// + #include <gtkmm/notebook.h> + #include <glibmm/i18n.h> +diff -aur old/src/ui/dialog/inkscape-preferences.h new/src/ui/dialog/inkscape-preferences.h +--- old/src/ui/dialog/inkscape-preferences.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/dialog/inkscape-preferences.h 2011-05-26 14:37:30.821456796 +0000 +@@ -28,6 +28,7 @@ + #include <gtkmm/frame.h> + #include <gtkmm/notebook.h> + #include "ui/widget/preferences-widget.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/i18n.h> + #include <gtkmm/textview.h> +diff -aur old/src/ui/dialog/undo-history.cpp new/src/ui/dialog/undo-history.cpp +--- old/src/ui/dialog/undo-history.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/undo-history.cpp 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include <glibmm/i18n.h> + #include <gtk/gtkimage.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + +diff -aur old/src/ui/tool/control-point.h new/src/ui/tool/control-point.h +--- old/src/ui/tool/control-point.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/tool/control-point.h 2011-05-26 14:37:30.821456796 +0000 +@@ -12,6 +12,7 @@ + #define SEEN_UI_TOOL_CONTROL_POINT_H + + #include <boost/utility.hpp> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gdkmm.h> + #include <gtkmm.h> +diff -aur old/src/ui/tool/control-point-selection.h new/src/ui/tool/control-point-selection.h +--- old/src/ui/tool/control-point-selection.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/ui/tool/control-point-selection.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include <memory> + #include <boost/optional.hpp> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <2geom/forward.h> + #include <2geom/point.h> +diff -aur old/src/ui/tool/manipulator.h new/src/ui/tool/manipulator.h +--- old/src/ui/tool/manipulator.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/tool/manipulator.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + + #include <set> + #include <map> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glib.h> + #include <gdk/gdk.h> +diff -aur old/src/ui/tool/multi-path-manipulator.h new/src/ui/tool/multi-path-manipulator.h +--- old/src/ui/tool/multi-path-manipulator.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/tool/multi-path-manipulator.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H + #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H + ++#include <stddef.h> + #include <sigc++/connection.h> + #include "display/display-forward.h" + #include "forward.h" +diff -aur old/src/ui/tool/node.h new/src/ui/tool/node.h +--- old/src/ui/tool/node.h 2011-01-02 04:34:09.814902000 +0000 ++++ new/src/ui/tool/node.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + #include <iterator> + #include <iosfwd> + #include <stdexcept> ++#include <cstddef> + #include <tr1/functional> + #include <boost/utility.hpp> + #include <boost/shared_ptr.hpp> +diff -aur old/src/ui/tool/node-tool.h new/src/ui/tool/node-tool.h +--- old/src/ui/tool/node-tool.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/tool/node-tool.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + #include <memory> + #include <boost/ptr_container/ptr_map.hpp> + #include <glib.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "forward.h" +diff -aur old/src/ui/view/view.h new/src/ui/view/view.h +--- old/src/ui/view/view.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/view/view.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + */ + + #include <gdk/gdktypes.h> ++#include <stddef.h> + #include <sigc++/connection.h> + #include "message.h" + #include "gc-managed.h" +diff -aur old/src/ui/widget/color-picker.h new/src/ui/widget/color-picker.h +--- old/src/ui/widget/color-picker.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/color-picker.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + #ifndef __COLOR_PICKER_H__ + #define __COLOR_PICKER_H__ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtkmm/button.h> + #include <gtkmm/dialog.h> +diff -aur old/src/ui/widget/page-sizer.h new/src/ui/widget/page-sizer.h +--- old/src/ui/widget/page-sizer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/page-sizer.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H + + #include <gtkmm.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include "helper/units.h" +diff -aur old/src/ui/widget/preferences-widget.h new/src/ui/widget/preferences-widget.h +--- old/src/ui/widget/preferences-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/preferences-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -26,6 +26,7 @@ + #include <gtkmm/drawingarea.h> + #include <gtkmm/frame.h> + #include <gtkmm/filechooserbutton.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/i18n.h> + +diff -aur old/src/ui/widget/selected-style.h new/src/ui/widget/selected-style.h +--- old/src/ui/widget/selected-style.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/selected-style.h 2011-05-26 14:37:30.824789230 +0000 +@@ -23,6 +23,7 @@ + #include <gtkmm/adjustment.h> + #include <gtkmm/spinbutton.h> + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include <glibmm/i18n.h> +diff -aur old/src/ui/widget/style-subject.h new/src/ui/widget/style-subject.h +--- old/src/ui/widget/style-subject.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/style-subject.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + #include "libnr/nr-rect.h" + #include <2geom/rect.h> + #include "sp-item.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPDesktop; +diff -aur old/src/uri-references.h new/src/uri-references.h +--- old/src/uri-references.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/uri-references.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/trackable.h> + +diff -aur old/src/util/forward-pointer-iterator.h new/src/util/forward-pointer-iterator.h +--- old/src/util/forward-pointer-iterator.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/forward-pointer-iterator.h 2011-05-26 14:37:30.824789230 +0000 +@@ -15,6 +15,7 @@ + #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H + + #include <iterator> ++#include <cstddef> + #include "util/reference.h" + + namespace Inkscape { +diff -aur old/src/util/share.h new/src/util/share.h +--- old/src/util/share.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/share.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + + #include "gc-core.h" + #include <cstring> ++#include <cstddef> + + namespace Inkscape { + namespace Util { +diff -aur old/src/util/unordered-containers.h new/src/util/unordered-containers.h +--- old/src/util/unordered-containers.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/unordered-containers.h 2011-05-26 14:37:30.824789230 +0000 +@@ -41,6 +41,8 @@ + # define INK_UNORDERED_MAP __gnu_cxx::hash_map + # define INK_HASH __gnu_cxx::hash + ++#include <cstddef> ++ + namespace __gnu_cxx { + // hash function for pointers + // TR1 and Boost have this defined by default, __gnu_cxx doesn't +diff -aur old/src/widgets/desktop-widget.h new/src/widgets/desktop-widget.h +--- old/src/widgets/desktop-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/desktop-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -21,6 +21,7 @@ + #include "ui/view/view-widget.h" + #include "ui/view/edit-widget-interface.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + // forward declaration +diff -aur old/src/widgets/gradient-image.h new/src/widgets/gradient-image.h +--- old/src/widgets/gradient-image.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/gradient-image.h 2011-05-26 14:37:30.824789230 +0000 +@@ -19,6 +19,7 @@ + + #include <glib.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ()) +diff -aur old/src/widgets/gradient-vector.h new/src/widgets/gradient-vector.h +--- old/src/widgets/gradient-vector.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/gradient-vector.h 2011-05-26 14:37:30.824789230 +0000 +@@ -17,6 +17,7 @@ + + #include <glib.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #include <gtk/gtkvbox.h> +diff -aur old/src/widgets/sp-attribute-widget.h new/src/widgets/sp-attribute-widget.h +--- old/src/widgets/sp-attribute-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/sp-attribute-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H + + #include <glib.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ()) +diff -aur old/src/widgets/sp-color-notebook.cpp new/src/widgets/sp-color-notebook.cpp +--- old/src/widgets/sp-color-notebook.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/sp-color-notebook.cpp 2011-05-26 14:37:30.824789230 +0000 +@@ -22,6 +22,7 @@ + #include <cstring> + #include <string> + #include <cstdlib> ++#include <cstddef> + #include <gtk/gtk.h> + #include <glibmm/i18n.h> + +diff -aur old/src/xml/helper-observer.h new/src/xml/helper-observer.h +--- old/src/xml/helper-observer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/xml/helper-observer.h 2011-05-26 14:37:30.824789230 +0000 +@@ -5,6 +5,7 @@ + #include "node.h" + #include "../sp-object.h" + //#include "../sp-object-repr.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { diff --git a/extra/inkscape/install b/extra/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/extra/inkscape/install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index f8a341783..210e6cead 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122250 2011-05-03 10:29:38Z andrea $ +# $Id: PKGBUILD 124831 2011-05-24 17:22:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace pkgver=4.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -16,8 +16,7 @@ groups=('kde') depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx' 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez' - 'python2' 'kdebindings-python') +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" @@ -28,7 +27,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'nm-09.patch') + 'fixpath.patch' 'terminate-server.patch' + 'fix-app-launch-in-plasmoid.patch') sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -37,14 +37,16 @@ sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33') + 'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d') 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 - patch -p1 -i ${srcdir}/nm-09.patch + + # Already fixed upstream + patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch cd ${srcdir} mkdir build @@ -54,7 +56,8 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF + -DWITH_Googlegadgets=OFF \ + -DWITH_NetworkManager=OFF make } diff --git a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch new file mode 100644 index 000000000..fec667663 --- /dev/null +++ b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch @@ -0,0 +1,22 @@ +commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0 +Author: Aaron Seigo <aseigo@kde.org> +Date: Fri May 6 22:51:50 2011 +0200 + + get rid of duplicate connect + + patch contributed by Luc Menut + BUG:262614 + REVIEW:101284 + +diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp +index cbc7175..bef53e5 100644 +--- a/plasma/generic/containmentactions/applauncher/launch.cpp ++++ b/plasma/generic/containmentactions/applauncher/launch.cpp +@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args) + { + m_menu = new KMenu(); + connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); +- connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); + + m_action->setMenu(m_menu); + } diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index e1c29b24b..a5a24fb20 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122727 2011-05-06 08:29:55Z andrea $ +# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -26,8 +26,8 @@ pkgname=('kdeedu-blinken' 'kdeedu-rocs' 'kdeedu-step') pkgver=4.6.3 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') @@ -46,7 +46,6 @@ build() { cd ${srcdir} mkdir build cd build - # rpath is needed for cantor to find R cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=OFF \ diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 572d2bdb3..428e753e8 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $ +# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,11 +19,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('arts' 'kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch') + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch') sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'd994f262356af5b9e4e9619646e471bd98c91efb') + 'd994f262356af5b9e4e9619646e471bd98c91efb' + 'c8ef05943e71a28c4604217d31fc6ca83e48476c') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -35,6 +37,9 @@ build() { # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch + # Already fixed upstream + patch -p1 -i $srcdir/fix-double-POST-action.patch + cd ${srcdir} mkdir build cd build diff --git a/extra/kdelibs/fix-double-POST-action.patch b/extra/kdelibs/fix-double-POST-action.patch new file mode 100644 index 000000000..2672d65db --- /dev/null +++ b/extra/kdelibs/fix-double-POST-action.patch @@ -0,0 +1,27 @@ +commit 92db24adfa941003db1d885df01157056617f30b +Author: Maks Orlovich <maksim@kde.org> +Date: Sun May 8 14:39:03 2011 -0400 + + Fix the job-on-hold reuse logic, which caused the double-POST problem) + + adawit, could you please at least READ what you're backporting if you are + going to be this aggressive? Or better yet, please don't backport anything + that's not fixing a critical bug or is trivial, as per: + http://techbase.kde.org/Policies/Minor_Point_Release_Policy + + CCMAIL: adawit@kde.org + BUG: 272466 + +diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp +index 55da053..9f5607e 100644 +--- a/kio/kio/scheduler.cpp ++++ b/kio/kio/scheduler.cpp +@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job) + bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET); + + if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) { +- canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL); ++ canJobReuse = (canJobReuse || cmd == CMD_SPECIAL); + if (canJobReuse) { + KIO::MetaData outgoing = tJob->outgoingMetaData(); + const QString resume = outgoing.value("resume"); diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index b3d455918..36f799fbb 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=git20110323 -_commit=986cae8974998213496a8678ad03523dba83e69d +pkgver=git20110524 +_commit=f112886575a9c1fc8986f098db9ef84a6fb2e98e pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -15,15 +15,10 @@ depends=('kdebase-workspace' 'networkmanager') makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}" - 'nm-09.patch') -md5sums=('3dc3b2631e0d4e4f578ef20f7802bf04' - 'b7ad3dac9a5022c99dfd2ad0dc8549cb') +source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") +md5sums=('19d139aa4e80b5829b8a898b315a0a0a') build() { - cd "${srcdir}/networkmanagement" - patch -p1 -i "${srcdir}/nm-09.patch" - cd "${srcdir}" mkdir build cd build @@ -38,5 +33,3 @@ package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install } -md5sums=('8373cd729b12a821b28b483e3e9d253f' - 'c46839bc0503f2dbec76282b8ab163bd') diff --git a/extra/kismet/kismet-2008-05-R1-infinite-loop.diff b/extra/kismet/kismet-2008-05-R1-infinite-loop.diff deleted file mode 100644 index f8417943e..000000000 --- a/extra/kismet/kismet-2008-05-R1-infinite-loop.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- gpsmap.cc -+++ gpsmap.cc -@@ -874,7 +874,7 @@ - - // Break up the path to the gpsxml file and form a path based on that - unsigned int lastslash = 0; -- for (unsigned int x = origxmlfile.find('/'); x != string::npos; -+ for (string::size_type x = origxmlfile.find('/'); x != string::npos; - lastslash = x, x = origxmlfile.find('/', lastslash+1)) { - // We don't actually need to do anything... - } -@@ -882,7 +882,7 @@ - comp = origxmlfile.substr(0, lastslash); - - lastslash = 0; -- for (unsigned int x = orignetfile.find('/'); x != string::npos; -+ for (string::size_type x = orignetfile.find('/'); x != string::npos; - lastslash = x, x = orignetfile.find('/', lastslash+1)) { - // We don't actually need to do anything... - } diff --git a/extra/kismet/kismet-build.patch b/extra/kismet/kismet-build.patch deleted file mode 100644 index 9935ca4fa..000000000 --- a/extra/kismet/kismet-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- macaddr.h.orig 2009-07-08 02:29:38.000000000 -0400 -+++ macaddr.h 2009-07-08 02:37:54.000000000 -0400 -@@ -73,7 +73,7 @@ - longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8); - - // If it has a mask component, get that -- char *in_mask = strchr(in, '/'); -+ const char *in_mask = strchr(in, '/'); - if (in_mask != NULL) { - longmask = 0; - diff --git a/extra/kmldonkey/PKGBUILD b/extra/kmldonkey/PKGBUILD deleted file mode 100644 index aea99597c..000000000 --- a/extra/kmldonkey/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 104423 2011-01-02 13:07:17Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kmldonkey -pkgver=2.0.2 -_kdever=4.4.0 -pkgrel=5 -pkgdesc="An MLDonkey frontend for KDE" -arch=('i686' 'x86_64' 'mips64el') -url='http://userbase.kde.org/KMLDonkey' -license=('GPL') -depends=('kdebase-workspace') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl') -install="${pkgname}.install" -source=("http://download.kde.org/stable/extragear/${pkgname}-${pkgver}-kde${_kdever}.tar.bz2") -md5sums=('40ae039dc01a45807111c2d0023eeaa6') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver}-kde${_kdever} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/extra/kmplayer/PKGBUILD b/extra/kmplayer/PKGBUILD deleted file mode 100644 index 3114a8bb8..000000000 --- a/extra/kmplayer/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 94084 2010-10-04 12:47:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=kmplayer -pkgver=0.11.2c -pkgrel=1 -pkgdesc="Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL') -url="http://kmplayer.kde.org" -depends=('kdebase-runtime' 'pango') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl') -install=${pkgname}.install -source=("http://kmplayer.kde.org/pkgs/$pkgname-$pkgver.tar.bz2") -md5sums=('7a1363dfaad0c7b563ecbd58f301e704') - -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/extra/libbtctl/PKGBUILD b/extra/libbtctl/PKGBUILD deleted file mode 100644 index 76cd085aa..000000000 --- a/extra/libbtctl/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 59225 2009-11-21 15:31:57Z giovanni $ -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=libbtctl -pkgver=0.11.1 -pkgrel=1 -pkgdesc="GObject wrapper for Bluetooth functionality." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.usefulinc.com/software/gnome-bluetooth/" -license=('GPL' 'LGPL') -depends=('glib2' 'openobex' 'bluez') -makedepends=('intltool' 'python' 'gtk2') -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.11/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5b5ab9e71dd5428c4e5c45cbf581a384') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-gtk-doc \ - --disable-mono --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD index ba33e210d..b43d6ab53 100644 --- a/extra/libftdi/PKGBUILD +++ b/extra/libftdi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 101400 2010-11-29 04:43:52Z allan $ +# $Id: PKGBUILD 125350 2011-05-26 02:17:50Z eric $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libftdi -pkgver=0.18 -pkgrel=2 +pkgver=0.19 +pkgrel=1 pkgdesc="A library to talk to FTDI chips" -arch=("i686" "x86_64" 'mips64el') +arch=('i686' 'x86_64') url="http://www.intra2net.com/en/developer/libftdi/download.php" -license=("GPL2" "LGPL2.1") -depends=('libusb-compat') -makedepends=("boost") +license=('GPL2' 'LGPL2.1') +depends=('libusb-compat' 'gcc-libs') +makedepends=('boost') options=('!libtool') source=("http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz") -md5sums=('916f65fa68d154621fc0cf1f405f2726') -sha1sums=('52401db0e7cb90a5d83f82c2859a4f8d44e52579') +md5sums=('e6e25f33b4327b1b7aa1156947da45f3') +sha1sums=('0f08caf8e754ace69cd682489fae3f7f09920fe1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 158699992..fa4540a1a 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 120579 2011-04-25 17:26:49Z ibiru $ +#$Id: PKGBUILD 125537 2011-05-26 16:32:57Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9d748842dab86914488bef039ca2c25f8ff5510daae3815643e6e00a2f69cacb') +sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch new file mode 100644 index 000000000..1e28cdb73 --- /dev/null +++ b/extra/libgnome-keyring/fix_crash.patch @@ -0,0 +1,35 @@ +From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon, 23 May 2011 08:58:49 +0000 +Subject: Fix crash from recent memleak fix (b49e32b) + +make_attribute_list_va() statically copies the caller's method arguments into +the GnomeKeyringAttributeList, so we must only free the array itself, not the +GnomeKeyringAttribute strings. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840 +--- +diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c +index dc271dd..4febf47 100644 +--- a/library/gnome-keyring.c ++++ b/library/gnome-keyring.c +@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type, + va_end (args); + + ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data); +- gnome_keyring_attribute_list_free (attributes); ++ g_array_free (attributes, TRUE); + return ret; + } + +@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type, + va_end (args); + + ret = gnome_keyring_find_items_sync (type, attributes, found); +- gnome_keyring_attribute_list_free (attributes); ++ g_array_free (attributes, TRUE); + return ret; + } + +-- +cgit v0.9 diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 061dd2e68..d5343da70 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 116824 2011-03-25 21:58:52Z heftig $ +# $Id: PKGBUILD 124392 2011-05-20 13:18:16Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=libgsf pkgname=('libgsf' 'libgsf-gnome') -pkgver=1.14.20 +pkgver=1.14.21 pkgrel=1 arch=(i686 x86_64 'mips64el') url="http://www.gnome.org/" @@ -13,7 +13,7 @@ makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig' 'python2' 'libbonobo' 'gconf' 'pygtk') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6') +sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 9de18bb05..55cfcad8c 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117926 2011-04-04 21:33:29Z heftig $ +# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gettext-not-xml.patch) -sha256sums=('f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545' +sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c' 'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727') build() { diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index ce6e6e706..742e73b6b 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 111658 2011-02-28 03:23:17Z allan $ +# $Id: PKGBUILD 124693 2011-05-24 03:40:20Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64' 'mips64el') url="http://libjpeg-turbo.virtualgl.org/" license=('GPL' 'custom') +depends=('glibc') makedepends=('nasm') provides=('libjpeg=8.0.2') conflicts=('libjpeg') replaces=('libjpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('83e6914a281d649ad289445dc20f9de4') +md5sums=('03b9c1406c7bfdc204313c2917ce6962') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,6 +29,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE" } - diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD index 84fa40839..445511d75 100644 --- a/extra/liblqr/PKGBUILD +++ b/extra/liblqr/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 49462 2009-08-08 15:03:23Z tpowa $ +# $Id: PKGBUILD 124082 2011-05-16 15:00:24Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=liblqr pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A seam-carving C/C++ library called Liquid Rescale" arch=('i686' 'x86_64' 'mips64el') url="http://liblqr.wikidot.com/" license=('GPL') -depends=('glibc' 'glib2') +depends=('glib2') makedepends=('pkgconfig') -options=('!libtool') -source=(http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2) +options=('!libtool' '!emptydirs') +source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2") build() { cd "$srcdir/$pkgname-1-$pkgver" ./configure --prefix=/usr - make || return 1 - make DESTDIR="$pkgdir/" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-1-$pkgver" + make DESTDIR="$pkgdir/" install } md5sums=('0e24ed3c9fcdcb111062640764d7b87a') diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 9a8fbea4d..d75e8840c 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122697 2011-05-06 06:29:29Z andrea $ +# $Id: PKGBUILD 124554 2011-05-22 22:58:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('6f88444c82e9840638ec16e366457dd7') +md5sums=('0ed91cc9483f4634e8709a0ea95baeba') build() { cd "${srcdir}" diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD index f53f584e9..9d29118a9 100644 --- a/extra/liborigin2/PKGBUILD +++ b/extra/liborigin2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112096 2011-03-03 20:59:03Z eric $ +# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgbase=liborigin2 pkgname=('liborigin2' 'liborigin2-docs') pkgver=20100913 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +arch=('i686' 'x86_64') url="http://soft.proindependent.com/liborigin2/" license=('GPL3') makedepends=('doxygen' 'qt' 'boost') diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index 1daebcb01..614c58ea4 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112025 2011-03-03 09:42:31Z eric $ +# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') pkgver=0.6.49 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +arch=('i686' 'x86_64') url="http://www.five-ten-sg.com/libpst/" license=('GPL') makedepends=('python2' 'boost') diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD new file mode 100644 index 000000000..6e2d4766f --- /dev/null +++ b/extra/libqzeitgeist/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libqzeitgeist +pkgver=0.7.0 +pkgrel=1 +pkgdesc="A Qt interface to the Zeitgeist event tracking system" +url="https://projects.kde.org/projects/kdesupport/libqzeitgeist" +arch=('i686' 'x86_64') +license=('GPL') +depends=('qt') +makedepends=('cmake') +source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2") +md5sums=('e58d4b988bbab812f8bd6878d87c0956') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../QtZeitgeist-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 901438de5..0367ee9c9 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $ +# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b') +sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD new file mode 100644 index 000000000..ddf30e72c --- /dev/null +++ b/extra/libssh2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124297 2011-05-19 05:00:38Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.2.7 +pkgrel=2 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +options=('!libtool') +source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('a5d78344886f1282e4008c09bf568076') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 77f1d048b..24f4aea76 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $ +# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar pkgver=0.15.6 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index 18d101959..446e2bf63 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120955 2011-04-27 19:24:20Z andrea $ +# $Id: PKGBUILD 124232 2011-05-17 19:20:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libvncserver pkgver=0.9.8 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64' 'mips64el') url="http://libvncserver.sourceforge.net/" license=('GPL') -depends=('libjpeg' 'zlib') +depends=('libjpeg' 'zlib' 'gnutls') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index c9395bec3..d37c740ec 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117893 2011-04-04 21:09:31Z heftig $ +# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15') +sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/libx86/PKGBUILD b/extra/libx86/PKGBUILD deleted file mode 100644 index c181e7a7b..000000000 --- a/extra/libx86/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 21343 2008-12-12 01:32:33Z eric $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: tardo <tardo@nagi-fanboi.net> -# Maintainer: Thayer Williams <thayer@archlinux.org> - -pkgname=libx86 -pkgver=1.1 -pkgrel=2 -pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.codon.org.uk/~mjg59/libx86/" -license=('custom') -depends=('glibc') -source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz - libx86-ifmask.patch) -md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' - '573897186eb8670d8d97c64ea7614001') - -build() { - cd $srcdir/$pkgname-$pkgver - - # lrmi.c patch courtesy of Gentoo - patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1 - - # compensate for x86_64 - if [ "$CARCH" = "x86_64" ]; then - make BACKEND=x86emu || return 1 - else - make || return 1 - fi - - make DESTDIR=$pkgdir install || return 1 - chmod 644 $pkgdir/usr/lib/libx86.a || return 1 - - install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1 -} diff --git a/extra/libx86/libx86-ifmask.patch b/extra/libx86/libx86-ifmask.patch deleted file mode 100644 index c99eeb819..000000000 --- a/extra/libx86/libx86-ifmask.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lrmi.c.orig 2008-09-06 12:24:36.070136428 +0200 -+++ lrmi.c 2008-09-06 12:28:10.584287458 +0200 -@@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE. - #include "x86-common.h" - - #if defined(__linux__) -+#ifndef TF_MASK -+#define TF_MASK X86_EFLAGS_TF -+#endif -+#ifndef IF_MASK -+#define IF_MASK X86_EFLAGS_IF -+#endif -+#ifndef IOPL_MASK -+#define IOPL_MASK X86_EFLAGS_IOPL -+#endif -+#ifndef VIF_MASK -+#define VIF_MASK X86_EFLAGS_VIF -+#endif - #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) - #elif defined(__NetBSD__) || defined(__FreeBSD__) - #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD index 2f4479bee..2e7e8d593 100644 --- a/extra/libxfce4ui/PKGBUILD +++ b/extra/libxfce4ui/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 106352 2011-01-16 16:37:35Z andyrtr $ +# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=libxfce4ui pkgver=4.8.0 -pkgrel=1 +pkgrel=3 pkgdesc="share commonly used Xfce widgets among the Xfce applications" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.xfce.org/" -groups=('xfce4') -depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'startup-notification') +depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') makedepends=('intltool' 'gtk-doc' 'glade') optdepends=('glade: for using the included glade module') #replaces=('libxfcegui4') - later when all is ported diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD index 6b2f5a989..7855ad22c 100644 --- a/extra/libxfce4util/PKGBUILD +++ b/extra/libxfce4util/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 106357 2011-01-16 16:41:01Z andyrtr $ +# $Id: PKGBUILD 124279 2011-05-18 16:40:43Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=libxfce4util pkgver=4.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Basic utility non-GUI functions for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.xfce.org/" -groups=('xfce4') depends=("glib2") makedepends=('pkgconfig' 'intltool' 'gtk-doc') options=('!libtool') diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD index a99ca04d9..5c7e594d0 100644 --- a/extra/libxfcegui4/PKGBUILD +++ b/extra/libxfcegui4/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 119470 2011-04-11 17:35:10Z andyrtr $ +# $Id: PKGBUILD 124284 2011-05-18 17:58:51Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=libxfcegui4 pkgver=4.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Various gtk widgets for Xfce" arch=(i686 x86_64 'mips64el') license=('GPL2') url="http://www.xfce.org/" -groups=('xfce4') depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') diff --git a/extra/lsdvd/PKGBUILD b/extra/lsdvd/PKGBUILD index 7fd464fb3..fbda54607 100644 --- a/extra/lsdvd/PKGBUILD +++ b/extra/lsdvd/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 39761 2009-05-21 11:31:55Z jgc $ +# $Id: PKGBUILD 124465 2011-05-22 11:21:47Z andrea $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=lsdvd pkgver=0.16 -pkgrel=4 -pkgdesc="lsdvd is a C application for reading the contents of a DVD and printing the contents to your terminal" -arch=(i686 x86_64 'mips64el') -url="http://untrepid.com/acidrip/lsdvd.html" -depends=('libdvdread>=4.1.3') +pkgrel=5 +pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/lsdvd/" +depends=('libdvdread') license=('GPL2') #Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches -source=(http://downloads.sourceforge.net/lsdvd/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz stdint_usage.patch) -md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' '6cbcbfde873f894bd3c784f65141b2fc') +md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' + '6cbcbfde873f894bd3c784f65141b2fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/stdint_usage.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/stdint_usage.patch" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 95fe0d747..d89319bd6 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112021 2011-03-03 08:05:12Z eric $ +# $Id: PKGBUILD 124982 2011-05-25 15:39:01Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=1.6.9 -pkgrel=2 +pkgver=1.6.10 +pkgrel=1 pkgdesc="An advanced open-source document processor." arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" @@ -12,14 +12,15 @@ depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus' makedepends=('boost') license=('GPL') source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \ - lyx.desktop) -sha1sums=('a1acacc8a26546542e32977ae222e811c98b1ca4' + lyx.desktop) +sha1sums=('344e14897ea7d004bf181eac39355f1b08f0af83' 'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844') build() { cd "${srcdir}/${pkgname}-${pkgver}" find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp + export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr \ --with-frontend=qt4 --without-included-boost make diff --git a/extra/mc/PKGBUILD b/extra/mc/PKGBUILD deleted file mode 100644 index 14a7edd76..000000000 --- a/extra/mc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 119545 2011-04-12 03:04:01Z eric $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=mc -pkgver=4.7.5.2 -pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.ibiblio.org/mc/" -license=('GPL') -depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') -makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives') -provides=('mcedit-pkgbuild-syntax') -conflicts=('mc-utf8') -replaces=('mc-utf8') -options=('!emptydirs' '!makeflags') -source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bdae966244496cd4f6d282d80c9cf3c6') -sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-background --enable-charset --enable-largefile \ - --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ - --with-screen=slang --with-subshell --with-vfs --with-x \ - --without-debug --without-gnome --without-included-gettext \ - --libexecdir=/usr/lib - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - - # Fix FS#18312 - rm "${pkgdir}/usr/lib/mc/extfs.d/u7z" - - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" -} diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index d96117ea1..3b347e45e 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122421 2011-05-04 06:44:02Z andyrtr $ +# $Id: PKGBUILD 124201 2011-05-17 17:28:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori #_gitdate=20090306 -pkgver=0.3.5 #_git${_gitdate} +pkgver=0.3.6 #_git${_gitdate} pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2 #midori-${_gitdate}.tar.bz2 ) -md5sums=('f92f0f11276d63150fd321dc08d575fb') +md5sums=('c4cb0686601b1c470c317de3d3f8e8fd') # source PKGBUILD && mksource mksource() { diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 19b9c8249..5b83cd885 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 120268 2011-04-21 21:31:35Z giovanni $ +# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=mkvtoolnix -pkgver=4.7.0 -pkgrel=1 +pkgver=4.8.0 +pkgrel=2 pkgdesc="Set of tools to create, edit and inspect Matroska files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -depends=('libmatroska' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2' 'xdg-utils') -makedepends=('wxgtk' 'boost' 'ruby') -optdepends=('wxgtk: mkvmerge,mkvinfo and mmg GUI') +depends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils') +makedepends=('boost' 'ruby') install=mkvtoolnix.install source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('68200debce9570fc14d934a3d6a750b5') +md5sums=('47a730706f3da2bcf4ba62bba3a8f260') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index cbe919280..2df733cc2 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,11 +1,9 @@ -# $Id: PKGBUILD 107458 2011-01-25 20:51:09Z remy $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@gmx.net> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.4.4 -pkgrel=3 +pkgrel=4 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64' 'mips64el') url="http://moc.daper.net/" @@ -18,27 +16,32 @@ optdepends=('speex: for using the speex plugin' 'libmpcdec: for using the musepack plugin' 'wavpack: for using the wavpack plugin' 'libmodplug: for using the modplug plugin') -options=('!libtool' 'force') -source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2) -md5sums=('647c770a5542a4ae5437386807a89796') -sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db') +options=('!libtool') +source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \ + gcc-undefined-symbols.diff curl-streams.diff) +md5sums=('647c770a5542a4ae5437386807a89796' + 'efacb8559e9145e15b0c25f8fa2a9d79' + 'bb9be1e80762851c57075c99a612af2f') +sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db' + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'a58ca952d7f3b0ede19b95c53da96c090d0a94c4') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c - sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c - # Disabling aac to use the external ffmpeg to play them (FS#13164) - ./configure --prefix=/usr --without-rcc --without-aac \ - --with-oss --with-alsa --with-jack --with-mp3 \ - --with-musepack --with-vorbis --with-flac --with-wavpack \ - --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl - make + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../gcc-undefined-symbols.diff + patch -p1 -i ../curl-streams.diff + sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c + sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c +# Disabling aac to use the external ffmpeg to play them (FS#13164) + ./configure --prefix=/usr --without-rcc --without-aac \ + --with-oss --with-alsa --with-jack --with-mp3 \ + --with-musepack --with-vorbis --with-flac --with-wavpack \ + --with-sndfile --with-modplug --with-ffmpeg --with-speex \ + --with-samplerate --with-curl + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff new file mode 100644 index 000000000..2dbc38d54 --- /dev/null +++ b/extra/moc/curl-streams.diff @@ -0,0 +1,28 @@ +diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c +--- a/io_curl.c 2007-07-08 08:54:45.000000000 +0200 ++++ b/io_curl.c 2011-05-18 09:09:40.000000000 +0200 +@@ -338,6 +338,8 @@ + fd_set read_fds, write_fds, exc_fds; + int max_fd; + int ret; ++ long milliseconds; ++ struct timeval timeout; + + logit ("Doing select()..."); + +@@ -356,8 +358,14 @@ + if (s->curl.wake_up_pipe[0] > max_fd) + max_fd = s->curl.wake_up_pipe[0]; + ++ curl_multi_timeout(s->curl.multi_handle, &milliseconds); ++ if(milliseconds <= 0) ++ milliseconds = 1000; /* just a cautionary default */ ++ timeout.tv_sec = milliseconds / 1000; ++ timeout.tv_usec = (milliseconds % 1000) * 1000; ++ + ret = select (max_fd + 1, &read_fds, &write_fds, +- &exc_fds, NULL); ++ &exc_fds, &timeout); + + if (ret < 0 && errno == EINTR) { + logit ("Interrupted"); diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff new file mode 100644 index 000000000..09e9b8bda --- /dev/null +++ b/extra/moc/gcc-undefined-symbols.diff @@ -0,0 +1,12 @@ +--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 ++++ decoder.c 2011-05-10 21:40:48.887941968 +0200 +@@ -259,6 +259,9 @@ + for (i = 0; i < plugins_num; i++) + if (plugins[i].decoder->destroy) + plugins[i].decoder->destroy (); ++ for (i = 0; i < plugins_num; i++) ++ if (plugins[i].handle) ++ lt_dlclose(plugins[i].handle); + + if (lt_dlexit()) + logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/extra/monotone/PKGBUILD b/extra/monotone/PKGBUILD deleted file mode 100644 index 8f5c29287..000000000 --- a/extra/monotone/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 119532 2011-04-11 21:19:22Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor: Dan McGee <dpmcgee@gmail.com> -pkgname=monotone -pkgver=1.0 -pkgrel=1 -pkgdesc="A modern distributed version control system, like hg, darcs, or git" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.monotone.ca" -license=('GPL') -depends=('botan' 'pcre' 'lua' 'sqlite3' 'libidn' 'zlib') -makedepends=('boost') -install=${pkgname}.install -source=(http://www.monotone.ca/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6a0b5d8560f08d76a950172f9ed0feff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - MAKEFLAGS="-j1" make DESTDIR="${pkgdir}" install - install -Dm644 contrib/monotone.zsh_completion \ - "${pkgdir}/usr/share/zsh/site-functions/monotone" -} diff --git a/extra/monotone/monotone.install b/extra/monotone/monotone.install deleted file mode 100644 index 49a8651c0..000000000 --- a/extra/monotone/monotone.install +++ /dev/null @@ -1,29 +0,0 @@ -infodir=usr/share/info -filelist=(monotone.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 - -# arg 1: the new package version -# arg 2: the old package version - if [ "$(vercmp $2 0.45)" -lt 0 ]; then - echo ">>> Your monotone databases will need updating for an internal format" - echo ">>> change. Please run the following command on each of your databases" - echo ">>> (after remembering to take a backup copy):" - echo ">>> $ mtn -d dbname.mtn db migrate" - fi -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD index 93558817f..aa356da64 100644 --- a/extra/multitail/PKGBUILD +++ b/extra/multitail/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 79574 2010-05-04 15:01:54Z kevin $ +# $Id: PKGBUILD 125613 2011-05-27 00:13:31Z kevin $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Roberto Carvajal <roberto@archlinux.org> pkgname=multitail -pkgver=5.2.6 +pkgver=5.2.8 pkgrel=1 -pkgdesc="MultiTail lets you view one or multiple files like the original tail program" -arch=(i686 x86_64 'mips64el') +pkgdesc="Lets you view one or multiple files like the original tail program" +arch=(i686 x86_64) license=('GPL') url="http://www.vanheusden.com/multitail" depends=('ncurses') backup=(etc/multitail.conf) source=(${url}/${pkgname}-${pkgver}.tgz) -md5sums=('6496b3d78660ff8d11c743a0d03cca34') +md5sums=('aaa3691b0ea66ef02ffefd628c7dee8b') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - /usr/bin/make || return 1 - /bin/install -D -m 755 multitail ${startdir}/pkg/usr/bin/multitail - /bin/install -D -m 644 multitail.1 ${startdir}/pkg/usr/share/man/man1/multitail.1 - /bin/install -D -m 644 multitail.conf ${startdir}/pkg/etc/multitail.conf + cd ${srcdir}/${pkgname}-${pkgver} + /usr/bin/make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + /bin/install -D -m 755 multitail ${pkgdir}/usr/bin/multitail + /bin/install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1 + /bin/install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 0f40309d1..7f1a0f89a 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $ +# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="A window manager for GNOME3" arch=(i686 x86_64) license=('GPL') depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') -makedepends=('intltool' 'gtk-doc') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - squash_some_leaks.patch) -sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708' - 'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/squash_some_leaks.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 94cdc6efa..7ba50f3f1 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122706 2011-05-06 06:57:16Z ibiru $ +# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.0.1.1 -pkgrel=3 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME shell and file manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,8 +14,8 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nbsmtp/PKGBUILD b/extra/nbsmtp/PKGBUILD deleted file mode 100644 index d10254ed7..000000000 --- a/extra/nbsmtp/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 75557 2010-04-01 20:23:24Z giovanni $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=nbsmtp -pkgver=1.00 -pkgrel=3 -pkgdesc="No-Brainer SMTP client suitable to run in chroot jails, embeded systems, laptops, and workstations" -arch=(i686 x86_64 'mips64el') -url="http://nbsmtp.ferdyx.org/" -license=('GPL') -depends=('openssl') -source=(http://www.it.uc3m.es/~ferdy/nbsmtp/$pkgname-$pkgver.tar.bz2 build.patch) -md5sums=('0c6a200027a6f7f61f44b374261aa52f' '043236152fecb550d80ab3cd84711cd3') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 -i ../build.patch || return 1 - ./configure --prefix=/usr --enable-ssl || return 1 - make || return 1 - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install || return 1 -} diff --git a/extra/nbsmtp/build.patch b/extra/nbsmtp/build.patch deleted file mode 100644 index 325b16308..000000000 --- a/extra/nbsmtp/build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- hmac_md5.c~ 2005-07-28 19:29:07.000000000 +0200 -+++ hmac_md5.c 2006-06-04 15:49:09.000000000 +0200 -@@ -4,10 +4,11 @@ - * - * Code taken from RFC2104. - */ -- -+#include <stdlib.h> - #include <openssl/md5.h> - #include <string.h> - -+ - #include "hmac_md5.h" - - /** diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD index b43b0526d..bcfd1aa15 100644 --- a/extra/neon/PKGBUILD +++ b/extra/neon/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $ +# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $ +# Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# KEEP LIBTOOL FILES! pkgname=neon -pkgver=0.29.3 -pkgrel=3 +pkgver=0.29.6 +pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') depends=('krb5' 'expat' 'ca-certificates') url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba1015b59c112d44d7797b62fe7bee51') -options=('libtool') +source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('591e0c82e6979e7e615211b386b8f6bc') +options=('libtool') # FS#16067 build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr \ - --with-expat --enable-shared --disable-static \ - --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + --with-expat \ + --enable-shared \ + --disable-static \ + --with-ssl=openssl \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index 90812bd04..839a9a9d1 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 63937 2010-01-19 04:44:36Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> +# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64' 'mips64el') url="http://neverball.org/" license=('GPL') -depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg>=7' 'libvorbis' 'physfs') +depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') makedepends=('mesa') source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz) md5sums=('c523b0f72c2035831310e821162f7bd7') @@ -17,36 +16,31 @@ sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1 + sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h if [ "${CARCH}" = "i686" ] ;then - make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" || return 1 + make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" else - make ENABLE_NLS=1 DATADIR=/usr/share/neverball || return 1 + make ENABLE_NLS=1 DATADIR=/usr/share/neverball fi +} - install -D -m755 neverball "${pkgdir}/usr/bin/neverball" || return 1 - install -D -m755 neverputt "${pkgdir}/usr/bin/neverputt" || return 1 - install -D -m755 mapc "${pkgdir}/usr/bin/mapc" || return 1 - - install -d "${pkgdir}/usr/share/neverball" - cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1 +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball} + install -d "${pkgdir}"/usr/share/man/man{1,6} + + install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" + cp -r locale/* "${pkgdir}/usr/share/locale/" + cp -r data/* "${pkgdir}/usr/share/neverball/" + install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" + install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" + install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" + install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" + install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" + + ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" + ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \; - - install -d "${pkgdir}/usr/share/locale" - cp -r locale/* "${pkgdir}/usr/share/locale/" || return 1 - - install -d "${pkgdir}/usr/share/applications" - install -d "${pkgdir}/usr/share/pixmaps" - install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" || return 1 - install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" || return 1 - ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" || return 1 - ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" || return 1 - - install -d "${pkgdir}/usr/share/doc/neverball" - install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" || return 1 - - install -D -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1/mapc.1" || return 1 - install -D -m644 dist/neverball.6 "${pkgdir}/usr/share/man/man6/neverball.6" || return 1 - install -D -m644 dist/neverputt.6 "${pkgdir}/usr/share/man/man6/neverputt.6" || return 1 } diff --git a/extra/nickle/PKGBUILD b/extra/nickle/PKGBUILD deleted file mode 100644 index e31d0f4bc..000000000 --- a/extra/nickle/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -#$Id: $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nickle -pkgver=2.70 -pkgrel=1 -pkgdesc="A programming language based prototyping environment with powerful programming and scripting capabilities" -arch=('i686' 'x86_64' 'mips64el') -url="http://nickle.org" -license=('custom') -depends=('readline') -source=(http://nickle.org/release/${pkgname}-${pkgver}.tar.gz) -md5sums=('fbb77ad1c6f80a9a67ae28a2a678ed67') - -build() { - cd "${srcdir}/${pkgname}-${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/extra/nppangband/Makefile.std b/extra/nppangband/Makefile.std deleted file mode 100755 index 5bebf01fa..000000000 --- a/extra/nppangband/Makefile.std +++ /dev/null @@ -1,375 +0,0 @@ -# File: Makefile.std
-
-# This is not a very "nice" Makefile, but it usually works.
-
-#
-# Note that you may have to make modifications below according
-# to your machine, available libraries, compilation options,
-# and your "visual module" of choice. This Makefile is intended
-# for use with Unix machines running X11, gtk, (n)curses, termcap,
-# or VT100, Slang, Linux VCS or SVGA library,
-# or possibly for "Atari" or "Amiga" computers with "Curses" ports,
-# see below for more information.
-#
-# Note that "main-mac.c", the visual module for the Macintosh,
-# must be compiled in a special way, see elsewhere.
-#
-# Note that "main-win.c", the visual module for Windows,
-# must be compiled in a special way, see elsewhere.
-#
-# Note that "main-ibm.c", "main-dos.c", and "main-emx.c",
-# the visual modules for various types of IBM-PC computers,
-# must be compiled with special Makefiles, see elsewhere.
-#
-# Note that "main-ros.c", the visual module for RISC OS,
-# must be compiled with "Makefile.ros", see elsewhere.
-#
-# Note that "main-ami.c", the visual module for the Amiga,
-# must be compiled with "Makefile.ami", see elsewhere.
-#
-# If you are able to construct "main-xxx.c" and/or "Makefile.xxx"
-# files for a currently unsupported system, please send them to
-# Robert Ruehlmann < rr9@thangorodrim.net > for inclusion in future
-# versions.
-#
-# This Makefile comes with "default" dependencies that may be obsolete.
-#
-
-
-#
-# The "source" and "object" files.
-#
-
-SRCS = \
- z-util.c z-virt.c z-form.c z-rand.c z-term.c \
- variable.c tables.c util.c cave.c \
- object1.c object2.c monster1.c monster2.c \
- xtra1.c xtra2.c spells1.c spells2.c \
- melee1.c melee2.c save.c effects.c feature.c files.c \
- cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c \
- store.c birth.c load.c quest.c squelch.c \
- wizard1.c wizard2.c obj-info.c \
- generate.c dungeon.c init1.c init2.c randart.c \
- main-cap.c main-gcu.c main-x11.c main-xaw.c main.c \
- main-gtk.c main-lsl.c main-sla.c main-vcs.c main-xpj.c main-lfb.c \
- maid-x11.c \
- use-obj.c
-
-OBJS = \
- z-util.o z-virt.o z-form.o z-rand.o z-term.o \
- variable.o tables.o util.o cave.o \
- object1.o object2.o monster1.o monster2.o \
- xtra1.o xtra2.o spells1.o spells2.o \
- melee1.o melee2.o save.o effects.o feature.o files.o \
- cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o \
- store.o birth.o load.o quest.o squelch.o \
- wizard1.o wizard2.o obj-info.o \
- generate.o dungeon.o init1.o init2.o randart.o \
- main-cap.o main-gcu.o main-x11.o main-xaw.o main.o \
- main-gtk.o main-lsl.o main-sla.o main-vcs.o main-xpj.o main-lfb.o \
- maid-x11.o \
- use-obj.o
-
-
-
-##
-## Following are some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like. For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## With X11, XAW or GTK, you can add -D"USE_XPJ" to CFLAGS to get the
-## 3d-projection module "xpj".
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-#
-# This is my compiler of choice, it seems to work most everywhere.
-#
-CC = gcc
-
-
-#
-# Standard version (see main-x11.c and main-gcu.c)
-#
-# This version supports both "X11" and "curses" in a single executable.
-#
-# You may have to add various X11 include/library directories to the
-# "CFLAGS", if your machine places files in a weird location.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "CFLAGS".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET". Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
-#LIBS = -lX11 -lcurses -ltermcap
-
-
-##
-## Variation -- Only support "main-x11.c" (not "main-gcu.c")
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11"
-#LIBS = -lX11
-
-
-##
-## Variation -- Only support "main-gcu.c" (not "main-x11.c")
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_GCU"
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-xaw.c" instead of "main-x11.c"
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_XAW" -D"USE_GCU"
-#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-gtk.c" instead of "main-x11.c"
-## Note: gtk-config adds GTK and X11 includes and libraries as appropriate.
-##
-#CFLAGS = -Wall -O `gtk-config --cflags` -g -D"USE_GTK" -D"USE_GCU"
-#LIBS = `gtk-config --libs` -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-cap.c" instead of "main-gcu.c"
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_CAP"
-#LIBS = -lX11 -ltermcap
-
-
-##
-## Variation -- Only work on simple vt100 terminals
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_CAP" -D"USE_HARDCODE"
-
-
-##
-## Variation -- compile for Linux
-##
-## Allows the use of Angband in the console using ncurses,
-## as well as under X11.
-##
-#CFLAGS = -I/usr/X11R6/include -I/usr/include/ncurses -Wall \
- # -O2 -fno-strength-reduce -D"HAVE_MKSTEMP" \
- # -D"USE_X11" -D"USE_GCU" -D"USE_NCURSES" -g
-#LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses
-
-
-##
-## Variation -- compile for Linux
-##
-## Allows the use of Angband in the console using curses.
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -pipe -D"USE_GCU"
-#LIBS = -lcurses
-
-
-##
-## Variation -- compile for Linux
-##
-## Allows the use of Angband in X11 using the Athena Widget set.
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -pipe -g -D"USE_XAW"
-#LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11
-
-
-##
-## Variation -- this might work better than the suggestion above
-##
-CFLAGS = -I/usr/include/ncurses \
- -Wall -O2 -fno-strength-reduce -fomit-frame-pointer \
- -D"USE_X11" -D"USE_GCU" \
- -D"USE_TPOSIX" -D"USE_CURS_SET"
-LIBS = -lX11 -lncurses
-LDFLAGS = -s
-
-
-##
-## Variation -- compile for Solaris
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU" -D"SOLARIS"
-#LIBS = -lX11 -lsocket -lcurses
-
-
-##
-## Variation -- compile for SGI Indigo runnig Irix
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU" -D"SGI"
-#LIBS = -lX11 -lcurses -ltermcap -lsun
-
-
-##
-## Variation -- compile for Dec ALPHA OSF/1 v2.0
-##
-#CC = cc
-##CFLAGS = -std -O -g3 -Olimit 4000 -D"USE_X11" -D"USE_GCU"
-#CFLAGS = -std -g -D"USE_X11" -D"USE_GCU"
-#LIBS = -lX11 -lcurses -ltermcap -lrpcsvc
-
-
-##
-## Variation -- compile for Interactive Unix (ISC) systems
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU" -D"ISC"
-#LIBS = -lX11 -lcurses -lnsl_s -linet -lcposix
-
-
-##
-## Variation -- Support fat binaries under NEXTSTEP
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_GCU" -arch m68k -arch i386
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Support Linux + SVGA library
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -D"USE_LSL"
-#LIBS = -lz -lvgagl -lvga
-
-
-##
-## Variation -- Support Linux "vcs" (Virtual Console memory) module
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -D"USE_VCS"
-#LIBS =
-
-
-##
-## Variation -- Support S-Lang library
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -D"USE_SLA" -I/usr/include/slang
-#LIBS = -lslang
-
-
-#
-# Default target.
-#
-all: nppangband
-
-
-#
-# Install the game.
-#
-
-install: nppangband
- cp nppangband ..
-
-
-#
-# Build the "NPPAngband" program
-#
-
-nppangband: $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o nppangband $(OBJS) $(LIBS)
-
-
-#
-# Clean up old junk
-#
-
-clean:
- -rm -f *.o nppangband
-
-#
-# Generate dependencies automatically
-#
-
-depend:
- makedepend -D__MAKEDEPEND__ $(SRCS)
-
-
-#
-# Hack -- some file dependencies
-#
-
-HDRS = \
- h-basic.h \
- h-define.h h-type.h h-system.h h-config.h
-
-INCS = \
- angband.h \
- config.h defines.h types.h externs.h \
- z-term.h z-rand.h z-util.h z-virt.h z-form.h $(HDRS)
-
-
-birth.o: birth.c $(INCS)
-cave.o: cave.c $(INCS)
-cmd1.o: cmd1.c $(INCS)
-cmd2.o: cmd2.c $(INCS)
-cmd3.o: cmd3.c $(INCS)
-cmd4.o: cmd4.c $(INCS)
-cmd5.o: cmd5.c $(INCS)
-cmd6.o: cmd6.c $(INCS)
-dungeon.o: dungeon.c $(INCS)
-effects.o: effects.c $(INCS)
-feature.o: feature.c $(INCS)
-files.o: files.c $(INCS)
-generate.o: generate.c $(INCS)
-init1.o: init1.c $(INCS) init.h
-init2.o: init2.c $(INCS) init.h
-load.o: load.c $(INCS) init.h
-maid-x11.o: maid-x11.c $(INCS) maid-x11.h
-main-cap.o: main-cap.c $(INCS) main.h
-main-gcu.o: main-gcu.c $(INCS) main.h
-main-gtk.o: main-gtk.c $(INCS) main.h maid-x11.h
-main-lsl.o: main-lsl.c $(INCS) main.h
-main-sla.o: main-sla.c $(INCS) main.h
-main-vcs.o: main-vcs.c $(INCS) main.h
-main-x11.o: main-x11.c $(INCS) main.h maid-x11.h
-main-xaw.o: main-xaw.c $(INCS) main.h maid-x11.h
-main-xpj.o: main-xpj.c $(INCS) main.h maid-x11.h
-main-lfb.o: main-lfb.c $(INCS) main.h
-main.o: main.c $(INCS) main.h
-melee1.o: melee1.c $(INCS)
-melee2.o: melee2.c $(INCS)
-monster1.o: monster1.c $(INCS)
-monster2.o: monster2.c $(INCS)
-obj-info.o: obj-info.c $(INCS)
-object1.o: object1.c $(INCS)
-object2.o: object2.c $(INCS)
-quest.o: quest.c $(INCS)
-randart.o: randart.c $(INCS) init.h
-save.o: save.c $(INCS)
-spells1.o: spells1.c $(INCS)
-spells2.o: spells2.c $(INCS)
-squelch.o: squelch.c $(INCS)
-store.o: store.c $(INCS)
-tables.o: tables.c $(INCS)
-use-obj.o: use-obj.c $(INCS)
-util.o: util.c $(INCS)
-variable.o: variable.c $(INCS)
-wizard1.o: wizard1.c $(INCS)
-wizard2.o: wizard2.c $(INCS)
-xtra1.o: xtra1.c $(INCS)
-xtra2.o: xtra2.c $(INCS)
-z-form.o: z-form.c $(HDRS) z-form.h z-util.h z-virt.h
-z-rand.o: z-rand.c $(HDRS) z-rand.h
-z-term.o: z-term.c $(HDRS) z-term.h z-virt.h
-z-util.o: z-util.c $(HDRS) z-util.h
-z-virt.o: z-virt.c $(HDRS) z-virt.h z-util.h
-
diff --git a/extra/nppangband/PKGBUILD b/extra/nppangband/PKGBUILD deleted file mode 100644 index 177b0fa53..000000000 --- a/extra/nppangband/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 58001 2009-11-03 08:18:40Z giovanni $ -# Maintainer: James Rayner <iphitus@gmail.com> - -pkgname=nppangband -pkgver=0.5.0.25 -pkgrel=1.1 -pkgdesc="A variant of Angband that attempts to take popular ideas from other variants" -url="http://www.assembla.com/wiki/show/NPPAngband" -depends=('ncurses' 'libx11') -makedepends=('libxaw' 'xorg-font-utils') -source=(http://www.assembla.com/spaces/NPPAngband/documents/dmfeFgWJir3PuseJe5afGb/download/npp050-rev25-src.zip) -license=('custom') -arch=('i686' 'x86_64' 'mips64el') - -build() { - - cd $srcdir/npp050-rev25-src/src - sed 's@# define DEFAULT_PATH "./lib/"@# define DEFAULT_PATH "/usr/share/nppangband/"@' -i config.h - sed -i 's/-D"USE_LFB"//g' Makefile.std # Remove framebuffer support, does not compile, - make -f Makefile.std - - - # Fix fonts - cd ../lib/xtra/font/ - tr -d '\r' < compile_bdf_fonts.sh > compile_bdf_fonts2.sh # Convert line endings dos->unix - sed -i "s/\.bdf/\.bdf;/g" compile_bdf_fonts2.sh # fix syntax error, missing ;. - bash compile_bdf_fonts2.sh # no shebang, use bash explicitly - - # Install - cd $srcdir/npp050-rev25-src/ - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share - cp -R lib $pkgdir/usr/share/nppangband/ - chmod -R 775 $pkgdir/usr/share/nppangband/ - chown -R root:games $pkgdir/usr/share/nppangband/ - install -m755 src/nppangband $pkgdir/usr/bin/nppangband - - # install custom license - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} - -md5sums=('776d387ccbca31edf7eb30eb1402b0c9') diff --git a/extra/nss-mdns/PKGBUILD b/extra/nss-mdns/PKGBUILD index bfb2f6eeb..fb75b698e 100644 --- a/extra/nss-mdns/PKGBUILD +++ b/extra/nss-mdns/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 56016 2009-10-17 23:24:29Z giovanni $ +# $Id: PKGBUILD 124100 2011-05-16 15:17:50Z andrea $ +# Maintainer: # Contributor: Travis Willard <travis@archlinux.org> pkgname=nss-mdns pkgver=0.10 -pkgrel=2 +pkgrel=3 pkgdesc="glibc plugin providing host name resolution via mDNS" arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/nss-mdns/" -license=('lgpl') +license=('LGPL') depends=('glibc') makedepends=('pkgconfig') backup=('etc/mdns.allow') install=nss-mdns.install -source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz - mdns.allow) +source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'mdns.allow') md5sums=('03938f17646efbb50aa70ba5f99f51d7' '904abb492fb1f56722826c0c3a997bf0') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/ \ --disable-lynx \ --enable-avahi - make || return 1 - make DESTDIR=${pkgdir} install - mkdir -p ${startdir}/pkg/etc - install -m644 ../mdns.allow ${startdir}/pkg/etc/mdns.allow + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}"/mdns.allow "${pkgdir}"/etc/mdns.allow } diff --git a/extra/nss-mdns/nss-mdns.install b/extra/nss-mdns/nss-mdns.install index ed0fd0c24..85e4d269a 100644 --- a/extra/nss-mdns/nss-mdns.install +++ b/extra/nss-mdns/nss-mdns.install @@ -18,7 +18,3 @@ EOM post_install } - -op=$1 -shift -$op $* diff --git a/extra/numlockx/PKGBUILD b/extra/numlockx/PKGBUILD deleted file mode 100644 index 31dbbb430..000000000 --- a/extra/numlockx/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 75639 2010-04-02 01:32:53Z dgriffiths $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=numlockx -pkgver=1.2 -pkgrel=1 -pkgdesc="Turns on the numlock key in X11" -arch=('i686' 'x86_64' 'mips64el') -license=('MIT') -url="http://ktown.kde.org/~seli/numlockx/" -depends=('libxtst') -source=(http://ktown.kde.org/~seli/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('be9109370447eae23f6f3f8527bb1a67') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr x_includes=/usr/include/X11 \ - x_libraries=/usr/lib || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make prefix=${pkgdir}/usr install || return 1 - - # Install the custom MIT license - install -D LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 -} diff --git a/extra/oxygen-icons/PKGBUILD b/extra/oxygen-icons/PKGBUILD deleted file mode 100644 index 1440c6446..000000000 --- a/extra/oxygen-icons/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 121091 2011-04-29 00:27:25Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=oxygen-icons -pkgname=('oxygen-icons' - 'oxygen-icons-svg') -pkgver=4.6.3 -pkgrel=1 -pkgdesc="The Oxygen Icon Theme" -arch=('any') -url='http://www.oxygen-icons.org/' -license=('LGPL') -makedepends=('pkgconfig' 'cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9efaf92d516f716f3d36ff0e21c66384500e967d') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_oxygen-icons() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} - -package_oxygen-icons-svg() { - pkgdesc="The Oxygen Icon Theme (Scalable Vector Graphics)" - cd $srcdir/${pkgbase}-${pkgver} - find scalable -type f ! -name '*.sh' -exec \ - install -D -m644 "{}" "${pkgdir}/usr/share/icons/oxygen/{}" \; -} diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index e22ade6ce..f64ee4525 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82289 2010-06-10 01:52:54Z andrea $ +# $Id: PKGBUILD 124503 2011-05-22 16:56:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') options=('!libtool') install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30ceb6df7e8681891e865e2fe5a7903d') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('b6cc55fd6e04b37b1745bc2e10d1a888') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,11 +21,11 @@ build() { ./configure --prefix=/usr \ --disable-debug \ --disable-rpath \ - --disable-Werror || return 1 - make || return 1 + --disable-Werror + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/partitionmanager/PKGBUILD b/extra/partitionmanager/PKGBUILD index a37d30f06..061d656eb 100644 --- a/extra/partitionmanager/PKGBUILD +++ b/extra/partitionmanager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89515 2010-09-01 13:48:17Z tpowa $ +# $Id: PKGBUILD 124524 2011-05-22 18:37:51Z giovanni $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=partitionmanager pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A KDE 4 utility that allows you to manage disks, partitions, and file systems." arch=('i686' 'x86_64' 'mips64el') url="https://sourceforge.net/projects/partitionman/" diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index 70d8a705e..a878b42b5 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $ +# $Id: PKGBUILD 123989 2011-05-15 16:00:20Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.8 +pkgver=3.1.9 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license="PHP" source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('bb1147933a61aa70ceffe53cc6f2920f') +md5sums=('a2cf7fbf6f3a87f190d897a53260ddaa') build() { cd $srcdir/APC-$pkgver diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 814b4a97f..05883a1d8 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $ +# $Id: PKGBUILD 124929 2011-05-25 09:33:46Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,8 +7,8 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.7.11 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=5 +arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' @@ -16,12 +16,22 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + nm09-pidgin.patch + nm09-more.patch) +md5sums=('07c2a2535b4d7436b5ec7685fe063fec' + '744a21b4dbaf949dba7cd3b75b12b4fe' + 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" + # Update for NetworkManager 0.9 connection states + # (http://developer.pidgin.im/ticket/13505) + # (http://developer.pidgin.im/ticket/13859) + patch -Np1 -i "$srcdir/nm09-pidgin.patch" + patch -Np1 -i "$srcdir/nm09-more.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -51,7 +61,7 @@ package_pidgin(){ install=pidgin.install cd "$srcdir/pidgin-$pkgver" - + # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES @@ -72,7 +82,7 @@ package_libpurple(){ 'cyrus-sasl-plugins') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') - + cd "$srcdir/pidgin-$pkgver" for _dir in libpurple share/sounds share/ca-certs m4macros po; do @@ -100,3 +110,5 @@ package_finch(){ rm "$pkgdir"/usr/share/man/man1/pidgin.1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch new file mode 100644 index 000000000..8c708df9a --- /dev/null +++ b/extra/pidgin/nm09-more.patch @@ -0,0 +1,49 @@ +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 +@@ -833,8 +833,20 @@ purple_network_is_available(void) + purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); + } + +- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) +- return TRUE; ++ switch (nm_state) ++ { ++ case NM_STATE_UNKNOWN: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else ++ case NM_STATE_CONNECTED: ++#endif ++ return TRUE; ++ default: ++ break; ++ } + + return FALSE; + +@@ -1170,9 +1182,14 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); ++ /* NM 0.6 signal */ + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", + G_CALLBACK(nm_state_change_cb), NULL, NULL); ++ /* NM 0.7 and later signal */ ++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", ++ G_CALLBACK(nm_state_change_cb), NULL, NULL); + + dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, + DBUS_SERVICE_DBUS, +@@ -1207,6 +1224,7 @@ purple_network_uninit(void) + #ifdef HAVE_NETWORKMANAGER + if (nm_proxy) { + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); ++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); + g_object_unref(G_OBJECT(nm_proxy)); + } + if (dbus_proxy) { diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch new file mode 100644 index 000000000..1c2471d1f --- /dev/null +++ b/extra/pidgin/nm09-pidgin.patch @@ -0,0 +1,38 @@ +diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c +--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 ++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 +@@ -71,6 +71,10 @@ + #include <dbus/dbus-glib.h> + #include <NetworkManager.h> + ++#if !defined(NM_CHECK_VERSION) ++#define NM_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static DBusGConnection *nm_conn = NULL; + static DBusGProxy *nm_proxy = NULL; + static DBusGProxy *dbus_proxy = NULL; +@@ -863,7 +867,13 @@ nm_update_state(NMState state) + + switch(state) + { ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else + case NM_STATE_CONNECTED: ++#endif + /* Call res_init in case DNS servers have changed */ + res_init(); + /* update STUN IP in case we it changed (theoretically we could +@@ -880,6 +890,9 @@ nm_update_state(NMState state) + case NM_STATE_ASLEEP: + case NM_STATE_CONNECTING: + case NM_STATE_DISCONNECTED: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_DISCONNECTING: ++#endif + if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) + break; + if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index f11499723..51a71fe49 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 117503 2011-04-04 08:59:49Z jgc $ +# $Id: PKGBUILD 124052 2011-05-16 10:27:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib') # 'poppler-qt') -pkgver=0.16.4 +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.16.5 pkgrel=1 arch=(i686 x86_64 'mips64el') license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool') url="http://poppler.freedesktop.org/" -source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz) -md5sums=('2b996ca77dad04b422f67238daab48e7') +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) +md5sums=('2b6e0c26b77a943df3b9bb02d67ca236') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc \ @@ -25,8 +25,6 @@ build() { --disable-poppler-qt4 \ --enable-poppler-glib make - sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile } package_poppler() { @@ -35,6 +33,8 @@ package_poppler() { conflicts=("poppler-qt3<${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^glib_subdir =.*/glib_subdir =/' \ + -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile make DESTDIR="${pkgdir}" install rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 05554e4e5..417ab5c15 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123242 2011-05-09 13:33:46Z bisson $ +# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix pkgver=2.8.3 -pkgrel=1 +pkgrel=3 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p 'rc.d') sha1sums=('2604066f158f5327449960afd6334b996dc01799' '5fc3de6c7df1e5851a0a379e825148868808318b' - '050e6afc5886049682c945ce147b3c47fe113939') + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') provides=('smtp-server' 'smtp-forwarder') replaces=('postfix-mysql' 'postfix-pgsql') @@ -28,23 +28,23 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - make makefiles CCARGS=' \ - -DUSE_SASL_AUTH -I/usr/include/sasl \ - -DUSE_CYRUS_SASL \ + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ -DHAS_LDAP \ -DUSE_TLS \ -DHAS_MYSQL -I/usr/include/mysql \ -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ ' AUXLIBS=' \ - -lsasl2 -lssl -lcrypto \ + -lsasl2 \ -lldap -llber \ + -lssl -lcrypto \ -lmysqlclient -lz -lm \ -lpq \ -lsqlite3 -lpthread \ - ' + ' OPT="${CFLAGS} ${LDFLAGS}" - make OPT="${CFLAGS}" + make } package() { diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d index 94ccc2af0..fa314bb84 100755 --- a/extra/postfix/rc.d +++ b/extra/postfix/rc.d @@ -4,24 +4,23 @@ . /etc/rc.d/functions name=postfix -PID=$(pidof -o %PPID /usr/lib/postfix/master) case "$1" in start) stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \ + /usr/sbin/postfix start &>/dev/null \ && { add_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \ + /usr/sbin/postfix stop &>/dev/null \ && { rm_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; reload) stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + /usr/sbin/postfix reload &>/dev/null \ && { stat_done; } \ || { stat_fail; exit 1; } ;; diff --git a/extra/python-gtkglext/PKGBUILD b/extra/python-gtkglext/PKGBUILD deleted file mode 100644 index c1fcd1410..000000000 --- a/extra/python-gtkglext/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 89694 2010-09-03 10:37:56Z remy $ -# Maintainer: simo <simo@archlinux.org> -pkgname=python-gtkglext -pkgver=1.1.0 -pkgrel=4 -pkgdesc="Python language bindings for GtkGLExt" -arch=(i686 x86_64 'mips64el') -depends=('gtkglext' 'mesa' 'python-opengl' 'pygtk') -makedepends=('libxmu') -url="http://gtkglext.sourceforge.net/" -source=(http://downloads.sourceforge.net/gtkglext/pygtkglext-$pkgver.tar.bz2) -license="LGPL" -md5sums=('720b421d3b8514a40189b285dd91de57') - -build() { - cd $startdir/src/pygtkglext-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - find $startdir/pkg -name '*.la' -exec rm {} \; -} diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 2e56f44e7..ba8c0f601 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110855 2011-02-22 19:17:39Z tpowa $ +# $Id: PKGBUILD 124173 2011-05-17 12:44:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm pkgver=0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') @@ -16,6 +16,7 @@ provides=('qemu') replaces=('kvm') source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) +options=(!strip) build() { @@ -24,7 +25,7 @@ build() ./configure --prefix=/usr \ --sysconfdir=/etc \ --audio-drv-list=alsa,sdl,oss,esd \ - --audio-card-list=ac97,sb16,es1370,adlib \ + --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make } @@ -44,6 +45,13 @@ package() # install udev rules install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done } md5sums=('4ea6f412d85a826e0b0690f5c4c59f13' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index a541ebf6e..f6b1913ea 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 110725 2011-02-21 20:11:19Z tpowa $ +# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=1 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,14 @@ backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) +options=(!strip) build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \ - --audio-card-list=ac97,sb16,es1370,adlib \ + --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs \ --kerneldir="/usr/src/linux-$(uname -r)" make @@ -30,6 +31,14 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + } -md5sums=('f9d145d5c09de9f0984ffe9bd1229970' +md5sums=('b6c713a8db638e173af53a62d5178640' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index e7ed56b07..c41f9caee 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109447 2011-02-09 17:52:06Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=11.02 +pkgver=11.06 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('lilypond: notation display' 'dssi-vst: win32 VST support') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('fca86bfd7351a16cc2b55a85d2c8a128') +md5sums=('77ab43d06de53ace338843ff82e26288') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/rsync/ChangeLog b/extra/rsync/ChangeLog index a1d6b4f9d..d07e4ad5a 100644 --- a/extra/rsync/ChangeLog +++ b/extra/rsync/ChangeLog @@ -1,3 +1,7 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * rsync 3.0.8-2 + * Added call_rsync func to rsyncd to support pass arguments to the daemon + 2010-01-01 Eric Belanger <eric@archlinux.org> * rsync 3.0.7-1 diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 27f09a91d..a43d1440f 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 118437 2011-04-06 20:17:24Z angvp $ +# $Id: PKGBUILD 124256 2011-05-18 05:08:59Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rsync pkgver=3.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64' 'mips64el') url="http://samba.anu.edu.au/rsync/" license=('GPL3') depends=('acl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') +changelog=ChangeLog source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \ rsyncd.conf rsyncd rsync.xinetd) md5sums=('0ee8346ce16bdfe4c88a236e94c752b4' '4395c0591638349b1a7aeaaa4da1f03a' - '3d8f90ac8467ff6af28754584a61fd11' + '7a9ce3b5de97f3aae29b906f93e1d157' 'ea3e9277dc908bc51f9eddc0f6b935c1') sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d' '48be09294134dfed888818872fe552a59c29147a' - '357af5648eb4ecf84cc6b1de1cd79d21eca3a518' + 'eda623c31d9def454cf8e3e88dcf63de4ca5c08b' 'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1') build() { diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd index 573130fb3..d7a772e8e 100644 --- a/extra/rsync/rsyncd +++ b/extra/rsync/rsyncd @@ -3,10 +3,16 @@ . /etc/rc.conf . /etc/rc.d/functions +[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd + +function call_rsyncd() { + /usr/bin/rsync --daemon $RSYNCD_ARGS +} + case "$1" in start) stat_busy "Starting rsyncd" - [ ! -f /var/run/daemons/rsyncd ] && /usr/bin/rsync --daemon + [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog new file mode 100644 index 000000000..6b3a80c20 --- /dev/null +++ b/extra/rxvt-unicode/ChangeLog @@ -0,0 +1,2 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Removed not accepted upstream patch (closes FS#23324) diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD index 07bf9746e..86da1fd45 100644 --- a/extra/rxvt-unicode/PKGBUILD +++ b/extra/rxvt-unicode/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 122865 2011-05-07 00:01:55Z eric $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 124251 2011-05-18 04:52:29Z 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=1 +pkgrel=2 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" arch=('i686' 'x86_64' 'mips64el') 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 popup-menu-hang.diff) + ${pkgname}.desktop) md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37' - '3de6c13126a45bc3bc9f6bba077a1311' - 'aead33ba3b08eeb251fb0c1427a4a024') + '3de6c13126a45bc3bc9f6bba077a1311') sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d' - '962aebc88982dbeb62a7c4a051ff567e015f61a0' - 'ec4013f4af3a45da928b75f40fbf6389070e7fdd') + '962aebc88982dbeb62a7c4a051ff567e015f61a0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../popup-menu-hang.diff ./configure --prefix=/usr \ --with-terminfo=/usr/share/terminfo \ --enable-256-color \ diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 0a650eb85..e9755aada 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,29 +1,40 @@ -# $Id: PKGBUILD 84723 2010-07-03 19:29:41Z ibiru $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.9 -pkgrel=2 -pkgdesc="A Input Method development platform" -arch=("i686" "x86_64" 'mips64el') -url="http://www.scim-im.org/projects/scim" +pkgver=1.4.10 +pkgrel=1 +pkgdesc='Input method user interface and development platform' +url='http://www.scim-im.org/projects/scim' license=('GPL') +arch=('i686' 'x86_64') depends=('gtk2' 'gcc-libs') makedepends=('intltool') backup=('etc/scim/config' 'etc/scim/global') options=('!libtool') -install=scim.install -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz - gcc45.patch) -md5sums=('975ba34b01304ea8166ac8ea27aa9e88' - '9d7b41421424cedcbc5740098afa4921') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz") +sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf') + +install=install build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/gcc45.patch - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-gnu-ld --with-x --disable-static - make - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + + ./bootstrap + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + --with-gnu-ld \ + --with-x \ + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/scim/install b/extra/scim/install new file mode 100644 index 000000000..405061cb4 --- /dev/null +++ b/extra/scim/install @@ -0,0 +1,13 @@ +post_install() { + echo -n 'updating gtk.immodules... ' + /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + echo 'done.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index c235a694d..bbf5c4e21 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120604 2011-04-25 18:04:11Z ibiru $ +# $Id: PKGBUILD 124485 2011-05-22 15:13:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('79efc22f9fe7db3d53a02be8bcf910be25aef0e321a49ec87a3a709f8aaaa912') +sha256sums=('78b38d6e7220d1957af34eac79c21423f1f4be066853126d30cc030d8407a1bf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sharutils/sharutils.install b/extra/sharutils/sharutils.install deleted file mode 100644 index e8d9f8c07..000000000 --- a/extra/sharutils/sharutils.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(sharutils.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index 435321d1b..1d1af26d0 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 87629 2010-08-17 13:33:30Z bisson $ -# Maintainer: +# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat pkgver=1.7.1.3 -pkgrel=1 -pkgdesc='Relay for bidirectional data transfer via socket, pty, pipe, file and more' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') +pkgrel=2 +pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' +license=('GPL2') +arch=('i686' 'x86_64') depends=('readline' 'openssl' 'tcp_wrappers') -makedepends=('imake') source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz") sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make depend || return 1 - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD index 0c582933f..5f2c69b20 100644 --- a/extra/source-highlight/PKGBUILD +++ b/extra/source-highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111993 2011-03-02 22:17:55Z ibiru $ +# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=source-highlight pkgver=3.1.4 -pkgrel=2 +pkgrel=3 pkgdesc="Convert source code to syntax highlighted document" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/src-highlite/" diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 3f8d411f3..577657653 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 117296 2011-03-30 18:17:00Z schiv $ +# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack') +makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' 'libmad: for mp3 plugin' 'libid3tag: for mp3 plugin' - 'wavpack: for wavpack plugin') + 'wavpack: for wavpack plugin' + 'libpulse: for pulse plugin') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee') @@ -22,6 +23,7 @@ sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" make @@ -30,6 +32,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - ln -sf play "${pkgdir}/usr/bin/rec" - ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7" } diff --git a/extra/speedcrunch/PKGBUILD b/extra/speedcrunch/PKGBUILD deleted file mode 100644 index b3f5d875d..000000000 --- a/extra/speedcrunch/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 67114 2010-02-03 16:04:47Z andrea $ -# Maintainer: -# Contributor: Ronald van Haren <ronald.archlinux.org> - -pkgname=speedcrunch -pkgver=0.10.1 -pkgrel=2 -pkgdesc="Simple but powerful calculator using Qt" -url="http://speedcrunch.org/" -arch=('i686' 'x86_64' 'mips64el') -depends=('qt') -makedepends=('cmake') -license=('GPL2') -source=(http://speedcrunch.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('344ee1303b05502d28c58a2fff1ca6b2') - -build() { - cd $srcdir/$pkgname-$pkgver/src - cmake . -DCMAKE_INSTALL_PREFIX=/usr || return 1 - make || return 1 - - # fix make install issue - lrelease speedcrunch.pro - make DESTDIR=$pkgdir install -} diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD index de12bc3a4..4b1dccd98 100644 --- a/extra/startup-notification/PKGBUILD +++ b/extra/startup-notification/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111001 2011-02-23 15:59:58Z jgc $ +# $Id: PKGBUILD 124868 2011-05-24 20:23:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=startup-notification -pkgver=0.10 -pkgrel=2 +pkgver=0.12 +pkgrel=1 pkgdesc="Monitor and display application startup" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,13 +12,15 @@ depends=('libx11' 'xcb-util>=0.3.4') options=('!libtool') url="http://www.freedesktop.org" source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('bca0ed1c74bc4e483ea2ed12a5717354') +md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.in - autoreconf --force --install ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD index 44902b1fc..ebc6f52b3 100644 --- a/extra/telepathy-farsight/PKGBUILD +++ b/extra/telepathy-farsight/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 120813 2011-04-26 16:12:15Z ibiru $ +# $Id: PKGBUILD 124113 2011-05-16 16:15:50Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=telepathy-farsight -pkgver=0.0.17 +pkgver=0.0.18 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" license=('GPL') -depends=('telepathy-glib' 'farsight2' 'gstreamer0.10-base') +depends=('telepathy-glib' 'farsight2') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('f98377802d38333924f6f1a955a2d42a') +md5sums=('984be4153c635ca1b2010de27d74eff4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index cbb00a4c0..024b5df26 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120253 2011-04-21 18:20:55Z ibiru $ +# $Id: PKGBUILD 124130 2011-05-16 17:05:51Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.14.5 +pkgver=0.14.6 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2911d33b45744cdc41774c91f6b837c2') +md5sums=('ab8cf90283ef3382de1d20d87c9d970a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index aff371792..7390c8b74 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120807 2011-04-26 15:59:24Z ibiru $ +# $Id: PKGBUILD 123992 2011-05-15 17:48:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.9 +pkgver=0.1.10 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,15 +13,11 @@ license=('LGPL') depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - python27.patch) -md5sums=('423f2cc0481bdb32facb850eaf586ff2' - '03661efde8f768417e224720e1346d7b') +source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('570a431e3e28ca6ebf3f0c84198f0b9a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/python27.patch" - autoreconf -fi ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy make diff --git a/extra/telepathy-idle/python27.patch b/extra/telepathy-idle/python27.patch deleted file mode 100644 index f8abffb57..000000000 --- a/extra/telepathy-idle/python27.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur telepathy-idle-0.1.7.orig/configure.ac telepathy-idle-0.1.7/configure.ac ---- telepathy-idle-0.1.7.orig/configure.ac 2010-12-07 03:52:29.000000000 -0800 -+++ telepathy-idle-0.1.7/configure.ac 2010-12-07 09:41:21.179715253 -0800 -@@ -103,7 +103,7 @@ - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi - PYTHON= --AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) -+AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python2.7 python]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Python is required to compile this package]) - fi -@@ -111,7 +111,7 @@ - - dnl check for a version of python that can run the twisted tests - AC_MSG_CHECKING([for Python with Twisted and IRC protocol support]) --for TEST_PYTHON in python2.5 python2.6 python; do -+for TEST_PYTHON in python2.5 python2.6 python2.7 python; do - if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then - if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then - AM_CONDITIONAL([WANT_TWISTED_TESTS], true) diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index 0d98fcdec..42f52fb2b 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $ +# $Id: PKGBUILD 124315 2011-05-19 11:49:47Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt4 -pkgver=0.5.16 +pkgver=0.6.0 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('82e36c051c74d323b329f69ac2c5427f') +md5sums=('2acb266af1a3f55f7104830ac8db2090') build() { cd "${srcdir}" diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 4c0943fa1..98cbad621 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116067 2011-03-22 18:11:16Z heftig $ +# $Id: PKGBUILD 125552 2011-05-26 16:51:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=2.32.4 +pkgver=2.32.5 pkgrel=1 url="http://www.hadess.net/totem.php3" pkgdesc="Totem playlist parser library" @@ -12,7 +12,7 @@ depends=('gmime' 'libsoup-gnome') makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.bz2) -sha256sums=('349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6') +sha256sums=('f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d') build() { cd "${srcdir}/totem-pl-parser-${pkgver}" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index ff9fb8a51..75b5f10da 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $ +# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.0.1 -pkgrel=1 +pkgrel=2 url="http://www.hadess.net/totem.php3" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'custom') @@ -27,7 +27,7 @@ build() { package_totem() { pkgdesc="A GNOME3 integrated movie player based on Gstreamer." - depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas') + depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf') groups=('gnome-extra') install=totem.install optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index d01cbc5be..5f8e7da61 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 115693 2011-03-19 13:02:20Z ibiru $ +# $Id: PKGBUILD 124261 2011-05-18 07:05:56Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission -#pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgname=('transmission-cli' 'transmission-gtk' ) -pkgver=2.22 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgname=('transmission-cli' 'transmission-gtk') +pkgver=2.31 +pkgrel=1 +arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('intltool' 'curl' 'libnotify' 'desktop-file-utils' 'libevent' 'libcanberra' 'dbus-glib') +makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'libevent' 'libcanberra' 'dbus-glib') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 transmissiond transmissiond.conf) -md5sums=('6499986bf769276310b00bda1090090d' - '50b7c17300bc8b38f44fb6f681ba05d0' +md5sums=('2785016d74bbecf842cef04883e56400' + '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') - build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -61,6 +59,7 @@ package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" depends=('curl' 'qt' 'libevent') optdepends=('transmission-cli: daemon and web support') + install=transmission-qt.install cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/community-testing/calibre/calibre.install b/extra/transmission/transmission-qt.install index 6210bd0ab..e111ef946 100644 --- a/community-testing/calibre/calibre.install +++ b/extra/transmission/transmission-qt.install @@ -1,6 +1,5 @@ post_install() { update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null } post_upgrade() { diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond index ff83bd331..1b4b4dc0e 100644 --- a/extra/transmission/transmissiond +++ b/extra/transmission/transmissiond @@ -31,7 +31,16 @@ case "$1" in while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done $0 start ;; + reload) + stat_busy "Reloading config" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|reload}" esac exit 0 diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 2ad92d911..28eff256b 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122326 2011-05-03 20:32:37Z ibiru $ +# $Id: PKGBUILD 124509 2011-05-22 17:12:02Z giovanni $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Disk Management Service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index a7e4978d4..6e7f7afe5 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,32 +1,29 @@ -# $Id: PKGBUILD 109572 2011-02-10 20:32:59Z bisson $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 124164 2011-05-17 08:27:15Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc='Multilingual input method library' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/uim/' -license=('custom') +license=('custom:BSD') depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib') makedepends=('intltool' 'gettext' 'gnome-panel') optdepends=('gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" - 'home.patch') -sha1sums=('412bb2df6041185084e2f64fb73357389bf992b5' - 'dbcf90f3ea246c5723d715e0935072baa9364cd2') +source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # UIM's Makefile needs to write in $HOME - patch -p0 < ../home.patch; export HOME="`pwd`" - - ./configure --prefix=/usr --libexecdir=/usr/lib/uim \ - --with-anthy-utf8 + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/uim \ + --with-anthy-utf8 make } diff --git a/extra/uim/home.patch b/extra/uim/home.patch deleted file mode 100644 index 5d171529d..000000000 --- a/extra/uim/home.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aur uim/uim-helper.c uim/uim-helper.c ---- uim/uim-helper.c 2010-08-22 19:23:37.646666698 +0200 -+++ uim/uim-helper.c 2010-08-22 19:26:57.676666781 +0200 -@@ -178,7 +178,7 @@ - goto path_error; - } - -- if (strlcpy(helper_path, pw->pw_dir, len) >= (size_t)len) { -+ if (strlcpy(helper_path, getenv("HOME"), len) >= (size_t)len) { - endpwent(); - goto path_error; - } -diff -aur uim/uim-posix.c uim/uim-posix.c ---- uim/uim-posix.c 2010-08-22 19:23:37.650000031 +0200 -+++ uim/uim-posix.c 2010-08-22 19:26:40.096666322 +0200 -@@ -100,7 +100,7 @@ - home[0] = '\0'; - return UIM_FALSE; - } -- if (strlcpy(home, pw->pw_dir, len) >= (size_t)len) { -+ if (strlcpy(home, getenv("HOME"), len) >= (size_t)len) { - home[0] = '\0'; - endpwent(); - return UIM_FALSE; diff --git a/extra/uim/install b/extra/uim/install index ffed34d01..a2d5e00e6 100644 --- a/extra/uim/install +++ b/extra/uim/install @@ -1,13 +1,13 @@ post_install() { - echo -n "updating gtk.immodules... " - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - echo "done." + echo -n "updating gtk.immodules... " + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + echo "done." } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index fac9cc594..30a9704c2 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $ +# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.10 +pkgver=0.9.11 pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288') +sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vbetool/PKGBUILD b/extra/vbetool/PKGBUILD deleted file mode 100644 index 0e6033d81..000000000 --- a/extra/vbetool/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 19267 2008-11-18 03:22:15Z eric $ -# Contributor: Christian Storm <Christian.Storm@gmx.DE> -# Contributor: James Rayner <james@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> - -pkgname=vbetool -pkgver=1.1 -pkgrel=1 -pkgdesc="vbetool uses lrmi in order to run code from the video BIOS" -url="http://www.srcf.ucam.org/~mjg59/vbetool/" -license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') -depends=('zlib' 'libx86') -makedepends=('pciutils') -source=(http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${pkgver}.tar.gz) -md5sums=('ffb03b118867a02296d7449019ad8846') - -build() { - cd $srcdir/$pkgname-$pkgver - if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --without-x86emu || return 1 - else - ./configure --prefix=/usr || return 1 - fi - make LIBS=-lpci || return 1 - make DESTDIR=$pkgdir install || return 1 -} - diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 436ec5ddd..43f4aa5a4 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112123 2011-03-04 03:09:16Z eric $ +# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=vigra -pkgver=1.7.0 -pkgrel=6 +pkgver=1.7.1 +pkgrel=2 pkgdesc="Computer vision library" arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" @@ -14,13 +14,14 @@ makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-num optdepends=('python2: for python bindings' 'boost-libs: for python bindings') options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz libpng-1.4.patch) -md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76') -sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46') +source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz + vigra-1.7.1.gcc460.patch) +md5sums=('2bde208e0fd7626770169dd4fa097282' + '25ef8bc26bc38ee67e5b512d2acd0166') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src - patch -p1 < ../libpng-1.4.patch + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_VIGRANUMPY=1 \ -DDOCINSTALL=share/doc @@ -28,7 +29,7 @@ build() { } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # license install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/vigra/vigra-1.7.1.gcc460.patch b/extra/vigra/vigra-1.7.1.gcc460.patch new file mode 100644 index 000000000..46f194dbc --- /dev/null +++ b/extra/vigra/vigra-1.7.1.gcc460.patch @@ -0,0 +1,33 @@ +diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx +--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 +@@ -43,6 +43,7 @@ + #include <set> + #include <list> + #include <numeric> ++#include <stddef.h> + #include "mathutil.hxx" + #include "array_vector.hxx" + #include "sized_int.hxx" +diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx +--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -57,6 +57,7 @@ + #include <fstream> + #include <cstring> + #include <vector> ++#include <stddef.h> + #include "vigra/multi_array.hxx" + + namespace vigra { +diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx +--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index efe3dac2e..1a636f80e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,30 +1,43 @@ -# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $ +# $Id: PKGBUILD 125527 2011-05-26 14:21:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> -pkgbase=vlc -pkgname=('vlc' 'vlc-plugin') +pkgname=vlc pkgver=1.1.9 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') -makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm' - 'xulrunner' 'pkgconfig' 'live-media' 'libnotify' 'libcdio' +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') options=('!libtool') -source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c ./configure --prefix=/usr \ @@ -37,35 +50,12 @@ build() { --enable-lirc \ --enable-pvr \ --enable-ncurses \ - --enable-mozilla \ --with-live555-tree=/usr/lib/live \ --enable-realrtsp make } - -package_vlc() { - pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" - depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') - optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') - options=('!libtool') - conflicts=('vlc-pulse-plugin') - replaces=('vlc-pulse-plugin') - install=vlc.install - cd "${srcdir}/${pkgbase}-${pkgver}" +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install @@ -73,20 +63,4 @@ package_vlc() { install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done - - rm -rf "${pkgdir}/usr/lib/mozilla" -} - -package_vlc-plugin() { - pkgdesc="VLC mozilla browser plugin" - depends=("${pkgbase}=${pkgver}" 'nspr' 'xulrunner' 'libxpm') - cd "${srcdir}/${pkgbase}-${pkgver}" - - #for linking against libvlc - make -C src DESTDIR="${pkgdir}" install-libLTLIBRARIES - - make -C projects/mozilla DESTDIR="${pkgdir}/" install - - #clean up libvlc - make -C src DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES } diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 156a0941a..066ecc416 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106274 2011-01-16 13:41:19Z giovanni $ +# $Id: PKGBUILD 124014 2011-05-15 23:09:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ 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=('79207fea567548462fe36397e633d287') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,11 +23,11 @@ build() { cd build cmake .. -DPREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so || return 1 + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so } package() { cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}/" install || return 1 + make DESTDIR="${pkgdir}/" install } diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD index 24ba5d5c2..ec1cd77a8 100644 --- a/extra/wesnoth/PKGBUILD +++ b/extra/wesnoth/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112017 2011-03-03 06:20:54Z eric $ +# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Jacobo Arvelo <unix4all@ya.com> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=wesnoth -pkgver=1.8.5 -pkgrel=3 +pkgver=1.8.6 +pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ makedepends=('boost') install=wesnoth.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 wesnoth-libpng-1.4.0.patch) -md5sums=('a800285d1406690755dd0ea22b98b6df' +md5sums=('f1c3179869b01b61e253e74aeb241034' 'ca7412ffc4682ef55ddf82d56b0e2f08') build() { diff --git a/extra/wvdial/PKGBUILD b/extra/wvdial/PKGBUILD index 27c3d441e..2c756d99c 100644 --- a/extra/wvdial/PKGBUILD +++ b/extra/wvdial/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 57749 2009-11-01 22:53:25Z giovanni $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 123798 2011-05-13 06:53:04Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wvdial pkgver=1.61 -pkgrel=2 +pkgrel=3 pkgdesc="A dialer program to connect to the Internet" url="http://alumnit.ca/wiki/index.php?page=WvDial" arch=('i686' 'x86_64' 'mips64el') license=('custom') -depends=('wvstreams>=4.6.1' 'ppp') -source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +depends=('wvstreams' 'ppp' 'gcc-libs') +makedepends=('lockdev') +options=('!makeflags' '!buildflags') +source=("http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") md5sums=('acd3b2050c9b65fff2aecda6576ee7bc') build() { - unset LDFLAGS - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure - make || return 1 - make prefix=${pkgdir}/usr PPPDIR=${pkgdir}/etc/ppp/peers install || return 1 - install -Dm644 COPYING.LIB ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make LOCKDEV="-llockdev" +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make prefix="${pkgdir}"/usr PPPDIR="${pkgdir}"/etc/ppp/peers install + install -Dm644 COPYING.LIB "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD index 7744e668a..931513921 100644 --- a/extra/xaw3d/PKGBUILD +++ b/extra/xaw3d/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 38896 2009-05-10 18:12:17Z jgc $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaw3d pkgver=1.5E -pkgrel=2 +pkgrel=3 pkgdesc="Three-D Athena widgets" arch=('i686' 'x86_64' 'mips64el') url="http://directory.fsf.org/project/xaw3d/" license=('MIT') depends=('libxmu' 'libxpm') makedepends=('imake') -options=('!makeflags' 'force') +options=('!makeflags') source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz Xaw3d-1.5E-xorg-imake.patch Xaw3d-1.5-i18n.patch @@ -33,17 +32,20 @@ md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1' build() { cd "${srcdir}/xc/lib/Xaw3d" - patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" || return 1 - patch -Np4 -i "${srcdir}/xaw3d.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" || return 1 - + patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" + patch -Np4 -i "${srcdir}/xaw3d.patch" + patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" ln -s .. X11 - xmkmf || return 1 + xmkmf make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR" - make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install || return 1 - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 +} + +package() { + cd "${srcdir}/xc/lib/Xaw3d" + make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index 4cf84194a..c12fdbd4c 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112925 2011-03-07 18:53:16Z andyrtr $ +# $Id: PKGBUILD 124328 2011-05-19 16:30:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=xfce4-settings -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -16,7 +16,7 @@ makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 xfce4-settings-4.6.0.patch) -md5sums=('0097476baadcc9bc9841d6b8e687b8eb' +md5sums=('a45420fea20f29265ab6785cb1d07377' '3046732e5d73c9939e7674602eadb1e2') build() { diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 7489c6c08..8af9aa2b0 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113660 2011-03-10 14:29:50Z jgc $ +# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-iceauth -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('9b446c0d1815dce48bdea32db7dea7e429f6a310') +sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') build() { cd "${srcdir}/iceauth-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/iceauth-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD index 26935f83f..fc3b2bb16 100644 --- a/extra/xorg-xauth/PKGBUILD +++ b/extra/xorg-xauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113711 2011-03-10 14:51:46Z jgc $ +# $Id: PKGBUILD 125581 2011-05-26 20:38:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xauth -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X.Org authorization settings program" arch=(i686 x86_64 'mips64el') license=('custom') @@ -12,12 +12,16 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -sha1sums=('6d94b5822e8ce08630a8ff510230246d5ed45290') +sha1sums=('10a68367ecc60a641b9aa89e6f24f7ca71f23874') build() { cd "${srcdir}/xauth-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xauth-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xscreensaver/ChangeLog b/extra/xscreensaver/ChangeLog deleted file mode 100644 index ea08818fc..000000000 --- a/extra/xscreensaver/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -2010-09-26 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.12-1 - * Upstream update - * Added libxxf86vm depends - -2010-05-17 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.11-1 - * Upstream update - -2009-10-17 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.10-2 - * Added support for electricsheep (close FS#16400) - -2009-09-09 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.10-1 - * Upstream update - -2009-09-03 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.09-1 - * Upstream update - -2009-01-02 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.08-1 - * Upstream update - -2008-08-11 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.07-1 - * Upstream update - -2008-07-18 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.06-1 - * Upstream update - -2008-03-02 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.05-1 - * Upstream update - * FHS man pages diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD index 65db6d384..ff9f3e5a4 100644 --- a/extra/xscreensaver/PKGBUILD +++ b/extra/xscreensaver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123881 2011-05-14 00:52:40Z eric $ +# $Id: PKGBUILD 124565 2011-05-22 23:54:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xscreensaver -pkgver=5.13 +pkgver=5.14 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ makedepends=('bc') backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ add-electricsheep.diff xscreensaver.pam LICENSE) -md5sums=('a1a55b763e17c5c83a2b7cb5ddf23560' +md5sums=('7777f2a50d6797f9757b6e078a7bea83' 'f82524626ed8a6832cd279e0548a9b46' '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c') -sha1sums=('3bdac6122e5b7b0cffcc90b3b75dc7fa001c0181' +sha1sums=('bfa37a9e7b2e93f54922191bb93dbc70c2f73772' '65c2933380267475f2c4560bc22f4350393b00ce' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134') diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index c68a296b4..07c965bff 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120703 2011-04-26 05:18:34Z jgc $ +# $Id: PKGBUILD 124709 2011-05-24 06:57:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('6de6c45439b21a3042236d5d836de9dd44d59c2d4c324982c316b4b6834ce0a4') +sha256sums=('938b50b63f2783d8f87ce2e6ebb622dcfc7cb2d81b39278d1298c5f3bdf236b9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index be5bad18b..140fc2755 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 91694 2010-09-27 17:40:26Z bisson $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 123631 2011-05-11 23:05:30Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypbind-mt -pkgver=1.32 +pkgver=1.33 pkgrel=1 pkgdesc='Linux NIS daemon' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +15,7 @@ backup=('etc/yp.conf' 'etc/conf.d/ypbind') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" 'ypbind.conf' 'ypbind') -sha1sums=('136d1cb1499d32d01f7efa216352911980a7dda8' +sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' '66f6ea2f622e0724e6017bf835d4f7f4a5bf9534') diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index f3dd919f7..013eb774c 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91699 2010-09-27 17:41:23Z bisson $ +# $Id: PKGBUILD 123628 2011-05-11 23:04:51Z bisson $ # Maintainer: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypserv -pkgver=2.24 +pkgver=2.25 pkgrel=1 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" \ 'yppasswd' 'ypserv') -sha1sums=('3ae53fe5e047b3bf6a1e407424311ec6e806a95d' +sha1sums=('ab997022d25b6374ae21d39f7ff564be028d8736' '96192b628afe36709496e4801d016c4bff343f0e' 'b625381bfa6cf62345377a7df30b8f45935206c5') diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index f4f07366d..5a8334b7a 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104088 2010-12-28 17:55:43Z kevin $ +# $Id: PKGBUILD 125598 2011-05-26 20:47:05Z kevin $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=zile -pkgver=2.3.21 +pkgver=2.3.24 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64 'mips64el') @@ -13,12 +13,16 @@ makedepends=('help2man') depends=('ncurses') license=('GPL') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4bac1dc5d7e6fb5c13bd6677bca34b11') +md5sums=('fe77d801ba69e0fb9b4914a04b9ff506') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } -md5sums=('ec2834a42789477c55e7d44bc9438de1') + diff --git a/kde-unstable/akonadi/PKGBUILD b/kde-unstable/akonadi/PKGBUILD new file mode 100644 index 000000000..c19e6d4ce --- /dev/null +++ b/kde-unstable/akonadi/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/kde-unstable/akonadi/akonadi.install @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..f155259d7 --- /dev/null +++ b/kde-unstable/calligra/PKGBUILD @@ -0,0 +1,341 @@ +# $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 new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-braindump.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-filters.install b/kde-unstable/calligra/calligra-filters.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/kde-unstable/calligra/calligra-filters.install @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-flow.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-karbon.install b/kde-unstable/calligra/calligra-karbon.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-karbon.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-kexi.install b/kde-unstable/calligra/calligra-kexi.install new file mode 100644 index 000000000..b8c7ebf27 --- /dev/null +++ b/kde-unstable/calligra/calligra-kexi.install @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-kformula.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-kplato.install b/kde-unstable/calligra/calligra-kplato.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-kplato.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-krita.install b/kde-unstable/calligra/calligra-krita.install new file mode 100644 index 000000000..33d234a02 --- /dev/null +++ b/kde-unstable/calligra/calligra-krita.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-stage.install b/kde-unstable/calligra/calligra-stage.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-stage.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-tables.install b/kde-unstable/calligra/calligra-tables.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-tables.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-tools.install b/kde-unstable/calligra/calligra-tools.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-tools.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-words.install b/kde-unstable/calligra/calligra-words.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-words.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kmplayer/kmplayer.install b/kde-unstable/calligra/calligra.install index e70c054ec..e70c054ec 100644 --- a/extra/kmplayer/kmplayer.install +++ b/kde-unstable/calligra/calligra.install diff --git a/kde-unstable/kdeaccessibility/PKGBUILD b/kde-unstable/kdeaccessibility/PKGBUILD new file mode 100644 index 000000000..9fe34bcd9 --- /dev/null +++ b/kde-unstable/kdeaccessibility/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeaccessibility +pkgname=('kdeaccessibility-jovie' + 'kdeaccessibility-kaccessible' + 'kdeaccessibility-kmag' + 'kdeaccessibility-kmousetool' + 'kdeaccessibility-kmouth') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://accessibility.kde.org' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('a8d4ca99dadc9439b6a1ee91645527f954665cb1') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Opentts=OFF + make +} + +package_kdeaccessibility-jovie() { + pkgdesc='A text to speech application' + depends=('kdebase-runtime' 'speech-dispatcher') + replaces=('kdeaccessibility-kttsd') + install='kdeaccessibility.install' + cd $srcdir/build/jovie + make DESTDIR=$pkgdir install + cd $srcdir/build/jovie/doc + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kaccessible() { + pkgdesc='Provides accessibility services like focus tracking and a screenreader' + depends=('kdebase-runtime' 'speech-dispatcher') + install='kdeaccessibility.install' + cd $srcdir/build/kaccessible + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmag() { + pkgdesc='Screen Magnifier' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmag/" + install='kdeaccessibility.install' + cd $srcdir/build/kmag + make DESTDIR=$pkgdir install + cd $srcdir/build/kmag/doc + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmousetool() { + pkgdesc='Clicks the mouse for you, reducing the effects of RSI' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmousetool/" + install='kdeaccessibility.install' + cd $srcdir/build/kmousetool + make DESTDIR=$pkgdir install + cd $srcdir/build/kmousetool/doc + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmouth() { + pkgdesc='Speech Synthesizer Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmouth/" + install='kdeaccessibility.install' + cd $srcdir/build/kmouth + make DESTDIR=$pkgdir install + cd $srcdir/build/kmouth/doc + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdeaccessibility/kdeaccessibility.install b/kde-unstable/kdeaccessibility/kdeaccessibility.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeaccessibility/kdeaccessibility.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD new file mode 100644 index 000000000..ceac7ec49 --- /dev/null +++ b/kde-unstable/kdeadmin/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 124778 2011-05-24 11:55:25Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeadmin +pkgname=('kdeadmin-kcron' + 'kdeadmin-ksystemlog' + 'kdeadmin-kuser' + 'kdeadmin-system-config-printer-kde') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeadmin') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' + 'system-config-printer-common') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'syslog-path.patch') +sha1sums=('ceb0ccd2d24b64770f6ac7649d312937a09a17e2' + '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/syslog-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_strigi-analyzer=OFF + make +} + +package_kdeadmin-kcron() { + pkgdesc='Configure and schedule tasks' + depends=('kdelibs') + cd $srcdir/build/kcron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcron + make DESTDIR=$pkgdir install +} + +package_kdeadmin-ksystemlog() { + pkgdesc='System log viewer tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/ksystemlog/" + cd $srcdir/build/ksystemlog + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksystemlog + make DESTDIR=$pkgdir install +} + +package_kdeadmin-kuser() { + pkgdesc='User Manager' + depends=('kdepim-runtime') + url="http://kde.org/applications/system/kuser/" + install='kdeadmin.install' + cd $srcdir/build/kuser + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kuser + make DESTDIR=$pkgdir install +} + +package_kdeadmin-system-config-printer-kde() { + pkgdesc='Configure local and remote Printers' + depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/system-config-printer-kde + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} diff --git a/kde-unstable/kdeadmin/kdeadmin.install b/kde-unstable/kdeadmin/kdeadmin.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeadmin/kdeadmin.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeadmin/syslog-path.patch b/kde-unstable/kdeadmin/syslog-path.patch new file mode 100644 index 000000000..8a9142bf6 --- /dev/null +++ b/kde-unstable/kdeadmin/syslog-path.patch @@ -0,0 +1,11 @@ +--- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 ++++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 +@@ -39,7 +39,7 @@ + SystemConfiguration() : + GenericLogModeConfiguration( + QLatin1String( SYSTEM_LOG_MODE_ID ), +- QStringList() << QLatin1String( "/var/log/syslog" ), ++ QStringList() << QLatin1String( "/var/log/messages.log" ), + QList<int>() << INFORMATION_LOG_LEVEL_ID + ) { + diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD new file mode 100644 index 000000000..0118d8b45 --- /dev/null +++ b/kde-unstable/kdeartwork/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 124845 2011-05-24 18:14:29Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeartwork +pkgname=('kdeartwork-aurorae' + 'kdeartwork-colorschemes' + 'kdeartwork-desktopthemes' + 'kdeartwork-emoticons' + 'kdeartwork-iconthemes' + 'kdeartwork-kscreensaver' + 'kdeartwork-sounds' + 'kdeartwork-styles' + 'kdeartwork-wallpapers' + 'kdeartwork-weatherwallpapers') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeartwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' + 'kdebase-workspace' 'libkexiv2') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('70c5274f2c933b87c10a1ae53eb6971ae3887e87') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeartwork-aurorae() { + pkgdesc='An Aurorae theme based on the Oxygen plasma theme' + cd $srcdir/build/aurorae + make DESTDIR=$pkgdir install +} + +package_kdeartwork-colorschemes() { + pkgdesc='KDE color schemes' + replaces=('kdeaccessibility-colorschemes') + cd $srcdir/build/ColorSchemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-desktopthemes() { + pkgdesc='KDE desktop themes' + cd $srcdir/build/desktopthemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-emoticons() { + pkgdesc='KDE emoticons' + cd $srcdir/build/emoticons + make DESTDIR=$pkgdir install +} + +package_kdeartwork-iconthemes() { + pkgdesc='KDE icon themes' + replaces=('kdeaccessibility-iconthemes') + cd $srcdir/build/IconThemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-kscreensaver() { + pkgdesc='KDE screensaver' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/kscreensaver + make DESTDIR=$pkgdir install +} + +package_kdeartwork-sounds() { + pkgdesc='KDE sounds' + cd $srcdir/build/sounds + make DESTDIR=$pkgdir install +} + +package_kdeartwork-styles() { + pkgdesc='KDE styles' + depends=('kdebase-workspace') + cd $srcdir/build/styles + make DESTDIR=$pkgdir install + cd $srcdir/build/kwin-styles + make DESTDIR=$pkgdir install +} + +package_kdeartwork-wallpapers() { + pkgdesc='KDE wallpapers' + cd $srcdir/build/wallpapers + make DESTDIR=$pkgdir install + cd $srcdir/build/HighResolutionWallpapers + make DESTDIR=$pkgdir install +} + +package_kdeartwork-weatherwallpapers() { + pkgdesc='KDE weather wallpapers' + cd $srcdir/build/WeatherWallpapers + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD new file mode 100644 index 000000000..105e3dc39 --- /dev/null +++ b/kde-unstable/kdebase-konsole/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124800 2011-05-24 13:26:15Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebase-konsole +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://kde.org/applications/system/konsole/' +pkgdesc="Terminal" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2") +sha1sums=('7e7b5a0b37ae4d22e51a61f70afccbba86a93921') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../konsole-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..70105c4ec --- /dev/null +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-runtime +_pkgname=kde-runtime +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE Base Runtime Environment" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' + 'xorg-xauth' 'hicolor-icon-theme') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') +optdepends=('htdig: to build the search index in khelpcenter' + 'rarian: needed by khelpcenter' + 'gdb: drkonq crash handler') +install="${pkgname}.install" +source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('5d06c11f43beb21ebf6c47d2a7addcbe710e019e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" +} diff --git a/kde-unstable/kdebase-runtime/kdebase-runtime.install b/kde-unstable/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/kde-unstable/kdebase-runtime/kdebase-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD new file mode 100644 index 000000000..fae8c192f --- /dev/null +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 125374 2011-05-26 12:53:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.6.80 +pkgrel=2 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' + 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx' + 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'kde-wallpapers') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" + 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('99bf68ee90c4cfa3568527a55c7c68d4247d9b13' + '8c2bdefb23a03b753b78d16944d03fa3939d2d99' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'f7b38af38549242a240f1a90ab9964ca8a366129' + '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + patch -p0 -i ${srcdir}/kdm-zsh-profile.patch + patch -p0 -i ${srcdir}/fixpath.patch + patch -p0 -i ${srcdir}/terminate-server.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_Prison=OFF \ + -DWITH_NetworkManager=OFF \ + -DKWIN_MOBILE_EFFECTS=OFF \ + -DWITH_OpenGLES=OFF \ + -DKWIN_BUILD_WITH_OPENGLES=OFF + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + + install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm + install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde + install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np + install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver + install -d -m755 ${pkgdir}/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/ + install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm +} diff --git a/kde-unstable/kdebase-workspace/fixpath.patch b/kde-unstable/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/kde-unstable/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/kde-unstable/kdebase-workspace/kde-np.pam b/kde-unstable/kdebase-workspace/kde-np.pam new file mode 100644 index 000000000..81eeef47b --- /dev/null +++ b/kde-unstable/kdebase-workspace/kde-np.pam @@ -0,0 +1,7 @@ +#%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 new file mode 100644 index 000000000..1a259390f --- /dev/null +++ b/kde-unstable/kdebase-workspace/kde.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/kde-unstable/kdebase-workspace/kdebase-workspace.install b/kde-unstable/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 000000000..f7d6d305b --- /dev/null +++ b/kde-unstable/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/community-testing/ipsec-tools/ipsec.rc b/kde-unstable/kdebase-workspace/kdm index cff472c59..799d58f4b 100755..100644 --- a/community-testing/ipsec-tools/ipsec.rc +++ b/kde-unstable/kdebase-workspace/kdm @@ -3,30 +3,31 @@ . /etc/rc.conf . /etc/rc.d/functions +PID=$(pidof -o %PPID /usr/bin/kdm) case "$1" in start) - stat_busy "Loading IPSec Security Policy Database..." - /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null if [ $? -gt 0 ]; then stat_fail else - add_daemon ipsec + add_daemon kdm stat_done fi ;; stop) - stat_busy "Unloading IPSec Security Policy Database..." - /usr/sbin/setkey -F -P - /usr/sbin/setkey -F + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon ipsec + rm_daemon kdm stat_done fi ;; restart) $0 stop + sleep 3 $0 start ;; *) diff --git a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch new file mode 100644 index 000000000..779456b39 --- /dev/null +++ b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch @@ -0,0 +1,11 @@ +--- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000 ++++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000 +@@ -662,7 +662,7 @@ + " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n" + " zhome=${ZDOTDIR:-$HOME}\n" + " # zshenv is always sourced automatically.\n" +-" [ -f $zdir/zprofile ] && . $zdir/zprofile\n" ++" [ -f /etc/profile ] && . /etc/profile\n" + " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n" + " [ -f $zdir/zlogin ] && . $zdir/zlogin\n" + " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n" diff --git a/kde-unstable/kdebase-workspace/kscreensaver.pam b/kde-unstable/kdebase-workspace/kscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/kde-unstable/kdebase-workspace/kscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so diff --git a/kde-unstable/kdebase-workspace/terminate-server.patch b/kde-unstable/kdebase-workspace/terminate-server.patch new file mode 100644 index 000000000..094591317 --- /dev/null +++ b/kde-unstable/kdebase-workspace/terminate-server.patch @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD new file mode 100644 index 000000000..da7098290 --- /dev/null +++ b/kde-unstable/kdebase/PKGBUILD @@ -0,0 +1,117 @@ +# $Id: PKGBUILD 124659 2011-05-23 19:43:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdebase +pkgname=('kdebase-dolphin' + 'kdebase-kdepasswd' + 'kdebase-kdialog' + 'kdebase-keditbookmarks' + 'kdebase-kfind' + 'kdebase-konq-plugins' + 'kdebase-konqueror' + 'kdebase-lib' + 'kdebase-plasma') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') +source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") +sha1sums=('f89b848791628d675e26dd7e703bd79834d1c951') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../kde-baseapps-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdebase-dolphin() { + pkgdesc='File Manager' + depends=('kdebase-runtime' 'kdebase-lib') + optdepends=('ruby: servicemenu installation') + url="http://kde.org/applications/system/dolphin/" + cd $srcdir/build/dolphin + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dolphin + make DESTDIR=$pkgdir install +} + +package_kdebase-kdepasswd() { + pkgdesc='Change Password' + depends=('kdebase-runtime' 'kdebase-lib') + cd $srcdir/build/kdepasswd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdepasswd + make DESTDIR=$pkgdir install +} + +package_kdebase-kdialog() { + pkgdesc='A utility for displaying dialog boxes from shell scripts' + depends=('kdebase-runtime') + cd $srcdir/build/kdialog + make DESTDIR=$pkgdir install +} + +package_kdebase-keditbookmarks() { + pkgdesc='Bookmark Organizer and Editor' + depends=('kdebase-runtime') + cd $srcdir/build/keditbookmarks + make DESTDIR=$pkgdir install +} + +package_kdebase-kfind() { + pkgdesc='Find Files/Folders' + depends=('kdebase-runtime' 'kdebase-lib') + url="http://kde.org/applications/utilities/kfind/" + install='kdebase.install' + cd $srcdir/build/kfind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfind + make DESTDIR=$pkgdir install +} + +package_kdebase-konq-plugins() { + pkgdesc='Extra plugins for Konqueror' + depends=('kdebase-konqueror') + replaces=('konq-plugins') + install='kdebase.install' + cd $srcdir/build/konq-plugins + make DESTDIR=$pkgdir install +} + +package_kdebase-konqueror() { + pkgdesc='KDE File Manager & Web Browser' + depends=('kdebase-dolphin' 'kdebase-keditbookmarks') + optdepends=('kwebkitpart: to enable webkit engine') + url="http://kde.org/applications/internet/konqueror/" + install='kdebase.install' + conflicts=('kdebase-nsplugins') + replaces=('kdebase-nsplugins') + for i in konqueror doc/konqueror nsplugins; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdebase-lib() { + pkgdesc='KDE libraries for the basic desktop applications' + groups=() + depends=('kdelibs') + cd $srcdir/build/lib + make DESTDIR=$pkgdir install +} + +package_kdebase-plasma() { + pkgdesc='Display the contents of folders (User´s home folder as default)' + depends=('kdebase-workspace' 'kdebase-lib') + cd $srcdir/build/plasma + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdebase/kdebase.install b/kde-unstable/kdebase/kdebase.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdebase/kdebase.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD new file mode 100644 index 000000000..0fa73a2b1 --- /dev/null +++ b/kde-unstable/kdebindings-kimono/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124934 2011-05-25 09:35:20Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-kimono +pkgver=4.6.80 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-qyoto' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2") +sha1sums=('911dfbee3141ca0f72c13e15bafc549ccd9ab33a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kimono-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD new file mode 100644 index 000000000..9c40054a2 --- /dev/null +++ b/kde-unstable/kdebindings-korundum/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124940 2011-05-25 09:48:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-korundum +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-qtruby' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2") +sha1sums=('30209e7e3d3dc54c7eb787d7e7bcc90735c5bc1a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../korundum-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD new file mode 100644 index 000000000..4dfb0d07e --- /dev/null +++ b/kde-unstable/kdebindings-perlkde/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124941 2011-05-25 09:55:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-perlkde +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Perl bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-perlqt' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' + 'kdegraphics-okular' 'kdesdk-kate') +source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") +sha1sums=('0d689b8ffcfaeb1f4e216f00f0ddacb5f59b9047') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlkde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD new file mode 100644 index 000000000..a8268f3c5 --- /dev/null +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124667 2011-05-23 20:36:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-perlqt +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Perl bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") +sha1sums=('aa6f72ff5eed3f178a1d7274e61c2c7ed81fd74e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD new file mode 100644 index 000000000..817ca914a --- /dev/null +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 124775 2011-05-24 11:26:16Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-python +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE bindings for python" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2" + 'fix-build.patch') +sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da' + '3d2329981ea571d38f0354c6d1300a2743a775db') + +build() { + cd "${srcdir}"/pykde4-${pkgver} + patch -p3 -i "${srcdir}"/fix-build.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} +sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da' + '4eb8917ad922819bbea038d79a9786cf5d0e2767') diff --git a/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD new file mode 100644 index 000000000..82fd53c1b --- /dev/null +++ b/kde-unstable/kdebindings-qtruby/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-qtruby +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Qt bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt' 'ruby') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") +sha1sums=('9b153784efb3187ca4f38a14355b8a5ce283316c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qtruby-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD new file mode 100644 index 000000000..d130b397d --- /dev/null +++ b/kde-unstable/kdebindings-qyoto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-qyoto +pkgver=4.6.80 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt' 'mono') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") +sha1sums=('7f63ae1c1e30edf226ca8418d5fa78edaf42cb36') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qyoto-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD new file mode 100644 index 000000000..ba2edc4f6 --- /dev/null +++ b/kde-unstable/kdebindings-smokegen/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokegen +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A general purpose C++ parser with a plugin infrastructure" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") +sha1sums=('ce860f4308df4cc91b1e49d0f1f5bca3805c4cf1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokegen-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD new file mode 100644 index 000000000..6f9724353 --- /dev/null +++ b/kde-unstable/kdebindings-smokekde/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124928 2011-05-25 09:28:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokekde +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Language independent library for KDE bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") +sha1sums=('9fd8cbac3f0affce6fa078b07ca418a5e0c79521') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokekde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD new file mode 100644 index 000000000..c7bdbcbd1 --- /dev/null +++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokeqt +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Language independent library for Qt bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('872b77e7e445b7492a647e63e267677604d76a96') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokeqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD new file mode 100644 index 000000000..7ebd3c811 --- /dev/null +++ b/kde-unstable/kdeedu-blinken/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-blinken +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Memory Enhancement Game" +url="http://kde.org/applications/education/blinken/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2") +sha1sums=('847ee81d2a4f5f1acb4bf8c0835c2e8187a631ea') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../blinken-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-blinken/kdeedu-blinken.install b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD new file mode 100644 index 000000000..a82cacfaa --- /dev/null +++ b/kde-unstable/kdeedu-cantor/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-cantor +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE Frontend to Mathematical Software" +url="http://kde.org/applications/education/cantor/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'r' 'libspectre') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2") +sha1sums=('0c6ebd5e523bf5fdf01bbf654ce60a55fc72cbe2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../cantor-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-cantor/kdeedu-cantor.install b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD new file mode 100644 index 000000000..40b24830e --- /dev/null +++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kalgebra +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Graph Calculator" +url="http://kde.org/applications/education/kalgebra/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") +sha1sums=('d448a675782157d8c553db497e048231d6eb5f53') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalgebra-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD new file mode 100644 index 000000000..8bc1d0c3c --- /dev/null +++ b/kde-unstable/kdeedu-kalzium/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kalzium +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Periodic Table of Elements" +url="http://kde.org/applications/education/kalzium/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdelibs' 'avogadro' 'ocaml') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") +sha1sums=('1ace4d42711904d9556efbe1ff89dc4c803887fe') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalzium-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD new file mode 100644 index 000000000..45a33746c --- /dev/null +++ b/kde-unstable/kdeedu-kanagram/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kanagram +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Letter Order Game" +url="http://kde.org/applications/education/kanagram/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") +sha1sums=('b7075ffa2c366acecfce13b5bef9938c6317aefb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kanagram-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD new file mode 100644 index 000000000..9710c1df2 --- /dev/null +++ b/kde-unstable/kdeedu-kbruch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kbruch +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Exercise Fractions" +url="http://kde.org/applications/education/kbruch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") +sha1sums=('205b7f2171e67b55fc1bbcd0844702daf9dcb4a6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kbruch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD new file mode 100644 index 000000000..720c4027a --- /dev/null +++ b/kde-unstable/kdeedu-kgeography/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kgeography +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Geography Trainer" +url="http://kde.org/applications/education/kgeography/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") +sha1sums=('2d161ef150618780e6f2bcf3a8e19993a5c95fa6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgeography-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD new file mode 100644 index 000000000..56df0fbce --- /dev/null +++ b/kde-unstable/kdeedu-khangman/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-khangman +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Hangman Game" +url="http://kde.org/applications/education/khangman/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2") +sha1sums=('a3e140a71c27400d49f75b862965123c1df6e992') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../khangman-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-khangman/kdeedu-khangman.install b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD new file mode 100644 index 000000000..ca6f92279 --- /dev/null +++ b/kde-unstable/kdeedu-kig/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 125335 2011-05-25 23:12:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kig +pkgver=4.6.80 +pkgrel=2 +pkgdesc="Interactive Geometry" +url="http://kde.org/applications/education/kig/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2") +sha1sums=('d0b2ca69262b1e720be8ab2b6cfb9dd6b5a81371') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kig-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py +} diff --git a/kde-unstable/kdeedu-kig/kdeedu-kig.install b/kde-unstable/kdeedu-kig/kdeedu-kig.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kig/kdeedu-kig.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD new file mode 100644 index 000000000..6ba5c4b19 --- /dev/null +++ b/kde-unstable/kdeedu-kiten/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kiten +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Japanese Reference/Study Tool" +url="http://kde.org/applications/education/kiten/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2") +sha1sums=('a5120c87015e044b4313e889b80afd608341e414') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kiten-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kiten/kdeedu-kiten.install b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD new file mode 100644 index 000000000..70f5e54b4 --- /dev/null +++ b/kde-unstable/kdeedu-klettres/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-klettres +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Learn The Alphabet" +url="http://kde.org/applications/education/klettres/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2") +sha1sums=('395a1c700eaf1fee83216facbe5442162d383e64') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../klettres-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-klettres/kdeedu-klettres.install b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD new file mode 100644 index 000000000..8db40962f --- /dev/null +++ b/kde-unstable/kdeedu-kmplot/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kmplot +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Mathematical Function Plotter" +url="http://kde.org/applications/education/kmplot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") +sha1sums=('be3593a33b05a59d82020d988804e82737abbc09') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmplot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD new file mode 100644 index 000000000..77306c68d --- /dev/null +++ b/kde-unstable/kdeedu-kstars/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kstars +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Desktop Planetarium" +url="http://kde.org/applications/education/kstars/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2") +sha1sums=('c74818da033d70200b873a954a2f05af3e03c610') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kstars-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xplanet=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kstars/kdeedu-kstars.install b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD new file mode 100644 index 000000000..0b8e706e9 --- /dev/null +++ b/kde-unstable/kdeedu-ktouch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-ktouch +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Touch Typing Tutor" +url="http://kde.org/applications/education/ktouch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") +sha1sums=('7e80926b1fe45d7af861891a140e843b27cbf171') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ktouch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD new file mode 100644 index 000000000..dc60d6200 --- /dev/null +++ b/kde-unstable/kdeedu-kturtle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kturtle +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Educational Programming Environment" +url="http://kde.org/applications/education/kturtle/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") +sha1sums=('5aa67c458212315616a9c67e06a3e8a8a79ee302') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kturtle-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD new file mode 100644 index 000000000..76696bc6d --- /dev/null +++ b/kde-unstable/kdeedu-kwordquiz/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kwordquiz +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Flash Card Trainer" +url="http://kde.org/applications/education/kwordquiz/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") +sha1sums=('44277946ffad538cd50690af9475e0520698bafb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kwordquiz-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD new file mode 100644 index 000000000..39fe50f17 --- /dev/null +++ b/kde-unstable/kdeedu-marble/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-marble +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Desktop Globe" +url="http://kde.org/applications/education/marble/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'gpsd') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2" + 'gpsd-2.96.patch') +sha1sums=('4d7663909efe3b42006debd78f1217bb3dfffd88' + 'f44dfd3bb384e631d59b93d7dda3413795da8183') + +build() { + cd "${srcdir}"/marble-${pkgver} + patch -p1 -i "${srcdir}"/gpsd-2.96.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-marble/gpsd-2.96.patch b/kde-unstable/kdeedu-marble/gpsd-2.96.patch new file mode 100644 index 000000000..e27702181 --- /dev/null +++ b/kde-unstable/kdeedu-marble/gpsd-2.96.patch @@ -0,0 +1,41 @@ +--- 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 new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-marble/kdeedu-marble.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD new file mode 100644 index 000000000..7b27fa558 --- /dev/null +++ b/kde-unstable/kdeedu-parley/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-parley +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Vocabulary Trainer" +url="http://kde.org/applications/education/parley/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2") +sha1sums=('991f7aeee7849913a167d65b792791724bc5c1aa') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../parley-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-parley/kdeedu-parley.install b/kde-unstable/kdeedu-parley/kdeedu-parley.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-parley/kdeedu-parley.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD new file mode 100644 index 000000000..1ab660c03 --- /dev/null +++ b/kde-unstable/kdeedu-rocs/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-rocs +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Rocs Graph Theory" +url="http://kde.org/applications/education/rocs/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2") +sha1sums=('90ea18d54bc7dc6a87db72e34fb9131849300392') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../rocs-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD new file mode 100644 index 000000000..6b63198df --- /dev/null +++ b/kde-unstable/kdeedu-step/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-step +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Interactive Physical Simulator" +url="http://kde.org/applications/education/step/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2") +sha1sums=('a71d1ed2f92c9b881640b273adafa71240ca6e8a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../step-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-step/kdeedu-step.install b/kde-unstable/kdeedu-step/kdeedu-step.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-step/kdeedu-step.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD new file mode 100644 index 000000000..bc3b1576a --- /dev/null +++ b/kde-unstable/kdegames/PKGBUILD @@ -0,0 +1,514 @@ +# $Id: PKGBUILD 124786 2011-05-24 12:57:40Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegames +pkgname=('kdegames-bomber' + 'kdegames-bovo' + 'kdegames-granatier' + 'kdegames-kajongg' + 'kdegames-kapman' + 'kdegames-katomic' + 'kdegames-kbattleship' + 'kdegames-kblackbox' + 'kdegames-kblocks' + 'kdegames-kbounce' + 'kdegames-kbreakout' + 'kdegames-kdiamond' + 'kdegames-kfourinline' + 'kdegames-kgoldrunner' + 'kdegames-kigo' + 'kdegames-killbots' + 'kdegames-kiriki' + 'kdegames-kjumpingcube' + 'kdegames-klines' + 'kdegames-klickety' + 'kdegames-kmahjongg' + 'kdegames-kmines' + 'kdegames-knetwalk' + 'kdegames-kolf' + 'kdegames-kollision' + 'kdegames-konquest' + 'kdegames-kpatience' + 'kdegames-kreversi' + 'kdegames-kshisen' + 'kdegames-ksirk' + 'kdegames-kspaceduel' + 'kdegames-ksquares' + 'kdegames-ksudoku' + 'kdegames-ktron' + 'kdegames-ktuberling' + 'kdegames-kubrick' + 'kdegames-libkdegames' + 'kdegames-libkmahjongg' + 'kdegames-lskat' + 'kdegames-palapeli') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegames') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' + 'kdebindings-python' 'openal') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('c9e21203e8f47e1748c309a4ff14c87953c43839') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdegames-bomber() { + pkgdesc='Arcade Bombing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bomber/" + install='kdegames.install' + cd $srcdir/build/bomber + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bomber + make DESTDIR=$pkgdir install +} + +package_kdegames-bovo() { + pkgdesc='Five-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bovo/" + install='kdegames.install' + cd $srcdir/build/bovo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bovo + make DESTDIR=$pkgdir install +} + +package_kdegames-granatier() { + pkgdesc='Granatier' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') + url="http://kde.org/applications/games/granatier/" + install='kdegames.install' + cd $srcdir/build/granatier + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/granatier + make DESTDIR=$pkgdir install +} + +package_kdegames-kajongg() { + pkgdesc='The ancient Chinese board game for 4 players' + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + install='kdegames.install' + cd $srcdir/build/kajongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kajongg + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdegames-kapman() { + pkgdesc='Eat pills escaping ghosts' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kapman/" + install='kdegames.install' + cd $srcdir/build/kapman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapman + make DESTDIR=$pkgdir install +} + +package_kdegames-katomic() { + pkgdesc='Sokoban-like Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/katomic/" + install='kdegames.install' + cd $srcdir/build/katomic + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/katomic + make DESTDIR=$pkgdir install +} + +package_kdegames-kbattleship() { + pkgdesc='Battleship Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kbattleship/" + install='kdegames-kbattleship.install' + cd $srcdir/build/kbattleship + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbattleship + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ + $pkgdir/usr/share/ggz/kbattleship.dsc +} + +package_kdegames-kblackbox() { + pkgdesc='Blackbox Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblackbox/" + install='kdegames.install' + cd $srcdir/build/kblackbox + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblackbox + make DESTDIR=$pkgdir install +} + +package_kdegames-kblocks() { + pkgdesc='Falling Blocks Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblocks/" + install='kdegames.install' + cd $srcdir/build/kblocks + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblocks + make DESTDIR=$pkgdir install +} + +package_kdegames-kbounce() { + pkgdesc='Ball Bouncing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbounce/" + install='kdegames.install' + cd $srcdir/build/kbounce + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbounce + make DESTDIR=$pkgdir install +} + +package_kdegames-kbreakout() { + pkgdesc='Breakout-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbreakout/" + install='kdegames.install' + cd $srcdir/build/kbreakout + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbreakout + make DESTDIR=$pkgdir install +} + +package_kdegames-kdiamond() { + pkgdesc='Three-in-a-row game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kdiamond/" + install='kdegames.install' + cd $srcdir/build/kdiamond + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdiamond + make DESTDIR=$pkgdir install +} + +package_kdegames-kfourinline() { + pkgdesc='Four-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kfourinline/" + install='kdegames-kfourinline.install' + cd $srcdir/build/kfourinline + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfourinline + make DESTDIR=$pkgdir install +} + +package_kdegames-kgoldrunner() { + pkgdesc='A game of action and puzzle-solving' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kgoldrunner/" + install='kdegames.install' + cd $srcdir/build/kgoldrunner + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgoldrunner + make DESTDIR=$pkgdir install +} + +package_kdegames-kigo() { + pkgdesc='Go Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') + url="http://kde.org/applications/games/kigo/" + install='kdegames-kigo.install' + cd $srcdir/build/kigo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kigo + make DESTDIR=$pkgdir install +} + +package_kdegames-killbots() { + pkgdesc='Killbots' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/killbots/" + install='kdegames.install' + cd $srcdir/build/killbots + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/killbots + make DESTDIR=$pkgdir install +} + +package_kdegames-kiriki() { + pkgdesc='Yahtzee-like Dice Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kiriki/" + install='kdegames.install' + cd $srcdir/build/kiriki + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiriki + make DESTDIR=$pkgdir install +} + +package_kdegames-kjumpingcube() { + pkgdesc='Territory Capture Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kjumpingcube/" + install='kdegames.install' + cd $srcdir/build/kjumpingcube + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kjumpingcube + make DESTDIR=$pkgdir install +} + +package_kdegames-klickety() { + pkgdesc='Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + replaces=('kdegames-ksame') + conflicts=('kdegames-ksame') + url="http://kde.org/applications/games/ksame/" + install='kdegames.install' + cd $srcdir/build/klickety + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klickety + make DESTDIR=$pkgdir install +} + +package_kdegames-klines() { + pkgdesc='Tactical Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/klines/" + install='kdegames.install' + cd $srcdir/build/klines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klines + make DESTDIR=$pkgdir install +} + +package_kdegames-kmahjongg() { + pkgdesc='Mahjongg Solitaire' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kmahjongg/" + install='kdegames.install' + cd $srcdir/build/kmahjongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-kmines() { + pkgdesc='Minesweeper-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kmines/" + install='kdegames.install' + cd $srcdir/build/kmines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmines + make DESTDIR=$pkgdir install +} + +package_kdegames-knetwalk() { + pkgdesc='Network Construction Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/knetwalk/" + install='kdegames.install' + cd $srcdir/build/knetwalk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/knetwalk + make DESTDIR=$pkgdir install +} + +package_kdegames-kolf() { + pkgdesc='Miniature Golf' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kolf/" + install='kdegames-kolf.install' + cd $srcdir/build/kolf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kolf + make DESTDIR=$pkgdir install +} + +package_kdegames-kollision() { + pkgdesc='A simple ball dodging game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kollision/" + install='kdegames.install' + cd $srcdir/build/kollision + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kollision + make DESTDIR=$pkgdir install +} + +package_kdegames-konquest() { + pkgdesc='Galactic Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/konquest/" + install='kdegames.install' + cd $srcdir/build/konquest + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/konquest + make DESTDIR=$pkgdir install +} + +package_kdegames-kpatience() { + pkgdesc='Patience Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kpatience/" + install='kdegames.install' + replaces=('kdegames-kpat') + cd $srcdir/build/kpat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kpat + make DESTDIR=$pkgdir install +} + +package_kdegames-kreversi() { + pkgdesc='Reversi Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kreversi/" + install='kdegames-kreversi.install' + cd $srcdir/build/kreversi + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kreversi + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ + $pkgdir/usr/share/ggz/kreversi.dsc +} + +package_kdegames-kshisen() { + pkgdesc='Shisen-Sho Mahjongg-like Tile Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kshisen/" + install='kdegames.install' + cd $srcdir/build/kshisen + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kshisen + make DESTDIR=$pkgdir install +} + +package_kdegames-ksirk() { + pkgdesc='World Domination Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksirk/" + install='kdegames.install' + cd $srcdir/build/ksirk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksirk + make DESTDIR=$pkgdir install +} + +package_kdegames-kspaceduel() { + pkgdesc='Space Arcade Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kspaceduel/" + install='kdegames-kspaceduel.install' + cd $srcdir/build/kspaceduel + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kspaceduel + make DESTDIR=$pkgdir install +} + +package_kdegames-ksquares() { + pkgdesc='Connect the dots to create squares' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/ksquares/" + install='kdegames-ksquares.install' + cd $srcdir/build/ksquares + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksquares + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ + $pkgdir/usr/share/ggz/ksquares.dsc +} + +package_kdegames-ksudoku() { + pkgdesc='KSudoku, Sudoku game & more for KDE' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksudoku/" + install='kdegames.install' + cd $srcdir/build/ksudoku + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksudoku + make DESTDIR=$pkgdir install +} + +package_kdegames-ktron() { + pkgdesc='Tron-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktron/" + install='kdegames.install' + cd $srcdir/build/ktron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktron + make DESTDIR=$pkgdir install +} + +package_kdegames-ktuberling() { + pkgdesc='Picture Game for Children' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktuberling/" + install='kdegames-ktuberling.install' + cd $srcdir/build/ktuberling + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktuberling + make DESTDIR=$pkgdir install +} + +package_kdegames-kubrick() { + pkgdesc='A 3-D game based on Rubik´s Cube' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kubrick/" + install='kdegames.install' + cd $srcdir/build/kubrick + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kubrick + make DESTDIR=$pkgdir install +} + +package_kdegames-libkdegames() { + pkgdesc='KDE game library' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkdegames + make DESTDIR=$pkgdir install + for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do + install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) + done +} + +package_kdegames-libkmahjongg() { + pkgdesc='Library used for loading and rendering of Mahjongg tilesets' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-lskat() { + pkgdesc='Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/lskat/" + install='kdegames-lskat.install' + cd $srcdir/build/lskat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lskat + make DESTDIR=$pkgdir install +} + +package_kdegames-palapeli() { + pkgdesc='Jigsaw puzzle game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/palapeli/" + install='kdegames-palapeli.install' + cd $srcdir/build/palapeli + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/palapeli + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdegames/kdegames-kbattleship.install b/kde-unstable/kdegames/kdegames-kbattleship.install new file mode 100644 index 000000000..ac4516ed0 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kbattleship.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kbattleship.dsc ]; then + ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/kde-unstable/kdegames/kdegames-kfourinline.install b/kde-unstable/kdegames/kdegames-kfourinline.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kfourinline.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-kigo.install b/kde-unstable/kdegames/kdegames-kigo.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kigo.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-kolf.install b/kde-unstable/kdegames/kdegames-kolf.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kolf.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-kreversi.install b/kde-unstable/kdegames/kdegames-kreversi.install new file mode 100644 index 000000000..4623e6e49 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kreversi.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kreversi.dsc ]; then + ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/kde-unstable/kdegames/kdegames-kspaceduel.install b/kde-unstable/kdegames/kdegames-kspaceduel.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kspaceduel.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-ksquares.install b/kde-unstable/kdegames/kdegames-ksquares.install new file mode 100644 index 000000000..5a619897d --- /dev/null +++ b/kde-unstable/kdegames/kdegames-ksquares.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/ksquares.dsc ]; then + ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/kde-unstable/kdegames/kdegames-ktuberling.install b/kde-unstable/kdegames/kdegames-ktuberling.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-ktuberling.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-lskat.install b/kde-unstable/kdegames/kdegames-lskat.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-lskat.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-palapeli.install b/kde-unstable/kdegames/kdegames-palapeli.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-palapeli.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames.install b/kde-unstable/kdegames/kdegames.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdegames/kdegames.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD new file mode 100644 index 000000000..c8528477b --- /dev/null +++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-gwenview +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A fast and easy to use image viewer for KDE" +url="http://kde.org/applications/graphics/gwenview/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-lib' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins') +source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") +sha1sums=('41b93bdcab6ba169be4ed3fcfb481c6ae1161bd6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../gwenview-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD new file mode 100644 index 000000000..17b0a9b3f --- /dev/null +++ b/kde-unstable/kdegraphics-kamera/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kamera +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Configure Kamera" +url="http://kde.org/applications/graphics/kamera/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'gphoto2') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2") +sha1sums=('cba0e4ca19fe62a9cbfe7b2559e5364c16944901') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kamera-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD new file mode 100644 index 000000000..ebad9e424 --- /dev/null +++ b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kcolorchooser +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Color Chooser" +url="http://kde.org/applications/graphics/kcolorchooser/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") +sha1sums=('99aad5ebb4b1d5d99426e8a33c2f15717cc4087e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kcolorchooser-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD new file mode 100644 index 000000000..18926be42 --- /dev/null +++ b/kde-unstable/kdegraphics-kgamma/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 124788 2011-05-24 12:59:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kgamma +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A monitor calibration tool" +url="http://kde.org/applications/graphics/kgamma/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +# note on libxxf86vm: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxxf86vm +depends=('kdebase-runtime' 'libxxf86vm') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") +sha1sums=('aac4e43df0095e0511bb27cc27a23b10847eb075') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgamma-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD new file mode 100644 index 000000000..c68c46c2d --- /dev/null +++ b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kolourpaint +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Paint Program" +url="http://kde.org/applications/graphics/kolourpaint/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") +sha1sums=('c79fc3a31d61623a02e7c89ede19cbe7e49a8518') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kolourpaint-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD new file mode 100644 index 000000000..663888d54 --- /dev/null +++ b/kde-unstable/kdegraphics-kruler/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kruler +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Screen Ruler" +url="http://kde.org/applications/graphics/kruler/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2") +sha1sums=('b43fee1954baa7b84866a1cd5f15cbcff54d5e3d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kruler-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD new file mode 100644 index 000000000..4dde21e03 --- /dev/null +++ b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-ksaneplugin +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A scan plugin that implements the scanning" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libksane') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") +sha1sums=('3caa70899ed3797c9739409d311779f39fa9eda7') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksaneplugin-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD new file mode 100644 index 000000000..de10d1e5e --- /dev/null +++ b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-ksnapshot +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Screen Capture Program" +url="http://kde.org/applications/graphics/ksnapshot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdelibs' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") +sha1sums=('684be8b03920e4a92625337ff18a5b368482dd08') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksnapshot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD new file mode 100644 index 000000000..4c027b673 --- /dev/null +++ b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-strigi-analyzer +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Strigi analyzers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('bc4c901bc4bc7080c91ed739d2480294d2fc5033') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD new file mode 100644 index 000000000..ce748bb92 --- /dev/null +++ b/kde-unstable/kdegraphics-svgpart/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-svgpart +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A KPart for viewving SVGs" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") +sha1sums=('300fc6a062ea34e6131097ae9a59e8279f3c1193') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../svgpart-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD new file mode 100644 index 000000000..7a3e5b1a1 --- /dev/null +++ b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-thumbnailers +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Thumbnailers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('d350cb85ad8520be00f6ee1f05a393d777e0f021') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics/PKGBUILD b/kde-unstable/kdegraphics/PKGBUILD new file mode 100644 index 000000000..4780a97e7 --- /dev/null +++ b/kde-unstable/kdegraphics/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegraphics +pkgname=('kdegraphics-okular') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'ebook-tools' + 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('69f191663db147cf481edd9f528fcae50c1dc2c3') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdegraphics-okular() { + pkgdesc='Document Viewer' + depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') + url="http://kde.org/applications/graphics/okular/" + install='kdegraphics-okular.install' + cd $srcdir/build/okular + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okular + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdegraphics/kdegraphics-okular.install b/kde-unstable/kdegraphics/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics/kdegraphics-okular.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD index 0f4a867d4..8bfff6584 100644 --- a/testing/kdelibs/PKGBUILD +++ b/kde-unstable/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $ +# $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.3 -pkgrel=2 +pkgver=4.6.80 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -16,14 +16,15 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' 'docbook-xsl') makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell') -replaces=('arts' 'kdelibs-experimental') +replaces=('kdelibs-experimental') install='kdelibs.install' -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch') -sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' +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' - 'd994f262356af5b9e4e9619646e471bd98c91efb') + '13cbb58347dc7103684bb002b8f636fc0fa9e738') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -32,8 +33,9 @@ build() { patch -p1 -i $srcdir/kde-applications-menu.patch # add Archlinux menu entry patch -p1 -i $srcdir/archlinux-menu.patch - # add syntax highlightning for PKGBUILD and .install files - patch -p1 -i $srcdir/abs-syntax-highlight.patch + + # Already fixed upstream + patch -p1 -i "${srcdir}"/kcalendarsystem-fixed.patch cd ${srcdir} mkdir build @@ -46,8 +48,7 @@ build() { -DSYSCONF_INSTALL_DIR=/etc \ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ -DKDE_DEFAULT_HOME='.kde4' \ - -DWITH_FAM=OFF \ - -DKAUTH_BACKEND=PolkitQt-1 + -DWITH_FAM=OFF make } diff --git a/testing/kdelibs/archlinux-menu.patch b/kde-unstable/kdelibs/archlinux-menu.patch index 546784fa2..546784fa2 100644 --- a/testing/kdelibs/archlinux-menu.patch +++ b/kde-unstable/kdelibs/archlinux-menu.patch diff --git a/kde-unstable/kdelibs/kcalendarsystem-fixed.patch b/kde-unstable/kdelibs/kcalendarsystem-fixed.patch new file mode 100644 index 000000000..d97a9b904 --- /dev/null +++ b/kde-unstable/kdelibs/kcalendarsystem-fixed.patch @@ -0,0 +1,18073 @@ +diff --git a/kdecore/date/kcalendarera.cpp b/kdecore/date/kcalendarera.cpp +index d56c265..0a21e37 100644 +--- a/kdecore/date/kcalendarera.cpp ++++ b/kdecore/date/kcalendarera.cpp +@@ -71,21 +71,21 @@ int KCalendarEra::direction() const + return m_direction; + } + +-bool KCalendarEra::isInEra( const QDate &date ) const ++bool KCalendarEra::isInEra(const QDate &date) const + { +- if ( m_endDate < m_startDate ) { +- return ( date >= m_endDate && date <= m_startDate ); ++ if (m_endDate < m_startDate) { ++ return (date >= m_endDate && date <= m_startDate); + } else { +- return ( date >= m_startDate && date <= m_endDate ); ++ return (date >= m_startDate && date <= m_endDate); + } + } + +-int KCalendarEra::yearInEra( int year ) const ++int KCalendarEra::yearInEra(int year) const + { +- return ( ( year - m_startYear ) * m_direction ) + m_offset; ++ return ((year - m_startYear) * m_direction) + m_offset; + } + +-int KCalendarEra::year( int yearInEra ) const ++int KCalendarEra::year(int yearInEra) const + { +- return ( ( yearInEra - m_offset ) / m_direction ) + m_startYear; ++ return ((yearInEra - m_offset) / m_direction) + m_startYear; + } +diff --git a/kdecore/date/kcalendarera_p.h b/kdecore/date/kcalendarera_p.h +index f1f05f7..d1564ea 100644 +--- a/kdecore/date/kcalendarera_p.h ++++ b/kdecore/date/kcalendarera_p.h +@@ -56,9 +56,9 @@ public: + int direction() const; + int offset() const; + +- bool isInEra( const QDate &date ) const; +- int yearInEra( int year ) const; +- int year( int yearInEra ) const; ++ bool isInEra(const QDate &date) const; ++ int yearInEra(int year) const; ++ int year(int yearInEra) const; + + private: + friend class KCalendarSystemPrivate; +diff --git a/kdecore/date/kcalendarsystem.cpp b/kdecore/date/kcalendarsystem.cpp +index ccc02cd..77ef0e9 100644 +--- a/kdecore/date/kcalendarsystem.cpp ++++ b/kdecore/date/kcalendarsystem.cpp +@@ -34,91 +34,92 @@ + #include "kcalendarsystemcoptic_p.h" + #include "kcalendarsystemethiopian_p.h" + #include "kcalendarsystemgregorian_p.h" +-#include "kcalendarsystemgregorianproleptic_p.h" + #include "kcalendarsystemhebrew_p.h" +-#include "kcalendarsystemhijri_p.h" + #include "kcalendarsystemindiannational_p.h" ++#include "kcalendarsystemislamiccivil_p.h" + #include "kcalendarsystemjalali_p.h" + #include "kcalendarsystemjapanese_p.h" + #include "kcalendarsystemjulian_p.h" + #include "kcalendarsystemminguo_p.h" ++#include "kcalendarsystemqdate_p.h" + #include "kcalendarsystemthai_p.h" + +-KCalendarSystem *KCalendarSystem::create( const QString &calendarType, const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(const QString &calendarType, const KLocale *locale) + { +- return create( calendarSystemForCalendarType( calendarType ), locale ); ++ return create(calendarSystem(calendarType), locale); + } + +-KCalendarSystem *KCalendarSystem::create( const QString &calendarType, KSharedConfig::Ptr config, +- const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(const QString &calendarType, KSharedConfig::Ptr config, ++ const KLocale *locale) + { +- return create( calendarSystemForCalendarType( calendarType ), config, locale ); ++ return create(calendarSystem(calendarType), config, locale); + } + + QStringList KCalendarSystem::calendarSystems() + { + QStringList lst; + +- lst.append( QLatin1String("coptic") ); +- lst.append( QLatin1String("ethiopian") ); +- lst.append( QLatin1String("gregorian") ); +- lst.append( QLatin1String("gregorian-proleptic") ); +- lst.append( QLatin1String("hebrew") ); +- lst.append( QLatin1String("hijri") ); +- lst.append( QLatin1String("indian-national") ); +- lst.append( QLatin1String("jalali") ); +- lst.append( QLatin1String("japanese") ); +- lst.append( QLatin1String("julian") ); +- lst.append( QLatin1String("minguo") ); +- lst.append( QLatin1String("thai") ); ++ lst.append(QLatin1String("coptic")); ++ lst.append(QLatin1String("ethiopian")); ++ lst.append(QLatin1String("gregorian")); ++ lst.append(QLatin1String("gregorian-proleptic")); ++ lst.append(QLatin1String("hebrew")); ++ lst.append(QLatin1String("hijri")); ++ lst.append(QLatin1String("indian-national")); ++ lst.append(QLatin1String("jalali")); ++ lst.append(QLatin1String("japanese")); ++ lst.append(QLatin1String("julian")); ++ lst.append(QLatin1String("minguo")); ++ lst.append(QLatin1String("thai")); + + return lst; + } + +-QString KCalendarSystem::calendarLabel( const QString &calendarType ) ++QString KCalendarSystem::calendarLabel(const QString &calendarType) + { +- if ( calendarSystems().contains( calendarType ) ) { +- return KCalendarSystem::calendarLabel( KCalendarSystem::calendarSystemForCalendarType( calendarType ) ); ++ if (calendarSystemsList().contains(calendarSystem(calendarType))) { ++ return KCalendarSystem::calendarLabel(KCalendarSystem::calendarSystem(calendarType)); + } else { +- return ki18nc( "@item Calendar system", "Invalid Calendar Type" ).toString( KGlobal::locale() ); ++ return ki18nc("@item Calendar system", "Invalid Calendar Type").toString(KGlobal::locale()); + } + } + +-KCalendarSystem *KCalendarSystem::create( KLocale::CalendarSystem calendarSystem, const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(KLocale::CalendarSystem calendarSystem, const KLocale *locale) + { +- return create( calendarSystem, KSharedConfig::Ptr(), locale ); ++ return create(calendarSystem, KSharedConfig::Ptr(), locale); + } + +-KCalendarSystem *KCalendarSystem::create( KLocale::CalendarSystem calendarSystem, KSharedConfig::Ptr config, +- const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(KLocale::CalendarSystem calendarSystem, ++ KSharedConfig::Ptr config, ++ const KLocale *locale) + { +- switch ( calendarSystem ) { ++ switch (calendarSystem) { + case KLocale::QDateCalendar: +- return new KCalendarSystemGregorian( config, locale ); ++ return new KCalendarSystemQDate(config, locale); + case KLocale::CopticCalendar: +- return new KCalendarSystemCoptic( config, locale ); ++ return new KCalendarSystemCoptic(config, locale); + case KLocale::EthiopianCalendar: +- return new KCalendarSystemEthiopian( config, locale ); ++ return new KCalendarSystemEthiopian(config, locale); + case KLocale::GregorianCalendar: +- return new KCalendarSystemGregorianProleptic( config, locale ); ++ return new KCalendarSystemGregorian(config, locale); + case KLocale::HebrewCalendar: +- return new KCalendarSystemHebrew( config, locale ); +- case KLocale::IslamicCivilCalendar: +- return new KCalendarSystemHijri( config, locale ); ++ return new KCalendarSystemHebrew(config, locale); + case KLocale::IndianNationalCalendar: +- return new KCalendarSystemIndianNational( config, locale ); ++ return new KCalendarSystemIndianNational(config, locale); ++ case KLocale::IslamicCivilCalendar: ++ return new KCalendarSystemIslamicCivil(config, locale); + case KLocale::JalaliCalendar: +- return new KCalendarSystemJalali( config, locale ); ++ return new KCalendarSystemJalali(config, locale); + case KLocale::JapaneseCalendar: +- return new KCalendarSystemJapanese( config, locale ); ++ return new KCalendarSystemJapanese(config, locale); + case KLocale::JulianCalendar: +- return new KCalendarSystemJulian( config, locale ); ++ return new KCalendarSystemJulian(config, locale); + case KLocale::MinguoCalendar: +- return new KCalendarSystemMinguo( config, locale ); ++ return new KCalendarSystemMinguo(config, locale); + case KLocale::ThaiCalendar: +- return new KCalendarSystemThai( config, locale ); ++ return new KCalendarSystemThai(config, locale); + default: +- return new KCalendarSystemGregorian( config, locale ); ++ return new KCalendarSystemQDate(config, locale); + } + } + +@@ -126,90 +127,127 @@ QList<KLocale::CalendarSystem> KCalendarSystem::calendarSystemsList() + { + QList<KLocale::CalendarSystem> list; + +- list.append( KLocale::QDateCalendar ); +- list.append( KLocale::CopticCalendar ); +- list.append( KLocale::EthiopianCalendar ); +- list.append( KLocale::GregorianCalendar ); +- list.append( KLocale::HebrewCalendar ); +- list.append( KLocale::IslamicCivilCalendar ); +- list.append( KLocale::IndianNationalCalendar ); +- list.append( KLocale::JalaliCalendar ); +- list.append( KLocale::JapaneseCalendar ); +- list.append( KLocale::JulianCalendar ); +- list.append( KLocale::MinguoCalendar ); +- list.append( KLocale::ThaiCalendar ); ++ list.append(KLocale::QDateCalendar); ++ list.append(KLocale::CopticCalendar); ++ list.append(KLocale::EthiopianCalendar); ++ list.append(KLocale::GregorianCalendar); ++ list.append(KLocale::HebrewCalendar); ++ list.append(KLocale::IslamicCivilCalendar); ++ list.append(KLocale::IndianNationalCalendar); ++ list.append(KLocale::JalaliCalendar); ++ list.append(KLocale::JapaneseCalendar); ++ list.append(KLocale::JulianCalendar); ++ list.append(KLocale::MinguoCalendar); ++ list.append(KLocale::ThaiCalendar); + + return list; + } + +-QString KCalendarSystem::calendarLabel( KLocale::CalendarSystem calendarSystem, const KLocale *locale ) ++QString KCalendarSystem::calendarLabel(KLocale::CalendarSystem calendarSystem, const KLocale *locale) + { +- switch ( calendarSystem ) { ++ switch (calendarSystem) { + case KLocale::QDateCalendar: +- return ki18nc( "@item Calendar system", "Gregorian" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Gregorian").toString(locale); + case KLocale::CopticCalendar: +- return ki18nc( "@item Calendar system", "Coptic" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Coptic").toString(locale); + case KLocale::EthiopianCalendar: +- return ki18nc( "@item Calendar system", "Ethiopian" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Ethiopian").toString(locale); + case KLocale::GregorianCalendar: +- return ki18nc( "@item Calendar system", "Gregorian (Proleptic)" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Gregorian (Proleptic)").toString(locale); + case KLocale::HebrewCalendar: +- return ki18nc( "@item Calendar system", "Hebrew" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Hebrew").toString(locale); + case KLocale::IslamicCivilCalendar: +- return ki18nc( "@item Calendar system", "Islamic / Hijri (Civil)" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Islamic / Hijri (Civil)").toString(locale); + case KLocale::IndianNationalCalendar: +- return ki18nc( "@item Calendar system", "Indian National" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Indian National").toString(locale); + case KLocale::JalaliCalendar: +- return ki18nc( "@item Calendar system", "Jalali" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Jalali").toString(locale); + case KLocale::JapaneseCalendar: +- return ki18nc( "@item Calendar system", "Japanese" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Japanese").toString(locale); + case KLocale::JulianCalendar: +- return ki18nc( "@item Calendar system", "Julian" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Julian").toString(locale); + case KLocale::MinguoCalendar: +- return ki18nc( "@item Calendar system", "Taiwanese" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Taiwanese").toString(locale); + case KLocale::ThaiCalendar: +- return ki18nc( "@item Calendar system", "Thai" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Thai").toString(locale); + } + +- return ki18nc( "@item Calendar system", "Invalid Calendar Type" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Invalid Calendar Type").toString(locale); + } + +-KLocale::CalendarSystem KCalendarSystem::calendarSystemForCalendarType( const QString &calendarType ) ++KLocale::CalendarSystem KCalendarSystem::calendarSystemForCalendarType(const QString &calendarType ) + { +- if ( calendarType == QLatin1String( "coptic" ) ) { ++ return calendarSystem( calendarType ); ++} ++ ++KLocale::CalendarSystem KCalendarSystem::calendarSystem(const QString &calendarType ) ++{ ++ if (calendarType == QLatin1String("coptic")) { + return KLocale::CopticCalendar; +- } else if ( calendarType == QLatin1String( "ethiopian" ) ) { ++ } else if (calendarType == QLatin1String("ethiopian")) { + return KLocale::EthiopianCalendar; +- } else if ( calendarType == QLatin1String( "gregorian" ) ) { ++ } else if (calendarType == QLatin1String("gregorian")) { + return KLocale::QDateCalendar; +- } else if ( calendarType == QLatin1String( "gregorian-proleptic" ) ) { ++ } else if (calendarType == QLatin1String("gregorian-proleptic")) { + return KLocale::GregorianCalendar; +- } else if ( calendarType == QLatin1String( "hebrew" ) ) { ++ } else if (calendarType == QLatin1String("hebrew")) { + return KLocale::HebrewCalendar; +- } else if ( calendarType == QLatin1String( "hijri" ) ) { ++ } else if (calendarType == QLatin1String("hijri")) { + return KLocale::IslamicCivilCalendar; +- } else if ( calendarType == QLatin1String( "indian-national" ) ) { ++ } else if (calendarType == QLatin1String("indian-national")) { + return KLocale::IndianNationalCalendar; +- } else if ( calendarType == QLatin1String( "jalali" ) ) { ++ } else if (calendarType == QLatin1String("jalali")) { + return KLocale::JalaliCalendar; +- } else if ( calendarType == QLatin1String( "japanese" ) ) { ++ } else if (calendarType == QLatin1String("japanese")) { + return KLocale::JapaneseCalendar; +- } else if ( calendarType == QLatin1String( "julian" ) ) { ++ } else if (calendarType == QLatin1String("julian")) { + return KLocale::JulianCalendar; +- } else if ( calendarType == QLatin1String( "minguo" ) ) { ++ } else if (calendarType == QLatin1String("minguo")) { + return KLocale::MinguoCalendar; +- } else if ( calendarType == QLatin1String( "thai" ) ) { ++ } else if (calendarType == QLatin1String("thai")) { + return KLocale::ThaiCalendar; + } else { + return KLocale::QDateCalendar; + } + } + ++QString KCalendarSystem::calendarType(KLocale::CalendarSystem calendarSystem) ++{ ++ if (calendarSystem == KLocale::QDateCalendar) { ++ return QLatin1String("gregorian"); ++ } else if (calendarSystem == KLocale::CopticCalendar) { ++ return QLatin1String("coptic"); ++ } else if (calendarSystem == KLocale::EthiopianCalendar) { ++ return QLatin1String("ethiopian"); ++ } else if (calendarSystem == KLocale::GregorianCalendar) { ++ return QLatin1String("gregorian-proleptic"); ++ } else if (calendarSystem == KLocale::HebrewCalendar) { ++ return QLatin1String("hebrew"); ++ } else if (calendarSystem == KLocale::IndianNationalCalendar) { ++ return QLatin1String("indian-national"); ++ } else if (calendarSystem == KLocale::IslamicCivilCalendar) { ++ return QLatin1String("hijri"); ++ } else if (calendarSystem == KLocale::JalaliCalendar) { ++ return QLatin1String("jalali"); ++ } else if (calendarSystem == KLocale::JapaneseCalendar) { ++ return QLatin1String("japanese"); ++ } else if (calendarSystem == KLocale::JulianCalendar) { ++ return QLatin1String("julian"); ++ } else if (calendarSystem == KLocale::MinguoCalendar) { ++ return QLatin1String("minguo"); ++ } else if (calendarSystem == KLocale::ThaiCalendar) { ++ return QLatin1String("thai"); ++ } else { ++ return QLatin1String("gregorian"); ++ } ++} ++ + // Shared d pointer base class definitions + +-KCalendarSystemPrivate::KCalendarSystemPrivate( KCalendarSystem *q_ptr ): q( q_ptr ), +- m_eraList( 0 ), +- m_shortYearWindowStartYear( 2000 ) ++KCalendarSystemPrivate::KCalendarSystemPrivate(KCalendarSystem *q_ptr) ++ : q(q_ptr), ++ m_eraList(0), ++ m_shortYearWindowStartYear(2000) + { + } + +@@ -230,31 +268,31 @@ KLocale::CalendarSystem KCalendarSystemPrivate::calendarSystem() const + // This method MUST be re-implemented in any new Calendar System + void KCalendarSystemPrivate::loadDefaultEraList() + { +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), QLatin1String("Before KDE"), QLatin1String("BK"), QLatin1String("%Ey %EC") ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), QLatin1String("Anno KDE"), QLatin1String("AK"), QLatin1String("%Ey %EC") ); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), QLatin1String("Before KDE"), QLatin1String("BK"), QLatin1String("%Ey %EC")); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), QLatin1String("Anno KDE"), QLatin1String("AK"), QLatin1String("%Ey %EC")); + } + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-int KCalendarSystemPrivate::monthsInYear( int year ) const ++int KCalendarSystemPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-int KCalendarSystemPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemPrivate::daysInMonth(int year, int month) const + { +- if ( month == 2 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 2) { ++ if (isLeapYear(year)) { + return 29; + } else { + return 28; + } + } + +- if ( month == 4 || month == 6 || month == 9 || month == 11 ) { ++ if (month == 4 || month == 6 || month == 9 || month == 11) { + return 30; + } + +@@ -263,9 +301,9 @@ int KCalendarSystemPrivate::daysInMonth( int year, int month ) const + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-int KCalendarSystemPrivate::daysInYear( int year ) const ++int KCalendarSystemPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -281,16 +319,16 @@ int KCalendarSystemPrivate::daysInWeek() const + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-bool KCalendarSystemPrivate::isLeapYear( int year ) const ++bool KCalendarSystemPrivate::isLeapYear(int year) const + { +- if ( year < 1 ) { ++ if (year < 1) { + year = year + 1; + } + +- if ( year % 4 == 0 ) { +- if ( year % 100 != 0 ) { ++ if (year % 4 == 0) { ++ if (year % 100 != 0) { + return true; +- } else if ( year % 400 == 0 ) { ++ } else if (year % 400 == 0) { + return true; + } + } +@@ -346,120 +384,120 @@ int KCalendarSystemPrivate::latestValidYear() const + + // Dummy version + // This method MUST be re-implemented in any new Calendar System +-QString KCalendarSystemPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( month ); +- Q_UNUSED( year ); +- Q_UNUSED( format ); +- Q_UNUSED( possessive ); ++ Q_UNUSED(month); ++ Q_UNUSED(year); ++ Q_UNUSED(format); ++ Q_UNUSED(possessive); + return QString(); + } + + // Dummy version + // This method MUST be re-implemented in any new Calendar System +-QString KCalendarSystemPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- Q_UNUSED( weekDay ); +- Q_UNUSED( format ); ++ Q_UNUSED(weekDay); ++ Q_UNUSED(format); + return QString(); + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum ) const ++int KCalendarSystemPrivate::week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); + +- switch ( weekNumberSystem ) { ++ switch (weekNumberSystem) { + case KLocale::IsoWeekNumber: +- return isoWeekNumber( date, yearNum ); ++ return isoWeekNumber(date, yearNum); + case KLocale::FirstFullWeek: +- return regularWeekNumber( date, locale()->weekStartDay(), 0, yearNum ); ++ return regularWeekNumber(date, locale()->weekStartDay(), 0, yearNum); + case KLocale::FirstPartialWeek: +- return regularWeekNumber( date, locale()->weekStartDay(), 1, yearNum ); ++ return regularWeekNumber(date, locale()->weekStartDay(), 1, yearNum); + case KLocale::SimpleWeek: +- return simpleWeekNumber( date, yearNum ); ++ return simpleWeekNumber(date, yearNum); + case KLocale::DefaultWeekNumber: + default: +- return week( date, locale()->weekNumberSystem(), yearNum ); ++ return week(date, locale()->weekNumberSystem(), yearNum); + } + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::isoWeekNumber( const QDate &date, int *yearNum ) const ++int KCalendarSystemPrivate::isoWeekNumber(const QDate &date, int *yearNum) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); + + QDate firstDayWeek1, lastDay; + int week; + int weekDay1, dayOfWeek1InYear; + + // let's guess 1st day of 1st week +- firstDayWeek1 = firstDayOfYear( y ); +- weekDay1 = dayOfWeek( firstDayWeek1 ); ++ firstDayWeek1 = firstDayOfYear(y); ++ weekDay1 = dayOfWeek(firstDayWeek1); + + // iso 8601: week 1 is the first containing thursday and week starts on monday +- if ( weekDay1 > 4 /*Thursday*/ ) { +- firstDayWeek1 = q->addDays( firstDayWeek1 , daysInWeek() - weekDay1 + 1 ); // next monday ++ if (weekDay1 > 4 /*Thursday*/) { ++ firstDayWeek1 = q->addDays(firstDayWeek1 , daysInWeek() - weekDay1 + 1); // next monday + } + +- dayOfWeek1InYear = dayOfYear( firstDayWeek1 ); ++ dayOfWeek1InYear = dayOfYear(firstDayWeek1); + + // our date in prev year's week +- if ( dayOfYear( date ) < dayOfWeek1InYear ) { +- if ( yearNum ) { +- *yearNum = addYears( y, - 1 ); ++ if (dayOfYear(date) < dayOfWeek1InYear) { ++ if (yearNum) { ++ *yearNum = addYears(y, - 1); + } +- return isoWeeksInYear( addYears( y, - 1 ) ); ++ return isoWeeksInYear(addYears(y, - 1)); + } + + // let's check if its last week belongs to next year +- lastDay = lastDayOfYear( y ); ++ lastDay = lastDayOfYear(y); + + // if our date is in last week && 1st week in next year has thursday +- if ( ( dayOfYear( date ) >= daysInYear( y ) - dayOfWeek( lastDay ) + 1 ) +- && dayOfWeek( lastDay ) < 4 ) { +- if ( yearNum ) { +- * yearNum = addYears( y, 1 ); ++ if ((dayOfYear(date) >= daysInYear(y) - dayOfWeek(lastDay) + 1) ++ && dayOfWeek(lastDay) < 4) { ++ if (yearNum) { ++ * yearNum = addYears(y, 1); + } + week = 1; + } else { + // To calculate properly the number of weeks from day a to x let's make a day 1 of week +- if( weekDay1 < 5 ) { +- firstDayWeek1 = q->addDays( firstDayWeek1, -( weekDay1 - 1 ) ); ++ if (weekDay1 < 5) { ++ firstDayWeek1 = q->addDays(firstDayWeek1, -(weekDay1 - 1)); + } + +- if ( yearNum ) { ++ if (yearNum) { + * yearNum = y; + } + +- week = firstDayWeek1.daysTo( date ) / daysInWeek() + 1; ++ week = firstDayWeek1.daysTo(date) / daysInWeek() + 1; + } + + return week; + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::regularWeekNumber( const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear ) const ++int KCalendarSystemPrivate::regularWeekNumber(const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); + +- int firstWeekDayOffset = ( dayOfWeek( date ) - weekStartDay + daysInWeek() ) % daysInWeek(); +- int dayInYear = date.toJulianDay() - firstDayOfYear( y ).toJulianDay(); // 0 indexed +- int week = ( ( dayInYear - firstWeekDayOffset + daysInWeek() ) / daysInWeek() ); ++ int firstWeekDayOffset = (dayOfWeek(date) - weekStartDay + daysInWeek()) % daysInWeek(); ++ int dayInYear = date.toJulianDay() - firstDayOfYear(y).toJulianDay(); // 0 indexed ++ int week = ((dayInYear - firstWeekDayOffset + daysInWeek()) / daysInWeek()); + +- if ( dayOfWeek( firstDayOfYear( y ) ) != weekStartDay ) { ++ if (dayOfWeek(firstDayOfYear(y)) != weekStartDay) { + week = week + firstWeekNumber; + } + +- if ( week < 1 ) { ++ if (week < 1) { + y = y - 1; +- week = regularWeeksInYear( y, weekStartDay, firstWeekNumber ); ++ week = regularWeeksInYear(y, weekStartDay, firstWeekNumber); + } + +- if ( weekYear ) { ++ if (weekYear) { + *weekYear = y; + } + +@@ -467,67 +505,67 @@ int KCalendarSystemPrivate::regularWeekNumber( const QDate &date, int weekStartD + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::simpleWeekNumber( const QDate &date, int *yearNum ) const ++int KCalendarSystemPrivate::simpleWeekNumber(const QDate &date, int *yearNum) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); +- if ( yearNum ) { ++ q->julianDayToDate(date.toJulianDay(), y, m, d); ++ if (yearNum) { + *yearNum = y; + } +- return ( ( date.toJulianDay() - firstDayOfYear( y ).toJulianDay() ) / daysInWeek() ) + 1; ++ return ((date.toJulianDay() - firstDayOfYear(y).toJulianDay()) / daysInWeek()) + 1; + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const ++int KCalendarSystemPrivate::weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const + { +- switch ( weekNumberSystem ) { ++ switch (weekNumberSystem) { + case KLocale::IsoWeekNumber: +- return isoWeeksInYear( year ); ++ return isoWeeksInYear(year); + case KLocale::FirstFullWeek: +- return regularWeeksInYear( year, locale()->weekStartDay(), 0 ); ++ return regularWeeksInYear(year, locale()->weekStartDay(), 0); + case KLocale::FirstPartialWeek: +- return regularWeeksInYear( year, locale()->weekStartDay(), 1 ); ++ return regularWeeksInYear(year, locale()->weekStartDay(), 1); + case KLocale::SimpleWeek: +- return simpleWeeksInYear( year ); ++ return simpleWeeksInYear(year); + case KLocale::DefaultWeekNumber: + default: +- return weeksInYear( year, locale()->weekNumberSystem() ); ++ return weeksInYear(year, locale()->weekNumberSystem()); + } + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::isoWeeksInYear( int year ) const ++int KCalendarSystemPrivate::isoWeeksInYear(int year) const + { +- QDate lastDayOfThisYear = lastDayOfYear( year ); ++ QDate lastDayOfThisYear = lastDayOfYear(year); + + int weekYear = year; +- int lastWeekInThisYear = isoWeekNumber( lastDayOfThisYear, &weekYear ); ++ int lastWeekInThisYear = isoWeekNumber(lastDayOfThisYear, &weekYear); + + // If error, or the last day of the year is in the first week of next year use the week before +- if ( lastWeekInThisYear < 1 || weekYear != year ) { +- lastWeekInThisYear = isoWeekNumber( q->addDays( lastDayOfThisYear, -7 ), &weekYear ); ++ if (lastWeekInThisYear < 1 || weekYear != year) { ++ lastWeekInThisYear = isoWeekNumber(q->addDays(lastDayOfThisYear, -7), &weekYear); + } + + return lastWeekInThisYear; + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::regularWeeksInYear( int year, int weekStartDay, int firstWeekNumber ) const ++int KCalendarSystemPrivate::regularWeeksInYear(int year, int weekStartDay, int firstWeekNumber) const + { +- return regularWeekNumber( lastDayOfYear( year ), weekStartDay, firstWeekNumber, 0 ); ++ return regularWeekNumber(lastDayOfYear(year), weekStartDay, firstWeekNumber, 0); + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::simpleWeeksInYear( int year ) const ++int KCalendarSystemPrivate::simpleWeeksInYear(int year) const + { +- return simpleWeekNumber( lastDayOfYear( year ), 0 ); ++ return simpleWeekNumber(lastDayOfYear(year), 0); + } + + // Reimplement if special maths handling required, e.g. Hebrew. + // Works for calendars with constant number of months, or where leap month is last month of year + // Will not work for Hebrew or others where leap month is inserted in middle of year +-void KCalendarSystemPrivate::dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const ++void KCalendarSystemPrivate::dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { + // This could be optimised a little but is left in full as it's easier to understand + int dy = 0; +@@ -535,171 +573,171 @@ void KCalendarSystemPrivate::dateDifference( const QDate &fromDate, const QDate + int dd = 0; + int dir = 1; + +- if ( toDate < fromDate ) { +- dateDifference( toDate, fromDate, &dy, &dm, &dd, 0 ); ++ if (toDate < fromDate) { ++ dateDifference(toDate, fromDate, &dy, &dm, &dd, 0); + dir = -1; +- } else if ( toDate > fromDate ) { ++ } else if (toDate > fromDate) { + +- int fromYear = q->year( fromDate ); +- int toYear = q->year( toDate ); +- int fromMonth = q->month( fromDate ); +- int toMonth = q->month( toDate ); +- int fromDay = q->day( fromDate ); +- int toDay = q->day( toDate ); ++ int fromYear = q->year(fromDate); ++ int toYear = q->year(toDate); ++ int fromMonth = q->month(fromDate); ++ int toMonth = q->month(toDate); ++ int fromDay = q->day(fromDate); ++ int toDay = q->day(toDate); + +- int monthsInPrevYear = monthsInYear( addYears( toYear, -1 ) ); +- int daysInPrevMonth = q->daysInMonth( q->addMonths( toDate, -1 ) ); +- int daysInFromMonth = daysInMonth( fromYear, fromMonth ); +- int daysInToMonth = daysInMonth( toYear, toMonth ); ++ int monthsInPrevYear = monthsInYear(addYears(toYear, -1)); ++ int daysInPrevMonth = q->daysInMonth(q->addMonths(toDate, -1)); ++ int daysInFromMonth = daysInMonth(fromYear, fromMonth); ++ int daysInToMonth = daysInMonth(toYear, toMonth); + + // Calculate years difference +- if ( toYear == fromYear ) { ++ if (toYear == fromYear) { + dy = 0; +- } else if ( toMonth > fromMonth ) { +- dy = differenceYearNumbers( fromYear, toYear ); +- } else if ( toMonth < fromMonth ) { +- dy = differenceYearNumbers( fromYear, toYear ) - 1; ++ } else if (toMonth > fromMonth) { ++ dy = differenceYearNumbers(fromYear, toYear); ++ } else if (toMonth < fromMonth) { ++ dy = differenceYearNumbers(fromYear, toYear) - 1; + } else { // toMonth == fromMonth + // Allow for last day of month to last day of month and leap days + // e.g. 2000-02-29 to 2001-02-28 is 1 year not 0 years +- if ( ( toDay >= fromDay ) || ( fromDay == daysInFromMonth && toDay == daysInToMonth ) ) { +- dy = differenceYearNumbers( fromYear, toYear ); ++ if ((toDay >= fromDay) || (fromDay == daysInFromMonth && toDay == daysInToMonth)) { ++ dy = differenceYearNumbers(fromYear, toYear); + } else { +- dy = differenceYearNumbers( fromYear, toYear ) - 1; ++ dy = differenceYearNumbers(fromYear, toYear) - 1; + } + } + + // Calculate months and days difference +- if ( toDay >= fromDay ) { +- dm = ( monthsInPrevYear + toMonth - fromMonth ) % monthsInPrevYear; ++ if (toDay >= fromDay) { ++ dm = (monthsInPrevYear + toMonth - fromMonth) % monthsInPrevYear; + dd = toDay - fromDay; + } else { // toDay < fromDay + // Allow for last day of month to last day of month and leap days + // e.g. 2010-03-31 to 2010-04-30 is 1 month + // 2000-02-29 to 2001-02-28 is 1 year + // 2000-02-29 to 2001-03-01 is 1 year 1 day +- int prevMonth = q->month( q->addMonths( toDate, -1 ) ); +- if ( fromDay == daysInFromMonth && toDay == daysInToMonth ) { +- dm = ( monthsInPrevYear + toMonth - fromMonth ) % monthsInPrevYear; ++ int prevMonth = q->month(q->addMonths(toDate, -1)); ++ if (fromDay == daysInFromMonth && toDay == daysInToMonth) { ++ dm = (monthsInPrevYear + toMonth - fromMonth) % monthsInPrevYear; + dd = 0; +- } else if ( prevMonth == fromMonth && daysInPrevMonth < daysInFromMonth ) { ++ } else if (prevMonth == fromMonth && daysInPrevMonth < daysInFromMonth) { + // Special case where fromDate = leap day and toDate in month following but non-leap year + // e.g. 2000-02-29 to 2001-03-01 needs to use 29 to calculate day number not 28 +- dm = ( monthsInPrevYear + toMonth - fromMonth - 1 ) % monthsInPrevYear; +- dd = ( daysInFromMonth + toDay - fromDay ) % daysInFromMonth; ++ dm = (monthsInPrevYear + toMonth - fromMonth - 1) % monthsInPrevYear; ++ dd = (daysInFromMonth + toDay - fromDay) % daysInFromMonth; + } else { +- dm = ( monthsInPrevYear + toMonth - fromMonth - 1 ) % monthsInPrevYear; +- dd = ( daysInPrevMonth + toDay - fromDay ) % daysInPrevMonth; ++ dm = (monthsInPrevYear + toMonth - fromMonth - 1) % monthsInPrevYear; ++ dd = (daysInPrevMonth + toDay - fromDay) % daysInPrevMonth; + } + } + + } + + // Only return values if we have a valid pointer +- if ( yearsDiff ) { ++ if (yearsDiff) { + *yearsDiff = dy; + } +- if ( monthsDiff ) { ++ if (monthsDiff) { + *monthsDiff = dm; + } +- if ( daysDiff ) { ++ if (daysDiff) { + *daysDiff = dd; + } +- if ( direction ) { ++ if (direction) { + *direction = dir; + } + } + + // Reimplement if special maths handling required, e.g. Hebrew + // Allows for calendars with leap months at end of year but not during year +-int KCalendarSystemPrivate::yearsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystemPrivate::yearsDifference(const QDate &fromDate, const QDate &toDate) const + { + // This could be optimised a little but is left in full as it's easier to understand + // Alternatively could just call dateDifference(), but this is slightly more efficient + +- if ( toDate < fromDate ) { +- return 0 - yearsDifference( toDate, fromDate ); ++ if (toDate < fromDate) { ++ return 0 - yearsDifference(toDate, fromDate); + } + +- if ( toDate == fromDate ) { ++ if (toDate == fromDate) { + return 0; + } + +- int fromYear = q->year( fromDate ); +- int toYear = q->year( toDate ); ++ int fromYear = q->year(fromDate); ++ int toYear = q->year(toDate); + +- if ( toYear == fromYear ) { ++ if (toYear == fromYear) { + return 0; + } + +- int fromMonth = q->month( fromDate ); +- int toMonth = q->month( toDate ); ++ int fromMonth = q->month(fromDate); ++ int toMonth = q->month(toDate); + +- if ( toMonth > fromMonth ) { +- return differenceYearNumbers( fromYear, toYear ); ++ if (toMonth > fromMonth) { ++ return differenceYearNumbers(fromYear, toYear); + } + +- if ( toMonth < fromMonth ) { +- return differenceYearNumbers( fromYear, toYear ) - 1; ++ if (toMonth < fromMonth) { ++ return differenceYearNumbers(fromYear, toYear) - 1; + } + + // toMonth == fromMonth +- int fromDay = q->day( fromDate ); +- int toDay = q->day( toDate ); ++ int fromDay = q->day(fromDate); ++ int toDay = q->day(toDate); + + // Adjust for month numbers in from and to year + // Allow for last day of month to last day of month and leap days + // e.g. 2000-02-29 to 2001-02-28 is 1 year not 0 years +- if ( ( toDay >= fromDay ) || +- ( fromDay == daysInMonth( fromYear, fromMonth ) && +- toDay == daysInMonth( toYear, toMonth ) ) ) { +- return differenceYearNumbers( fromYear, toYear ); ++ if ((toDay >= fromDay) || ++ (fromDay == daysInMonth(fromYear, fromMonth) && ++ toDay == daysInMonth(toYear, toMonth))) { ++ return differenceYearNumbers(fromYear, toYear); + } else { +- return differenceYearNumbers( fromYear, toYear ) - 1; ++ return differenceYearNumbers(fromYear, toYear) - 1; + } + + } + + // Reimplement if special maths handling required, e.g. maybe Hebrew? + // Allows for calendars with leap months +-int KCalendarSystemPrivate::monthsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystemPrivate::monthsDifference(const QDate &fromDate, const QDate &toDate) const + { +- if ( toDate < fromDate ) { +- return 0 - monthsDifference( toDate, fromDate ); ++ if (toDate < fromDate) { ++ return 0 - monthsDifference(toDate, fromDate); + } + +- if ( toDate == fromDate ) { ++ if (toDate == fromDate) { + return 0; + } + +- int fromYear = q->year( fromDate ); +- int toYear = q->year( toDate ); +- int fromMonth = q->month( fromDate ); +- int toMonth = q->month( toDate ); +- int fromDay = q->day( fromDate ); +- int toDay = q->day( toDate ); ++ int fromYear = q->year(fromDate); ++ int toYear = q->year(toDate); ++ int fromMonth = q->month(fromDate); ++ int toMonth = q->month(toDate); ++ int fromDay = q->day(fromDate); ++ int toDay = q->day(toDate); + + int monthsInPreceedingYears; + + // Calculate number of months in full years preceding toYear +- if ( toYear == fromYear ) { ++ if (toYear == fromYear) { + monthsInPreceedingYears = 0; +- } else if ( hasLeapMonths() ) { ++ } else if (hasLeapMonths()) { + monthsInPreceedingYears = 0; +- for ( int y = fromYear; y < toYear; y = addYears( y, 1 ) ) { +- monthsInPreceedingYears = monthsInPreceedingYears + monthsInYear( y ); ++ for (int y = fromYear; y < toYear; y = addYears(y, 1)) { ++ monthsInPreceedingYears = monthsInPreceedingYears + monthsInYear(y); + } + } else { +- monthsInPreceedingYears = differenceYearNumbers( fromYear, toYear ) * monthsInYear( toYear ); ++ monthsInPreceedingYears = differenceYearNumbers(fromYear, toYear) * monthsInYear(toYear); + } + + // Adjust for months in from and to year + // Allow for last day of month to last day of month and leap days + // e.g. 2010-03-31 to 2010-04-30 is 1 month not 0 months + // also 2000-02-29 to 2001-02-28 is 12 months not 11 months +- if ( ( toDay >= fromDay ) || +- ( fromDay == daysInMonth( fromYear, fromMonth ) && +- toDay == daysInMonth( toYear, toMonth ) ) ) { ++ if ((toDay >= fromDay) || ++ (fromDay == daysInMonth(fromYear, fromMonth) && ++ toDay == daysInMonth(toYear, toMonth))) { + return monthsInPreceedingYears + toMonth - fromMonth; + } else { + return monthsInPreceedingYears + toMonth - fromMonth - 1; +@@ -709,26 +747,26 @@ int KCalendarSystemPrivate::monthsDifference( const QDate &fromDate, const QDate + // Reimplement if special string to integer handling required, e.g. Hebrew. + // Peel a number off the front of a string which may have other trailing chars after the number + // Stop either at either maxLength, eos, or first non-digit char +-int KCalendarSystemPrivate::integerFromString( const QString &string, int maxLength, int &readLength ) const ++int KCalendarSystemPrivate::integerFromString(const QString &string, int maxLength, int &readLength) const + { + int value = -1; + int position = 0; + readLength = 0; + bool ok = false; + +- if ( maxLength < 0 ) { ++ if (maxLength < 0) { + maxLength = string.length(); + } + +- while ( position < string.length() && ++ while (position < string.length() && + position < maxLength && +- string.at( position ).isDigit() ) { ++ string.at(position).isDigit()) { + position++; + } + +- if ( position > 0 ) { +- value = string.left( position ).toInt( &ok ); +- if ( ok ) { ++ if (position > 0) { ++ value = string.left(position).toInt(&ok); ++ if (ok) { + readLength = position; + } else { + value = -1; +@@ -740,41 +778,41 @@ int KCalendarSystemPrivate::integerFromString( const QString &string, int maxLen + + // Reimplement if special integer to string handling required, e.g. Hebrew. + // Utility to convert an integer into the correct display string form +-QString KCalendarSystemPrivate::stringFromInteger( int number, int padWidth, QChar padChar ) const ++QString KCalendarSystemPrivate::stringFromInteger(int number, int padWidth, QChar padChar) const + { +- return stringFromInteger( number, padWidth, padChar, q->locale()->dateTimeDigitSet() ); ++ return stringFromInteger(number, padWidth, padChar, q->locale()->dateTimeDigitSet()); + } + + // Reimplement if special integer to string handling required, e.g. Hebrew. + // Utility to convert an integer into the correct display string form +-QString KCalendarSystemPrivate::stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const ++QString KCalendarSystemPrivate::stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const + { +- if ( padChar == QLatin1Char('\0') || padWidth == 0 ) { +- return q->locale()->convertDigits( QString::number( number ), digitSet ); ++ if (padChar == QLatin1Char('\0') || padWidth == 0) { ++ return q->locale()->convertDigits(QString::number(number), digitSet); + } else { +- return q->locale()->convertDigits( QString::number( number ).rightJustified( padWidth, padChar ), digitSet ); ++ return q->locale()->convertDigits(QString::number(number).rightJustified(padWidth, padChar), digitSet); + } + } + + // Allows us to set dates outside publically valid range, USE WITH CARE!!!! +-bool KCalendarSystemPrivate::setAnyDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemPrivate::setAnyDate(QDate &date, int year, int month, int day) const + { + int jd; +- q->dateToJulianDay( year, month, day, jd ); +- date = QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, month, day, jd); ++ date = QDate::fromJulianDay(jd); + return true; + } + + // Utility to correctly add years to a year number because some systems such as + // Julian and Gregorian calendars don't have a year 0 +-int KCalendarSystemPrivate::addYears( int originalYear, int addYears ) const ++int KCalendarSystemPrivate::addYears(int originalYear, int addYears) const + { + int newYear = originalYear + addYears; + +- if ( !hasYearZero() ) { +- if ( originalYear > 0 && newYear <= 0 ) { ++ if (!hasYearZero()) { ++ if (originalYear > 0 && newYear <= 0) { + newYear = newYear - 1; +- } else if ( originalYear < 0 && newYear >= 0 ) { ++ } else if (originalYear < 0 && newYear >= 0) { + newYear = newYear + 1; + } + } +@@ -784,14 +822,14 @@ int KCalendarSystemPrivate::addYears( int originalYear, int addYears ) const + + // Utility to correctly return number of years between two year numbers because some systems such as + // Julian and Gregorian calendars don't have a year 0 +-int KCalendarSystemPrivate::differenceYearNumbers( int fromYear, int toYear ) const ++int KCalendarSystemPrivate::differenceYearNumbers(int fromYear, int toYear) const + { + int dy = toYear - fromYear; + +- if ( !hasYearZero() ) { +- if ( toYear > 0 && fromYear < 0 ) { ++ if (!hasYearZero()) { ++ if (toYear > 0 && fromYear < 0) { + dy = dy - 1; +- } else if ( toYear < 0 && fromYear > 0 ) { ++ } else if (toYear < 0 && fromYear > 0) { + dy = dy + 1; + } + } +@@ -805,71 +843,71 @@ QDate KCalendarSystemPrivate::invalidDate() const + return QDate(); + } + +-QString KCalendarSystemPrivate::simpleDateString( const QString &str ) const ++QString KCalendarSystemPrivate::simpleDateString(const QString &str) const + { + QString newStr; +- for ( int i = 0; i < str.length(); i++ ) { +- if ( str.at(i).isLetterOrNumber() ) { +- newStr.append( str.at(i) ); ++ for (int i = 0; i < str.length(); i++) { ++ if (str.at(i).isLetterOrNumber()) { ++ newStr.append(str.at(i)); + } else { +- newStr.append( QLatin1Char(' ') ); ++ newStr.append(QLatin1Char(' ')); + } + } + newStr.simplified(); + return newStr; + } + +-int KCalendarSystemPrivate::dayOfYear( const QDate &date ) const ++int KCalendarSystemPrivate::dayOfYear(const QDate &date) const + { + int y, m, d, jdFirstDayOfYear; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); +- q->dateToJulianDay( y, 1, 1, jdFirstDayOfYear ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); ++ q->dateToJulianDay(y, 1, 1, jdFirstDayOfYear); + //Take the jd of the given date, and subtract the jd of the first day of that year +- return ( date.toJulianDay() - jdFirstDayOfYear + 1 ); ++ return (date.toJulianDay() - jdFirstDayOfYear + 1); + } + +-int KCalendarSystemPrivate::dayOfWeek( const QDate &date ) const ++int KCalendarSystemPrivate::dayOfWeek(const QDate &date) const + { + // Makes assumption that Julian Day 0 was day 1 of week + // This is true for Julian/Gregorian calendar with jd 0 being Monday + // We add 1 for ISO compliant numbering for 7 day week + // Assumes we've never skipped weekdays +- return ( ( date.toJulianDay() % daysInWeek() ) + 1 ); ++ return ((date.toJulianDay() % daysInWeek()) + 1); + } + +-QDate KCalendarSystemPrivate::firstDayOfYear( int year ) const ++QDate KCalendarSystemPrivate::firstDayOfYear(int year) const + { + int jd; +- q->dateToJulianDay( year, 1, 1, jd ); +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, 1, 1, jd); ++ return QDate::fromJulianDay(jd); + } + +-QDate KCalendarSystemPrivate::lastDayOfYear( int year ) const ++QDate KCalendarSystemPrivate::lastDayOfYear(int year) const + { + int jd; +- q->dateToJulianDay( year, 1, 1, jd ); +- jd = jd + daysInYear( year ) - 1; +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, 1, 1, jd); ++ jd = jd + daysInYear(year) - 1; ++ return QDate::fromJulianDay(jd); + } + +-QDate KCalendarSystemPrivate::firstDayOfMonth( int year, int month ) const ++QDate KCalendarSystemPrivate::firstDayOfMonth(int year, int month) const + { + int jd; +- q->dateToJulianDay( year, month, 1, jd ); +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, month, 1, jd); ++ return QDate::fromJulianDay(jd); + } + +-QDate KCalendarSystemPrivate::lastDayOfMonth( int year, int month ) const ++QDate KCalendarSystemPrivate::lastDayOfMonth(int year, int month) const + { + int jd; +- q->dateToJulianDay( year, month, 1, jd ); +- jd = jd + daysInMonth( year, month ) - 1; +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, month, 1, jd); ++ jd = jd + daysInMonth(year, month) - 1; ++ return QDate::fromJulianDay(jd); + } + + const KLocale * KCalendarSystemPrivate::locale() const + { +- if ( m_locale ) { ++ if (m_locale) { + return m_locale; + } else { + return KGlobal::locale(); +@@ -881,93 +919,93 @@ QList<KCalendarEra> *KCalendarSystemPrivate::eraList() const + return m_eraList; + } + +-KCalendarEra KCalendarSystemPrivate::era( const QDate &eraDate ) const ++KCalendarEra KCalendarSystemPrivate::era(const QDate &eraDate) const + { +- for ( int i = m_eraList->count() -1; i >= 0; --i ) { +- if ( m_eraList->at( i ).isInEra( eraDate ) ) { +- return m_eraList->at( i ); ++ for (int i = m_eraList->count() - 1; i >= 0; --i) { ++ if (m_eraList->at(i).isInEra(eraDate)) { ++ return m_eraList->at(i); + } + } + return KCalendarEra(); + } + +-KCalendarEra KCalendarSystemPrivate::era( const QString &eraName, int yearInEra ) const ++KCalendarEra KCalendarSystemPrivate::era(const QString &eraName, int yearInEra) const + { +- Q_UNUSED( yearInEra ) ++ Q_UNUSED(yearInEra) + +- for ( int i = m_eraList->count() - 1; i >= 0; --i ) { +- KCalendarEra era = m_eraList->at( i ); +- if ( era.name(KLocale::LongName).toLower() == eraName.toLower() || +- era.name(KLocale::ShortName).toLower() == eraName.toLower() ) { ++ for (int i = m_eraList->count() - 1; i >= 0; --i) { ++ KCalendarEra era = m_eraList->at(i); ++ if (era.name(KLocale::LongName).toLower() == eraName.toLower() || ++ era.name(KLocale::ShortName).toLower() == eraName.toLower()) { + return era; + } + } + return KCalendarEra(); + } + +-void KCalendarSystemPrivate::loadEraList( const KConfigGroup & cg ) ++void KCalendarSystemPrivate::loadEraList(const KConfigGroup & cg) + { + delete m_eraList; + m_eraList = new QList<KCalendarEra>; + QString eraKey = QString::fromLatin1("Era1"); + int i = 1; +- while ( cg.hasKey( eraKey ) ) { +- QString eraEntry = cg.readEntry( eraKey, QString() ); +- if ( !eraEntry.isEmpty() ) { ++ while (cg.hasKey(eraKey)) { ++ QString eraEntry = cg.readEntry(eraKey, QString()); ++ if (!eraEntry.isEmpty()) { + // Based on LC_TIME, but different! + // Includes long and short names, uses ISO fomat dates + // e.g. +:1:0001-01-01:9999-12-31:Anno Domini:AD:%EC %Ey +- QChar direction = eraEntry.section( QLatin1Char(':'), 0, 0 ).at( 0 ); ++ QChar direction = eraEntry.section(QLatin1Char(':'), 0, 0).at(0); + QDate startDate, endDate; + int startYear; +- QString buffer = eraEntry.section( QLatin1Char(':'), 2, 2 ); +- if ( buffer.isEmpty() ) { +- if ( direction == QLatin1Char('-') ) { ++ QString buffer = eraEntry.section(QLatin1Char(':'), 2, 2); ++ if (buffer.isEmpty()) { ++ if (direction == QLatin1Char('-')) { + startDate = q->latestValidDate(); + } else { + startDate = q->earliestValidDate(); + } + } else { +- startDate = q->readDate( buffer, KLocale::IsoFormat ); ++ startDate = q->readDate(buffer, KLocale::IsoFormat); + } +- if ( q->isValid( startDate ) ) { +- startYear = q->year( startDate ); ++ if (q->isValid(startDate)) { ++ startYear = q->year(startDate); + } else { +- startYear = eraEntry.section( QLatin1Char(':'), 1, 1 ).toInt(); //Use offset ++ startYear = eraEntry.section(QLatin1Char(':'), 1, 1).toInt(); //Use offset + } + +- buffer = eraEntry.section( QLatin1Char(':'), 3, 3 ); +- if ( buffer.isEmpty() ) { +- if ( direction == QLatin1Char('-') ) { ++ buffer = eraEntry.section(QLatin1Char(':'), 3, 3); ++ if (buffer.isEmpty()) { ++ if (direction == QLatin1Char('-')) { + endDate = q->earliestValidDate(); + } else { + endDate = q->latestValidDate(); + } + } else { +- endDate = q->readDate( buffer, KLocale::IsoFormat ); ++ endDate = q->readDate(buffer, KLocale::IsoFormat); + } +- addEra( direction.toLatin1(), eraEntry.section( QLatin1Char(':'), 1, 1 ).toInt(), +- startDate, startYear, endDate, eraEntry.section( QLatin1Char(':'), 4, 4 ), +- eraEntry.section( QLatin1Char(':'), 5, 5 ), eraEntry.section( QLatin1Char(':'), 6 ) ); ++ addEra(direction.toLatin1(), eraEntry.section(QLatin1Char(':'), 1, 1).toInt(), ++ startDate, startYear, endDate, eraEntry.section(QLatin1Char(':'), 4, 4), ++ eraEntry.section(QLatin1Char(':'), 5, 5), eraEntry.section(QLatin1Char(':'), 6)); + } + ++i; + eraKey = QString::fromLatin1("Era%1").arg(i); + } + +- if ( m_eraList->isEmpty() ) { ++ if (m_eraList->isEmpty()) { + loadDefaultEraList(); + } + } + +-void KCalendarSystemPrivate::addEra( char direction, int offset, +- const QDate &startDate, int startYear, const QDate &endDate, +- const QString &name, const QString &shortName, +- const QString &format ) ++void KCalendarSystemPrivate::addEra(char direction, int offset, ++ const QDate &startDate, int startYear, const QDate &endDate, ++ const QString &name, const QString &shortName, ++ const QString &format) + { + KCalendarEra newEra; + + newEra.m_sequence = m_eraList->count() + 1; +- if ( direction == '-' ) { ++ if (direction == '-') { + newEra.m_direction = -1; + } else { + newEra.m_direction = 1; +@@ -980,7 +1018,7 @@ void KCalendarSystemPrivate::addEra( char direction, int offset, + newEra.m_shortName = shortName; + newEra.m_format = format; + +- m_eraList->append( newEra ); ++ m_eraList->append(newEra); + } + + int KCalendarSystemPrivate::shortYearWindowStartYear() const +@@ -988,12 +1026,12 @@ int KCalendarSystemPrivate::shortYearWindowStartYear() const + return m_shortYearWindowStartYear; + } + +-int KCalendarSystemPrivate::applyShortYearWindow( int inputYear ) const ++int KCalendarSystemPrivate::applyShortYearWindow(int inputYear) const + { +- if ( inputYear >= 0 && inputYear <= 99 ) { ++ if (inputYear >= 0 && inputYear <= 99) { + int shortStartYear = m_shortYearWindowStartYear % 100; + int yearOffset = m_shortYearWindowStartYear - shortStartYear; +- if ( inputYear >= shortStartYear ) { ++ if (inputYear >= shortStartYear) { + return inputYear + yearOffset; + } else { + return inputYear + yearOffset + 100; +@@ -1003,51 +1041,51 @@ int KCalendarSystemPrivate::applyShortYearWindow( int inputYear ) const + } + } + +-void KCalendarSystemPrivate::loadShortYearWindowStartYear( const KConfigGroup & cg ) ++void KCalendarSystemPrivate::loadShortYearWindowStartYear(const KConfigGroup & cg) + { +- // Default to 2000 for backwards compatability ++ // Default to 2000 for backwards compatibility + // as that's the old readDate() default value + int startYear = 2000; +- if ( cg.exists() ) { +- startYear = cg.readEntry( "ShortYearWindowStartYear", 2000 ); ++ if (cg.exists()) { ++ startYear = cg.readEntry("ShortYearWindowStartYear", 2000); + } + m_shortYearWindowStartYear = startYear; + } + + KSharedConfig::Ptr KCalendarSystemPrivate::config() + { +- if ( m_config == KSharedConfig::Ptr() ) { ++ if (m_config == KSharedConfig::Ptr()) { + return KGlobal::config(); + } else { + return m_config; + } + } + +-void KCalendarSystemPrivate::loadConfig( const QString & calendarType ) ++void KCalendarSystemPrivate::loadConfig(const QString & calendarType) + { +- KConfigGroup localeGroup( config(), QString::fromLatin1( "Locale" ) ); +- KConfigGroup calendarGroup = localeGroup.group( QString::fromLatin1( "KCalendarSystem %1" ).arg( calendarType ) ); +- loadEraList( calendarGroup ); +- loadShortYearWindowStartYear( calendarGroup ); ++ KConfigGroup localeGroup(config(), QString::fromLatin1("Locale")); ++ KConfigGroup calendarGroup = localeGroup.group(QString::fromLatin1("KCalendarSystem %1").arg(calendarType)); ++ loadEraList(calendarGroup); ++ loadShortYearWindowStartYear(calendarGroup); + } + + +-KCalendarSystem::KCalendarSystem( const KLocale *locale ) +- : d_ptr( new KCalendarSystemPrivate( this ) ) ++KCalendarSystem::KCalendarSystem(const KLocale *locale) ++ : d_ptr(new KCalendarSystemPrivate(this)) + { + d_ptr->m_config = KSharedConfig::Ptr(); + d_ptr->m_locale = locale; + } + +-KCalendarSystem::KCalendarSystem( const KSharedConfig::Ptr config, const KLocale *locale ) +- : d_ptr( new KCalendarSystemPrivate( this ) ) ++KCalendarSystem::KCalendarSystem(const KSharedConfig::Ptr config, const KLocale *locale) ++ : d_ptr(new KCalendarSystemPrivate(this)) + { + d_ptr->m_config = config; + d_ptr->m_locale = locale; + } + +-KCalendarSystem::KCalendarSystem( KCalendarSystemPrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale ) +- : d_ptr( &dd ) ++KCalendarSystem::KCalendarSystem(KCalendarSystemPrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale) ++ : d_ptr(&dd) + { + d_ptr->m_config = config; + d_ptr->m_locale = locale; +@@ -1061,7 +1099,7 @@ KCalendarSystem::~KCalendarSystem() + // NOT VIRTUAL - If override needed use shared-d + KLocale::CalendarSystem KCalendarSystem::calendarSystem() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->calendarSystem(); + } +@@ -1069,14 +1107,14 @@ KLocale::CalendarSystem KCalendarSystem::calendarSystem() const + // NOT VIRTUAL - If override needed use shared-d + QString KCalendarSystem::calendarLabel() const + { +- return KCalendarSystem::calendarLabel( calendarSystem() ); ++ return KCalendarSystem::calendarLabel(calendarSystem()); + } + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System + QDate KCalendarSystem::epoch() const + { +- return QDate::fromJulianDay( 38 ); ++ return QDate::fromJulianDay(38); + } + + QDate KCalendarSystem::earliestValidDate() const +@@ -1089,23 +1127,23 @@ QDate KCalendarSystem::earliestValidDate() const + QDate KCalendarSystem::latestValidDate() const + { + // Default to Gregorian 9999-12-31 +- return QDate::fromJulianDay( 5373484 ); ++ return QDate::fromJulianDay(5373484); + } + +-bool KCalendarSystem::isValid( int year, int month, int day ) const ++bool KCalendarSystem::isValid(int year, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( year < d->earliestValidYear() || year > d->latestValidYear() || +- ( !d->hasYearZero() && year == 0 ) ) { ++ if (year < d->earliestValidYear() || year > d->latestValidYear() || ++ (!d->hasYearZero() && year == 0)) { + return false; + } + +- if ( month < 1 || month > d->monthsInYear( year ) ) { ++ if (month < 1 || month > d->monthsInYear(year)) { + return false; + } + +- if ( day < 1 || day > d->daysInMonth( year, month ) ) { ++ if (day < 1 || day > d->daysInMonth(year, month)) { + return false; + } + +@@ -1113,59 +1151,59 @@ bool KCalendarSystem::isValid( int year, int month, int day ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::isValid( int year, int dayOfYear ) const ++bool KCalendarSystem::isValid(int year, int dayOfYear) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return ( isValid( year, 1, 1 ) && dayOfYear > 0 && dayOfYear <= d->daysInYear( year ) ); ++ return (isValid(year, 1, 1) && dayOfYear > 0 && dayOfYear <= d->daysInYear(year)); + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::isValid( const QString &eraName, int yearInEra, int month, int day ) const ++bool KCalendarSystem::isValid(const QString &eraName, int yearInEra, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- KCalendarEra era = d->era( eraName, yearInEra ); +- return ( era.isValid() && isValid( era.year( yearInEra ), month, day ) ); ++ KCalendarEra era = d->era(eraName, yearInEra); ++ return (era.isValid() && isValid(era.year(yearInEra), month, day)); + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const ++bool KCalendarSystem::isValidIsoWeekDate(int year, int isoWeekNumber, int dayOfIsoWeek) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + //Tests Year value in standard YMD isValid() +- if ( !isValid( year, 1, 1 ) ) { ++ if (!isValid(year, 1, 1)) { + return false; + } + + //Test Week Number falls in valid range for this year +- int weeksInThisYear = weeksInYear( year ); +- if ( isoWeekNumber < 1 || isoWeekNumber > weeksInThisYear ) { ++ int weeksInThisYear = weeksInYear(year); ++ if (isoWeekNumber < 1 || isoWeekNumber > weeksInThisYear) { + return false; + } + + //Test Day of Week Number falls in valid range +- if ( dayOfIsoWeek < 1 || dayOfIsoWeek > d->daysInWeek() ) { ++ if (dayOfIsoWeek < 1 || dayOfIsoWeek > d->daysInWeek()) { + return false; + } + + //If not in earliest or latest years then all OK + //Otherwise need to check don't fall into previous or next year that would be invalid +- if ( year == d->earliestValidYear() && isoWeekNumber == 1 ) { ++ if (year == d->earliestValidYear() && isoWeekNumber == 1) { + //If firstDayOfYear falls on or before Thursday then firstDayOfYear falls in week 1 this + //year and if wanted dayOfIsoWeek falls before firstDayOfYear then falls in previous year + //and so in invalid year +- int dowFirstDay = dayOfWeek( d->firstDayOfYear( year ) ); +- if ( dowFirstDay <= 4 && dayOfIsoWeek < dowFirstDay ) { ++ int dowFirstDay = dayOfWeek(d->firstDayOfYear(year)); ++ if (dowFirstDay <= 4 && dayOfIsoWeek < dowFirstDay) { + return false; + } +- } else if ( year == d->latestValidYear() && isoWeekNumber == weeksInThisYear ) { ++ } else if (year == d->latestValidYear() && isoWeekNumber == weeksInThisYear) { + //If lastDayOfYear falls on or after Thursday then lastDayOfYear falls in last week this + //year and if wanted dayOfIsoWeek falls after lastDayOfYear then falls in next year + //and so in invalid year +- int dowLastDay = dayOfWeek( d->lastDayOfYear( year ) ); +- if ( dowLastDay >= 4 && dayOfIsoWeek > dowLastDay ) { ++ int dowLastDay = dayOfWeek(d->lastDayOfYear(year)); ++ if (dowLastDay >= 4 && dayOfIsoWeek > dowLastDay) { + return false; + } + } +@@ -1173,26 +1211,26 @@ bool KCalendarSystem::isValidIsoWeekDate( int year, int isoWeekNumber, int dayOf + return true; + } + +-bool KCalendarSystem::isValid( const QDate &date ) const ++bool KCalendarSystem::isValid(const QDate &date) const + { +- if ( date.isNull() || date < earliestValidDate() || date > latestValidDate() ) { ++ if (date.isNull() || date < earliestValidDate() || date > latestValidDate()) { + return false; + } + return true; + } + +-bool KCalendarSystem::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystem::setDate(QDate &date, int year, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + date = d->invalidDate(); + +- if ( isValid( year, month, day ) ) { ++ if (isValid(year, month, day)) { + int jd; +- dateToJulianDay( year, month, day, jd ); +- QDate calcDate = QDate::fromJulianDay( jd ); ++ dateToJulianDay(year, month, day, jd); ++ QDate calcDate = QDate::fromJulianDay(jd); + +- if ( isValid( calcDate ) ) { ++ if (isValid(calcDate)) { + date = calcDate; + return true; + } +@@ -1202,17 +1240,17 @@ bool KCalendarSystem::setDate( QDate &date, int year, int month, int day ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::setDate( QDate &date, int year, int dayOfYear ) const ++bool KCalendarSystem::setDate(QDate &date, int year, int dayOfYear) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + date = d->invalidDate(); + +- if ( isValid( year, dayOfYear ) ) { ++ if (isValid(year, dayOfYear)) { + int jd; +- dateToJulianDay( year, 1, 1, jd ); +- QDate calcDate = QDate::fromJulianDay( jd + dayOfYear - 1 ); +- if ( isValid( calcDate ) ) { ++ dateToJulianDay(year, 1, 1, jd); ++ QDate calcDate = QDate::fromJulianDay(jd + dayOfYear - 1); ++ if (isValid(calcDate)) { + date = calcDate; + return true; + } +@@ -1222,35 +1260,35 @@ bool KCalendarSystem::setDate( QDate &date, int year, int dayOfYear ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::setDate( QDate &date, QString eraName, int yearInEra, int month, int day ) const ++bool KCalendarSystem::setDate(QDate &date, QString eraName, int yearInEra, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- KCalendarEra era = d->era( eraName, yearInEra ); +- return ( era.isValid() && setDate( date, era.year( yearInEra ), month, day ) ); ++ KCalendarEra era = d->era(eraName, yearInEra); ++ return (era.isValid() && setDate(date, era.year(yearInEra), month, day)); + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::setDateIsoWeek( QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek ) const ++bool KCalendarSystem::setDateIsoWeek(QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + date = d->invalidDate(); + +- if ( isValidIsoWeekDate( year, isoWeekNumber, dayOfIsoWeek ) ) { ++ if (isValidIsoWeekDate(year, isoWeekNumber, dayOfIsoWeek)) { + +- QDate calcDate = d->firstDayOfYear( year ); +- int dowFirstDayOfYear = dayOfWeek( calcDate ); ++ QDate calcDate = d->firstDayOfYear(year); ++ int dowFirstDayOfYear = dayOfWeek(calcDate); + +- int daysToAdd = ( d->daysInWeek() * ( isoWeekNumber - 1 ) ) + dayOfIsoWeek; ++ int daysToAdd = (d->daysInWeek() * (isoWeekNumber - 1)) + dayOfIsoWeek; + +- if ( dowFirstDayOfYear <= 4 ) { +- calcDate = calcDate.addDays( daysToAdd - dowFirstDayOfYear ); ++ if (dowFirstDayOfYear <= 4) { ++ calcDate = calcDate.addDays(daysToAdd - dowFirstDayOfYear); + } else { +- calcDate = calcDate.addDays( daysInWeek( calcDate ) + daysToAdd - dowFirstDayOfYear ); ++ calcDate = calcDate.addDays(daysInWeek(calcDate) + daysToAdd - dowFirstDayOfYear); + } + +- if ( isValid( calcDate ) ) { ++ if (isValid(calcDate)) { + date = calcDate; + return true; + } +@@ -1260,42 +1298,42 @@ bool KCalendarSystem::setDateIsoWeek( QDate &date, int year, int isoWeekNumber, + } + + // Deprecated +-bool KCalendarSystem::setYMD( QDate &date, int year, int month, int day ) const ++bool KCalendarSystem::setYMD(QDate &date, int year, int month, int day) const + { +- return setDate( date, year, month, day ); ++ return setDate(date, year, month, day); + } + + // NOT VIRTUAL - If override needed use shared-d +-void KCalendarSystem::getDate( const QDate date, int *year, int *month, int *day ) const ++void KCalendarSystem::getDate(const QDate date, int *year, int *month, int *day) const + { + int y, m, d; + +- if ( isValid( date ) ) { +- julianDayToDate( date.toJulianDay(), y, m, d ); ++ if (isValid(date)) { ++ julianDayToDate(date.toJulianDay(), y, m, d); + } else { + y = 0; // How do you denote invalid year when we support -ve years? + m = 0; + d = 0; + } + +- if ( year ) { ++ if (year) { + *year = y; + } +- if ( month ) { ++ if (month) { + *month = m; + } +- if ( day ) { ++ if (day) { + *day = d; + } + + } + +-int KCalendarSystem::year( const QDate &date ) const ++int KCalendarSystem::year(const QDate &date) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month, day; + +- julianDayToDate( date.toJulianDay(), year, month, day ); ++ julianDayToDate(date.toJulianDay(), year, month, day); + + return year; + } +@@ -1303,12 +1341,12 @@ int KCalendarSystem::year( const QDate &date ) const + return 0; // How do you denote invalid year when we support -ve years? + } + +-int KCalendarSystem::month( const QDate &date ) const ++int KCalendarSystem::month(const QDate &date) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month, day; + +- julianDayToDate( date.toJulianDay(), year, month, day ); ++ julianDayToDate(date.toJulianDay(), year, month, day); + + return month; + } +@@ -1316,12 +1354,12 @@ int KCalendarSystem::month( const QDate &date ) const + return 0; + } + +-int KCalendarSystem::day( const QDate &date ) const ++int KCalendarSystem::day(const QDate &date) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month, day; + +- julianDayToDate( date.toJulianDay(), year, month, day ); ++ julianDayToDate(date.toJulianDay(), year, month, day); + + return day; + } +@@ -1330,15 +1368,15 @@ int KCalendarSystem::day( const QDate &date ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::eraName( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::eraName(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- if ( format == LongFormat ) { +- return d->era( date ).name( KLocale::LongName ); ++ if (isValid(date)) { ++ if (format == LongFormat) { ++ return d->era(date).name(KLocale::LongName); + } else { +- return d->era( date ).name( KLocale::ShortName ); ++ return d->era(date).name(KLocale::ShortName); + } + } + +@@ -1346,25 +1384,25 @@ QString KCalendarSystem::eraName( const QDate &date, StringFormat format ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::eraYear( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::eraYear(const QDate &date, StringFormat format) const + { +- Q_UNUSED( format ) +- Q_D( const KCalendarSystem ); ++ Q_UNUSED(format) ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return formatDate( date, d->era( date ).format() ); ++ if (isValid(date)) { ++ return formatDate(date, d->era(date).format()); + } + + return QString(); + } + + // NOT VIRTUAL - If override needed use shared-d +-int KCalendarSystem::yearInEra( const QDate &date ) const ++int KCalendarSystem::yearInEra(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->era( date ).yearInEra( year( date ) ); ++ if (isValid(date)) { ++ return d->era(date).yearInEra(year(date)); + } + + return -1; +@@ -1373,48 +1411,48 @@ int KCalendarSystem::yearInEra( const QDate &date ) const + // NOT VIRTUAL - If override needed use shared-d + QList<KCalendarEra> *KCalendarSystem::eraList() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->eraList(); + } + + // NOT VIRTUAL - If override needed use shared-d +-KCalendarEra KCalendarSystem::era( const QDate &eraDate ) const ++KCalendarEra KCalendarSystem::era(const QDate &eraDate) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return d->era( eraDate ); ++ return d->era(eraDate); + } + + // NOT VIRTUAL - If override needed use shared-d +-KCalendarEra KCalendarSystem::era( const QString &eraName, int yearInEra ) const ++KCalendarEra KCalendarSystem::era(const QString &eraName, int yearInEra) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return d->era( eraName, yearInEra ); ++ return d->era(eraName, yearInEra); + } + +-QDate KCalendarSystem::addYears( const QDate &date, int numYears ) const ++QDate KCalendarSystem::addYears(const QDate &date, int numYears) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + + int originalYear, originalMonth, originalDay; +- julianDayToDate( date.toJulianDay(), originalYear, originalMonth, originalDay ); ++ julianDayToDate(date.toJulianDay(), originalYear, originalMonth, originalDay); + +- int newYear = d->addYears( originalYear, numYears ); ++ int newYear = d->addYears(originalYear, numYears); + int newMonth = originalMonth; + int newDay = originalDay; + + //Adjust day number if new month has fewer days than old month +- int daysInNewMonth = d->daysInMonth( newYear, newMonth ); +- if ( daysInNewMonth < originalDay ) { ++ int daysInNewMonth = d->daysInMonth(newYear, newMonth); ++ if (daysInNewMonth < originalDay) { + newDay = daysInNewMonth; + } + + QDate newDate; +- setDate( newDate, newYear, newMonth, newDay ); ++ setDate(newDate, newYear, newMonth, newDay); + return newDate; + + } +@@ -1422,38 +1460,38 @@ QDate KCalendarSystem::addYears( const QDate &date, int numYears ) const + return d->invalidDate(); + } + +-QDate KCalendarSystem::addMonths( const QDate &date, int numMonths ) const ++QDate KCalendarSystem::addMonths(const QDate &date, int numMonths) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + + int originalYear, originalMonth, originalDay; +- julianDayToDate( date.toJulianDay(), originalYear, originalMonth, originalDay ); ++ julianDayToDate(date.toJulianDay(), originalYear, originalMonth, originalDay); + +- int monthsInOriginalYear = d->monthsInYear( originalYear ); ++ int monthsInOriginalYear = d->monthsInYear(originalYear); + +- int newYear = d->addYears( originalYear, ( originalMonth + numMonths ) / monthsInOriginalYear ); +- int newMonth = ( originalMonth + numMonths ) % monthsInOriginalYear; ++ int newYear = d->addYears(originalYear, (originalMonth + numMonths) / monthsInOriginalYear); ++ int newMonth = (originalMonth + numMonths) % monthsInOriginalYear; + int newDay = originalDay; + +- if ( newMonth == 0 ) { +- newYear = d->addYears( newYear, - 1 ); ++ if (newMonth == 0) { ++ newYear = d->addYears(newYear, - 1); + newMonth = monthsInOriginalYear; + } +- if ( newMonth < 0 ) { +- newYear = d->addYears( newYear, - 1 ); ++ if (newMonth < 0) { ++ newYear = d->addYears(newYear, - 1); + newMonth = newMonth + monthsInOriginalYear; + } + + //Adjust day number if new month has fewer days than old month +- int daysInNewMonth = d->daysInMonth( newYear, newMonth ); +- if ( daysInNewMonth < originalDay ) { ++ int daysInNewMonth = d->daysInMonth(newYear, newMonth); ++ if (daysInNewMonth < originalDay) { + newDay = daysInNewMonth; + } + + QDate newDate; +- setDate( newDate, newYear, newMonth, newDay ); ++ setDate(newDate, newYear, newMonth, newDay); + return newDate; + + } +@@ -1461,15 +1499,15 @@ QDate KCalendarSystem::addMonths( const QDate &date, int numMonths ) const + return d->invalidDate(); + } + +-QDate KCalendarSystem::addDays( const QDate &date, int numDays ) const ++QDate KCalendarSystem::addDays(const QDate &date, int numDays) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + // QDate only holds a uint and has no boundary checking in addDays(), so we need to check +- if ( isValid( date ) && (long) date.toJulianDay() + (long) numDays > 0 ) { ++ if (isValid(date) && (long) date.toJulianDay() + (long) numDays > 0) { + // QDate adds straight to jd +- QDate temp = date.addDays( numDays ); +- if ( isValid( temp ) ) { ++ QDate temp = date.addDays(numDays); ++ if (isValid(temp)) { + return temp; + } + } +@@ -1478,519 +1516,517 @@ QDate KCalendarSystem::addDays( const QDate &date, int numDays ) const + } + + // NOT VIRTUAL - Uses shared-d instead +-void KCalendarSystem::dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const ++void KCalendarSystem::dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( fromDate ) && isValid( toDate ) ) { +- d->dateDifference( fromDate, toDate, yearsDiff, monthsDiff, daysDiff, direction ); ++ if (isValid(fromDate) && isValid(toDate)) { ++ d->dateDifference(fromDate, toDate, yearsDiff, monthsDiff, daysDiff, direction); + } + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::yearsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystem::yearsDifference(const QDate &fromDate, const QDate &toDate) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( fromDate ) && isValid( toDate ) ) { +- return d->yearsDifference( fromDate, toDate ); ++ if (isValid(fromDate) && isValid(toDate)) { ++ return d->yearsDifference(fromDate, toDate); + } + + return 0; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::monthsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystem::monthsDifference(const QDate &fromDate, const QDate &toDate) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( fromDate ) && isValid( toDate ) ) { +- return d->monthsDifference( fromDate, toDate ); ++ if (isValid(fromDate) && isValid(toDate)) { ++ return d->monthsDifference(fromDate, toDate); + } + + return 0; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::daysDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystem::daysDifference(const QDate &fromDate, const QDate &toDate) const + { +- if ( isValid( fromDate ) && isValid( toDate ) ) { ++ if (isValid(fromDate) && isValid(toDate)) { + return toDate.toJulianDay() - fromDate.toJulianDay(); + } + + return 0; + } + +-int KCalendarSystem::monthsInYear( const QDate &date ) const ++int KCalendarSystem::monthsInYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->monthsInYear( year( date ) ); ++ if (isValid(date)) { ++ return d->monthsInYear(year(date)); + } + + return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::monthsInYear( int year ) const ++int KCalendarSystem::monthsInYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->monthsInYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->monthsInYear(year); + } + + return -1; + } + +-int KCalendarSystem::weeksInYear( const QDate &date ) const ++int KCalendarSystem::weeksInYear(const QDate &date) const + { +- if ( isValid( date ) ) { +- return weeksInYear( year( date ) ); +- } ++ return weeksInYear(date, KLocale::DefaultWeekNumber); ++} + +- return -1; ++int KCalendarSystem::weeksInYear(int year) const ++{ ++ return weeksInYear(year, KLocale::DefaultWeekNumber); + } + +-int KCalendarSystem::weeksInYear( int year ) const ++// NOT VIRTUAL - Uses shared-d instead ++int KCalendarSystem::weeksInYear(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem) const + { +- return weeksInYear( year, KLocale::DefaultWeekNumber ); ++ Q_D(const KCalendarSystem); ++ ++ if (isValid(date)) { ++ return d->weeksInYear(year(date), weekNumberSystem); ++ } ++ ++ return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const ++int KCalendarSystem::weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->weeksInYear( year, weekNumberSystem ); ++ if (isValid(year, 1, 1)) { ++ return d->weeksInYear(year, weekNumberSystem); + } + + return -1; + } + +-int KCalendarSystem::daysInYear( const QDate &date ) const ++int KCalendarSystem::daysInYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->daysInYear( year( date ) ); ++ if (isValid(date)) { ++ return d->daysInYear(year(date)); + } + + return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::daysInYear( int year ) const ++int KCalendarSystem::daysInYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->daysInYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->daysInYear(year); + } + + return -1; + } + +-int KCalendarSystem::daysInMonth( const QDate &date ) const ++int KCalendarSystem::daysInMonth(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return d->daysInMonth( year, month ); ++ getDate(date, &year, &month, 0); ++ return d->daysInMonth(year, month); + } + + return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::daysInMonth( int year, int month ) const ++int KCalendarSystem::daysInMonth(int year, int month) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->daysInMonth( year, month ); ++ if (isValid(year, 1, 1)) { ++ return d->daysInMonth(year, month); + } + + return -1; + } + +-int KCalendarSystem::daysInWeek( const QDate &date ) const ++int KCalendarSystem::daysInWeek(const QDate &date) const + { +- Q_UNUSED( date ) +- Q_D( const KCalendarSystem ); ++ Q_UNUSED(date) ++ Q_D(const KCalendarSystem); + return d->daysInWeek(); + } + +-int KCalendarSystem::dayOfYear( const QDate &date ) const ++int KCalendarSystem::dayOfYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->dayOfYear( date ); ++ if (isValid(date)) { ++ return d->dayOfYear(date); + } + + return -1; + } + +-int KCalendarSystem::dayOfWeek( const QDate &date ) const ++int KCalendarSystem::dayOfWeek(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->dayOfWeek( date ); ++ if (isValid(date)) { ++ return d->dayOfWeek(date); + } + + return -1; + } + +-int KCalendarSystem::weekNumber( const QDate &date, int *yearNum ) const ++int KCalendarSystem::weekNumber(const QDate &date, int *yearNum) const + { +- return week( date, KLocale::IsoWeekNumber, yearNum ); ++ return week(date, KLocale::IsoWeekNumber, yearNum); + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::week( const QDate &date, int *yearNum ) const ++int KCalendarSystem::week(const QDate &date, int *yearNum) const + { +- return week( date, KLocale::DefaultWeekNumber, yearNum ); ++ return week(date, KLocale::DefaultWeekNumber, yearNum); + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum ) const ++int KCalendarSystem::week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->week( date, weekNumberSystem, yearNum ); ++ if (isValid(date)) { ++ return d->week(date, weekNumberSystem, yearNum); + } + + return -1; + } + +-bool KCalendarSystem::isLeapYear( int year ) const ++bool KCalendarSystem::isLeapYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->isLeapYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->isLeapYear(year); + } + + return false; + } + +-bool KCalendarSystem::isLeapYear( const QDate &date ) const ++bool KCalendarSystem::isLeapYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->isLeapYear( year( date ) ); ++ if (isValid(date)) { ++ return d->isLeapYear(year(date)); + } + + return false; + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfYear( int year ) const ++QDate KCalendarSystem::firstDayOfYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->firstDayOfYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->firstDayOfYear(year); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfYear( int year ) const ++QDate KCalendarSystem::lastDayOfYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->lastDayOfYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->lastDayOfYear(year); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfYear( const QDate &date ) const ++QDate KCalendarSystem::firstDayOfYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->firstDayOfYear( year( date ) ); ++ if (isValid(date)) { ++ return d->firstDayOfYear(year(date)); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfYear( const QDate &date ) const ++QDate KCalendarSystem::lastDayOfYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->lastDayOfYear( year( date ) ); ++ if (isValid(date)) { ++ return d->lastDayOfYear(year(date)); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfMonth( int year, int month ) const ++QDate KCalendarSystem::firstDayOfMonth(int year, int month) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, month, 1 ) ) { +- return d->firstDayOfMonth( year, month ); ++ if (isValid(year, month, 1)) { ++ return d->firstDayOfMonth(year, month); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfMonth( int year, int month ) const ++QDate KCalendarSystem::lastDayOfMonth(int year, int month) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, month, 1 ) ) { +- return d->lastDayOfMonth( year, month ); ++ if (isValid(year, month, 1)) { ++ return d->lastDayOfMonth(year, month); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfMonth( const QDate &date ) const ++QDate KCalendarSystem::firstDayOfMonth(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return d->firstDayOfMonth( year, month ); ++ getDate(date, &year, &month, 0); ++ return d->firstDayOfMonth(year, month); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfMonth( const QDate &date ) const ++QDate KCalendarSystem::lastDayOfMonth(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return d->lastDayOfMonth( year, month ); ++ getDate(date, &year, &month, 0); ++ return d->lastDayOfMonth(year, month); + } + + return QDate(); + } + +-QString KCalendarSystem::monthName( int month, int year, KCalendarSystem::MonthNameFormat format ) const ++QString KCalendarSystem::monthName(int month, int year, KCalendarSystem::MonthNameFormat format) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( !isValid( year, month, 1 ) ) { ++ if (!isValid(year, month, 1)) { + return QString(); + } + +- if ( format == KCalendarSystem::NarrowName ) { +- return d->monthName( month, year, KLocale::NarrowName, false ); ++ if (format == KCalendarSystem::NarrowName) { ++ return d->monthName(month, year, KLocale::NarrowName, false); + } + +- if ( format == KCalendarSystem::ShortNamePossessive ) { +- return d->monthName( month, year, KLocale::ShortName, true ); ++ if (format == KCalendarSystem::ShortNamePossessive) { ++ return d->monthName(month, year, KLocale::ShortName, true); + } + +- if ( format == KCalendarSystem::ShortName ) { +- return d->monthName( month, year, KLocale::ShortName, false ); ++ if (format == KCalendarSystem::ShortName) { ++ return d->monthName(month, year, KLocale::ShortName, false); + } + +- if ( format == KCalendarSystem::LongNamePossessive ) { +- return d->monthName( month, year, KLocale::LongName, true ); ++ if (format == KCalendarSystem::LongNamePossessive) { ++ return d->monthName(month, year, KLocale::LongName, true); + } + + // KCalendarSystem::LongName or any other +- return d->monthName( month, year, KLocale::LongName, false ); ++ return d->monthName(month, year, KLocale::LongName, false); + } + +-QString KCalendarSystem::monthName( const QDate &date, MonthNameFormat format ) const ++QString KCalendarSystem::monthName(const QDate &date, MonthNameFormat format) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return monthName( month, year, format ); ++ getDate(date, &year, &month, 0); ++ return monthName(month, year, format); + } + + return QString(); + } + +-QString KCalendarSystem::weekDayName( int weekDay, KCalendarSystem::WeekDayNameFormat format ) const ++QString KCalendarSystem::weekDayName(int weekDay, KCalendarSystem::WeekDayNameFormat format) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( weekDay < 1 || weekDay > d->daysInWeek() ) { ++ if (weekDay < 1 || weekDay > d->daysInWeek()) { + return QString(); + } + +- if ( format == KCalendarSystem::NarrowDayName ) { +- return d->weekDayName( weekDay, KLocale::NarrowName ); ++ if (format == KCalendarSystem::NarrowDayName) { ++ return d->weekDayName(weekDay, KLocale::NarrowName); + } + +- if ( format == KCalendarSystem::ShortDayName ) { +- return d->weekDayName( weekDay, KLocale::ShortName ); ++ if (format == KCalendarSystem::ShortDayName) { ++ return d->weekDayName(weekDay, KLocale::ShortName); + } + +- if ( format == KCalendarSystem::ShortDayName ) { +- return d->weekDayName( weekDay, KLocale::ShortName ); ++ if (format == KCalendarSystem::ShortDayName) { ++ return d->weekDayName(weekDay, KLocale::ShortName); + } + +- return d->weekDayName( weekDay, KLocale::LongName ); ++ return d->weekDayName(weekDay, KLocale::LongName); + } + +-QString KCalendarSystem::weekDayName( const QDate &date, WeekDayNameFormat format ) const ++QString KCalendarSystem::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- if ( isValid( date ) ) { +- return weekDayName( dayOfWeek( date ), format ); ++ if (isValid(date)) { ++ return weekDayName(dayOfWeek(date), format); + } + + return QString(); + } + +-QString KCalendarSystem::yearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::yearString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%y") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Year, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%Y") ); ++ return formatDate(date, KLocale::Year, KLocale::LongNumber); + } + } + +-QString KCalendarSystem::monthString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::monthString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%n") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Month, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%m") ); ++ return formatDate(date, KLocale::Month, KLocale::LongNumber); + } + } + +-QString KCalendarSystem::dayString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::dayString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%e") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Day, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%d") ); ++ return formatDate(date, KLocale::Day, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::yearInEraString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::yearInEraString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%Ey") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::YearInEra, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%4Ey") ); ++ return formatDate(date, KLocale::YearInEra, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::dayOfYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::dayOfYearString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%-j") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::DayOfYear, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%j") ); ++ return formatDate(date, KLocale::DayOfYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::dayOfWeekString( const QDate &date ) const ++QString KCalendarSystem::dayOfWeekString(const QDate &date) const + { +- return formatDate( date, QLatin1String("%-u") ); ++ return formatDate(date, KLocale::DayOfWeek, KLocale::ShortNumber); + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::weekNumberString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::weekNumberString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%-V") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Week, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%V") ); ++ return formatDate(date, KLocale::Week, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::monthsInYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::monthsInYearString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( monthsInYear( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::MonthsInYear, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( monthsInYear( date ), 2, QLatin1Char('0') ); ++ return formatDate(date, KLocale::MonthsInYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::weeksInYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::weeksInYearString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( weeksInYear( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::WeeksInYear, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( weeksInYear( date ), 2, QLatin1Char('0') ); ++ return formatDate(date, KLocale::WeeksInYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::daysInYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::daysInYearString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( daysInYear( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::DaysInYear, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( daysInYear( date ), 3, QLatin1Char('0') ); ++ return formatDate(date, KLocale::DaysInYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::daysInMonthString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::daysInMonthString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( daysInMonth( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::DaysInMonth, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( daysInMonth( date ), 2, QLatin1Char('0') ); ++ return formatDate(date, KLocale::DaysInMonth, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::daysInWeekString( const QDate &date) const ++QString KCalendarSystem::daysInWeekString(const QDate &date) const + { +- Q_D( const KCalendarSystem ); +- Q_UNUSED( date ); +- return d->stringFromInteger( d->daysInWeek(), 0 ); ++ return formatDate(date, KLocale::DaysInWeek, KLocale::ShortNumber); + } + +-int KCalendarSystem::yearStringToInteger( const QString &yearString, int &readLength ) const ++int KCalendarSystem::yearStringToInteger(const QString &yearString, int &readLength) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- QString minus = i18nc( "Negative symbol as used for year numbers, e.g. -5 = 5 BC", "-" ); +- if ( yearString.startsWith( minus ) ) { +- int value = d->integerFromString( yearString.mid( minus.length() ), 4, readLength ); +- if ( readLength > 0 && value >= 0 ) { ++ QString minus = i18nc("Negative symbol as used for year numbers, e.g. -5 = 5 BC", "-"); ++ if (yearString.startsWith(minus)) { ++ int value = d->integerFromString(yearString.mid(minus.length()), 4, readLength); ++ if (readLength > 0 && value >= 0) { + readLength = readLength + minus.length(); + return value * -1; + } else { +@@ -1998,31 +2034,31 @@ int KCalendarSystem::yearStringToInteger( const QString &yearString, int &readLe + } + } + +- return d->integerFromString( yearString, 4, readLength ); ++ return d->integerFromString(yearString, 4, readLength); + } + +-int KCalendarSystem::monthStringToInteger( const QString &monthString, int &readLength ) const ++int KCalendarSystem::monthStringToInteger(const QString &monthString, int &readLength) const + { +- Q_D( const KCalendarSystem ); +- return d->integerFromString( monthString, 2, readLength ); ++ Q_D(const KCalendarSystem); ++ return d->integerFromString(monthString, 2, readLength); + } + +-int KCalendarSystem::dayStringToInteger( const QString &dayString, int &readLength ) const ++int KCalendarSystem::dayStringToInteger(const QString &dayString, int &readLength) const + { +- Q_D( const KCalendarSystem ); +- return d->integerFromString( dayString, 2, readLength ); ++ Q_D(const KCalendarSystem); ++ return d->integerFromString(dayString, 2, readLength); + } + +-QString KCalendarSystem::formatDate( const QDate &fromDate, KLocale::DateFormat toFormat ) const ++QString KCalendarSystem::formatDate(const QDate &fromDate, KLocale::DateFormat toFormat) const + { +- if ( !fromDate.isValid() ) { ++ if (!fromDate.isValid()) { + return QString(); + } + +- if ( toFormat == KLocale::FancyShortDate || toFormat == KLocale::FancyLongDate ) { ++ if (toFormat == KLocale::FancyShortDate || toFormat == KLocale::FancyLongDate) { + QDate now = KDateTime::currentLocalDate(); +- int daysToNow = fromDate.daysTo( now ); +- switch ( daysToNow ) { ++ int daysToNow = fromDate.daysTo(now); ++ switch (daysToNow) { + case 0: + return i18n("Today"); + case 1: +@@ -2032,47 +2068,47 @@ QString KCalendarSystem::formatDate( const QDate &fromDate, KLocale::DateFormat + case 4: + case 5: + case 6: +- return weekDayName( fromDate ); ++ return weekDayName(fromDate); + default: + break; + } + } + +- switch ( toFormat ) { ++ switch (toFormat) { + case KLocale::LongDate: + case KLocale::FancyLongDate: +- return formatDate( fromDate, locale()->dateFormat() ); ++ return formatDate(fromDate, locale()->dateFormat()); + case KLocale::IsoDate: +- return formatDate( fromDate, QLatin1String("%Y-%m-%d") ); ++ return formatDate(fromDate, QLatin1String("%Y-%m-%d")); + case KLocale::IsoWeekDate: +- return formatDate( fromDate, QLatin1String("%Y-W%V-%u") ); ++ return formatDate(fromDate, QLatin1String("%Y-W%V-%u")); + case KLocale::IsoOrdinalDate: +- return formatDate( fromDate, QLatin1String("%Y-%j") ); ++ return formatDate(fromDate, QLatin1String("%Y-%j")); + case KLocale::ShortDate: + case KLocale::FancyShortDate: + default: +- return formatDate( fromDate, locale()->dateFormatShort() ); ++ return formatDate(fromDate, locale()->dateFormatShort()); + } + + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::formatDate( const QDate &fromDate, const QString &toFormat, +- KLocale::DateTimeFormatStandard standard ) const ++QString KCalendarSystem::formatDate(const QDate &fromDate, const QString &toFormat, ++ KLocale::DateTimeFormatStandard standard) const + { +- return formatDate( fromDate, toFormat, locale()->dateTimeDigitSet(), standard ); ++ return formatDate(fromDate, toFormat, locale()->dateTimeDigitSet(), standard); + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::formatDate( const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KCalendarSystem::formatDate(const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { +- if ( !isValid( fromDate ) || toFormat.isEmpty() ) { ++ if (!isValid(fromDate) || toFormat.isEmpty()) { + return QString(); + } + + KDateTimeFormatter formatter; +- return formatter.formatDate( fromDate, toFormat, this, locale(), digitSet, formatStandard ); ++ return formatter.formatDate(fromDate, toFormat, this, locale(), digitSet, formatStandard); + } + + // NOT VIRTUAL - If override needed use shared-d +@@ -2080,25 +2116,24 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + KLocale::DateTimeComponentFormat format, + KLocale::WeekNumberSystem weekNumberSystem) const + { +- Q_D( const KCalendarSystem ); +- Q_UNUSED( weekNumberSystem ); ++ Q_D(const KCalendarSystem); + +- switch ( component ) { ++ switch (component) { + case KLocale::Year: + case KLocale::YearName: +- switch ( format ) { ++ switch (format) { + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: +- return yearString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%y")); + case KLocale::LongNumber: + case KLocale::LongName: + case KLocale::DefaultComponentFormat: + default: +- return yearString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%Y")); + } + case KLocale::Month: +- switch ( format ) { ++ switch (format) { + case KLocale::LongName: + return monthName(date, KCalendarSystem::LongName); + case KLocale::ShortName: +@@ -2106,14 +2141,14 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + case KLocale::NarrowName: + return monthName(date, KCalendarSystem::NarrowName); + case KLocale::LongNumber: +- return monthString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%m")); + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return monthString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%n")); + } + case KLocale::MonthName: +- switch ( format ) { ++ switch (format) { + case KLocale::NarrowName: + return monthName(date, KCalendarSystem::NarrowName); + case KLocale::ShortName: +@@ -2130,16 +2165,16 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return dayString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%d")); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return dayString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%e")); + } + case KLocale::JulianDay: +- return d->stringFromInteger( date.toJulianDay(), 0 ); ++ return d->stringFromInteger(date.toJulianDay(), 0); + case KLocale::EraName: + switch (format) { + case KLocale::LongNumber: +@@ -2168,26 +2203,26 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return yearInEraString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%4Ey")); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return yearInEraString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%Ey")); + } + case KLocale::DayOfYear: + case KLocale::DayOfYearName: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return dayOfYearString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%j")); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return dayOfYearString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%-j")); + } + case KLocale::DayOfWeek: + switch (format) { +@@ -2201,10 +2236,10 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return dayOfWeekString(date); ++ return formatDate(date, QLatin1String("%-u")); + } + case KLocale::DayOfWeekName: +- switch ( format ) { ++ switch (format) { + case KLocale::NarrowName: + return weekDayName(date, KCalendarSystem::NarrowDayName); + case KLocale::ShortName: +@@ -2220,69 +2255,68 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return weekNumberString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(week(date, weekNumberSystem, 0), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return weekNumberString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(week(date, weekNumberSystem, 0), 0, QLatin1Char('0')); + } +- case KLocale::WeekYear: +- { ++ case KLocale::WeekYear: { + int weekYear; + QDate yearDate; +- weekNumber( date, &weekYear ); +- setDate( yearDate, weekYear, 1, 1 ); +- return formatDate( yearDate, KLocale::Year, format ); ++ week(date, weekNumberSystem, &weekYear); ++ setDate(yearDate, weekYear, 1, 1); ++ return formatDate(yearDate, KLocale::Year, format); + } + case KLocale::MonthsInYear: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return monthsInYearString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(monthsInYear(date), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return monthsInYearString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(monthsInYear(date), 0, QLatin1Char('0')); + } + case KLocale::WeeksInYear: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return weeksInYearString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(weeksInYear(date), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return weeksInYearString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(weeksInYear(date), 0, QLatin1Char('0')); + } + case KLocale::DaysInYear: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return daysInYearString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(daysInYear(date), 3, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return daysInYearString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(daysInYear(date), 0, QLatin1Char('0')); + } + case KLocale::DaysInMonth: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return daysInMonthString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(daysInMonth(date), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return daysInMonthString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(daysInMonth(date), 0, QLatin1Char('0')); + } + case KLocale::DaysInWeek: + switch (format) { +@@ -2293,26 +2327,26 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return daysInWeekString(date); ++ return d->stringFromInteger(d->daysInWeek(), 0); + } + default: + return QString(); + } + } + +-QDate KCalendarSystem::readDate( const QString &str, bool *ok ) const ++QDate KCalendarSystem::readDate(const QString &str, bool *ok) const + { + //Try each standard format in turn, start with the locale ones, + //then the well defined standards +- QDate date = readDate( str, KLocale::ShortFormat, ok); +- if ( !isValid( date ) ) { +- date = readDate( str, KLocale::NormalFormat, ok); +- if ( !isValid( date )) { +- date = readDate( str, KLocale::IsoFormat, ok); +- if ( !isValid( date ) ) { +- date = readDate( str, KLocale::IsoWeekFormat, ok); +- if ( !isValid( date ) ) { +- date = readDate( str, KLocale::IsoOrdinalFormat, ok); ++ QDate date = readDate(str, KLocale::ShortFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::NormalFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::IsoFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::IsoWeekFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::IsoOrdinalFormat, ok); + } + } + } +@@ -2321,35 +2355,35 @@ QDate KCalendarSystem::readDate( const QString &str, bool *ok ) const + return date; + } + +-QDate KCalendarSystem::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const ++QDate KCalendarSystem::readDate(const QString &str, KLocale::ReadDateFlags flags, bool *ok) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( flags & KLocale::ShortFormat ) { +- return readDate( str, locale()->dateFormatShort(), ok ); +- } else if ( flags & KLocale::NormalFormat ) { +- return readDate( str, locale()->dateFormat(), ok ); +- } else if ( flags & KLocale::IsoFormat ) { +- return readDate( str, QLatin1String("%Y-%m-%d"), ok ); +- } else if ( flags & KLocale::IsoWeekFormat ) { +- return readDate( str, QLatin1String("%Y-W%V-%u"), ok ); +- } else if ( flags & KLocale::IsoOrdinalFormat ) { +- return readDate( str, QLatin1String("%Y-%j"), ok ); ++ if (flags & KLocale::ShortFormat) { ++ return readDate(str, locale()->dateFormatShort(), ok); ++ } else if (flags & KLocale::NormalFormat) { ++ return readDate(str, locale()->dateFormat(), ok); ++ } else if (flags & KLocale::IsoFormat) { ++ return readDate(str, QLatin1String("%Y-%m-%d"), ok); ++ } else if (flags & KLocale::IsoWeekFormat) { ++ return readDate(str, QLatin1String("%Y-W%V-%u"), ok); ++ } else if (flags & KLocale::IsoOrdinalFormat) { ++ return readDate(str, QLatin1String("%Y-%j"), ok); + } + return d->invalidDate(); + } + +-QDate KCalendarSystem::readDate( const QString &inputString, const QString &formatString, bool *ok ) const ++QDate KCalendarSystem::readDate(const QString &inputString, const QString &formatString, bool *ok) const + { +- return readDate( inputString, formatString, ok, KLocale::KdeFormat ); ++ return readDate(inputString, formatString, ok, KLocale::KdeFormat); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::readDate( const QString &inputString, const QString &formatString, bool *ok, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QDate KCalendarSystem::readDate(const QString &inputString, const QString &formatString, bool *ok, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + KDateTimeParser parser; +- QDate resultDate = parser.parseDate( inputString, formatString, this, locale(), locale()->dateTimeDigitSet(), formatStandard ); ++ QDate resultDate = parser.parseDate(inputString, formatString, this, locale(), locale()->dateTimeDigitSet(), formatStandard); + if (ok) { + *ok = resultDate.isValid(); + } +@@ -2359,17 +2393,17 @@ QDate KCalendarSystem::readDate( const QString &inputString, const QString &form + // NOT VIRTUAL - If override needed use shared-d + int KCalendarSystem::shortYearWindowStartYear() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->shortYearWindowStartYear(); + } + + // NOT VIRTUAL - If override needed use shared-d +-int KCalendarSystem::applyShortYearWindow( int inputYear ) const ++int KCalendarSystem::applyShortYearWindow(int inputYear) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return d->applyShortYearWindow( inputYear ); ++ return d->applyShortYearWindow(inputYear); + } + + int KCalendarSystem::weekStartDay() const +@@ -2383,7 +2417,7 @@ int KCalendarSystem::weekStartDay() const + // instead be wrapped in validity checks, as sometimes we want this to work outside the public valid + // range, i.e. to allow us to internally set dates of 1/1/10000 which are not publically valid but + // are required for internal maths +-bool KCalendarSystem::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystem::julianDayToDate(int jd, int &year, int &month, int &day) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -2391,18 +2425,18 @@ bool KCalendarSystem::julianDayToDate( int jd, int &year, int &month, int &day ) + // the Boost licensed source code + + int a = jd + 32044; +- int b = ( ( 4 * a ) + 3 ) / 146097; +- int c = a - ( ( 146097 * b ) / 4 ); +- int d = ( ( 4 * c ) + 3 ) / 1461; +- int e = c - ( ( 1461 * d ) / 4 ); +- int m = ( ( 5 * e ) + 2 ) / 153; +- day = e - ( ( (153 * m ) + 2 ) / 5 ) + 1; +- month = m + 3 - ( 12 * ( m / 10 ) ); +- year = ( 100 * b ) + d - 4800 + ( m / 10 ); ++ int b = ((4 * a) + 3) / 146097; ++ int c = a - ((146097 * b) / 4); ++ int d = ((4 * c) + 3) / 1461; ++ int e = c - ((1461 * d) / 4); ++ int m = ((5 * e) + 2) / 153; ++ day = e - (((153 * m) + 2) / 5) + 1; ++ month = m + 3 - (12 * (m / 10)); ++ year = (100 * b) + d - 4800 + (m / 10); + + // If year is -ve then is BC. In Gregorian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- if ( year < 1 ) { ++ if (year < 1) { + year = year - 1; + } + +@@ -2415,7 +2449,7 @@ bool KCalendarSystem::julianDayToDate( int jd, int &year, int &month, int &day ) + // instead be wrapped in validity checks, as sometimes we want this to work outside the public valid + // range, i.e. to allow us to internally set dates of 1/1/10000 which are not publically valid but + // are required for internal maths +-bool KCalendarSystem::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystem::dateToJulianDay(int year, int month, int day, int &jd) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -2425,22 +2459,22 @@ bool KCalendarSystem::dateToJulianDay( int year, int month, int day, int &jd ) c + // If year is -ve then is BC. In Gregorian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally + int y; +- if ( year < 1 ) { ++ if (year < 1) { + y = year + 1; + } else { + y = year; + } + +- int a = ( 14 - month ) / 12; ++ int a = (14 - month) / 12; + y = y + 4800 - a; +- int m = month + ( 12 * a ) - 3; ++ int m = month + (12 * a) - 3; + + jd = day +- + ( ( ( 153 * m ) + 2 ) / 5 ) +- + ( 365 * y ) +- + ( y / 4 ) +- - ( y / 100 ) +- + ( y / 400 ) ++ + (((153 * m) + 2) / 5) ++ + (365 * y) ++ + (y / 4) ++ - (y / 100) ++ + (y / 400) + - 32045; + + return true; +@@ -2448,25 +2482,25 @@ bool KCalendarSystem::dateToJulianDay( int year, int month, int day, int &jd ) c + + const KLocale * KCalendarSystem::locale() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->locale(); + } + + // Deprecated +-void KCalendarSystem::setMaxMonthsInYear( int maxMonths ) ++void KCalendarSystem::setMaxMonthsInYear(int maxMonths) + { +- Q_UNUSED( maxMonths ) ++ Q_UNUSED(maxMonths) + } + + // Deprecated +-void KCalendarSystem::setMaxDaysInWeek( int maxDays ) ++void KCalendarSystem::setMaxDaysInWeek(int maxDays) + { +- Q_UNUSED( maxDays ) ++ Q_UNUSED(maxDays) + } + + // Deprecated +-void KCalendarSystem::setHasYear0( bool hasYear0 ) ++void KCalendarSystem::setHasYear0(bool hasYear0) + { +- Q_UNUSED( hasYear0 ) ++ Q_UNUSED(hasYear0) + } +diff --git a/kdecore/date/kcalendarsystem.h b/kdecore/date/kcalendarsystem.h +index 318e2d3..4dfda62 100644 +--- a/kdecore/date/kcalendarsystem.h ++++ b/kdecore/date/kcalendarsystem.h +@@ -45,28 +45,28 @@ public: + * Format for returned year number / month number / day number as string. + */ + enum StringFormat { +- ShortFormat, /**< Short string format, e.g. 2000 = "00" or 6 = "6" */ +- LongFormat /**< Long string format, e.g. 2000 = "2000" or 6 = "06" */ ++ ShortFormat, /**< Short string format, e.g. 2000 = "00" or 6 = "6" */ ++ LongFormat /**< Long string format, e.g. 2000 = "2000" or 6 = "06" */ + }; + + /** + * Format for returned month / day name. + */ + enum MonthNameFormat { +- ShortName, /**< Short name format, e.g. "Dec" */ +- LongName, /**< Long name format, e.g. "December" */ +- ShortNamePossessive, /**< Short name possessive format, e.g. "of Dec" */ +- LongNamePossessive, /**< Long name possessive format, e.g. "of December" */ +- NarrowName /**< Narrow name format, e.g. "D". @since 4.7 */ ++ ShortName, /**< Short name format, e.g. "Dec" */ ++ LongName, /**< Long name format, e.g. "December" */ ++ ShortNamePossessive, /**< Short name possessive format, e.g. "of Dec" */ ++ LongNamePossessive, /**< Long name possessive format, e.g. "of December" */ ++ NarrowName /**< Narrow name format, e.g. "D". @since 4.7 */ + }; + + /** + * Format for returned month / day name. + */ + enum WeekDayNameFormat { +- ShortDayName, /**< Short name format, e.g. "Fri" */ +- LongDayName, /**< Long name format, e.g. "Friday" */ +- NarrowDayName /**< Narrow name format, e.g. "F". @since 4.7 */ ++ ShortDayName, /**< Short name format, e.g. "Fri" */ ++ LongDayName, /**< Long name format, e.g. "Friday" */ ++ NarrowDayName /**< Narrow name format, e.g. "F". @since 4.7 */ + }; + + //KDE5 remove +@@ -80,8 +80,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( const QString & calType = QLatin1String( "gregorian" ), +- const KLocale * locale = 0 ); ++ KDE_DEPRECATED static KCalendarSystem *create(const QString & calType = QLatin1String("gregorian"), ++ const KLocale * locale = 0); + + //KDE5 remove + /** +@@ -98,8 +98,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( const QString & calType, KSharedConfig::Ptr config, +- const KLocale * locale = 0 ); ++ KDE_DEPRECATED static KCalendarSystem *create(const QString & calType, KSharedConfig::Ptr config, ++ const KLocale * locale = 0); + + //KDE5 add default value to calendarSystem + /** +@@ -111,8 +111,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem, +- const KLocale *locale = 0 ); ++ static KCalendarSystem *create(KLocale::CalendarSystem calendarSystem, ++ const KLocale *locale = 0); + + /** + * @since 4.6 +@@ -126,8 +126,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem, KSharedConfig::Ptr config, +- const KLocale *locale = 0 ); ++ static KCalendarSystem *create(KLocale::CalendarSystem calendarSystem, KSharedConfig::Ptr config, ++ const KLocale *locale = 0); + + //KDE5 remove + /** +@@ -137,7 +137,7 @@ public: + * + * @return list of names + */ +- static QStringList calendarSystems(); ++ KDE_DEPRECATED static QStringList calendarSystems(); + + /** + * @since 4.6 +@@ -160,23 +160,25 @@ public: + * + * @return label for calendar + */ +- static QString calendarLabel( const QString &calendarType ); ++ KDE_DEPRECATED static QString calendarLabel(const QString &calendarType); + + /** + * @since 4.6 + * + * Returns a localized label to display for the required Calendar System type. + * +- * Use with calendarSystemsList() to populate selction lists of available ++ * Use with calendarSystemsList() to populate selection lists of available + * calendar systems. + * +- * @param calendarType the specific calendar type to return the label for ++ * @param calendarSystem the specific calendar type to return the label for + * @param locale the locale to use for the label, defaults to global + * @return label for calendar + */ +- static QString calendarLabel( KLocale::CalendarSystem calendarSystem, const KLocale *locale = KGlobal::locale() ); ++ static QString calendarLabel(KLocale::CalendarSystem calendarSystem, const KLocale *locale = KGlobal::locale()); + ++ //KDE5 Remove + /** ++ * @deprecated use calendarSystem(const QString &calendarType) instead + * @since 4.6 + * + * Returns the Calendar System enum value for a given Calendar Type, +@@ -185,14 +187,38 @@ public: + * @param calendarType the calendar type to convert + * @return calendar system for calendar type + */ +- static KLocale::CalendarSystem calendarSystemForCalendarType( const QString &calendarType ); ++ KDE_DEPRECATED static KLocale::CalendarSystem calendarSystemForCalendarType(const QString &calendarType); ++ ++ //KDE5 Remove ++ /** ++ * @since 4.7 ++ * ++ * Returns the Calendar System enum value for a given Calendar Type, ++ * e.g. KLocale::QDateCalendar for "gregorian" ++ * ++ * @param calendarType the calendar type to convert ++ * @return calendar system for calendar type ++ */ ++ static KLocale::CalendarSystem calendarSystem(const QString &calendarType); ++ ++ //KDE5 remove ++ /** ++ * @since 4.7 ++ * ++ * Returns the deprecated Calendar Type for a given Calendar System enum value, ++ * e.g. "gregorian" for KLocale::QDateCalendar ++ * ++ * @param calendarSystem the calendar system to convert ++ * @return calendar type for calendar system ++ */ ++ static QString calendarType(KLocale::CalendarSystem calendarSystem); + + /** + * Constructor of abstract calendar class. This will be called by derived classes. + * + * @param locale locale to use for translations. The global locale is used if null. + */ +- explicit KCalendarSystem( const KLocale *locale = 0 ); ++ explicit KCalendarSystem(const KLocale *locale = 0); + + /** + * Constructor of abstract calendar class. This will be called by derived classes. +@@ -202,7 +228,7 @@ public: + if null. + * @param locale locale to use for translations. The global locale is used if null. + */ +- explicit KCalendarSystem( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystem(const KSharedConfig::Ptr config, const KLocale *locale = 0); + + /** + * Destructor. +@@ -216,7 +242,7 @@ public: + * + * @return type of calendar system + */ +- virtual QString calendarType() const = 0; ++ KDE_DEPRECATED virtual QString calendarType() const = 0; + + //KDE5 make virtual? + /** +@@ -285,7 +311,7 @@ public: + * @param day the day portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool isValid( int year, int month, int day ) const = 0; ++ virtual bool isValid(int year, int month, int day) const = 0; + + //KDE5 make virtual? + /** +@@ -297,7 +323,7 @@ public: + * @param dayOfYear the day of year portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- bool isValid( int year, int dayOfYear ) const; ++ bool isValid(int year, int dayOfYear) const; + + //KDE5 make virtual? + /** +@@ -305,13 +331,13 @@ public: + * + * Returns whether a given date is valid in this calendar system. + * +- * @param era the Era Name portion of the date to check ++ * @param eraName the Era Name portion of the date to check + * @param yearInEra the Year In Era portion of the date to check + * @param month the Month portion of the date to check + * @param day the Day portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- bool isValid( const QString &eraName, int yearInEra, int month, int day ) const; ++ bool isValid(const QString &eraName, int yearInEra, int month, int day) const; + + //KDE5 make virtual? + /** +@@ -324,7 +350,7 @@ public: + * @param dayOfIsoWeek the day of week portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- bool isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const; ++ bool isValidIsoWeekDate(int year, int isoWeekNumber, int dayOfIsoWeek) const; + + /** + * Returns whether a given date is valid in this calendar system. +@@ -332,7 +358,7 @@ public: + * @param date the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(const QDate &date) const; + + /** + * Changes the date's year, month and day. The range of the year, month +@@ -346,7 +372,7 @@ public: + * @param day day of month + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool setDate( QDate &date, int year, int month, int day ) const; ++ virtual bool setDate(QDate &date, int year, int month, int day) const; + + //KDE5 make virtual? + /** +@@ -359,7 +385,7 @@ public: + * @param dayOfYear day of year + * @return @c true if the date is valid, @c false otherwise + */ +- bool setDate( QDate &date, int year, int dayOfYear ) const; ++ bool setDate(QDate &date, int year, int dayOfYear) const; + + //KDE5 make virtual? + /** +@@ -369,12 +395,12 @@ public: + * + * @param date date to change + * @param eraName Era string +- * @param year Year In Era number ++ * @param yearInEra Year In Era number + * @param month Month number + * @param day Day Of Month number + * @return @c true if the date is valid, @c false otherwise + */ +- bool setDate( QDate &date, QString eraName, int yearInEra, int month, int day ) const; ++ bool setDate(QDate &date, QString eraName, int yearInEra, int month, int day) const; + + //KDE5 make virtual? + /** +@@ -388,14 +414,10 @@ public: + * @param dayOfIsoWeek day of week Mon..Sun (1..7) + * @return @c true if the date is valid, @c false otherwise + */ +- bool setDateIsoWeek( QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek ) const; ++ bool setDateIsoWeek(QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek) const; + + /** +- * @deprecated +- * +- * Use setDate instead +- * +- * @see KCalendarSystem::setDate ++ * @deprecated Use setDate() instead + * + * Some implementations reject year range 00 to 99, but extended date + * ranges now require these to be accepted. Equivalent in QDate is +@@ -410,7 +432,7 @@ public: + * @param d Day of month + * @return true if the date is valid; otherwise returns false. + */ +- virtual bool setYMD( QDate &date, int y, int m, int d ) const; ++ KDE_DEPRECATED virtual bool setYMD(QDate &date, int y, int m, int d) const; + + //KDE5 make virtual? + /** +@@ -423,7 +445,7 @@ public: + * @param month month number returned in this variable + * @param day day of month returned in this variable + */ +- void getDate( const QDate date, int *year, int *month, int *day ) const; ++ void getDate(const QDate date, int *year, int *month, int *day) const; + + /** + * Returns the year portion of a given date in the current calendar system +@@ -431,7 +453,7 @@ public: + * @param date date to return year for + * @return year, 0 if input date is invalid + */ +- virtual int year( const QDate &date ) const; ++ virtual int year(const QDate &date) const; + + /** + * Returns the month portion of a given date in the current calendar system +@@ -439,7 +461,7 @@ public: + * @param date date to return month for + * @return month of year, 0 if input date is invalid + */ +- virtual int month( const QDate &date ) const; ++ virtual int month(const QDate &date) const; + + /** + * Returns the day portion of a given date in the current calendar system +@@ -447,7 +469,7 @@ public: + * @param date date to return day for + * @return day of the month, 0 if input date is invalid + */ +- virtual int day( const QDate &date ) const; ++ virtual int day(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -460,7 +482,7 @@ public: + * @param format format to return, either short or long + * @return era name, empty string if input date is invalid + */ +- QString eraName( const QDate &date, StringFormat format = ShortFormat ) const; ++ QString eraName(const QDate &date, StringFormat format = ShortFormat) const; + + //KDE5 make virtual? + /** +@@ -473,7 +495,7 @@ public: + * @param format format to return, either short or long + * @return era name, empty string if input date is invalid + */ +- QString eraYear( const QDate &date, StringFormat format = ShortFormat ) const; ++ QString eraYear(const QDate &date, StringFormat format = ShortFormat) const; + + //KDE5 make virtual? + /** +@@ -485,7 +507,7 @@ public: + * @param date date to return Year In Era for + * @return Year In Era, -1 if input date is invalid + */ +- int yearInEra( const QDate &date ) const; ++ int yearInEra(const QDate &date) const; + + /** + * Returns a QDate containing a date @p nyears years later. +@@ -494,7 +516,7 @@ public: + * @param nyears The number of years to add + * @return The new date, null date if any errors + */ +- virtual QDate addYears( const QDate &date, int nyears ) const; ++ virtual QDate addYears(const QDate &date, int nyears) const; + + /** + * Returns a QDate containing a date @p nmonths months later. +@@ -503,7 +525,7 @@ public: + * @param nmonths number of months to add + * @return The new date, null date if any errors + */ +- virtual QDate addMonths( const QDate &date, int nmonths ) const; ++ virtual QDate addMonths(const QDate &date, int nmonths) const; + + /** + * Returns a QDate containing a date @p ndays days later. +@@ -512,7 +534,7 @@ public: + * @param ndays number of days to add + * @return The new date, null date if any errors + */ +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QDate addDays(const QDate &date, int ndays) const; + + //KDE5 make virtual? + /** +@@ -533,8 +555,8 @@ public: + * @param daysDiff Returns number of days difference + * @param direction Returns direction of difference, 1 if fromDate <= toDate, -1 otherwise + */ +- void dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const; ++ void dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const; + + //KDE5 make virtual? + /** +@@ -547,7 +569,7 @@ public: + * @param toDate The date to end at + * @return The number of years difference + */ +- int yearsDifference( const QDate &fromDate, const QDate &toDate ) const; ++ int yearsDifference(const QDate &fromDate, const QDate &toDate) const; + + //KDE5 make virtual? + /** +@@ -562,7 +584,7 @@ public: + * @param toDate The date to end at + * @return The number of months difference + */ +- int monthsDifference( const QDate &fromDate, const QDate &toDate ) const; ++ int monthsDifference(const QDate &fromDate, const QDate &toDate) const; + + //KDE5 make virtual? + /** +@@ -573,7 +595,7 @@ public: + * @param toDate The date to end at + * @return The number of days difference + */ +- int daysDifference( const QDate &fromDate, const QDate &toDate ) const; ++ int daysDifference(const QDate &fromDate, const QDate &toDate) const; + + /** + * Returns number of months in the given year +@@ -581,7 +603,7 @@ public: + * @param date the date to obtain year from + * @return number of months in the year, -1 if input date invalid + */ +- virtual int monthsInYear( const QDate &date ) const; ++ virtual int monthsInYear(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -592,7 +614,7 @@ public: + * @param year the required year + * @return number of months in the year, -1 if input date invalid + */ +- int monthsInYear( int year ) const; ++ int monthsInYear(int year) const; + + /** + * Returns the number of localized weeks in the given year. +@@ -600,7 +622,7 @@ public: + * @param date the date to obtain year from + * @return number of weeks in the year, -1 if input date invalid + */ +- virtual int weeksInYear( const QDate &date ) const; ++ virtual int weeksInYear(const QDate &date) const; + + //KDE5 Merge with virtual weeksInYear with default + /** +@@ -617,7 +639,7 @@ public: + * @param weekNumberSystem the week number system to use + * @return number of weeks in the year, -1 if date invalid + */ +- int weeksInYear( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem ) const; ++ int weeksInYear(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem) const; + + /** + * Returns the number of localized weeks in the given year. +@@ -625,7 +647,7 @@ public: + * @param year the year + * @return number of weeks in the year, -1 if input date invalid + */ +- virtual int weeksInYear( int year ) const; ++ virtual int weeksInYear(int year) const; + + //KDE5 Merge with virtual weeksInYear with default + /** +@@ -642,7 +664,7 @@ public: + * @param weekNumberSystem the week number system to use + * @return number of weeks in the year, -1 if date invalid + */ +- int weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const; ++ int weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const; + + /** + * Returns the number of days in the given year. +@@ -650,7 +672,7 @@ public: + * @param date the date to obtain year from + * @return number of days in year, -1 if input date invalid + */ +- virtual int daysInYear( const QDate &date ) const; ++ virtual int daysInYear(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -661,7 +683,7 @@ public: + * @param year the year + * @return number of days in year, -1 if input date invalid + */ +- int daysInYear( int year ) const; ++ int daysInYear(int year) const; + + /** + * Returns the number of days in the given month. +@@ -669,7 +691,7 @@ public: + * @param date the date to obtain month from + * @return number of days in month, -1 if input date invalid + */ +- virtual int daysInMonth( const QDate &date ) const; ++ virtual int daysInMonth(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -681,7 +703,7 @@ public: + * @param month the month + * @return number of days in month, -1 if input date invalid + */ +- int daysInMonth( int year, int month ) const; ++ int daysInMonth(int year, int month) const; + + /** + * Returns the number of days in the given week. +@@ -689,7 +711,7 @@ public: + * @param date the date to obtain week from + * @return number of days in week, -1 if input date invalid + */ +- virtual int daysInWeek( const QDate &date ) const; ++ virtual int daysInWeek(const QDate &date) const; + + /** + * Returns the day number of year for the given date +@@ -699,7 +721,7 @@ public: + * @param date the date to obtain day from + * @return day of year number, -1 if input date not valid + */ +- virtual int dayOfYear( const QDate &date ) const; ++ virtual int dayOfYear(const QDate &date) const; + + /** + * Returns the weekday number for the given date +@@ -711,10 +733,10 @@ public: + * @param date the date to obtain day from + * @return day of week number, -1 if input date not valid + */ +- virtual int dayOfWeek( const QDate &date ) const; ++ virtual int dayOfWeek(const QDate &date) const; + + /** +- * @deprecated ++ * @deprecated use week() instead + * + * Returns the ISO week number for the given date. + * +@@ -728,7 +750,7 @@ public: + * @param yearNum returns the year the date belongs to + * @return ISO week number, -1 if input date invalid + */ +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; ++ KDE_DEPRECATED virtual int weekNumber(const QDate &date, int *yearNum = 0) const; + + //KDE5 Make virtual? + /** +@@ -748,7 +770,7 @@ public: + * @param yearNum returns the year the date belongs to + * @return localized week number, -1 if input date invalid + */ +- int week( const QDate &date, int *yearNum = 0 ) const; ++ int week(const QDate &date, int *yearNum = 0) const; + + //KDE5 Make virtual? + /** +@@ -771,7 +793,7 @@ public: + * @param yearNum returns the year the date belongs to + * @return week number, -1 if input date invalid + */ +- int week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum = 0) const; ++ int week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum = 0) const; + + /** + * Returns whether a given year is a leap year. +@@ -782,7 +804,7 @@ public: + * @param year the year to check + * @return @c true if the year is a leap year, @c false otherwise + */ +- virtual bool isLeapYear( int year ) const = 0; ++ virtual bool isLeapYear(int year) const = 0; + + /** + * Returns whether a given date falls in a leap year. +@@ -793,7 +815,7 @@ public: + * @param date the date to check + * @return @c true if the date falls in a leap year, @c false otherwise + */ +- virtual bool isLeapYear( const QDate &date ) const; ++ virtual bool isLeapYear(const QDate &date) const; + + //KDE5 Make virtual? + /** +@@ -801,10 +823,10 @@ public: + * + * Returns a QDate containing the first day of the year + * +- * @param date The year to return the date for ++ * @param year The year to return the date for + * @return The first day of the year + */ +- QDate firstDayOfYear( int year ) const; ++ QDate firstDayOfYear(int year) const; + + //KDE5 Make virtual? + /** +@@ -812,10 +834,10 @@ public: + * + * Returns a QDate containing the last day of the year + * +- * @param date The year to return the date for ++ * @param year The year to return the date for + * @return The last day of the year + */ +- QDate lastDayOfYear( int year ) const; ++ QDate lastDayOfYear(int year) const; + + //KDE5 Make virtual? + /** +@@ -826,7 +848,7 @@ public: + * @param date The year to return the date for, defaults to today + * @return The first day of the year + */ +- QDate firstDayOfYear( const QDate &date = QDate::currentDate() ) const; ++ QDate firstDayOfYear(const QDate &date = QDate::currentDate()) const; + + //KDE5 Make virtual? + /** +@@ -837,7 +859,7 @@ public: + * @param date The year to return the date for, defaults to today + * @return The last day of the year + */ +- QDate lastDayOfYear( const QDate &date = QDate::currentDate() ) const; ++ QDate lastDayOfYear(const QDate &date = QDate::currentDate()) const; + + //KDE5 Make virtual? + /** +@@ -845,10 +867,11 @@ public: + * + * Returns a QDate containing the first day of the month + * +- * @param date The month to return the date for, defaults to today ++ * @param year The year to return the date for ++ * @param month The month to return the date for + * @return The first day of the month + */ +- QDate firstDayOfMonth( int year, int month ) const; ++ QDate firstDayOfMonth(int year, int month) const; + + //KDE5 Make virtual? + /** +@@ -856,10 +879,11 @@ public: + * + * Returns a QDate containing the last day of the month + * +- * @param date The month to return the date for, defaults to today ++ * @param year The year to return the date for ++ * @param month The month to return the date for + * @return The last day of the month + */ +- QDate lastDayOfMonth( int year, int month ) const; ++ QDate lastDayOfMonth(int year, int month) const; + + //KDE5 Make virtual? + /** +@@ -870,7 +894,7 @@ public: + * @param date The month to return the date for, defaults to today + * @return The first day of the month + */ +- QDate firstDayOfMonth( const QDate &date = QDate::currentDate() ) const; ++ QDate firstDayOfMonth(const QDate &date = QDate::currentDate()) const; + + //KDE5 Make virtual? + /** +@@ -881,7 +905,7 @@ public: + * @param date The month to return the date for, defaults to today + * @return The last day of the month + */ +- QDate lastDayOfMonth( const QDate &date = QDate::currentDate() ) const; ++ QDate lastDayOfMonth(const QDate &date = QDate::currentDate()) const; + + /** + * Gets specific calendar type month name for a given month number +@@ -892,7 +916,7 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return name of the month, empty string if any error + */ +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const = 0; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const = 0; + + /** + * Gets specific calendar type month name for a given date +@@ -901,7 +925,7 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return name of the month, empty string if any error + */ +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + + /** + * Gets specific calendar type week day name. +@@ -911,7 +935,7 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return day name, empty string if any error + */ +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const = 0; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const = 0; + + /** + * Gets specific calendar type week day name. +@@ -920,9 +944,11 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return day name, empty string if any error + */ +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * Converts a date into a year literal + * + * @param date date to convert +@@ -930,9 +956,11 @@ public: + * @return year literal of the date, empty string if any error + * @see year() + */ +- virtual QString yearString( const QDate &date, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED virtual QString yearString(const QDate &date, StringFormat format = LongFormat) const; + + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * Converts a date into a month literal + * + * @param pDate The date to convert +@@ -940,9 +968,11 @@ public: + * @return The month literal of the date, empty string if any error + * @see month() + */ +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED virtual QString monthString(const QDate &pDate, StringFormat format = LongFormat) const; + + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * Converts a date into a day literal + * + * @param pDate The date to convert +@@ -950,10 +980,12 @@ public: + * @return The day literal of the date, empty string if any error + * @see day() + */ +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED virtual QString dayString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.5 + * + * Converts a date into a Year In Era literal +@@ -962,10 +994,12 @@ public: + * @param format format to return, either short or long + * @return Year In Era literal of the date, empty string if any error + */ +- QString yearInEraString( const QDate &date, StringFormat format = ShortFormat ) const; ++ KDE_DEPRECATED QString yearInEraString(const QDate &date, StringFormat format = ShortFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Converts a date into a day of year literal +@@ -975,10 +1009,12 @@ public: + * @return The day of year literal of the date, empty string if any error + * @see dayOfYear() + */ +- QString dayOfYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString dayOfYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Converts a date into a day of week literal +@@ -987,10 +1023,12 @@ public: + * @return The day of week literal of the date, empty string if any error + * @see dayOfWeek() + */ +- QString dayOfWeekString( const QDate &pDate ) const; ++ KDE_DEPRECATED QString dayOfWeekString(const QDate &pDate) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Converts a date into a week number literal +@@ -1000,10 +1038,12 @@ public: + * @return The day literal of the date, empty string if any error + * @see weekNumber() + */ +- QString weekNumberString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString weekNumberString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the months in year for a date as a numeric string +@@ -1013,10 +1053,12 @@ public: + * @return The months in year literal of the date, empty string if any error + * @see monthsInYear() + */ +- QString monthsInYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString monthsInYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the weeks in year for a date as a numeric string +@@ -1026,10 +1068,12 @@ public: + * @return The weeks in year literal of the date, empty string if any error + * @see weeksInYear() + */ +- QString weeksInYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString weeksInYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the days in year for a date as a numeric string +@@ -1039,10 +1083,12 @@ public: + * @return The days in year literal of the date, empty string if any error + * @see daysInYear() + */ +- QString daysInYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString daysInYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the days in month for a date as a numeric string +@@ -1052,10 +1098,12 @@ public: + * @return The days in month literal of the date, empty string if any error + * @see daysInMonth() + */ +- QString daysInMonthString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString daysInMonthString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the days in week for a date as a numeric string +@@ -1064,11 +1112,11 @@ public: + * @return The days in week literal of the date, empty string if any error + * @see daysInWeek() + */ +- QString daysInWeekString( const QDate &date ) const; ++ KDE_DEPRECATED QString daysInWeekString(const QDate &date) const; + + //KDE5 make protected or remove? + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Converts a year literal of a part of a string into a integer starting at the beginning of the string + * +@@ -1076,11 +1124,11 @@ public: + * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @return An integer corresponding to the year + */ +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + + //KDE5 make protected or remove? + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Converts a month literal of a part of a string into a integer starting at the beginning of the string + * +@@ -1088,11 +1136,11 @@ public: + * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @return An integer corresponding to the month + */ +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual int monthStringToInteger(const QString &sNum, int &iLength) const; + + //KDE5 make protected or remove? + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Converts a day literal of a part of a string into a integer starting at the beginning of the string + * +@@ -1100,7 +1148,7 @@ public: + * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @return An integer corresponding to the day + */ +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual int dayStringToInteger(const QString &sNum, int &iLength) const; + + /** + * Returns a string formatted to the current locale's conventions +@@ -1118,7 +1166,7 @@ public: + * + * @return The date as a string + */ +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; ++ virtual QString formatDate(const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate) const; + + //KDE5 Make virtual + /** +@@ -1237,8 +1285,8 @@ public: + * + * @return The date as a string + */ +- QString formatDate( const QDate &fromDate, const QString &toFormat, +- KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat ) const; ++ QString formatDate(const QDate &fromDate, const QString &toFormat, ++ KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat) const; + + //KDE5 Make virtual + /** +@@ -1257,8 +1305,8 @@ public: + * + * @return The date as a string + */ +- QString formatDate( const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat ) const; ++ QString formatDate(const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat) const; + + //KDE5 Make virtual + /** +@@ -1299,7 +1347,7 @@ public: + * + * @return the string converted to a QDate + */ +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; ++ virtual QDate readDate(const QString &str, bool *ok = 0) const; + + /** + * Converts a localized date string to a QDate. +@@ -1319,7 +1367,7 @@ public: + * + * @return the string converted to a QDate + */ +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; ++ virtual QDate readDate(const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0) const; + + /** + * Converts a localized date string to a QDate, using the specified @p format. +@@ -1334,7 +1382,7 @@ public: + * @see formatDate + * @see KLocale::readDate + */ +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; ++ virtual QDate readDate(const QString &dateString, const QString &dateFormat, bool *ok = 0) const; + + //KDE5 Make virtual + /** +@@ -1396,8 +1444,8 @@ public: + * @see formatDate + * @see KLocale::readDate + */ +- QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok, +- KLocale::DateTimeFormatStandard formatStandard ) const; ++ QDate readDate(const QString &dateString, const QString &dateFormat, bool *ok, ++ KLocale::DateTimeFormatStandard formatStandard) const; + + //KDE5 Make virtual + /** +@@ -1448,7 +1496,7 @@ public: + * @param inputYear the year number to apply the year window to + * @return the year number after applying the year window + */ +- int applyShortYearWindow( int inputYear ) const; ++ int applyShortYearWindow(int inputYear) const; + + /** + * Use this to determine which day is the first day of the week. +@@ -1465,6 +1513,8 @@ public: + virtual int weekStartDay() const; + + /** ++ * @deprecated use KLocale::weekDayOfPray() instead ++ * + * Returns the day of the week traditionally associated with religious + * observance for this calendar system. Note this may not be accurate + * for the users locale, e.g. Gregorian calendar used in non-Christian +@@ -1473,7 +1523,7 @@ public: + * + * @return day number (None = 0, Monday = 1, ..., Sunday = 7) + */ +- virtual int weekDayOfPray() const = 0; ++ KDE_DEPRECATED virtual int weekDayOfPray() const = 0; + + /** + * Returns whether the calendar is lunar based. +@@ -1524,7 +1574,7 @@ protected: + * @param day day of month returned in this variable + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const = 0; ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const = 0; + + /** + * Internal method to convert YMD values for this calendar system into a +@@ -1542,7 +1592,7 @@ protected: + * @param jd Julian day number returned in this variable + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const = 0; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const = 0; + + /** + * Returns the locale used for translations and formats for this +@@ -1569,25 +1619,25 @@ protected: + const KLocale *locale() const; + + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Sets the maximum number of months in a year + * + * Only for internal calendar system use + */ +- void setMaxMonthsInYear( int maxMonths ); ++ KDE_DEPRECATED void setMaxMonthsInYear(int maxMonths); + + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Sets the maximum number of days in a week + * + * Only for internal calendar system use + */ +- void setMaxDaysInWeek( int maxDays ); ++ KDE_DEPRECATED void setMaxDaysInWeek(int maxDays); + + /** +- * @deprecated ++ * @deprecated for internal use only + * + * @since 4.4 + * +@@ -1595,7 +1645,7 @@ protected: + * + * Only for internal calendar system use + */ +- void setHasYear0( bool hasYear0 ); ++ KDE_DEPRECATED void setHasYear0(bool hasYear0); + + /** + * Constructor of abstract calendar class. This will be called by derived classes. +@@ -1606,36 +1656,38 @@ protected: + if null. + * @param locale locale to use for translations. The global locale is used if null. + */ +- KCalendarSystem( KCalendarSystemPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ KCalendarSystem(KCalendarSystemPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + //Required for shared d-pointer as already private, remove in KDE5 + friend class KCalendarSystemCoptic; + friend class KCalendarSystemEthiopian; + friend class KCalendarSystemGregorian; +- friend class KCalendarSystemGregorianProleptic; + friend class KCalendarSystemHebrew; +- friend class KCalendarSystemHijri; + friend class KCalendarSystemIndianNational; ++ friend class KCalendarSystemIslamicCivil; + friend class KCalendarSystemJalali; + friend class KCalendarSystemJapanese; + friend class KCalendarSystemJulian; + friend class KCalendarSystemMinguo; ++ friend class KCalendarSystemQDate; + friend class KCalendarSystemThai; ++ //Other friends that need access to protected/private functions + friend class KLocalizedDate; + friend class KLocalizedDatePrivate; + friend class KDateTimeParser; ++ friend class KDateTable; + + // Era functions needed by friends, may be made public later if needed in KCM + QList<KCalendarEra> *eraList() const; +- KCalendarEra era( const QDate &eraDate ) const; +- KCalendarEra era( const QString &eraName, int yearInEra ) const; ++ KCalendarEra era(const QDate &eraDate) const; ++ KCalendarEra era(const QString &eraName, int yearInEra) const; + +- Q_DISABLE_COPY( KCalendarSystem ) ++ Q_DISABLE_COPY(KCalendarSystem) + KCalendarSystemPrivate * const d_ptr; // KDE5 make protected +- Q_DECLARE_PRIVATE( KCalendarSystem ) ++ Q_DECLARE_PRIVATE(KCalendarSystem) + }; + + #endif +diff --git a/kdecore/date/kcalendarsystemcoptic.cpp b/kdecore/date/kcalendarsystemcoptic.cpp +index d8ed426..25f4f0d 100644 +--- a/kdecore/date/kcalendarsystemcoptic.cpp ++++ b/kdecore/date/kcalendarsystemcoptic.cpp +@@ -29,8 +29,8 @@ + + // Shared d pointer implementations + +-KCalendarSystemCopticPrivate::KCalendarSystemCopticPrivate( KCalendarSystemCoptic *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemCopticPrivate::KCalendarSystemCopticPrivate(KCalendarSystemCoptic *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -47,22 +47,22 @@ void KCalendarSystemCopticPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // AM for Anno Martyrum or "Year of the Martyrs" +- name = i18nc( "Calendar Era: Coptic Era of Martyrs, years > 0, LongFormat", "Anno Martyrum" ); +- shortName = i18nc( "Calendar Era: Coptic Era of Martyrs, years > 0, ShortFormat", "AM" ); +- format = i18nc( "(kdedt-format) Coptic, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Coptic Era of Martyrs, years > 0, LongFormat", "Anno Martyrum"); ++ shortName = i18nc("Calendar Era: Coptic Era of Martyrs, years > 0, ShortFormat", "AM"); ++ format = i18nc("(kdedt-format) Coptic, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemCopticPrivate::monthsInYear( int year ) const ++int KCalendarSystemCopticPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 13; + } + +-int KCalendarSystemCopticPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemCopticPrivate::daysInMonth(int year, int month) const + { +- if ( month == 13 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 13) { ++ if (isLeapYear(year)) { + return 6; + } else { + return 5; +@@ -72,9 +72,9 @@ int KCalendarSystemCopticPrivate::daysInMonth( int year, int month ) const + return 30; + } + +-int KCalendarSystemCopticPrivate::daysInYear( int year ) const ++int KCalendarSystemCopticPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -86,16 +86,16 @@ int KCalendarSystemCopticPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemCopticPrivate::isLeapYear( int year ) const ++bool KCalendarSystemCopticPrivate::isLeapYear(int year) const + { + //Uses same rule as Julian but offset by 1 year with year 3 being first leap year +- if ( year < 1 ) { ++ if (year < 1) { + year = year + 2; + } else { + year = year + 1; + } + +- if ( year % 4 == 0 ) { ++ if (year % 4 == 0) { + return true; + } + return false; +@@ -156,170 +156,170 @@ int KCalendarSystemCopticPrivate::latestValidYear() const + // * Mesore Mesori Mesorē Mesra Mesra + // * Kouji nabot Pi Kogi Enavot Epagomenē Nasie + // * +-QString KCalendarSystemCopticPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemCopticPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::NarrowName", "T").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::NarrowName", "P").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::NarrowName", "H").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::NarrowName", "K").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::NarrowName", "T").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::NarrowName", "M").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::NarrowName", "P").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::NarrowName", "P").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::NarrowName", "P").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::NarrowName", "P").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::NarrowName", "E" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::NarrowName", "E").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::NarrowName", "M").toString(locale()); + case 13: +- return ki18nc( "Coptic month 13 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Coptic month 13 - KLocale::NarrowName", "K").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::ShortName Possessive", "of Tho" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::ShortName Possessive", "of Tho").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::ShortName Possessive", "of Pao" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::ShortName Possessive", "of Pao").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::ShortName Possessive", "of Hat" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::ShortName Possessive", "of Hat").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::ShortName Possessive", "of Kia" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::ShortName Possessive", "of Kia").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::ShortName Possessive", "of Tob" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::ShortName Possessive", "of Tob").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::ShortName Possessive", "of Mes" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::ShortName Possessive", "of Mes").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::ShortName Possessive", "of Par" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::ShortName Possessive", "of Par").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::ShortName Possessive", "of Pam" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::ShortName Possessive", "of Pam").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::ShortName Possessive", "of Pas" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::ShortName Possessive", "of Pas").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::ShortName Possessive", "of Pan" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::ShortName Possessive", "of Pan").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::ShortName Possessive", "of Epe" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::ShortName Possessive", "of Epe").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::ShortName Possessive", "of Meo" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::ShortName Possessive", "of Meo").toString(locale()); + case 13: +- return ki18nc( "Coptic month 13 - KLocale::ShortName Possessive", "of Kou" ).toString( locale() ); ++ return ki18nc("Coptic month 13 - KLocale::ShortName Possessive", "of Kou").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::ShortName", "Tho" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::ShortName", "Tho").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::ShortName", "Pao" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::ShortName", "Pao").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::ShortName", "Hat" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::ShortName", "Hat").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::ShortName", "Kia" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::ShortName", "Kia").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::ShortName", "Tob" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::ShortName", "Tob").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::ShortName", "Mes" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::ShortName", "Mes").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::ShortName", "Par" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::ShortName", "Par").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::ShortName", "Pam" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::ShortName", "Pam").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::ShortName", "Pas" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::ShortName", "Pas").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::ShortName", "Pan" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::ShortName", "Pan").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::ShortName", "Epe" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::ShortName", "Epe").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::ShortName", "Meo" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::ShortName", "Meo").toString(locale()); + case 13: +- return ki18nc( "Coptic month 12 - KLocale::ShortName", "Kou" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::ShortName", "Kou").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::LongName Possessive", "of Thoout" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::LongName Possessive", "of Thoout").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::LongName Possessive", "of Paope" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::LongName Possessive", "of Paope").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::LongName Possessive", "of Hathor" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::LongName Possessive", "of Hathor").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::LongName Possessive", "of Kiahk" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::LongName Possessive", "of Kiahk").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::LongName Possessive", "of Tobe" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::LongName Possessive", "of Tobe").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::LongName Possessive", "of Meshir" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::LongName Possessive", "of Meshir").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::LongName Possessive", "of Paremhotep" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::LongName Possessive", "of Paremhotep").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::LongName Possessive", "of Parmoute" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::LongName Possessive", "of Parmoute").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::LongName Possessive", "of Pashons" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::LongName Possessive", "of Pashons").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::LongName Possessive", "of Paone" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::LongName Possessive", "of Paone").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::LongName Possessive", "of Epep" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::LongName Possessive", "of Epep").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::LongName Possessive", "of Mesore" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName Possessive", "of Mesore").toString(locale()); + case 13: +- return ki18nc( "Coptic month 12 - KLocale::LongName Possessive", "of Kouji nabot" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName Possessive", "of Kouji nabot").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::LongName", "Thoout" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::LongName", "Thoout").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::LongName", "Paope" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::LongName", "Paope").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::LongName", "Hathor" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::LongName", "Hathor").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::LongName", "Kiahk" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::LongName", "Kiahk").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::LongName", "Tobe" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::LongName", "Tobe").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::LongName", "Meshir" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::LongName", "Meshir").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::LongName", "Paremhotep" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::LongName", "Paremhotep").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::LongName", "Parmoute" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::LongName", "Parmoute").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::LongName", "Pashons" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::LongName", "Pashons").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::LongName", "Paone" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::LongName", "Paone").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::LongName", "Epep" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::LongName", "Epep").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::LongName", "Mesore" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName", "Mesore").toString(locale()); + case 13: +- return ki18nc( "Coptic month 12 - KLocale::LongName", "Kouji nabot" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName", "Kouji nabot").toString(locale()); + default: + return QString(); + } +@@ -327,115 +327,111 @@ QString KCalendarSystemCopticPrivate::monthName( int month, int year, KLocale::D + + // Names taken from from the Sahidic dialect transliterations used in Dershowitz & Reingold which went out of use in the 11th centuary + // Boharic or Arabic transliterations would be preferred but none could be found +-QString KCalendarSystemCopticPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemCopticPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Coptic weekday 1 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 1 - KLocale::NarrowName", "P").toString(locale()); + case 2: +- return ki18nc( "Coptic weekday 2 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 2 - KLocale::NarrowName", "P").toString(locale()); + case 3: +- return ki18nc( "Coptic weekday 3 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 3 - KLocale::NarrowName", "P").toString(locale()); + case 4: +- return ki18nc( "Coptic weekday 4 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 4 - KLocale::NarrowName", "P").toString(locale()); + case 5: +- return ki18nc( "Coptic weekday 5 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 5 - KLocale::NarrowName", "P").toString(locale()); + case 6: +- return ki18nc( "Coptic weekday 6 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 6 - KLocale::NarrowName", "P").toString(locale()); + case 7: +- return ki18nc( "Coptic weekday 7 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Coptic weekday 7 - KLocale::NarrowName", "T").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Coptic weekday 1 - KLocale::ShortName", "Pes" ).toString( locale() ); ++ return ki18nc("Coptic weekday 1 - KLocale::ShortName", "Pes").toString(locale()); + case 2: +- return ki18nc( "Coptic weekday 2 - KLocale::ShortName", "Psh" ).toString( locale() ); ++ return ki18nc("Coptic weekday 2 - KLocale::ShortName", "Psh").toString(locale()); + case 3: +- return ki18nc( "Coptic weekday 3 - KLocale::ShortName", "Pef" ).toString( locale() ); ++ return ki18nc("Coptic weekday 3 - KLocale::ShortName", "Pef").toString(locale()); + case 4: +- return ki18nc( "Coptic weekday 4 - KLocale::ShortName", "Pti" ).toString( locale() ); ++ return ki18nc("Coptic weekday 4 - KLocale::ShortName", "Pti").toString(locale()); + case 5: +- return ki18nc( "Coptic weekday 5 - KLocale::ShortName", "Pso" ).toString( locale() ); ++ return ki18nc("Coptic weekday 5 - KLocale::ShortName", "Pso").toString(locale()); + case 6: +- return ki18nc( "Coptic weekday 6 - KLocale::ShortName", "Psa" ).toString( locale() ); ++ return ki18nc("Coptic weekday 6 - KLocale::ShortName", "Psa").toString(locale()); + case 7: +- return ki18nc( "Coptic weekday 7 - KLocale::ShortName", "Tky" ).toString( locale() ); ++ return ki18nc("Coptic weekday 7 - KLocale::ShortName", "Tky").toString(locale()); + default: + return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Coptic weekday 1 - KLocale::LongName", "Pesnau" ).toString( locale() ); ++ return ki18nc("Coptic weekday 1 - KLocale::LongName", "Pesnau").toString(locale()); + case 2: +- return ki18nc( "Coptic weekday 2 - KLocale::LongName", "Pshoment" ).toString( locale() ); ++ return ki18nc("Coptic weekday 2 - KLocale::LongName", "Pshoment").toString(locale()); + case 3: +- return ki18nc( "Coptic weekday 3 - KLocale::LongName", "Peftoou" ).toString( locale() ); ++ return ki18nc("Coptic weekday 3 - KLocale::LongName", "Peftoou").toString(locale()); + case 4: +- return ki18nc( "Coptic weekday 4 - KLocale::LongName", "Ptiou" ).toString( locale() ); ++ return ki18nc("Coptic weekday 4 - KLocale::LongName", "Ptiou").toString(locale()); + case 5: +- return ki18nc( "Coptic weekday 5 - KLocale::LongName", "Psoou" ).toString( locale() ); ++ return ki18nc("Coptic weekday 5 - KLocale::LongName", "Psoou").toString(locale()); + case 6: +- return ki18nc( "Coptic weekday 6 - KLocale::LongName", "Psabbaton" ).toString( locale() ); ++ return ki18nc("Coptic weekday 6 - KLocale::LongName", "Psabbaton").toString(locale()); + case 7: +- return ki18nc( "Coptic weekday 7 - KLocale::LongName", "Tkyriakē" ).toString( locale() ); ++ return ki18nc("Coptic weekday 7 - KLocale::LongName", "Tkyriakē").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemCoptic::KCalendarSystemCoptic( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemCopticPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemCoptic::KCalendarSystemCoptic(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemCopticPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemCoptic::KCalendarSystemCoptic( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemCopticPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemCoptic::KCalendarSystemCoptic(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemCopticPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemCoptic::KCalendarSystemCoptic( KCalendarSystemCopticPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemCoptic::KCalendarSystemCoptic(KCalendarSystemCopticPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemCoptic::~KCalendarSystemCoptic() + { +- delete dont_use; + } + + QString KCalendarSystemCoptic::calendarType() const + { +- return QLatin1String( "coptic" ); ++ return QLatin1String("coptic"); + } + + QDate KCalendarSystemCoptic::epoch() const + { + //0001-01-01, no Year 0. + //0284-08-29 AD Julian +- return QDate::fromJulianDay( 1825030 ); ++ return QDate::fromJulianDay(1825030); + } + + QDate KCalendarSystemCoptic::earliestValidDate() const + { + //0001-01-01, no Year 0. + //0284-08-29 AD Julian +- return QDate::fromJulianDay( 1825030 ); ++ return QDate::fromJulianDay(1825030); + } + + QDate KCalendarSystemCoptic::latestValidDate() const +@@ -443,188 +439,47 @@ QDate KCalendarSystemCoptic::latestValidDate() const + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + //9999-12-30 + //10283-08-29 AD Julian +- return QDate::fromJulianDay( 5477164 ); ++ return QDate::fromJulianDay(5477164); + } + +-bool KCalendarSystemCoptic::isValid( int year, int month, int day ) const ++bool KCalendarSystemCoptic::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemCoptic::isValid( const QDate &date ) const ++bool KCalendarSystemCoptic::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemCoptic::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemCoptic::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemCoptic::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemCoptic::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setDate( date, y, m, d ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemCoptic::year( const QDate &date ) const ++QString KCalendarSystemCoptic::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemCoptic::month( const QDate &date ) const ++QString KCalendarSystemCoptic::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::month( date ); ++ return KCalendarSystem::monthName(date, format); + } + +-int KCalendarSystemCoptic::day( const QDate &date ) const ++QString KCalendarSystemCoptic::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::day( date ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemCoptic::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemCoptic::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemCoptic::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemCoptic::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemCoptic::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemCoptic::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemCoptic::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemCoptic::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemCoptic::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemCoptic::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemCoptic::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemCoptic::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemCoptic::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemCoptic::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemCoptic::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemCoptic::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemCoptic::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemCoptic::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemCoptic::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemCoptic::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemCoptic::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemCoptic::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemCoptic::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemCoptic::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemCoptic::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemCoptic::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemCoptic::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemCoptic::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemCoptic::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemCoptic::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemCoptic::weekDayOfPray() const +@@ -652,7 +507,7 @@ bool KCalendarSystemCoptic::isProleptic() const + return false; + } + +-bool KCalendarSystemCoptic::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemCoptic::julianDayToDate(int jd, int &year, int &month, int &day) const + { + //The Coptic calendar has 12 months of 30 days, a 13th month of 5 or 6 days, + //and a leap year every 4th year without fail that falls on the last day of +@@ -663,32 +518,32 @@ bool KCalendarSystemCoptic::julianDayToDate( int jd, int &year, int &month, int + //pattern of 365/365/365/366 with the leap day the very last day makes the maths easier. + + //Day number in the fake epoch, 0 indexed +- int dayInEpoch = jd - ( epoch().toJulianDay() - 365 ); ++ int dayInEpoch = jd - (epoch().toJulianDay() - 365); + //How many full 4 year leap cycles have been completed, 1461 = (365*3)+366 + int leapCyclesCompleted = dayInEpoch / 1461; + //Which year are we in the current 4 year leap cycle, 0 indexed + //Need the qMin as day 366 of 4th year of cycle returns following year (max 3 as 0 index) +- int yearInCurrentLeapCycle = qMin( 3, ( dayInEpoch % 1461 ) / 365 ); ++ int yearInCurrentLeapCycle = qMin(3, (dayInEpoch % 1461) / 365); + //Calculate the year +- year = ( leapCyclesCompleted * 4 ) + yearInCurrentLeapCycle; ++ year = (leapCyclesCompleted * 4) + yearInCurrentLeapCycle; + //Days since the fake epoch up to 1st day of this year +- int daysBeforeThisYear = ( year * 365 ) + ( year / 4 ); ++ int daysBeforeThisYear = (year * 365) + (year / 4); + //Gives the day number in this year, 0 indexed + int dayOfThisYear = dayInEpoch - daysBeforeThisYear; + //Then just calculate month and day from that based on regular 30 day months +- month = ( ( dayOfThisYear ) / 30 ) + 1; +- day = dayOfThisYear - ( ( month - 1 ) * 30 ) + 1; ++ month = ((dayOfThisYear) / 30) + 1; ++ day = dayOfThisYear - ((month - 1) * 30) + 1; + + // If year is -ve then is BC. In Coptic there is no year 0, but the maths + // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- if ( year < 1 ) { ++ if (year < 1) { + year = year - 1; + } + + return true; + } + +-bool KCalendarSystemCoptic::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemCoptic::dateToJulianDay(int year, int month, int day, int &jd) const + { + //The Coptic calendar has 12 months of 30 days, a 13th month of 5 or 6 days, + //and a leap year every 4th year without fail that falls on the last day of +@@ -699,17 +554,17 @@ bool KCalendarSystemCoptic::dateToJulianDay( int year, int month, int day, int & + // If year is -ve then is 'BC'. In Coptic there is no year 0, but the maths + // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally + int y; +- if ( year < 1 ) { ++ if (year < 1) { + y = year + 1; + } else { + y = year; + } + + jd = epoch().toJulianDay() - 1 // jd of day before Epoch +- + ( ( y - 1 ) * 365 ) // Add all normal days in years preceding +- + ( y / 4 ) // Add all leap days in years preceding +- + ( ( month - 1 ) * 30 ) // Add days this year in months preceding +- + day; // Add days in this month ++ + ((y - 1) * 365) // Add all normal days in years preceding ++ + (y / 4) // Add all leap days in years preceding ++ + ((month - 1) * 30) // Add days this year in months preceding ++ + day; // Add days in this month + + return true; + } +diff --git a/kdecore/date/kcalendarsystemcoptic_p.h b/kdecore/date/kcalendarsystemcoptic_p.h +index e62c0e2..d7498a4 100644 +--- a/kdecore/date/kcalendarsystemcoptic_p.h ++++ b/kdecore/date/kcalendarsystemcoptic_p.h +@@ -37,8 +37,8 @@ class KCalendarSystemCopticPrivate; + class KCalendarSystemCoptic: public KCalendarSystem + { + public: +- explicit KCalendarSystemCoptic( const KLocale *locale = 0 ); +- explicit KCalendarSystemCoptic( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemCoptic(const KLocale *locale = 0); ++ explicit KCalendarSystemCoptic(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemCoptic(); + + virtual QString calendarType() const; +@@ -46,58 +46,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -105,14 +66,13 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemCoptic( KCalendarSystemCopticPrivate &dd, const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemCoptic(KCalendarSystemCopticPrivate &dd, const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemCoptic ) +- KCalendarSystemCopticPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemCoptic) + }; + + #endif // KCALENDARSYSTEMCOPTIC_H +diff --git a/kdecore/date/kcalendarsystemcopticprivate_p.h b/kdecore/date/kcalendarsystemcopticprivate_p.h +index e2a15ca..d30bd6a 100644 +--- a/kdecore/date/kcalendarsystemcopticprivate_p.h ++++ b/kdecore/date/kcalendarsystemcopticprivate_p.h +@@ -25,26 +25,26 @@ + class KCalendarSystemCopticPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemCopticPrivate( KCalendarSystemCoptic *q ); ++ explicit KCalendarSystemCopticPrivate(KCalendarSystemCoptic *q); + + virtual ~KCalendarSystemCopticPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + #endif // KCALENDARSYSTEMCOPTICPRIVATE_H +diff --git a/kdecore/date/kcalendarsystemethiopian.cpp b/kdecore/date/kcalendarsystemethiopian.cpp +index 967c356..d337003 100644 +--- a/kdecore/date/kcalendarsystemethiopian.cpp ++++ b/kdecore/date/kcalendarsystemethiopian.cpp +@@ -30,18 +30,16 @@ + class KCalendarSystemEthiopianPrivate : public KCalendarSystemCopticPrivate + { + public: +- explicit KCalendarSystemEthiopianPrivate( KCalendarSystemEthiopian *q ) : KCalendarSystemCopticPrivate( q ) +- { ++ explicit KCalendarSystemEthiopianPrivate(KCalendarSystemEthiopian *q) : KCalendarSystemCopticPrivate(q) { + } + +- virtual ~KCalendarSystemEthiopianPrivate() +- { ++ virtual ~KCalendarSystemEthiopianPrivate() { + } + + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + KLocale::CalendarSystem KCalendarSystemEthiopianPrivate::calendarSystem() const +@@ -53,291 +51,287 @@ void KCalendarSystemEthiopianPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Incarnation Era, Amätä Mehrät, "Year of Mercy". +- name = i18nc( "Calendar Era: Ethiopian Incarnation Era, years > 0, LongFormat", "Amata Mehrat" ); +- shortName = i18nc( "Calendar Era: Ethiopian Incarnation Era, years > 0, ShortFormat", "AM" ); +- format = i18nc( "(kdedt-format) Ethiopian, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Ethiopian Incarnation Era, years > 0, LongFormat", "Amata Mehrat"); ++ shortName = i18nc("Calendar Era: Ethiopian Incarnation Era, years > 0, ShortFormat", "AM"); ++ format = i18nc("(kdedt-format) Ethiopian, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + + // Names taken from http://www.ethiopianembassy.at/dates_cycles.htm, alternative transliterations exist +-QString KCalendarSystemEthiopianPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemEthiopianPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::NarrowName", "M").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::NarrowName", "T").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::NarrowName", "H").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::NarrowName", "T").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::NarrowName", "T").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::NarrowName", "Y" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::NarrowName", "Y").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::NarrowName", "M").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::NarrowName", "M").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::NarrowName", "G" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::NarrowName", "G").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::NarrowName", "S").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::NarrowName", "H").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::NarrowName", "N").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::NarrowName", "P").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::ShortName Possessive", "of Mes" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::ShortName Possessive", "of Mes").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::ShortName Possessive", "of Teq" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::ShortName Possessive", "of Teq").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::ShortName Possessive", "of Hed" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::ShortName Possessive", "of Hed").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::ShortName Possessive", "of Tah" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::ShortName Possessive", "of Tah").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::ShortName Possessive", "of Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::ShortName Possessive", "of Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::ShortName Possessive", "of Yak" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::ShortName Possessive", "of Yak").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::ShortName Possessive", "of Mag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::ShortName Possessive", "of Mag").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::ShortName Possessive", "of Miy" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::ShortName Possessive", "of Miy").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::ShortName Possessive", "of Gen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::ShortName Possessive", "of Gen").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::ShortName Possessive", "of Sen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::ShortName Possessive", "of Sen").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::ShortName Possessive", "of Ham" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::ShortName Possessive", "of Ham").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::ShortName Possessive", "of Neh" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::ShortName Possessive", "of Neh").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::ShortName Possessive", "of Pag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::ShortName Possessive", "of Pag").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::ShortName", "Mes" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::ShortName", "Mes").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::ShortName", "Teq" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::ShortName", "Teq").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::ShortName", "Hed" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::ShortName", "Hed").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::ShortName", "Tah" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::ShortName", "Tah").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::ShortName", "Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::ShortName", "Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::ShortName", "Yak" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::ShortName", "Yak").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::ShortName", "Mag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::ShortName", "Mag").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::ShortName", "Miy" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::ShortName", "Miy").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::ShortName", "Gen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::ShortName", "Gen").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::ShortName", "Sen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::ShortName", "Sen").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::ShortName", "Ham" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::ShortName", "Ham").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::ShortName", "Neh" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::ShortName", "Neh").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::ShortName", "Pag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::ShortName", "Pag").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::LongName Possessive", "of Meskerem" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::LongName Possessive", "of Meskerem").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::LongName Possessive", "of Tequemt" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::LongName Possessive", "of Tequemt").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::LongName Possessive", "of Hedar" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::LongName Possessive", "of Hedar").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::LongName Possessive", "of Tahsas" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::LongName Possessive", "of Tahsas").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::LongName Possessive", "of Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::LongName Possessive", "of Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::LongName Possessive", "of Yakatit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::LongName Possessive", "of Yakatit").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::LongName Possessive", "of Magabit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::LongName Possessive", "of Magabit").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::LongName Possessive", "of Miyazya" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::LongName Possessive", "of Miyazya").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::LongName Possessive", "of Genbot" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::LongName Possessive", "of Genbot").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::LongName Possessive", "of Sene" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::LongName Possessive", "of Sene").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::LongName Possessive", "of Hamle" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::LongName Possessive", "of Hamle").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::LongName Possessive", "of Nehase" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::LongName Possessive", "of Nehase").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::LongName Possessive", "of Pagumen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::LongName Possessive", "of Pagumen").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::LongName", "Meskerem" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::LongName", "Meskerem").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::LongName", "Tequemt" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::LongName", "Tequemt").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::LongName", "Hedar" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::LongName", "Hedar").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::LongName", "Tahsas" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::LongName", "Tahsas").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::LongName", "Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::LongName", "Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::LongName", "Yakatit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::LongName", "Yakatit").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::LongName", "Magabit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::LongName", "Magabit").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::LongName", "Miyazya" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::LongName", "Miyazya").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::LongName", "Genbot" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::LongName", "Genbot").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::LongName", "Sene" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::LongName", "Sene").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::LongName", "Hamle" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::LongName", "Hamle").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::LongName", "Nehase" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::LongName", "Nehase").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::LongName", "Pagumen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::LongName", "Pagumen").toString(locale()); + default: + return QString(); + } + } + + // Names taken from http://www.ethiopianembassy.at/dates_cycles.htm, alternative transliterations exist +-QString KCalendarSystemEthiopianPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemEthiopianPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Ethiopian weekday 1 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 1 - KLocale::NarrowName ", "S").toString(locale()); + case 2: +- return ki18nc( "Ethiopian weekday 2 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 2 - KLocale::NarrowName ", "M").toString(locale()); + case 3: +- return ki18nc( "Ethiopian weekday 3 - KLocale::NarrowName ", "R" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 3 - KLocale::NarrowName ", "R").toString(locale()); + case 4: +- return ki18nc( "Ethiopian weekday 4 - KLocale::NarrowName ", "H" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 4 - KLocale::NarrowName ", "H").toString(locale()); + case 5: +- return ki18nc( "Ethiopian weekday 5 - KLocale::NarrowName ", "A" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 5 - KLocale::NarrowName ", "A").toString(locale()); + case 6: +- return ki18nc( "Ethiopian weekday 6 - KLocale::NarrowName ", "Q" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 6 - KLocale::NarrowName ", "Q").toString(locale()); + case 7: +- return ki18nc( "Ethiopian weekday 7 - KLocale::NarrowName ", "E" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 7 - KLocale::NarrowName ", "E").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Ethiopian weekday 1 - KLocale::ShortName", "Seg" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 1 - KLocale::ShortName", "Seg").toString(locale()); + case 2: +- return ki18nc( "Ethiopian weekday 2 - KLocale::ShortName", "Mak" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 2 - KLocale::ShortName", "Mak").toString(locale()); + case 3: +- return ki18nc( "Ethiopian weekday 3 - KLocale::ShortName", "Rob" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 3 - KLocale::ShortName", "Rob").toString(locale()); + case 4: +- return ki18nc( "Ethiopian weekday 4 - KLocale::ShortName", "Ham" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 4 - KLocale::ShortName", "Ham").toString(locale()); + case 5: +- return ki18nc( "Ethiopian weekday 5 - KLocale::ShortName", "Arb" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 5 - KLocale::ShortName", "Arb").toString(locale()); + case 6: +- return ki18nc( "Ethiopian weekday 6 - KLocale::ShortName", "Qed" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 6 - KLocale::ShortName", "Qed").toString(locale()); + case 7: +- return ki18nc( "Ethiopian weekday 7 - KLocale::ShortName", "Ehu" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 7 - KLocale::ShortName", "Ehu").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Ethiopian weekday 1 - KLocale::LongName", "Segno" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 1 - KLocale::LongName", "Segno").toString(locale()); + case 2: +- return ki18nc( "Ethiopian weekday 2 - KLocale::LongName", "Maksegno" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 2 - KLocale::LongName", "Maksegno").toString(locale()); + case 3: +- return ki18nc( "Ethiopian weekday 3 - KLocale::LongName", "Rob" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 3 - KLocale::LongName", "Rob").toString(locale()); + case 4: +- return ki18nc( "Ethiopian weekday 4 - KLocale::LongName", "Hamus" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 4 - KLocale::LongName", "Hamus").toString(locale()); + case 5: +- return ki18nc( "Ethiopian weekday 5 - KLocale::LongName", "Arb" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 5 - KLocale::LongName", "Arb").toString(locale()); + case 6: +- return ki18nc( "Ethiopian weekday 6 - KLocale::LongName", "Qedame" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 6 - KLocale::LongName", "Qedame").toString(locale()); + case 7: +- return ki18nc( "Ethiopian weekday 7 - KLocale::LongName", "Ehud" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 7 - KLocale::LongName", "Ehud").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemEthiopian::KCalendarSystemEthiopian( const KLocale *locale ) +- : KCalendarSystemCoptic( *new KCalendarSystemEthiopianPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemEthiopian::KCalendarSystemEthiopian(const KLocale *locale) ++ : KCalendarSystemCoptic(*new KCalendarSystemEthiopianPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemEthiopian::KCalendarSystemEthiopian( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemCoptic( *new KCalendarSystemEthiopianPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemEthiopian::KCalendarSystemEthiopian(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemCoptic(*new KCalendarSystemEthiopianPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemEthiopian::KCalendarSystemEthiopian( KCalendarSystemEthiopianPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemCoptic( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemEthiopian::KCalendarSystemEthiopian(KCalendarSystemEthiopianPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemCoptic(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemEthiopian::~KCalendarSystemEthiopian() + { +- delete dont_use; + } + + QString KCalendarSystemEthiopian::calendarType() const + { +- return QLatin1String( "ethiopian" ); ++ return QLatin1String("ethiopian"); + } + + QDate KCalendarSystemEthiopian::epoch() const + { + //0001-01-01, no Year 0. + //0008-08-29 AD Julian +- return QDate::fromJulianDay( 1724221 ); ++ return QDate::fromJulianDay(1724221); + } + + QDate KCalendarSystemEthiopian::earliestValidDate() const + { + //0001-01-01, no Year 0. + //0008-08-29 AD Julian +- return QDate::fromJulianDay( 1724221 ); ++ return QDate::fromJulianDay(1724221); + } + + QDate KCalendarSystemEthiopian::latestValidDate() const +@@ -345,188 +339,47 @@ QDate KCalendarSystemEthiopian::latestValidDate() const + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + //9999-12-30 + //100008-08-29 AD Julian +- return QDate::fromJulianDay( 5376721 ); ++ return QDate::fromJulianDay(5376721); + } + +-bool KCalendarSystemEthiopian::isValid( int year, int month, int day ) const ++bool KCalendarSystemEthiopian::isValid(int year, int month, int day) const + { +- return KCalendarSystemCoptic::isValid( year, month, day ); ++ return KCalendarSystemCoptic::isValid(year, month, day); + } + +-bool KCalendarSystemEthiopian::isValid( const QDate &date ) const ++bool KCalendarSystemEthiopian::isValid(const QDate &date) const + { +- return KCalendarSystemCoptic::isValid( date ); ++ return KCalendarSystemCoptic::isValid(date); + } + +-bool KCalendarSystemEthiopian::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemEthiopian::isLeapYear(int year) const + { +- return KCalendarSystemCoptic::setDate( date, year, month, day ); ++ return KCalendarSystemCoptic::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemEthiopian::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemEthiopian::isLeapYear(const QDate &date) const + { +- return KCalendarSystemCoptic::setDate( date, y, m, d ); ++ return KCalendarSystemCoptic::isLeapYear(date); + } + +-int KCalendarSystemEthiopian::year( const QDate &date ) const ++QString KCalendarSystemEthiopian::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystemCoptic::year( date ); ++ return KCalendarSystemCoptic::monthName(month, year, format); + } + +-int KCalendarSystemEthiopian::month( const QDate &date ) const ++QString KCalendarSystemEthiopian::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystemCoptic::month( date ); ++ return KCalendarSystemCoptic::monthName(date, format); + } + +-int KCalendarSystemEthiopian::day( const QDate &date ) const ++QString KCalendarSystemEthiopian::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystemCoptic::day( date ); ++ return KCalendarSystemCoptic::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemEthiopian::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemEthiopian::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystemCoptic::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemEthiopian::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystemCoptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemEthiopian::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemCoptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemEthiopian::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::monthsInYear( date ); +-} +- +-int KCalendarSystemEthiopian::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::weeksInYear( date ); +-} +- +-int KCalendarSystemEthiopian::weeksInYear( int year ) const +-{ +- return KCalendarSystemCoptic::weeksInYear( year ); +-} +- +-int KCalendarSystemEthiopian::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::daysInYear( date ); +-} +- +-int KCalendarSystemEthiopian::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::daysInMonth( date ); +-} +- +-int KCalendarSystemEthiopian::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::daysInWeek( date ); +-} +- +-int KCalendarSystemEthiopian::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::dayOfYear( date ); +-} +- +-int KCalendarSystemEthiopian::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemEthiopian::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemCoptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemEthiopian::isLeapYear( int year ) const +-{ +- return KCalendarSystemCoptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemEthiopian::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemEthiopian::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemCoptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemEthiopian::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemCoptic::monthName( date, format ); +-} +- +-QString KCalendarSystemEthiopian::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemCoptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemEthiopian::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemCoptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemEthiopian::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemCoptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemEthiopian::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemCoptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemEthiopian::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemCoptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemEthiopian::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemCoptic::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemEthiopian::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemCoptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemEthiopian::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemCoptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemEthiopian::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemCoptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemEthiopian::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemCoptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemEthiopian::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemCoptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemEthiopian::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemCoptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemEthiopian::weekStartDay() const +-{ +- return KCalendarSystemCoptic::weekStartDay(); ++ return KCalendarSystemCoptic::weekDayName(date, format); + } + + int KCalendarSystemEthiopian::weekDayOfPray() const +@@ -554,12 +407,12 @@ bool KCalendarSystemEthiopian::isProleptic() const + return false; + } + +-bool KCalendarSystemEthiopian::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemEthiopian::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- return KCalendarSystemCoptic::julianDayToDate( jd, year, month, day ); ++ return KCalendarSystemCoptic::julianDayToDate(jd, year, month, day); + } + +-bool KCalendarSystemEthiopian::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemEthiopian::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemCoptic::dateToJulianDay( year, month, day, jd ); ++ return KCalendarSystemCoptic::dateToJulianDay(year, month, day, jd); + } +diff --git a/kdecore/date/kcalendarsystemethiopian_p.h b/kdecore/date/kcalendarsystemethiopian_p.h +index 002c2c5..8394f07 100644 +--- a/kdecore/date/kcalendarsystemethiopian_p.h ++++ b/kdecore/date/kcalendarsystemethiopian_p.h +@@ -38,8 +38,8 @@ class KCalendarSystemEthiopianPrivate; + class KCalendarSystemEthiopian: public KCalendarSystemCoptic + { + public: +- explicit KCalendarSystemEthiopian( const KLocale *locale = 0 ); +- explicit KCalendarSystemEthiopian( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemEthiopian(const KLocale *locale = 0); ++ explicit KCalendarSystemEthiopian(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemEthiopian(); + + virtual QString calendarType() const; +@@ -47,58 +47,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,15 +67,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemEthiopian( KCalendarSystemEthiopianPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemEthiopian(KCalendarSystemEthiopianPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemEthiopian) +- KCalendarSystemEthiopianPrivate * const dont_use; // KDE5 remove, use shared d + }; + + #endif // KCALENDARSYSTEMETHIOPIAN_H +diff --git a/kdecore/date/kcalendarsystemgregorian.cpp b/kdecore/date/kcalendarsystemgregorian.cpp +index 26132dc..57ba552 100644 +--- a/kdecore/date/kcalendarsystemgregorian.cpp ++++ b/kdecore/date/kcalendarsystemgregorian.cpp +@@ -1,7 +1,5 @@ + /* +- Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2010 John Layt <john@layt.net> ++ Copyright 2009, 2010 John Layt <john@layt.net> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public +@@ -22,7 +20,7 @@ + // Derived gregorian kde calendar class + + #include "kcalendarsystemgregorian_p.h" +-#include "kcalendarsystemprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + #include "kcalendarera_p.h" + + #include "kdebug.h" +@@ -33,39 +31,10 @@ + #include <QtCore/QDate> + #include <QtCore/QCharRef> + +-class KCalendarSystemGregorianPrivate : public KCalendarSystemPrivate +-{ +-public: +- explicit KCalendarSystemGregorianPrivate( KCalendarSystemGregorian *q ); +- +- virtual ~KCalendarSystemGregorianPrivate(); +- +- // Virtual methods each calendar system must re-implement +- virtual KLocale::CalendarSystem calendarSystem() const; +- virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; +- virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; +- virtual bool hasLeapMonths() const; +- virtual bool hasYearZero() const; +- virtual int maxDaysInWeek() const; +- virtual int maxMonthsInYear() const; +- virtual int earliestValidYear() const; +- virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; +- +- bool m_useCommonEra; +-}; +- +-// Shared d pointer implementations +- +-KCalendarSystemGregorianPrivate::KCalendarSystemGregorianPrivate( KCalendarSystemGregorian *q ) +- :KCalendarSystemPrivate( q ), +- m_useCommonEra( false ) ++// Shared d pointer base class definitions + ++KCalendarSystemGregorianPrivate::KCalendarSystemGregorianPrivate(KCalendarSystemGregorian *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -75,54 +44,69 @@ KCalendarSystemGregorianPrivate::~KCalendarSystemGregorianPrivate() + + KLocale::CalendarSystem KCalendarSystemGregorianPrivate::calendarSystem() const + { +- return KLocale::QDateCalendar; ++ return KLocale::GregorianCalendar; + } + ++// Dummy version using Gregorian as an example ++// This method MUST be re-implemented in any new Calendar System + void KCalendarSystemGregorianPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- KConfigGroup lcg( config(), QString::fromLatin1( "Locale" ) ); +- KConfigGroup cg = lcg.group( QString::fromLatin1( "KCalendarSystem %1" ).arg( q->calendarType() ) ); +- m_useCommonEra = cg.readEntry( "UseCommonEra", false ); ++ KConfigGroup cg(config(), QString::fromLatin1("KCalendarSystem %1").arg(q->calendarType(q->calendarSystem()))); ++ m_useCommonEra = cg.readEntry("UseCommonEra", false); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE"); + } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC" ); ++ name = i18nc("Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC"); + } +- format = i18nc( "(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC" ); +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC"); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), name, shortName, format); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE"); + } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD" ); ++ name = i18nc("Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD"); + } +- format = i18nc( "(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemGregorianPrivate::monthsInYear( int year ) const ++int KCalendarSystemGregorianPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemGregorianPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemGregorianPrivate::daysInMonth(int year, int month) const + { +- QDate tempDate( year, month, 1 ); +- return tempDate.daysInMonth(); ++ if (month == 2) { ++ if (isLeapYear(year)) { ++ return 29; ++ } else { ++ return 28; ++ } ++ } ++ ++ if (month == 4 || month == 6 || month == 9 || month == 11) { ++ return 30; ++ } ++ ++ return 31; + } + +-int KCalendarSystemGregorianPrivate::daysInYear( int year ) const ++int KCalendarSystemGregorianPrivate::daysInYear(int year) const + { +- QDate tempDate( year, 1, 1 ); +- return tempDate.daysInYear(); ++ if (isLeapYear(year)) { ++ return 366; ++ } else { ++ return 365; ++ } + } + + int KCalendarSystemGregorianPrivate::daysInWeek() const +@@ -130,9 +114,21 @@ int KCalendarSystemGregorianPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemGregorianPrivate::isLeapYear( int year ) const ++bool KCalendarSystemGregorianPrivate::isLeapYear(int year) const + { +- return QDate::isLeapYear( year ); ++ if (!hasYearZero() && year < 1) { ++ year = year + 1; ++ } ++ ++ if (year % 4 == 0) { ++ if (year % 100 != 0) { ++ return true; ++ } else if (year % 400 == 0) { ++ return true; ++ } ++ } ++ ++ return false; + } + + bool KCalendarSystemGregorianPrivate::hasLeapMonths() const +@@ -157,7 +153,7 @@ int KCalendarSystemGregorianPrivate::maxMonthsInYear() const + + int KCalendarSystemGregorianPrivate::earliestValidYear() const + { +- return -4712; ++ return -4713; + } + + int KCalendarSystemGregorianPrivate::latestValidYear() const +@@ -165,465 +161,321 @@ int KCalendarSystemGregorianPrivate::latestValidYear() const + return 9999; + } + +-QString KCalendarSystemGregorianPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemGregorianPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::NarrowName", "J").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::NarrowName", "F" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::NarrowName", "F").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::NarrowName", "M").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::NarrowName", "A").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::NarrowName", "M").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::NarrowName", "J").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::NarrowName", "J").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::NarrowName", "A").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::NarrowName", "S").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::NarrowName", "O" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::NarrowName", "O").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::NarrowName", "N").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::NarrowName", "D" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::NarrowName", "D").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName Possessive", "of Jan" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::ShortName Possessive", "of Jan").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName Possessive", "of Feb" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::ShortName Possessive", "of Feb").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName Possessive", "of Mar" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::ShortName Possessive", "of Mar").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName Possessive", "of Apr" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::ShortName Possessive", "of Apr").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::ShortName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName Possessive", "of Jun" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::ShortName Possessive", "of Jun").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName Possessive", "of Jul" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::ShortName Possessive", "of Jul").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName Possessive", "of Aug" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::ShortName Possessive", "of Aug").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName Possessive", "of Sep" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::ShortName Possessive", "of Sep").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName Possessive", "of Oct" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::ShortName Possessive", "of Oct").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName Possessive", "of Nov" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::ShortName Possessive", "of Nov").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName Possessive", "of Dec" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::ShortName Possessive", "of Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName", "Jan" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::ShortName", "Jan").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName", "Feb" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::ShortName", "Feb").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName", "Mar" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::ShortName", "Mar").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName", "Apr" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::ShortName", "Apr").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName", "May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::ShortName", "May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName", "Jun" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::ShortName", "Jun").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName", "Jul" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::ShortName", "Jul").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName", "Aug" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::ShortName", "Aug").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName", "Sep" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::ShortName", "Sep").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName", "Oct" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::ShortName", "Oct").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName", "Nov" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::ShortName", "Nov").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName", "Dec" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::ShortName", "Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName Possessive", "of January" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::LongName Possessive", "of January").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName Possessive", "of February" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::LongName Possessive", "of February").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName Possessive", "of March" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::LongName Possessive", "of March").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName Possessive", "of April" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::LongName Possessive", "of April").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::LongName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName Possessive", "of June" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::LongName Possessive", "of June").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName Possessive", "of July" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::LongName Possessive", "of July").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName Possessive", "of August" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::LongName Possessive", "of August").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName Possessive", "of September" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::LongName Possessive", "of September").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName Possessive", "of October" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::LongName Possessive", "of October").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName Possessive", "of November" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::LongName Possessive", "of November").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName Possessive", "of December" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::LongName Possessive", "of December").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName", "January" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::LongName", "January").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName", "February" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::LongName", "February").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName", "March" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::LongName", "March").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName", "April" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::LongName", "April").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName", "May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::LongName", "May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName", "June" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::LongName", "June").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName", "July" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::LongName", "July").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName", "August" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::LongName", "August").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName", "September" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::LongName", "September").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName", "October" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::LongName", "October").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName", "November" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::LongName", "November").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName", "December" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::LongName", "December").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemGregorianPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemGregorianPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::LongName", "Monday").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::LongName", "Friday").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemGregorian::KCalendarSystemGregorian( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemGregorian::KCalendarSystemGregorian(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemGregorianPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemGregorian::KCalendarSystemGregorian( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemGregorian::KCalendarSystemGregorian(const KSharedConfig::Ptr config, ++ const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemGregorianPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemGregorian::KCalendarSystemGregorian( KCalendarSystemGregorianPrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemGregorian::KCalendarSystemGregorian(KCalendarSystemGregorianPrivate &dd, ++ const KSharedConfig::Ptr config, ++ const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemGregorian::~KCalendarSystemGregorian() + { +- delete dont_use; + } + + QString KCalendarSystemGregorian::calendarType() const + { +- return QLatin1String( "gregorian" ); ++ return QLatin1String("gregorian-proleptic"); + } + + QDate KCalendarSystemGregorian::epoch() const + { +- // 1 Jan 1 AD in Julian +- return QDate::fromJulianDay( 1721424 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemGregorian::earliestValidDate() const + { +- // 1 Jan 4712 BC, no year zero, cant be 4713BC due to error in QDate that day 0 is not valid +- // and we really need the first in each year to be valid for the date maths +- return QDate::fromJulianDay( 366 ); ++ // Gregorian 1 Jan 4713 BC, no year zero ++ return QDate::fromJulianDay(38); + } + + QDate KCalendarSystemGregorian::latestValidDate() const + { +- // Set to last day of year 9999 until confirm date formats & widets support > 9999 ++ // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // In Gregorian this is 9999-12-31, which is is jd 5373484 + // Can't call setDate( 9999, 12, 31 ) as it creates circular reference! +- return QDate::fromJulianDay( 5373484 ); +-} +- +-bool KCalendarSystemGregorian::isValid( int year, int month, int day ) const +-{ +- // Limit to max year 9999 for now, QDate allows to be greater +- if ( year <= 9999 ) { +- return QDate::isValid( year, month, day ); +- } +- +- return false; +-} +- +-bool KCalendarSystemGregorian::isValid( const QDate &date ) const +-{ +- return KCalendarSystem::isValid( date ); +-} +- +-bool KCalendarSystemGregorian::setDate( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemGregorian::setYMD( QDate &date, int y, int m, int d ) const +-{ +- return KCalendarSystem::setDate( date, y, m, d ); +-} +- +-int KCalendarSystemGregorian::year( const QDate &date ) const +-{ +- return date.year(); +-} +- +-int KCalendarSystemGregorian::month( const QDate &date ) const +-{ +- return date.month(); +-} +- +-int KCalendarSystemGregorian::day( const QDate &date ) const +-{ +- return date.day(); +-} +- +-QDate KCalendarSystemGregorian::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemGregorian::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemGregorian::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemGregorian::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemGregorian::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemGregorian::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); ++ return QDate::fromJulianDay(5373484); + } + +-int KCalendarSystemGregorian::daysInYear( const QDate &date ) const ++bool KCalendarSystemGregorian::isValid(int year, int month, int day) const + { +- return date.daysInYear(); ++ return KCalendarSystem::isValid(year, month, day); + } + +-int KCalendarSystemGregorian::daysInMonth( const QDate &date ) const ++bool KCalendarSystemGregorian::isValid(const QDate &date) const + { +- return date.daysInMonth(); ++ return KCalendarSystem::isValid(date); + } + +-int KCalendarSystemGregorian::daysInWeek( const QDate &date ) const ++bool KCalendarSystemGregorian::isLeapYear(int year) const + { +- return KCalendarSystem::daysInWeek( date ); ++ return KCalendarSystem::isLeapYear(year); + } + +-int KCalendarSystemGregorian::dayOfYear( const QDate &date ) const ++bool KCalendarSystemGregorian::isLeapYear(const QDate &date) const + { +- return date.dayOfYear(); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemGregorian::dayOfWeek( const QDate &date ) const ++QString KCalendarSystemGregorian::monthName(int month, int year, MonthNameFormat format) const + { +- return date.dayOfWeek(); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemGregorian::weekNumber( const QDate &date, int * yearNum ) const ++QString KCalendarSystemGregorian::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::weekNumber( date, yearNum ); ++ return KCalendarSystem::monthName(date, format); + } + +-bool KCalendarSystemGregorian::isLeapYear( int year ) const ++QString KCalendarSystemGregorian::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return QDate::isLeapYear( year ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-bool KCalendarSystemGregorian::isLeapYear( const QDate &date ) const ++QString KCalendarSystemGregorian::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return QDate::isLeapYear( date.year() ); ++ return KCalendarSystem::weekDayName(date, format); + } + +-QString KCalendarSystemGregorian::monthName( int month, int year, MonthNameFormat format ) const ++int KCalendarSystemGregorian::yearStringToInteger(const QString &sNum, int &iLength) const + { +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemGregorian::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemGregorian::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemGregorian::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemGregorian::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemGregorian::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemGregorian::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemGregorian::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorian::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorian::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemGregorian::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemGregorian::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemGregorian::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemGregorian::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemGregorian::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::yearStringToInteger(sNum, iLength); + } + + int KCalendarSystemGregorian::weekDayOfPray() const +@@ -648,24 +500,67 @@ bool KCalendarSystemGregorian::isSolar() const + + bool KCalendarSystemGregorian::isProleptic() const + { +- return false; ++ return true; + } + +-bool KCalendarSystemGregorian::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemGregorian::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- QDate date = QDate::fromJulianDay( jd ); ++ Q_D(const KCalendarSystemGregorian); ++ ++ // Formula from The Calendar FAQ by Claus Tondering ++ // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 ++ // NOTE: Coded from scratch from mathematical formulas, not copied from ++ // the Boost licensed source code + +- date.getDate( &year, &month, &day ); ++ int a = jd + 32044; ++ int b = ((4 * a) + 3) / 146097; ++ int c = a - ((146097 * b) / 4); ++ int dd = ((4 * c) + 3) / 1461; ++ int e = c - ((1461 * dd) / 4); ++ int m = ((5 * e) + 2) / 153; ++ day = e - (((153 * m) + 2) / 5) + 1; ++ month = m + 3 - (12 * (m / 10)); ++ year = (100 * b) + dd - 4800 + (m / 10); + +- return date.isValid(); ++ // If year is -ve then is BC. In Gregorian there is no year 0, but the maths ++ // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside ++ // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO ++ if (!d->hasYearZero() && year < 1) { ++ year = year - 1; ++ } ++ return true; + } + +-bool KCalendarSystemGregorian::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemGregorian::dateToJulianDay(int year, int month, int day, int &jd) const + { +- QDate date; ++ Q_D(const KCalendarSystemGregorian); ++ ++ // Formula from The Calendar FAQ by Claus Tondering ++ // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 ++ // NOTE: Coded from scratch from mathematical formulas, not copied from ++ // the Boost licensed source code + +- date.setDate( year, month, day ); +- jd = date.toJulianDay(); ++ // If year is -ve then is BC. In Gregorian there is no year 0, but the maths ++ // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally ++ // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO ++ int y; ++ if (!d->hasYearZero() && year < 1) { ++ y = year + 1; ++ } else { ++ y = year; ++ } + +- return date.isValid(); ++ int a = (14 - month) / 12; ++ y = y + 4800 - a; ++ int m = month + (12 * a) - 3; ++ ++ jd = day ++ + (((153 * m) + 2) / 5) ++ + (365 * y) ++ + (y / 4) ++ - (y / 100) ++ + (y / 400) ++ - 32045; ++ ++ return true; + } +diff --git a/kdecore/date/kcalendarsystemgregorian_p.h b/kdecore/date/kcalendarsystemgregorian_p.h +index 31f861b..c173ea9 100644 +--- a/kdecore/date/kcalendarsystemgregorian_p.h ++++ b/kdecore/date/kcalendarsystemgregorian_p.h +@@ -1,7 +1,5 @@ + /* +- Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2010 John Layt <john@layt.net> ++ Copyright 2009, 2010 John Layt <john@layt.net> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public +@@ -28,84 +26,46 @@ class KCalendarSystemGregorianPrivate; + + /** + * @internal +- * This is the Gregorian calendar implementation. ++ * This is the pure Gregorian calendar implementation. + * +- * The Gregorian calendar is the most used calendar today. The first year in +- * the calendar is set to the birth of Christ. ++ * Note: This is a proleptic version of the Gregorian calendar, it does not ++ * copy the QDate method of using the Julian Calendar for dates before 15 ++ * October 1582. This is the traditional proleptic Gregorian calendar ++ * that does not have a year 0, unlike the ISO version which does. + * +- * WARNING: This is not a pure Gregorian calendar, it copies the QDate method +- * of using the Julian Calendar for dates before 15 October 1582. +- * +- * @b license GNU-GPL v.2 ++ * @b license GNU-LGPL v.2 or later + * + * @see KLocale,KCalendarSystem + * +- * @author Carlos Moro <cfmoro@correo.uniovi.es> ++ * @author John Layt <john@layt.net> + */ + class KCalendarSystemGregorian: public KCalendarSystem + { + public: +- explicit KCalendarSystemGregorian ( const KLocale *locale = 0 ); +- explicit KCalendarSystemGregorian( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); +- virtual ~KCalendarSystemGregorian (); ++ explicit KCalendarSystemGregorian(const KLocale *locale = 0); ++ explicit KCalendarSystemGregorian(const KSharedConfig::Ptr config, const KLocale *locale = 0); ++ virtual ~KCalendarSystemGregorian(); + + virtual QString calendarType() const; + + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; +- +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; +- +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -113,15 +73,15 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemGregorian( KCalendarSystemGregorianPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemGregorian(KCalendarSystemGregorianPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemGregorian ) +- KCalendarSystemGregorianPrivate * const dont_use; // KDE5 remove, use shared d ++ friend class KCalendarSystemIndianNational; // To allow access to julianDayToDate() and dateToJulianDay() ++ Q_DECLARE_PRIVATE(KCalendarSystemGregorian) + }; + +-#endif ++#endif // KCALENDARSYSTEMGREGORIAN_H +diff --git a/kdecore/date/kcalendarsystemgregorianprivate_p.h b/kdecore/date/kcalendarsystemgregorianprivate_p.h +new file mode 100644 +index 0000000..61d6646 +--- /dev/null ++++ b/kdecore/date/kcalendarsystemgregorianprivate_p.h +@@ -0,0 +1,54 @@ ++/* ++ Copyright 2009, 2010 John Layt <john@layt.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#ifndef KCALENDARSYSTEMGREGORIANPRIVATE_H ++#define KCALENDARSYSTEMGREGORIANPRIVATE_H ++ ++// Derived gregorian kde calendar class ++ ++#include "kcalendarsystemprivate_p.h" ++ ++class KCalendarSystemGregorianPrivate : public KCalendarSystemPrivate ++{ ++public: ++ explicit KCalendarSystemGregorianPrivate(KCalendarSystemGregorian *q); ++ ++ virtual ~KCalendarSystemGregorianPrivate(); ++ ++ // Virtual methods each calendar system must re-implement ++ virtual KLocale::CalendarSystem calendarSystem() const; ++ virtual void loadDefaultEraList(); ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; ++ virtual int daysInWeek() const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool hasLeapMonths() const; ++ virtual bool hasYearZero() const; ++ virtual int maxDaysInWeek() const; ++ virtual int maxMonthsInYear() const; ++ virtual int earliestValidYear() const; ++ virtual int latestValidYear() const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; ++ ++ bool m_useCommonEra; ++}; ++ ++#endif // KCALENDARSYSTEMGREGORIANPRIVATE_H +diff --git a/kdecore/date/kcalendarsystemgregorianproleptic.cpp b/kdecore/date/kcalendarsystemgregorianproleptic.cpp +deleted file mode 100644 +index 32ffeb4..0000000 +--- a/kdecore/date/kcalendarsystemgregorianproleptic.cpp ++++ /dev/null +@@ -1,706 +0,0 @@ +-/* +- Copyright 2009, 2010 John Layt <john@layt.net> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-// Derived gregorian kde calendar class +- +-#include "kcalendarsystemgregorianproleptic_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" +-#include "kcalendarera_p.h" +- +-#include "kdebug.h" +-#include "klocale.h" +-#include "kglobal.h" +-#include "kconfiggroup.h" +- +-#include <QtCore/QDate> +-#include <QtCore/QCharRef> +- +-// Shared d pointer base class definitions +- +-KCalendarSystemGregorianProlepticPrivate::KCalendarSystemGregorianProlepticPrivate( KCalendarSystemGregorianProleptic *q ) +- :KCalendarSystemPrivate( q ) +-{ +-} +- +-KCalendarSystemGregorianProlepticPrivate::~KCalendarSystemGregorianProlepticPrivate() +-{ +-} +- +-KLocale::CalendarSystem KCalendarSystemGregorianProlepticPrivate::calendarSystem() const +-{ +- return KLocale::GregorianCalendar; +-} +- +-// Dummy version using Gregorian as an example +-// This method MUST be re-implemented in any new Calendar System +-void KCalendarSystemGregorianProlepticPrivate::loadDefaultEraList() +-{ +- QString name, shortName, format; +- +- KConfigGroup cg( config(), QString::fromLatin1( "KCalendarSystem %1" ).arg( q->calendarType() ) ); +- m_useCommonEra = cg.readEntry( "UseCommonEra", false ); +- +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE" ); +- } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC" ); +- } +- format = i18nc( "(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC" ); +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), name, shortName, format ); +- +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE" ); +- } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD" ); +- } +- format = i18nc( "(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); +-} +- +-int KCalendarSystemGregorianProlepticPrivate::monthsInYear( int year ) const +-{ +- Q_UNUSED( year ) +- return 12; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::daysInMonth( int year, int month ) const +-{ +- if ( month == 2 ) { +- if ( isLeapYear( year ) ) { +- return 29; +- } else { +- return 28; +- } +- } +- +- if ( month == 4 || month == 6 || month == 9 || month == 11 ) { +- return 30; +- } +- +- return 31; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::daysInYear( int year ) const +-{ +- if ( isLeapYear( year ) ) { +- return 366; +- } else { +- return 365; +- } +-} +- +-int KCalendarSystemGregorianProlepticPrivate::daysInWeek() const +-{ +- return 7; +-} +- +-bool KCalendarSystemGregorianProlepticPrivate::isLeapYear( int year ) const +-{ +- if ( !hasYearZero() && year < 1 ) { +- year = year + 1; +- } +- +- if ( year % 4 == 0 ) { +- if ( year % 100 != 0 ) { +- return true; +- } else if ( year % 400 == 0 ) { +- return true; +- } +- } +- +- return false; +-} +- +-bool KCalendarSystemGregorianProlepticPrivate::hasLeapMonths() const +-{ +- return false; +-} +- +-bool KCalendarSystemGregorianProlepticPrivate::hasYearZero() const +-{ +- return false; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::maxDaysInWeek() const +-{ +- return 7; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::maxMonthsInYear() const +-{ +- return 12; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::earliestValidYear() const +-{ +- return -4713; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::latestValidYear() const +-{ +- return 9999; +-} +- +-QString KCalendarSystemGregorianProlepticPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const +-{ +- Q_UNUSED( year ); +- +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::NarrowName", "J" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::NarrowName", "F" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::NarrowName", "M" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::NarrowName", "M" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::NarrowName", "J" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::NarrowName", "J" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::NarrowName", "O" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::NarrowName", "N" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::NarrowName", "D" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName Possessive", "of Jan" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName Possessive", "of Feb" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName Possessive", "of Mar" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName Possessive", "of Apr" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName Possessive", "of May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName Possessive", "of Jun" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName Possessive", "of Jul" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName Possessive", "of Aug" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName Possessive", "of Sep" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName Possessive", "of Oct" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName Possessive", "of Nov" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName Possessive", "of Dec" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName", "Jan" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName", "Feb" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName", "Mar" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName", "Apr" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName", "May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName", "Jun" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName", "Jul" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName", "Aug" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName", "Sep" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName", "Oct" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName", "Nov" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName", "Dec" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName Possessive", "of January" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName Possessive", "of February" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName Possessive", "of March" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName Possessive", "of April" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName Possessive", "of May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName Possessive", "of June" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName Possessive", "of July" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName Possessive", "of August" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName Possessive", "of September" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName Possessive", "of October" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName Possessive", "of November" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName Possessive", "of December" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- // Default to LongName +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName", "January" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName", "February" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName", "March" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName", "April" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName", "May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName", "June" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName", "July" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName", "August" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName", "September" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName", "October" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName", "November" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName", "December" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +-QString KCalendarSystemGregorianProlepticPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const +-{ +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); +- default: return QString(); +- } +- } +- +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +- +-KCalendarSystemGregorianProleptic::KCalendarSystemGregorianProleptic( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianProlepticPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemGregorianProleptic::KCalendarSystemGregorianProleptic( const KSharedConfig::Ptr config, +- const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianProlepticPrivate( this ), config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemGregorianProleptic::KCalendarSystemGregorianProleptic( KCalendarSystemGregorianProlepticPrivate &dd, +- const KSharedConfig::Ptr config, +- const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemGregorianProleptic::~KCalendarSystemGregorianProleptic() +-{ +- delete dont_use; +-} +- +-QString KCalendarSystemGregorianProleptic::calendarType() const +-{ +- return QLatin1String( "gregorian-proleptic" ); +-} +- +-QDate KCalendarSystemGregorianProleptic::epoch() const +-{ +- return QDate::fromJulianDay( 1721426 ); +-} +- +-QDate KCalendarSystemGregorianProleptic::earliestValidDate() const +-{ +- // Gregorian 1 Jan 4713 BC, no year zero +- return QDate::fromJulianDay( 38 ); +-} +- +-QDate KCalendarSystemGregorianProleptic::latestValidDate() const +-{ +- // Set to last day of year 9999 until confirm date formats & widgets support > 9999 +- // In Gregorian this is 9999-12-31, which is is jd 5373484 +- // Can't call setDate( 9999, 12, 31 ) as it creates circular reference! +- return QDate::fromJulianDay( 5373484 ); +-} +- +-bool KCalendarSystemGregorianProleptic::isValid( int year, int month, int day ) const +-{ +- return KCalendarSystem::isValid( year, month, day ); +-} +- +-bool KCalendarSystemGregorianProleptic::isValid( const QDate &date ) const +-{ +- return KCalendarSystem::isValid( date ); +-} +- +-bool KCalendarSystemGregorianProleptic::setDate( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemGregorianProleptic::setYMD( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setYMD( date, year, month, day ); +-} +- +-int KCalendarSystemGregorianProleptic::year( const QDate &date ) const +-{ +- return KCalendarSystem::year( date ); +-} +- +-int KCalendarSystemGregorianProleptic::month( const QDate &date ) const +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemGregorianProleptic::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemGregorianProleptic::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemGregorianProleptic::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemGregorianProleptic::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemGregorianProleptic::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemGregorianProleptic::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemGregorianProleptic::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemGregorianProleptic::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemGregorianProleptic::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemGregorianProleptic::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemGregorianProleptic::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemGregorianProleptic::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemGregorianProleptic::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorianProleptic::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorianProleptic::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemGregorianProleptic::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemGregorianProleptic::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemGregorianProleptic::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemGregorianProleptic::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemGregorianProleptic::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); +-} +- +-int KCalendarSystemGregorianProleptic::weekDayOfPray() const +-{ +- return 7; // sunday +-} +- +-bool KCalendarSystemGregorianProleptic::isLunar() const +-{ +- return false; +-} +- +-bool KCalendarSystemGregorianProleptic::isLunisolar() const +-{ +- return false; +-} +- +-bool KCalendarSystemGregorianProleptic::isSolar() const +-{ +- return true; +-} +- +-bool KCalendarSystemGregorianProleptic::isProleptic() const +-{ +- return true; +-} +- +-bool KCalendarSystemGregorianProleptic::julianDayToDate( int jd, int &year, int &month, int &day ) const +-{ +- Q_D( const KCalendarSystemGregorianProleptic ); +- +- // Formula from The Calendar FAQ by Claus Tondering +- // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +- // NOTE: Coded from scratch from mathematical formulas, not copied from +- // the Boost licensed source code +- +- int a = jd + 32044; +- int b = ( ( 4 * a ) + 3 ) / 146097; +- int c = a - ( ( 146097 * b ) / 4 ); +- int dd = ( ( 4 * c ) + 3 ) / 1461; +- int e = c - ( ( 1461 * dd ) / 4 ); +- int m = ( ( 5 * e ) + 2 ) / 153; +- day = e - ( ( (153 * m ) + 2 ) / 5 ) + 1; +- month = m + 3 - ( 12 * ( m / 10 ) ); +- year = ( 100 * b ) + dd - 4800 + ( m / 10 ); +- +- // If year is -ve then is BC. In Gregorian there is no year 0, but the maths +- // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO +- if ( !d->hasYearZero() && year < 1 ) { +- year = year - 1; +- } +- return true; +-} +- +-bool KCalendarSystemGregorianProleptic::dateToJulianDay( int year, int month, int day, int &jd ) const +-{ +- Q_D( const KCalendarSystemGregorianProleptic ); +- +- // Formula from The Calendar FAQ by Claus Tondering +- // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +- // NOTE: Coded from scratch from mathematical formulas, not copied from +- // the Boost licensed source code +- +- // If year is -ve then is BC. In Gregorian there is no year 0, but the maths +- // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally +- // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO +- int y; +- if ( !d->hasYearZero() && year < 1 ) { +- y = year + 1; +- } else { +- y = year; +- } +- +- int a = ( 14 - month ) / 12; +- y = y + 4800 - a; +- int m = month + ( 12 * a ) - 3; +- +- jd = day +- + ( ( ( 153 * m ) + 2 ) / 5 ) +- + ( 365 * y ) +- + ( y / 4 ) +- - ( y / 100 ) +- + ( y / 400 ) +- - 32045; +- +- return true; +-} +diff --git a/kdecore/date/kcalendarsystemgregorianproleptic_p.h b/kdecore/date/kcalendarsystemgregorianproleptic_p.h +deleted file mode 100644 +index bbb2f2f..0000000 +--- a/kdecore/date/kcalendarsystemgregorianproleptic_p.h ++++ /dev/null +@@ -1,125 +0,0 @@ +-/* +- Copyright 2009, 2010 John Layt <john@layt.net> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef KCALENDARSYSTEMGREGORIANPROLEPTIC_H +-#define KCALENDARSYSTEMGREGORIANPROLEPTIC_H +- +-#include "kcalendarsystem.h" +- +-class KCalendarSystemGregorianProlepticPrivate; +- +-/** +- * @internal +- * This is the pure Gregorian calendar implementation. +- * +- * Note: This is a proleptic version of the Gregorian calendar, it does not +- * copy the QDate method of using the Julian Calendar for dates before 15 +- * October 1582. This is the traditional proleptic Gregorian calendar +- * that does not have a year 0, unlike the ISO version which does. +- * +- * @b license GNU-LGPL v.2 or later +- * +- * @see KLocale,KCalendarSystem +- * +- * @author John Layt <john@layt.net> +- */ +-class KCalendarSystemGregorianProleptic: public KCalendarSystem +-{ +-public: +- explicit KCalendarSystemGregorianProleptic( const KLocale *locale = 0 ); +- explicit KCalendarSystemGregorianProleptic( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); +- virtual ~KCalendarSystemGregorianProleptic(); +- +- virtual QString calendarType() const; +- +- virtual QDate epoch() const; +- virtual QDate earliestValidDate() const; +- virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; +- +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; +- +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; +- +- virtual bool isLunar() const; +- virtual bool isLunisolar() const; +- virtual bool isSolar() const; +- virtual bool isProleptic() const; +- +-protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemGregorianProleptic( KCalendarSystemGregorianProlepticPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); +- +-private: +- friend class KCalendarSystemIndianNational; // To allow access to julianDayToDate() and dateToJulianDay() +- Q_DECLARE_PRIVATE( KCalendarSystemGregorianProleptic ) +- KCalendarSystemGregorianProlepticPrivate * const dont_use; // KDE5 remove, use shared d +-}; +- +-#endif // KCALENDARSYSTEMGREGORIANPROLEPTIC_H +diff --git a/kdecore/date/kcalendarsystemgregorianprolepticprivate_p.h b/kdecore/date/kcalendarsystemgregorianprolepticprivate_p.h +deleted file mode 100644 +index e463b92..0000000 +--- a/kdecore/date/kcalendarsystemgregorianprolepticprivate_p.h ++++ /dev/null +@@ -1,54 +0,0 @@ +-/* +- Copyright 2009, 2010 John Layt <john@layt.net> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef KCALENDARSYSTEMGREGORIANPROLEPTICPRIVATE_H +-#define KCALENDARSYSTEMGREGORIANPROLEPTICPRIVATE_H +- +-// Derived gregorian kde calendar class +- +-#include "kcalendarsystemprivate_p.h" +- +-class KCalendarSystemGregorianProlepticPrivate : public KCalendarSystemPrivate +-{ +-public: +- explicit KCalendarSystemGregorianProlepticPrivate( KCalendarSystemGregorianProleptic *q ); +- +- virtual ~KCalendarSystemGregorianProlepticPrivate(); +- +- // Virtual methods each calendar system must re-implement +- virtual KLocale::CalendarSystem calendarSystem() const; +- virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; +- virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; +- virtual bool hasLeapMonths() const; +- virtual bool hasYearZero() const; +- virtual int maxDaysInWeek() const; +- virtual int maxMonthsInYear() const; +- virtual int earliestValidYear() const; +- virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; +- +- bool m_useCommonEra; +-}; +- +-#endif // KCALENDARSYSTEMGREGORIANPROLEPTICPRIVATE_H +diff --git a/kdecore/date/kcalendarsystemhebrew.cpp b/kdecore/date/kcalendarsystemhebrew.cpp +index b55c6ec..8620055 100644 +--- a/kdecore/date/kcalendarsystemhebrew.cpp ++++ b/kdecore/date/kcalendarsystemhebrew.cpp +@@ -31,7 +31,7 @@ + #include <QtCore/QDate> + #include <QtCore/QCharRef> + +-static int hebrewDaysElapsed( int y ); ++static int hebrewDaysElapsed(int y); + + class h_date + { +@@ -46,26 +46,26 @@ public: + /* + * compute general date structure from hebrew date + */ +-static class h_date * hebrewToGregorian( int y, int m, int d ) ++static class h_date * hebrewToGregorian(int y, int m, int d) + { + static class h_date h; + int s; + + y -= 3744; +- s = hebrewDaysElapsed( y ); ++ s = hebrewDaysElapsed(y); + d += s; +- s = hebrewDaysElapsed( y + 1 ) - s; /* length of year */ ++ s = hebrewDaysElapsed(y + 1) - s; /* length of year */ + +- if ( s > 365 && m > 6 ) { ++ if (s > 365 && m > 6) { + --m; + d += 30; + } +- d += ( 59 * ( m - 1 ) + 1 ) / 2; /* regular months */ ++ d += (59 * (m - 1) + 1) / 2; /* regular months */ + /* special cases */ +- if ( s % 10 > 4 && m > 2 ) { /* long Heshvan */ ++ if (s % 10 > 4 && m > 2) { /* long Heshvan */ + d++; + } +- if ( s % 10 < 4 && m > 3 ) { /* short Kislev */ ++ if (s % 10 < 4 && m > 3) { /* short Kislev */ + d--; + } + // ### HPB: Broken in leap years +@@ -73,53 +73,53 @@ static class h_date * hebrewToGregorian( int y, int m, int d ) + // d += 30; + d -= 6002; + +- y = ( d + 36525 ) * 4 / 146097 - 1; +- d -= y / 4 * 146097 + ( y % 4 ) * 36524; ++ y = (d + 36525) * 4 / 146097 - 1; ++ d -= y / 4 * 146097 + (y % 4) * 36524; + y *= 100; + + /* compute year */ +- s = ( d + 366 )*4 / 1461 - 1; +- d -= s / 4*1461 + ( s % 4 )*365; ++ s = (d + 366) * 4 / 1461 - 1; ++ d -= s / 4 * 1461 + (s % 4) * 365; + y += s; + /* compute month */ +- m = ( d + 245 )*12 / 367 - 7; +- d -= m*367 / 12 - 30; +- if ( ++m >= 12 ) { ++ m = (d + 245) * 12 / 367 - 7; ++ d -= m * 367 / 12 - 30; ++ if (++m >= 12) { + m -= 12; + y++; + } + h.hd_day = d; + h.hd_mon = m; + h.hd_year = y; +- return( &h ); ++ return(&h); + } + + /* + * compute date structure from no. of days since 1 Tishrei 3744 + */ +-static class h_date * gregorianToHebrew( int y, int m, int d ) ++static class h_date * gregorianToHebrew(int y, int m, int d) + { + static class h_date h; + int s; + +- if ( ( m -= 2 ) <= 0 ) { ++ if ((m -= 2) <= 0) { + m += 12; + y--; + } + /* no. of days, Julian calendar */ +- d += 365*y + y / 4 + 367*m / 12 + 5968; ++ d += 365 * y + y / 4 + 367 * m / 12 + 5968; + /* Gregorian calendar */ + d -= y / 100 - y / 400 - 2; +- h.hd_dw = ( d + 1 ) % 7; ++ h.hd_dw = (d + 1) % 7; + + /* compute the year */ + y += 16; +- s = hebrewDaysElapsed( y ); +- m = hebrewDaysElapsed( y + 1 ); +- while( d >= m ) { /* computed year was underestimated */ ++ s = hebrewDaysElapsed(y); ++ m = hebrewDaysElapsed(y + 1); ++ while (d >= m) { /* computed year was underestimated */ + s = m; + y++; +- m = hebrewDaysElapsed( y + 1 ); ++ m = hebrewDaysElapsed(y + 1); + } + d -= s; + s = m - s; /* size of current year */ +@@ -128,31 +128,31 @@ static class h_date * gregorianToHebrew( int y, int m, int d ) + h.hd_flg = s % 10 - 4; + + /* compute day and month */ +- if ( d >= s - 236 ) { /* last 8 months are regular */ ++ if (d >= s - 236) { /* last 8 months are regular */ + d -= s - 236; + m = d * 2 / 59; +- d -= ( m * 59 + 1 ) / 2; ++ d -= (m * 59 + 1) / 2; + m += 4; +- if ( s > 365 && m <= 5 ) { /* Adar of Meuberet */ ++ if (s > 365 && m <= 5) { /* Adar of Meuberet */ + m += 8; + } + } else { + /* first 4 months have 117-119 days */ + s = 114 + s % 10; + m = d * 4 / s; +- d -= ( m * s + 3 ) / 4; ++ d -= (m * s + 3) / 4; + } + + h.hd_day = d; + h.hd_mon = m; + h.hd_year = y; +- return( &h ); ++ return(&h); + } + + /* constants, in 1/18th of minute */ + static const int HOUR = 1080; +-static const int DAY = 24*HOUR; +-static const int WEEK = 7*DAY; ++static const int DAY = 24 * HOUR; ++static const int WEEK = 7 * DAY; + #define M(h,p) ((h)*HOUR+p) + #define MONTH (DAY+M(12,793)) + +@@ -160,14 +160,14 @@ static const int WEEK = 7*DAY; + * @internal + * no. of days in y years + */ +-static int hebrewDaysElapsed( int y ) ++static int hebrewDaysElapsed(int y) + { + int m, nm, dw, s, l; + + l = y * 7 + 1; // no. of leap months + m = y * 12 + l / 19; // total no. of months + l %= 19; +- nm = m * MONTH + M( 1 + 6, 779 ); // molad new year 3744 (16BC) + 6 hours ++ nm = m * MONTH + M(1 + 6, 779); // molad new year 3744 (16BC) + 6 hours + s = m * 28 + nm / DAY - 2; + + nm %= WEEK; +@@ -175,13 +175,13 @@ static int hebrewDaysElapsed( int y ) + nm %= DAY; + + // special cases of Molad Zaken +- if ( (l < 12 && dw == 3 && nm >= M( 9 + 6, 204 )) || +- (l < 7 && dw == 2 && nm >= M( 15 + 6, 589 )) ) { ++ if ((l < 12 && dw == 3 && nm >= M(9 + 6, 204)) || ++ (l < 7 && dw == 2 && nm >= M(15 + 6, 589))) { + s++, dw++; + } + + /* ADU */ +- if ( dw == 1 || dw == 4 || dw == 6 ) { ++ if (dw == 1 || dw == 4 || dw == 6) { + s++; + } + return s; +@@ -191,44 +191,44 @@ static int hebrewDaysElapsed( int y ) + * @internal + * true if long Cheshvan + */ +-static int long_cheshvan( int year ) ++static int long_cheshvan(int year) + { + QDate first, last; + class h_date *gd; + +- gd = hebrewToGregorian( year, 1, 1 ); +- first.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year, 1, 1); ++ first.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- gd = hebrewToGregorian( year + 1, 1, 1 ); +- last.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year + 1, 1, 1); ++ last.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- return ( first.daysTo( last ) % 10 == 5 ); ++ return (first.daysTo(last) % 10 == 5); + } + + /** + * @internal + * true if short Kislev + */ +-static int short_kislev( int year ) ++static int short_kislev(int year) + { + QDate first, last; + class h_date * gd; + +- gd = hebrewToGregorian( year, 1, 1 ); +- first.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year, 1, 1); ++ first.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- gd = hebrewToGregorian( year + 1, 1, 1 ); +- last.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year + 1, 1, 1); ++ last.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- return ( first.daysTo( last ) % 10 == 3 ); ++ return (first.daysTo(last) % 10 == 3); + } + + // Ok +-static class h_date *toHebrew( const QDate &date ) ++static class h_date *toHebrew(const QDate &date) + { + class h_date *sd; + +- sd = gregorianToHebrew( date.year(), date.month(), date.day() ); ++ sd = gregorianToHebrew(date.year(), date.month(), date.day()); + ++sd->hd_mon; + ++sd->hd_day; + +@@ -238,38 +238,38 @@ static class h_date *toHebrew( const QDate &date ) + class KCalendarSystemHebrewPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemHebrewPrivate( KCalendarSystemHebrew *q ); ++ explicit KCalendarSystemHebrewPrivate(KCalendarSystemHebrew *q); + + virtual ~KCalendarSystemHebrewPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + +- virtual int integerFromString( const QString &string, int maxLength, int &readLength ) const; +- virtual QString stringFromInteger( int number, int padWidth = 0, QChar padChar = QLatin1Char('0') ) const; +- virtual QString stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const; ++ virtual int integerFromString(const QString &string, int maxLength, int &readLength) const; ++ virtual QString stringFromInteger(int number, int padWidth = 0, QChar padChar = QLatin1Char('0')) const; ++ virtual QString stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const; + +- virtual int monthNumberToMonthIndex( int year, int month ) const; ++ virtual int monthNumberToMonthIndex(int year, int month) const; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemHebrewPrivate::KCalendarSystemHebrewPrivate( KCalendarSystemHebrew *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemHebrewPrivate::KCalendarSystemHebrewPrivate(KCalendarSystemHebrew *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -286,55 +286,55 @@ void KCalendarSystemHebrewPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Jewish Era, Anno Mundi, "Year of the World". +- name = i18nc( "Calendar Era: Hebrew Era, years > 0, LongFormat", "Anno Mundi" ); +- shortName = i18nc( "Calendar Era: Hebrew Era, years > 0, ShortFormat", "AM" ); +- format = i18nc( "(kdedt-format) Hebrew, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Hebrew Era, years > 0, LongFormat", "Anno Mundi"); ++ shortName = i18nc("Calendar Era: Hebrew Era, years > 0, ShortFormat", "AM"); ++ format = i18nc("(kdedt-format) Hebrew, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemHebrewPrivate::monthsInYear( int year ) const ++int KCalendarSystemHebrewPrivate::monthsInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 13; + } else { + return 12; + } + } + +-int KCalendarSystemHebrewPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemHebrewPrivate::daysInMonth(int year, int month) const + { +- int mi = monthNumberToMonthIndex( year, month ); ++ int mi = monthNumberToMonthIndex(year, month); + +- if ( mi == 2 && long_cheshvan( year ) ) { ++ if (mi == 2 && long_cheshvan(year)) { + return 30; + } + +- if ( mi == 3 && short_kislev( year ) ) { ++ if (mi == 3 && short_kislev(year)) { + return 29; + } + +- if ( mi % 2 == 0 ) { // Even number months have 29 days ++ if (mi % 2 == 0) { // Even number months have 29 days + return 29; + } else { // Odd number months have 30 days + return 30; + } + } + +-int KCalendarSystemHebrewPrivate::daysInYear( int year ) const ++int KCalendarSystemHebrewPrivate::daysInYear(int year) const + { + int days; + + // Get Regular year length +- if ( isLeapYear( year ) ) { // Has 13 months ++ if (isLeapYear(year)) { // Has 13 months + days = 384; + } else { // Has 12 months + days = 354; + } + + // Check if is Deficient or Abundant year +- if ( short_kislev( year ) ) { // Deficient ++ if (short_kislev(year)) { // Deficient + days = days - 1; +- } else if ( long_cheshvan( year ) ) { // Abundant ++ } else if (long_cheshvan(year)) { // Abundant + days = days + 1; + } + +@@ -346,9 +346,9 @@ int KCalendarSystemHebrewPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemHebrewPrivate::isLeapYear( int year ) const ++bool KCalendarSystemHebrewPrivate::isLeapYear(int year) const + { +- return ( ( ( ( 7 * year ) + 1 ) % 19 ) < 7 ); ++ return ((((7 * year) + 1) % 19) < 7); + } + + bool KCalendarSystemHebrewPrivate::hasLeapMonths() const +@@ -381,9 +381,9 @@ int KCalendarSystemHebrewPrivate::latestValidYear() const + return 8119; + } + +-int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, int maxLength, int &readLength ) const ++int KCalendarSystemHebrewPrivate::integerFromString(const QString &inputString, int maxLength, int &readLength) const + { +- if ( locale()->language() == QLatin1String("he") ) { ++ if (locale()->language() == QLatin1String("he")) { + + // Hebrew numbers are composed of combinations of normal letters which have a numeric value. + // This is a non-positional system, the numeric values are simply added together, however +@@ -420,18 +420,18 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + int result = 0; + int value = 0; + +- for ( ; position < stringLength ; ++position ) { ++ for (; position < stringLength ; ++position) { + + thisChar = string[position]; + +- if ( position + 1 < stringLength ) { ++ if (position + 1 < stringLength) { + nextChar = string[position + 1]; + // Ignore any geresh or gershayim chars, we don't bother checking they are in the right place +- if ( nextChar == QLatin1Char('\'') || nextChar == QChar( 0x05F3 ) || // geresh +- nextChar == QLatin1Char('\"') || nextChar == QChar( 0x05F4 ) ) { // gershayim +- string.remove( position + 1, 1 ); ++ if (nextChar == QLatin1Char('\'') || nextChar == QChar(0x05F3) || // geresh ++ nextChar == QLatin1Char('\"') || nextChar == QChar(0x05F4)) { // gershayim ++ string.remove(position + 1, 1); + stringLength = string.length(); +- if ( position + 1 < stringLength ) { ++ if (position + 1 < stringLength) { + nextChar = string[position + 1]; + } else { + nextChar = QChar(); +@@ -442,7 +442,7 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + nextChar = QChar(); + } + +- if ( thisChar >= QChar( 0x05D0 ) && thisChar <= QChar( 0x05D7 ) ) { ++ if (thisChar >= QChar(0x05D0) && thisChar <= QChar(0x05D7)) { + + // If this char Alef to Het, 1 to 8, א to ח + +@@ -450,13 +450,13 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + // then this char is a thousands digit + // else this char is a ones digit + +- if ( nextChar >= QChar( 0x05D0 ) && nextChar <= QChar( 0x05EA ) ) { +- value = ( thisChar.unicode() - 0x05D0 + 1 ) * 1000; ++ if (nextChar >= QChar(0x05D0) && nextChar <= QChar(0x05EA)) { ++ value = (thisChar.unicode() - 0x05D0 + 1) * 1000; + } else { + value = thisChar.unicode() - 0x05D0 + 1; + } + +- } else if ( thisChar == QChar( 0x05D8 ) ) { ++ } else if (thisChar == QChar(0x05D8)) { + + // If this char is Tet, 9, ט + +@@ -465,31 +465,31 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + // and next char not 7 (Special case for 97 = 16) + // then is a thousands digit else is 9 + +- if ( nextChar >= QChar( 0x05D0 ) && nextChar <= QChar( 0x05EA ) && +- nextChar != QChar( 0x05D5 ) && nextChar != QChar( 0x05D6 ) ) { ++ if (nextChar >= QChar(0x05D0) && nextChar <= QChar(0x05EA) && ++ nextChar != QChar(0x05D5) && nextChar != QChar(0x05D6)) { + value = 9000; + } else { + value = 9; + } + +- } else if ( thisChar >= QChar( 0x05D9 ) && thisChar <= QChar( 0x05E6 ) ) { ++ } else if (thisChar >= QChar(0x05D9) && thisChar <= QChar(0x05E6)) { + + // If this char Yod to Tsadi, 10 to 90, י to צ + + // If next char is a tens or hundreds char then is an error + // Else is a tens digit + +- if ( nextChar >= QChar( 0x05D9 ) ) { ++ if (nextChar >= QChar(0x05D9)) { + return -1; + } else { + value = decadeValues[thisChar.unicode() - 0x05D9]; + } + +- } else if ( thisChar >= QChar( 0x05E7 ) && thisChar <= QChar( 0x05EA ) ) { ++ } else if (thisChar >= QChar(0x05E7) && thisChar <= QChar(0x05EA)) { + + // If this char Qof to Tav, 100 to 400, ק to ת, then is hundreds digit + +- value = ( thisChar.unicode() - 0x05E7 + 1 ) * 100; ++ value = (thisChar.unicode() - 0x05E7 + 1) * 100; + + } else { + +@@ -508,18 +508,18 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + return result; + + } else { +- return KCalendarSystemPrivate::integerFromString( inputString, maxLength, readLength ); ++ return KCalendarSystemPrivate::integerFromString(inputString, maxLength, readLength); + } + } + +-QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidth, QChar padChar ) const ++QString KCalendarSystemHebrewPrivate::stringFromInteger(int number, int padWidth, QChar padChar) const + { +- return KCalendarSystemPrivate::stringFromInteger( number, padWidth, padChar ); ++ return KCalendarSystemPrivate::stringFromInteger(number, padWidth, padChar); + } + +-QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const ++QString KCalendarSystemHebrewPrivate::stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const + { +- if ( locale()->language() == QLatin1String("he") ) { ++ if (locale()->language() == QLatin1String("he")) { + + // Hebrew numbers are composed of combinations of normal letters which have a numeric value. + // This is a non-positional system, the numeric values are simply added together, however +@@ -546,8 +546,8 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + */ + + const QChar decade[] = { +- // Tet = ט, Yod = י, Kaf = כ, Lamed = ל, Mem = מ +- // Nun = נ, Samekh = ס, Ayin = ע, Pe = פ, Tsadi = צ ++ // Tet = ט, Yod = י, Kaf = כ, Lamed = ל, Mem = מ ++ // Nun = נ, Samekh = ס, Ayin = ע, Pe = פ, Tsadi = צ + 0x05D8, 0x05D9, 0x05DB, 0x05DC, 0x05DE, + 0x05E0, 0x05E1, 0x05E2, 0x05E4, 0x05E6 + }; +@@ -555,15 +555,15 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + QString result; + + // We have no rules for coping with numbers outside this range +- if ( number < 1 || number > 9999 ) { +- return KCalendarSystemPrivate::stringFromInteger( number, padWidth, padChar, digitSet ); ++ if (number < 1 || number > 9999) { ++ return KCalendarSystemPrivate::stringFromInteger(number, padWidth, padChar, digitSet); + } + + // Translate the thousands digit, just uses letter for number 1..9 ( א to ט, Alef to Tet ) + // Years 5001-5999 do not have the thousands by convention +- if ( number >= 1000 ) { +- if ( number <= 5000 || number >= 6000 ) { +- result += QChar( 0x05D0 - 1 + number / 1000 ); // Alef א to Tet ט ++ if (number >= 1000) { ++ if (number <= 5000 || number >= 6000) { ++ result += QChar(0x05D0 - 1 + number / 1000); // Alef א to Tet ט + } + number %= 1000; + } +@@ -571,28 +571,28 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + // Translate the hundreds digit + // Use traditional method where we only have letters assigned values for 100, 200, 300 and 400 + // so may need to repeat 400 twice to make up the required number +- if ( number >= 100 ) { +- while ( number >= 500 ) { +- result += QChar( 0x05EA ); // Tav = ת ++ if (number >= 100) { ++ while (number >= 500) { ++ result += QChar(0x05EA); // Tav = ת + number -= 400; + } +- result += QChar( 0x05E7 - 1 + number / 100 ); // Qof = ק to xxx ++ result += QChar(0x05E7 - 1 + number / 100); // Qof = ק to xxx + number %= 100; + } + + // Translate the tens digit + // The numbers 15 and 16 translate to letters that spell out the name of God which is + // forbidden, so require special treatment where 15 = 9 + 6 and 1 = 9 + 7. +- if ( number >= 10 ) { +- if ( number == 15 || number == 16 ) ++ if (number >= 10) { ++ if (number == 15 || number == 16) + number -= 9; + result += decade[number / 10]; + number %= 10; + } + + // Translate the ones digit, uses letter for number 1..9 ( א to ט, Alef to Tet ) +- if ( number > 0 ) { +- result += QChar( 0x05D0 - 1 + number ); // Alef = א to xxx ++ if (number > 0) { ++ result += QChar(0x05D0 - 1 + number); // Alef = א to xxx + } + + // When used in a string with mixed names and numbers the numbers need special chars to +@@ -601,27 +601,27 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + // single quote for convenience. + // Multiple digit numbers have a gershayim symbol ? (Unicode = 0x05F4) as second-to-last + // char, but we use double quote for convenience. +- if ( result.length() == 1 ) { ++ if (result.length() == 1) { + result += QLatin1Char('\''); + } else { +- result.insert( result.length() - 1, QLatin1Char('\"') ); ++ result.insert(result.length() - 1, QLatin1Char('\"')); + } + + return result; + + } else { +- return KCalendarSystemPrivate::stringFromInteger( number, padWidth, padChar, digitSet ); ++ return KCalendarSystemPrivate::stringFromInteger(number, padWidth, padChar, digitSet); + } + } + +-int KCalendarSystemHebrewPrivate::monthNumberToMonthIndex( int year, int month ) const ++int KCalendarSystemHebrewPrivate::monthNumberToMonthIndex(int year, int month) const + { +- if ( isLeapYear( year ) ) { +- if ( month == 6 ) { ++ if (isLeapYear(year)) { ++ if (month == 6) { + return 13; // Adar I +- } else if ( month == 7 ) { ++ } else if (month == 7) { + return 14; // Adar II +- } else if ( month > 7 ) { ++ } else if (month > 7) { + return month - 1; // Because of Adar II + } + } +@@ -629,181 +629,181 @@ int KCalendarSystemHebrewPrivate::monthNumberToMonthIndex( int year, int month ) + return month; + } + +-QString KCalendarSystemHebrewPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemHebrewPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { + // We must map month number to month index +- int monthIndex = monthNumberToMonthIndex( year, month ); ++ int monthIndex = monthNumberToMonthIndex(year, month); + +- if ( format == KLocale::NarrowName ) { +- switch ( monthIndex ) { ++ if (format == KLocale::NarrowName) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::NarrowName", "T").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::NarrowName", "H").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::NarrowName", "K").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::NarrowName", "T").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::NarrowName", "S").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::NarrowName", "A").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::NarrowName", "N").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::NarrowName", "I" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::NarrowName", "I").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::NarrowName", "S").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::NarrowName", "T").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::NarrowName", "A").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::NarrowName", "E" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::NarrowName", "E").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::NarrowName", "A").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::NarrowName", "A").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( monthIndex ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::ShortName Possessive", "of Tis" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::ShortName Possessive", "of Tis").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::ShortName Possessive", "of Hes" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::ShortName Possessive", "of Hes").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::ShortName Possessive", "of Kis" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::ShortName Possessive", "of Kis").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::ShortName Possessive", "of Tev" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::ShortName Possessive", "of Tev").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::ShortName Possessive", "of Shv" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::ShortName Possessive", "of Shv").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::ShortName Possessive", "of Ada" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::ShortName Possessive", "of Ada").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::ShortName Possessive", "of Nis" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::ShortName Possessive", "of Nis").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::ShortName Possessive", "of Iya" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::ShortName Possessive", "of Iya").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::ShortName Possessive", "of Siv" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::ShortName Possessive", "of Siv").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::ShortName Possessive", "of Tam" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::ShortName Possessive", "of Tam").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::ShortName Possessive", "of Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::ShortName Possessive", "of Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::ShortName Possessive", "of Elu" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::ShortName Possessive", "of Elu").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::ShortName Possessive", "of Ad1" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::ShortName Possessive", "of Ad1").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::ShortName Possessive", "of Ad2" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::ShortName Possessive", "of Ad2").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( monthIndex ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::ShortName", "Tis" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::ShortName", "Tis").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::ShortName", "Hes" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::ShortName", "Hes").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::ShortName", "Kis" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::ShortName", "Kis").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::ShortName", "Tev" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::ShortName", "Tev").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::ShortName", "Shv" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::ShortName", "Shv").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::ShortName", "Ada" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::ShortName", "Ada").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::ShortName", "Nis" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::ShortName", "Nis").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::ShortName", "Iya" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::ShortName", "Iya").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::ShortName", "Siv" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::ShortName", "Siv").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::ShortName", "Tam" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::ShortName", "Tam").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::ShortName", "Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::ShortName", "Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::ShortName", "Elu" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::ShortName", "Elu").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::ShortName", "Ad1" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::ShortName", "Ad1").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::ShortName", "Ad2" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::ShortName", "Ad2").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( monthIndex ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::LongName Possessive", "of Tishrey" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::LongName Possessive", "of Tishrey").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::LongName Possessive", "of Heshvan" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::LongName Possessive", "of Heshvan").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::LongName Possessive", "of Kislev" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::LongName Possessive", "of Kislev").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::LongName Possessive", "of Tevet" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::LongName Possessive", "of Tevet").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::LongName Possessive", "of Shvat" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::LongName Possessive", "of Shvat").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::LongName Possessive", "of Adar" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::LongName Possessive", "of Adar").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::LongName Possessive", "of Nisan" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::LongName Possessive", "of Nisan").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::LongName Possessive", "of Iyar" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::LongName Possessive", "of Iyar").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::LongName Possessive", "of Sivan" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::LongName Possessive", "of Sivan").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::LongName Possessive", "of Tamuz" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::LongName Possessive", "of Tamuz").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::LongName Possessive", "of Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::LongName Possessive", "of Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::LongName Possessive", "of Elul" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::LongName Possessive", "of Elul").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::LongName Possessive", "of Adar I" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::LongName Possessive", "of Adar I").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::LongName Possessive", "of Adar II" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::LongName Possessive", "of Adar II").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( monthIndex ) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::LongName", "Tishrey" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::LongName", "Tishrey").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::LongName", "Heshvan" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::LongName", "Heshvan").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::LongName", "Kislev" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::LongName", "Kislev").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::LongName", "Tevet" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::LongName", "Tevet").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::LongName", "Shvat" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::LongName", "Shvat").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::LongName", "Adar" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::LongName", "Adar").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::LongName", "Nisan" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::LongName", "Nisan").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::LongName", "Iyar" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::LongName", "Iyar").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::LongName", "Sivan" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::LongName", "Sivan").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::LongName", "Tamuz" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::LongName", "Tamuz").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::LongName", "Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::LongName", "Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::LongName", "Elul" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::LongName", "Elul").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::LongName", "Adar I" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::LongName", "Adar I").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::LongName", "Adar II" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::LongName", "Adar II").toString(locale()); + default: + return QString(); + } +@@ -812,106 +812,102 @@ QString KCalendarSystemHebrewPrivate::monthName( int month, int year, KLocale::D + // Use Western day names for now as that's what the old version did, + // but wouldn't it be better to use the right Hebrew names like Shabbat? + // Could make it switchable by adding new enums to WeekDayFormat, e.g. ShortNameWestern? +-QString KCalendarSystemHebrewPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemHebrewPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::LongName", "Monday").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::LongName", "Friday").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemHebrew::KCalendarSystemHebrew( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHebrewPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemHebrew::KCalendarSystemHebrew(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemHebrewPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemHebrew::KCalendarSystemHebrew( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHebrewPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemHebrew::KCalendarSystemHebrew(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemHebrewPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemHebrew::KCalendarSystemHebrew( KCalendarSystemHebrewPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemHebrew::KCalendarSystemHebrew(KCalendarSystemHebrewPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemHebrew::~KCalendarSystemHebrew() + { +- delete dont_use; + } + + QString KCalendarSystemHebrew::calendarType() const + { +- return QLatin1String( "hebrew" ); ++ return QLatin1String("hebrew"); + } + + QDate KCalendarSystemHebrew::epoch() const + { + // Hebrew 0001-01-01 (Gregorian -3760-09-07, Julian -3761-10-07) +- return QDate::fromJulianDay( 347998 ); ++ return QDate::fromJulianDay(347998); + } + + QDate KCalendarSystemHebrew::earliestValidDate() const +@@ -919,219 +915,88 @@ QDate KCalendarSystemHebrew::earliestValidDate() const + // Current formulas using direct Gregorian <-> Hebrew conversion using Qt + // will return invalid results prior to the Gregorian switchover in 1582 + // Next valid Hebrew year starts 5344-01-01 (Gregorian 1583-09-17) +- return QDate::fromJulianDay( 2299498 ); ++ return QDate::fromJulianDay(2299498); + } + + QDate KCalendarSystemHebrew::latestValidDate() const + { + // Testing shows current formulas only work up to 8119-13-29 (Gregorian 4359-10-07) +- return QDate::fromJulianDay( 3313431 ); ++ return QDate::fromJulianDay(3313431); + } + +-bool KCalendarSystemHebrew::isValid( int year, int month, int day ) const ++bool KCalendarSystemHebrew::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemHebrew::isValid( const QDate &date ) const ++bool KCalendarSystemHebrew::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemHebrew::setDate( QDate &date, int year, int month, int day ) const ++int KCalendarSystemHebrew::dayOfWeek(const QDate &date) const + { +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemHebrew::setYMD( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setYMD( date, year, month, day ); +-} +- +-int KCalendarSystemHebrew::year( const QDate &date ) const +-{ +- return KCalendarSystem::year( date ); +-} +- +-int KCalendarSystemHebrew::month( const QDate &date ) const +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemHebrew::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemHebrew::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemHebrew::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemHebrew::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemHebrew::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemHebrew::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemHebrew::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemHebrew::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemHebrew::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemHebrew::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemHebrew::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemHebrew::dayOfWeek( const QDate &date ) const +-{ +- class h_date * sd = toHebrew( date ); +- if ( sd->hd_dw == 0 ) { ++ class h_date * sd = toHebrew(date); ++ if (sd->hd_dw == 0) { + return 7; + } else { +- return ( sd->hd_dw ); ++ return (sd->hd_dw); + } + } + +-int KCalendarSystemHebrew::weekNumber( const QDate &date, int *yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemHebrew::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemHebrew::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemHebrew::monthName( int month, int year, MonthNameFormat format ) const ++bool KCalendarSystemHebrew::isLeapYear(int year) const + { +- return KCalendarSystem::monthName( month, year, format ); ++ return KCalendarSystem::isLeapYear(year); + } + +-QString KCalendarSystemHebrew::monthName( const QDate &date, MonthNameFormat format ) const ++bool KCalendarSystemHebrew::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::monthName( date, format ); ++ return KCalendarSystem::isLeapYear(date); + } + +-QString KCalendarSystemHebrew::weekDayName( int weekDay, WeekDayNameFormat format ) const ++QString KCalendarSystemHebrew::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::weekDayName( weekDay, format ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-QString KCalendarSystemHebrew::weekDayName( const QDate &date, WeekDayNameFormat format ) const ++QString KCalendarSystemHebrew::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::weekDayName( date, format ); ++ return KCalendarSystem::monthName(date, format); + } + +-QString KCalendarSystemHebrew::yearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystemHebrew::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::yearString( date, format ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QString KCalendarSystemHebrew::monthString( const QDate &date, StringFormat format ) const ++QString KCalendarSystemHebrew::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::monthString( date, format ); ++ return KCalendarSystem::weekDayName(date, format); + } + +-QString KCalendarSystemHebrew::dayString( const QDate &date, StringFormat format ) const ++int KCalendarSystemHebrew::yearStringToInteger(const QString &string, int &readLength) const + { +- return KCalendarSystem::dayString( date, format ); +-} +- +-int KCalendarSystemHebrew::yearStringToInteger( const QString &string, int &readLength ) const +-{ +- int result = KCalendarSystem::yearStringToInteger( string, readLength ); ++ int result = KCalendarSystem::yearStringToInteger(string, readLength); + + // Hebrew has no letter for 0, so 5 and 5000 are written the same + // Assume if less than 10 then we are in an exact multiple of 1000 +- if ( result < 10 ) { ++ if (result < 10) { + result = result * 1000; + } + + // Not good just assuming, make configurable +- if ( result < 1000 ) { ++ if (result < 1000) { + result += 5000; // assume we're in the 6th millenium (y6k bug) + } + + return result; + } + +-int KCalendarSystemHebrew::monthStringToInteger( const QString &string, int &readLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( string, readLength ); +-} +- +-int KCalendarSystemHebrew::dayStringToInteger( const QString &string, int &readLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( string, readLength ); +-} +- +-QString KCalendarSystemHebrew::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemHebrew::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemHebrew::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemHebrew::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- + int KCalendarSystemHebrew::weekDayOfPray() const + { + return 6; // Saturday + } + +-int KCalendarSystemHebrew::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); +-} +- + bool KCalendarSystemHebrew::isLunar() const + { + return false; +@@ -1152,19 +1017,19 @@ bool KCalendarSystemHebrew::isProleptic() const + return false; + } + +-bool KCalendarSystemHebrew::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemHebrew::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- class h_date * sd = toHebrew( QDate::fromJulianDay( jd ) ); ++ class h_date * sd = toHebrew(QDate::fromJulianDay(jd)); + + year = sd->hd_year; + + month = sd->hd_mon; +- if ( isLeapYear( sd->hd_year ) ) { +- if( month == 13 /*AdarI*/ ) { ++ if (isLeapYear(sd->hd_year)) { ++ if (month == 13 /*AdarI*/) { + month = 6; +- } else if( month == 14 /*AdarII*/ ) { ++ } else if (month == 14 /*AdarII*/) { + month = 7; +- } else if ( month > 6 && month < 13 ) { ++ } else if (month > 6 && month < 13) { + ++month; + } + } +@@ -1174,11 +1039,11 @@ bool KCalendarSystemHebrew::julianDayToDate( int jd, int &year, int &month, int + return true; + } + +-bool KCalendarSystemHebrew::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemHebrew::dateToJulianDay(int year, int month, int day, int &jd) const + { +- class h_date * gd = hebrewToGregorian( year, month, day ); ++ class h_date * gd = hebrewToGregorian(year, month, day); + +- QDate tempDate( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ QDate tempDate(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + + jd = tempDate.toJulianDay(); + +diff --git a/kdecore/date/kcalendarsystemhebrew_p.h b/kdecore/date/kcalendarsystemhebrew_p.h +index 72e82ec..3c3f7fb 100644 +--- a/kdecore/date/kcalendarsystemhebrew_p.h ++++ b/kdecore/date/kcalendarsystemhebrew_p.h +@@ -41,8 +41,8 @@ class KCalendarSystemHebrewPrivate; + class KCalendarSystemHebrew : public KCalendarSystem + { + public: +- explicit KCalendarSystemHebrew( const KLocale * locale = 0 ); +- explicit KCalendarSystemHebrew( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemHebrew(const KLocale * locale = 0); ++ explicit KCalendarSystemHebrew(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemHebrew(); + + virtual QString calendarType() const; +@@ -50,58 +50,23 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual int dayOfWeek(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -109,15 +74,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemHebrew( KCalendarSystemHebrewPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemHebrew(KCalendarSystemHebrewPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemHebrew ) +- KCalendarSystemHebrewPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemHebrew) + }; + + #endif // KCALENDARSYSTEMHEBREW_H +diff --git a/kdecore/date/kcalendarsystemhijri.cpp b/kdecore/date/kcalendarsystemhijri.cpp +deleted file mode 100644 +index 2af04ea..0000000 +--- a/kdecore/date/kcalendarsystemhijri.cpp ++++ /dev/null +@@ -1,741 +0,0 @@ +-/* +- Copyright (c) 2002-2003 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2008, 2009, 2010 John Layt <john@layt.net> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#include "kcalendarsystemhijri_p.h" +-#include "kcalendarsystemprivate_p.h" +- +-#include <QtCore/QDate> +- +-class KCalendarSystemHijriPrivate : public KCalendarSystemPrivate +-{ +-public: +- explicit KCalendarSystemHijriPrivate( KCalendarSystemHijri *q ); +- +- virtual ~KCalendarSystemHijriPrivate(); +- +- // Virtual methods each calendar system must re-implement +- virtual KLocale::CalendarSystem calendarSystem() const; +- virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; +- virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; +- virtual bool hasLeapMonths() const; +- virtual bool hasYearZero() const; +- virtual int maxDaysInWeek() const; +- virtual int maxMonthsInYear() const; +- virtual int earliestValidYear() const; +- virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; +-}; +- +-// Shared d pointer base class definitions +- +-KCalendarSystemHijriPrivate::KCalendarSystemHijriPrivate( KCalendarSystemHijri *q ) +- :KCalendarSystemPrivate( q ) +-{ +-} +- +-KCalendarSystemHijriPrivate::~KCalendarSystemHijriPrivate() +-{ +-} +- +-KLocale::CalendarSystem KCalendarSystemHijriPrivate::calendarSystem() const +-{ +- return KLocale::IslamicCivilCalendar; +-} +- +-void KCalendarSystemHijriPrivate::loadDefaultEraList() +-{ +- QString name, shortName, format; +- // Islamic Era, Anno Hegirae, "Year of the Hijra". +- name = i18nc( "Calendar Era: Hijri Islamic Era, years > 0, LongFormat", "Anno Hegirae" ); +- shortName = i18nc( "Calendar Era: Hijri Islamic Era, years > 0, ShortFormat", "AH" ); +- format = i18nc( "(kdedt-format) Hijri, AH, full era year format used for %EY, e.g. 2000 AH", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); +-} +- +-int KCalendarSystemHijriPrivate::monthsInYear( int year ) const +-{ +- Q_UNUSED( year ) +- return 12; +-} +- +-int KCalendarSystemHijriPrivate::daysInMonth( int year, int month ) const +-{ +- if ( month == 12 && isLeapYear( year ) ) { +- return 30; +- } +- +- if ( month % 2 == 0 ) { // Even number months have 29 days +- return 29; +- } else { // Odd number months have 30 days +- return 30; +- } +-} +- +-int KCalendarSystemHijriPrivate::daysInYear( int year ) const +-{ +- if ( isLeapYear( year ) ) { +- return 355; +- } else { +- return 354; +- } +-} +- +-int KCalendarSystemHijriPrivate::daysInWeek() const +-{ +- return 7; +-} +- +-bool KCalendarSystemHijriPrivate::isLeapYear( int year ) const +-{ +- // Years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26, 29 of the 30 year cycle +- +- /* +- The following C++ code is translated from the Lisp code +- in ``Calendrical Calculations'' by Nachum Dershowitz and +- Edward M. Reingold, Software---Practice & Experience, +- vol. 20, no. 9 (September, 1990), pp. 899--928. +- +- This code is in the public domain, but any use of it +- should publically acknowledge its source. +- */ +- +- if ( ( ( ( 11 * year ) + 14 ) % 30 ) < 11 ) { +- return true; +- } else { +- return false; +- } +- +- // The following variations will be implemented in separate classes in 4.5 +- // May be cleaner to formally define using a case statement switch on (year % 30) +- +- // Variation used by Bar Habraeus / Graves / Birashk / Some Microsoft products +- // Years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26, 29 of the 30 year cycle +- // if ( ( ( ( 11 * year ) + 15 ) % 30 ) < 11 ) { +- +- // Variation used by Bohras / Sahifa with epoch 15 July 622 jd = 1948440 +- // Years 2, 5, 8, 10, 13, 16, 19, 21, 24, 27, 29 of the 30 year cycle +- // if ( ( ( ( 11 * year ) + 1 ) % 30 ) < 11 ) { +-} +- +-bool KCalendarSystemHijriPrivate::hasLeapMonths() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijriPrivate::hasYearZero() const +-{ +- return false; +-} +- +-int KCalendarSystemHijriPrivate::maxDaysInWeek() const +-{ +- return 7; +-} +- +-int KCalendarSystemHijriPrivate::maxMonthsInYear() const +-{ +- return 12; +-} +- +-int KCalendarSystemHijriPrivate::earliestValidYear() const +-{ +- return 1; +-} +- +-int KCalendarSystemHijriPrivate::latestValidYear() const +-{ +- return 9999; +-} +- +-QString KCalendarSystemHijriPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const +-{ +- Q_UNUSED( year ); +- +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::NarrowName", "M" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::NarrowName", "T" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::NarrowName", "T" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::NarrowName", "R" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::NarrowName", "R" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::NarrowName", "Q" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::NarrowName", "H" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::ShortName Possessive", "of Muh" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::ShortName Possessive", "of Saf" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::ShortName Possessive", "of R.A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::ShortName Possessive", "of R.T" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::ShortName Possessive", "of J.A" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::ShortName Possessive", "of J.T" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::ShortName Possessive", "of Raj" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::ShortName Possessive", "of Sha" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::ShortName Possessive", "of Ram" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::ShortName Possessive", "of Shw" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::ShortName Possessive", "of Qid" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::ShortName Possessive", "of Hij" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::ShortName", "Muh" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::ShortName", "Saf" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::ShortName", "R.A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::ShortName", "R.T" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::ShortName", "J.A" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::ShortName", "J.T" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::ShortName", "Raj" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::ShortName", "Sha" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::ShortName", "Ram" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::ShortName", "Shw" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::ShortName", "Qid" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::ShortName", "Hij" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::LongName Possessive", "of Muharram" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::LongName Possessive", "of Safar" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::LongName Possessive", "of Rabi` al-Awal" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::LongName Possessive", "of Rabi` al-Thaani" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::LongName Possessive", "of Jumaada al-Awal" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::LongName Possessive", "of Jumaada al-Thaani" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::LongName Possessive", "of Rajab" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::LongName Possessive", "of Sha`ban" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::LongName Possessive", "of Ramadan" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::LongName Possessive", "of Shawwal" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::LongName Possessive", "of Thu al-Qi`dah" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::LongName Possessive", "of Thu al-Hijjah" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- // Default to LongName +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::LongName", "Muharram" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::LongName", "Safar" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::LongName", "Rabi` al-Awal" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::LongName", "Rabi` al-Thaani" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::LongName", "Jumaada al-Awal" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::LongName", "Jumaada al-Thaani" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::LongName", "Rajab" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::LongName", "Sha`ban" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::LongName", "Ramadan" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::LongName", "Shawwal" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::LongName", "Thu al-Qi`dah" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::LongName", "Thu al-Hijjah" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +-QString KCalendarSystemHijriPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const +-{ +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Hijri weekday 1 - KLocale::NarrowName ", "I" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri weekday 3 - KLocale::NarrowName ", "A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri weekday 4 - KLocale::NarrowName ", "K" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri weekday 5 - KLocale::NarrowName ", "J" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri weekday 7 - KLocale::NarrowName ", "A" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Hijri weekday 1 - KLocale::ShortName", "Ith" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri weekday 2 - KLocale::ShortName", "Thl" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri weekday 3 - KLocale::ShortName", "Arb" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri weekday 4 - KLocale::ShortName", "Kha" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri weekday 5 - KLocale::ShortName", "Jum" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri weekday 6 - KLocale::ShortName", "Sab" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri weekday 7 - KLocale::ShortName", "Ahd" ).toString( locale() ); +- default: return QString(); +- } +- } +- +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Hijri weekday 1 - KLocale::LongName", "Yaum al-Ithnain" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri weekday 2 - KLocale::LongName", "Yau al-Thulatha" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri weekday 3 - KLocale::LongName", "Yaum al-Arbi'a" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri weekday 4 - KLocale::LongName", "Yaum al-Khamees" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri weekday 5 - KLocale::LongName", "Yaum al-Jumma" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri weekday 6 - KLocale::LongName", "Yaum al-Sabt" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri weekday 7 - KLocale::LongName", "Yaum al-Ahad" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +- +-KCalendarSystemHijri::KCalendarSystemHijri( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHijriPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemHijri::KCalendarSystemHijri( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHijriPrivate( this ), config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemHijri::KCalendarSystemHijri( KCalendarSystemHijriPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemHijri::~KCalendarSystemHijri() +-{ +- delete dont_use; +-} +- +-QString KCalendarSystemHijri::calendarType() const +-{ +- return QLatin1String( "hijri" ); +-} +- +-QDate KCalendarSystemHijri::epoch() const +-{ +- // 16 July 622 in the Julian calendar +- return QDate::fromJulianDay( 1948440 ); +-} +- +-QDate KCalendarSystemHijri::earliestValidDate() const +-{ +- return epoch(); +-} +- +-QDate KCalendarSystemHijri::latestValidDate() const +-{ +- // Set to last day of year 9999 +- // Last day of Hijri year 9999 is 9999-12-29 +- return QDate::fromJulianDay( 5491751 ); +-} +- +-bool KCalendarSystemHijri::isValid( int year, int month, int day ) const +-{ +- return KCalendarSystem::isValid( year, month, day ); +-} +- +-bool KCalendarSystemHijri::isValid( const QDate &date ) const +-{ +- return KCalendarSystem::isValid( date ); +-} +- +-bool KCalendarSystemHijri::setDate( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemHijri::setYMD( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setYMD( date, year, month, day ); +-} +- +-int KCalendarSystemHijri::year( const QDate &date ) const +-{ +- return KCalendarSystem::year( date ); +-} +- +-int KCalendarSystemHijri::month( const QDate &date ) const +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemHijri::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemHijri::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemHijri::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemHijri::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemHijri::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemHijri::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemHijri::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemHijri::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemHijri::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemHijri::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemHijri::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemHijri::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemHijri::weekNumber( const QDate &date, int *yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemHijri::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemHijri::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemHijri::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemHijri::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemHijri::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemHijri::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemHijri::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemHijri::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemHijri::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemHijri::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemHijri::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemHijri::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemHijri::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemHijri::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemHijri::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemHijri::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemHijri::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); +-} +- +-int KCalendarSystemHijri::weekDayOfPray() const +-{ +- return 5; // Friday +-} +- +-bool KCalendarSystemHijri::isLunar() const +-{ +- return true; +-} +- +-bool KCalendarSystemHijri::isLunisolar() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijri::isSolar() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijri::isProleptic() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijri::julianDayToDate( int jd, int &year, int &month, int &day ) const +-{ +- Q_D( const KCalendarSystemHijri ); +- +- /* +- The following C++ code is translated from the Lisp code +- in ``Calendrical Calculations'' by Nachum Dershowitz and +- Edward M. Reingold, Software---Practice & Experience, +- vol. 20, no. 9 (September, 1990), pp. 899--928. +- +- This code is in the public domain, but any use of it +- should publically acknowledge its source. +- */ +- +- // Search forward year by year from approximate year +- year = ( jd - epoch().toJulianDay() ) / 355; +- int testJd; +- dateToJulianDay( year, 12, d->daysInMonth( year, 12 ), testJd ); +- while ( jd > testJd ) { +- year++; +- dateToJulianDay( year, 12, d->daysInMonth( year, 12 ), testJd ); +- } +- +- // Search forward month by month from Muharram +- month = 1; +- dateToJulianDay( year, month, d->daysInMonth( year, month ), testJd ); +- while ( jd > testJd ) { +- month++; +- dateToJulianDay( year, month, d->daysInMonth( year, month ), testJd ); +- } +- +- dateToJulianDay( year, month, 1, testJd ); +- day = jd - testJd + 1; +- +- return true; +- +- // Alternative implementations +- +- // More recent editions of "Calendrical Calculations" by Dershowitz & Reingold have a more +- // efficient direct calculation without recusrion, but this cannot be used due to licensing +- +- /* +- Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 +- int L = jd - epoch().toJulianDay() + 10632; +- int N = ( L - 1 ) / 10631; +- L = L - 10631 * N + 354; +- int J = ( ( 10985 - L ) / 5316 ) x ( ( 50* L ) / 17719 ) + ( L / 5670 ) * ( ( 43 * L ) / 15238 ); +- L = L - ( ( 30 - J ) / 15 ) * ( ( 17719 * J ) / 50 ) - ( J / 16 ) * ( ( 15238 * J ) / 43 ) + 29; +- year = ( 30 * N ) + J - 30; +- month = ( 24 * L ) / 709; +- day = L - ( ( 709 * month ) / 24 ); +- */ +- +- /* +- Formula from Fourmilab website +- jd = Math.floor(jd) + 0.5; +- year = Math.floor(((30 * (jd - epoch().toJulianDay())) + 10646) / 10631); +- month = qMin(12, Math.ceil((jd - (29 + islamic_to_jd(year, 1, 1))) / 29.5) + 1); +- day = (jd - islamic_to_jd(year, month, 1)) + 1; +- */ +-} +- +-bool KCalendarSystemHijri::dateToJulianDay( int year, int month, int day, int &jd ) const +-{ +- /* +- The following C++ code is translated from the Lisp code +- in ``Calendrical Calculations'' by Nachum Dershowitz and +- Edward M. Reingold, Software---Practice & Experience, +- vol. 20, no. 9 (September, 1990), pp. 899--928. +- +- This code is in the public domain, but any use of it +- should publically acknowledge its source. +- */ +- +- jd = epoch().toJulianDay() - 1 + // days before start of calendar +- ( year - 1 ) * 354 + // non-leap days in prior years +- ( 3 + ( 11 * year ) ) / 30 + // leap days in prior years +- 29 * ( month - 1 ) + // days so far... +- month / 2 + // ...this year +- day; // days so far this month +- +- return true; +- +- // Alternative implementations +- +- /* +- Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 +- jd = ( 3 + ( 11 * year ) ) / 30 + 354 * year + 30 * month - ( month - 1 ) / 2 + day + epoch().toJulianDay() - 385; +- */ +-} +diff --git a/kdecore/date/kcalendarsystemhijri_p.h b/kdecore/date/kcalendarsystemhijri_p.h +deleted file mode 100644 +index 8204683..0000000 +--- a/kdecore/date/kcalendarsystemhijri_p.h ++++ /dev/null +@@ -1,124 +0,0 @@ +-/* +- Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2010 John Layt <john@layt.net> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef KCALENDARSYSTEMHIJRI_H +-#define KCALENDARSYSTEMHIJRI_H +- +-#include "kcalendarsystem.h" +- +-class KCalendarSystemHijriPrivate; +- +-/** +- * @internal +- * This is the Hijri calendar implementation. +- * +- * The Hijri calendar is the traditional Islamic calendar used in the Middle +- * East. +- * +- * @b license GNU-LGPL v2+ +- * +- * @see KLocale,KCalendarSystem +- * +- * @author Carlos Moro <cfmoro@correo.uniovi.es> +- */ +-class KCalendarSystemHijri : public KCalendarSystem +-{ +-public: +- explicit KCalendarSystemHijri( const KLocale *locale = 0 ); +- explicit KCalendarSystemHijri( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); +- virtual ~KCalendarSystemHijri(); +- +- virtual QString calendarType() const; +- +- virtual QDate epoch() const; +- virtual QDate earliestValidDate() const; +- virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; +- +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; +- +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; +- +- virtual bool isLunar() const; +- virtual bool isLunisolar() const; +- virtual bool isSolar() const; +- virtual bool isProleptic() const; +- +-protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemHijri( KCalendarSystemHijriPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); +- +-private: +- Q_DECLARE_PRIVATE( KCalendarSystemHijri ) +- KCalendarSystemHijriPrivate * const dont_use; // KDE5 remove, use shared d +-}; +- +-#endif // KCALENDARSYSTEMHIJRI_H +diff --git a/kdecore/date/kcalendarsystemindiannational.cpp b/kdecore/date/kcalendarsystemindiannational.cpp +index 2bd3643..f5b79f2 100644 +--- a/kdecore/date/kcalendarsystemindiannational.cpp ++++ b/kdecore/date/kcalendarsystemindiannational.cpp +@@ -29,32 +29,32 @@ + class KCalendarSystemIndianNationalPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemIndianNationalPrivate( KCalendarSystemIndianNational *q ); ++ explicit KCalendarSystemIndianNationalPrivate(KCalendarSystemIndianNational *q); + + virtual ~KCalendarSystemIndianNationalPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemIndianNationalPrivate::KCalendarSystemIndianNationalPrivate( KCalendarSystemIndianNational *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemIndianNationalPrivate::KCalendarSystemIndianNationalPrivate(KCalendarSystemIndianNational *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -71,38 +71,38 @@ void KCalendarSystemIndianNationalPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Saka Era +- name = i18nc( "Calendar Era: Indian National Saka Era, years > 0, LongFormat", "Saka Era" ); +- shortName = i18nc( "Calendar Era: Indian National Saka Era, years > 0, ShortFormat", "SE" ); +- format = i18nc( "(kdedt-format) Indian National, SE, full era year format used for %EY, e.g. 2000 SE", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Indian National Saka Era, years > 0, LongFormat", "Saka Era"); ++ shortName = i18nc("Calendar Era: Indian National Saka Era, years > 0, ShortFormat", "SE"); ++ format = i18nc("(kdedt-format) Indian National, SE, full era year format used for %EY, e.g. 2000 SE", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemIndianNationalPrivate::monthsInYear( int year ) const ++int KCalendarSystemIndianNationalPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemIndianNationalPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemIndianNationalPrivate::daysInMonth(int year, int month) const + { +- if ( month == 1 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 1) { ++ if (isLeapYear(year)) { + return 31; + } else { + return 30; + } + } + +- if ( month >= 2 && month <= 6 ) { ++ if (month >= 2 && month <= 6) { + return 31; + } + + return 30; + } + +-int KCalendarSystemIndianNationalPrivate::daysInYear( int year ) const ++int KCalendarSystemIndianNationalPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -114,19 +114,19 @@ int KCalendarSystemIndianNationalPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemIndianNationalPrivate::isLeapYear( int year ) const ++bool KCalendarSystemIndianNationalPrivate::isLeapYear(int year) const + { + //Uses same rule as Gregorian, and is explicitly synchronized to Gregorian + //so add 78 years to get Gregorian year and apply Gregorian calculation + year = year + 78; +- if ( !hasYearZero() && year < 1 ) { ++ if (!hasYearZero() && year < 1) { + year = year + 1; + } + +- if ( year % 4 == 0 ) { +- if ( year % 100 != 0 ) { ++ if (year % 4 == 0) { ++ if (year % 100 != 0) { + return true; +- } else if ( year % 400 == 0 ) { ++ } else if (year % 400 == 0) { + return true; + } + } +@@ -164,267 +164,263 @@ int KCalendarSystemIndianNationalPrivate::latestValidYear() const + return 9999; + } + +-QString KCalendarSystemIndianNationalPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemIndianNationalPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::NarrowName", "C" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::NarrowName", "C").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::NarrowName", "V" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::NarrowName", "V").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::NarrowName", "J").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::NarrowName", "Ā" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::NarrowName", "Ā").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::NarrowName", "S").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::NarrowName", "B" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::NarrowName", "B").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::NarrowName", "Ā" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::NarrowName", "Ā").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::NarrowName", "K").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::NarrowName", "A").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::NarrowName", "P").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::NarrowName", "M").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::NarrowName", "P").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::ShortName Possessive", "of Cha" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::ShortName Possessive", "of Cha").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::ShortName Possessive", "of Vai" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::ShortName Possessive", "of Vai").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::ShortName Possessive", "of Jya" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::ShortName Possessive", "of Jya").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::ShortName Possessive", "of Āsh" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::ShortName Possessive", "of Āsh").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::ShortName Possessive", "of Shr" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::ShortName Possessive", "of Shr").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::ShortName Possessive", "of Bhā" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::ShortName Possessive", "of Bhā").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::ShortName Possessive", "of Āsw" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::ShortName Possessive", "of Āsw").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::ShortName Possessive", "of Kār" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::ShortName Possessive", "of Kār").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::ShortName Possessive", "of Agr" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::ShortName Possessive", "of Agr").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::ShortName Possessive", "of Pau" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::ShortName Possessive", "of Pau").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::ShortName Possessive", "of Māg" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::ShortName Possessive", "of Māg").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::ShortName Possessive", "of Phā" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::ShortName Possessive", "of Phā").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::ShortName", "Cha" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::ShortName", "Cha").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::ShortName", "Vai" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::ShortName", "Vai").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::ShortName", "Jya" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::ShortName", "Jya").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::ShortName", "Āsh" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::ShortName", "Āsh").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::ShortName", "Shr" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::ShortName", "Shr").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::ShortName", "Bhā" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::ShortName", "Bhā").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::ShortName", "Āsw" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::ShortName", "Āsw").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::ShortName", "Kār" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::ShortName", "Kār").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::ShortName", "Agr" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::ShortName", "Agr").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::ShortName", "Pau" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::ShortName", "Pau").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::ShortName", "Māg" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::ShortName", "Māg").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::ShortName", "Phā" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::ShortName", "Phā").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::LongName Possessive", "of Chaitra" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::LongName Possessive", "of Chaitra").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::LongName Possessive", "of Vaishākh" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::LongName Possessive", "of Vaishākh").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::LongName Possessive", "of Jyaishtha" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::LongName Possessive", "of Jyaishtha").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::LongName Possessive", "of Āshādha" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::LongName Possessive", "of Āshādha").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::LongName Possessive", "of Shrāvana" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::LongName Possessive", "of Shrāvana").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::LongName Possessive", "of Bhādrapad" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::LongName Possessive", "of Bhādrapad").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::LongName Possessive", "of Āshwin" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::LongName Possessive", "of Āshwin").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::LongName Possessive", "of Kārtik" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::LongName Possessive", "of Kārtik").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::LongName Possessive", "of Agrahayana" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::LongName Possessive", "of Agrahayana").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::LongName Possessive", "of Paush" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::LongName Possessive", "of Paush").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::LongName Possessive", "of Māgh" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::LongName Possessive", "of Māgh").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::LongName Possessive", "of Phālgun" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::LongName Possessive", "of Phālgun").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::LongName", "Chaitra" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::LongName", "Chaitra").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::LongName", "Vaishākh" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::LongName", "Vaishākh").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::LongName", "Jyaishtha" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::LongName", "Jyaishtha").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::LongName", "Āshādha" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::LongName", "Āshādha").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::LongName", "Shrāvana" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::LongName", "Shrāvana").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::LongName", "Bhādrapad" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::LongName", "Bhādrapad").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::LongName", "Āshwin" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::LongName", "Āshwin").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::LongName", "Kārtik" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::LongName", "Kārtik").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::LongName", "Agrahayana" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::LongName", "Agrahayana").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::LongName", "Paush" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::LongName", "Paush").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::LongName", "Māgh" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::LongName", "Māgh").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::LongName", "Phālgun" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::LongName", "Phālgun").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemIndianNationalPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemIndianNationalPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Indian National weekday 1 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Indian National weekday 1 - KLocale::NarrowName ", "S").toString(locale()); + case 2: +- return ki18nc( "Indian National weekday 2 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Indian National weekday 2 - KLocale::NarrowName ", "M").toString(locale()); + case 3: +- return ki18nc( "Indian National weekday 3 - KLocale::NarrowName ", "B" ).toString( locale() ); ++ return ki18nc("Indian National weekday 3 - KLocale::NarrowName ", "B").toString(locale()); + case 4: +- return ki18nc( "Indian National weekday 4 - KLocale::NarrowName ", "G" ).toString( locale() ); ++ return ki18nc("Indian National weekday 4 - KLocale::NarrowName ", "G").toString(locale()); + case 5: +- return ki18nc( "Indian National weekday 5 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Indian National weekday 5 - KLocale::NarrowName ", "S").toString(locale()); + case 6: +- return ki18nc( "Indian National weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Indian National weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Indian National weekday 7 - KLocale::NarrowName ", "R" ).toString( locale() ); ++ return ki18nc("Indian National weekday 7 - KLocale::NarrowName ", "R").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Indian National weekday 1 - KLocale::ShortName", "Som" ).toString( locale() ); ++ return ki18nc("Indian National weekday 1 - KLocale::ShortName", "Som").toString(locale()); + case 2: +- return ki18nc( "Indian National weekday 2 - KLocale::ShortName", "Mañ" ).toString( locale() ); ++ return ki18nc("Indian National weekday 2 - KLocale::ShortName", "Mañ").toString(locale()); + case 3: +- return ki18nc( "Indian National weekday 3 - KLocale::ShortName", "Bud" ).toString( locale() ); ++ return ki18nc("Indian National weekday 3 - KLocale::ShortName", "Bud").toString(locale()); + case 4: +- return ki18nc( "Indian National weekday 4 - KLocale::ShortName", "Gur" ).toString( locale() ); ++ return ki18nc("Indian National weekday 4 - KLocale::ShortName", "Gur").toString(locale()); + case 5: +- return ki18nc( "Indian National weekday 5 - KLocale::ShortName", "Suk" ).toString( locale() ); ++ return ki18nc("Indian National weekday 5 - KLocale::ShortName", "Suk").toString(locale()); + case 6: +- return ki18nc( "Indian National weekday 6 - KLocale::ShortName", "San" ).toString( locale() ); ++ return ki18nc("Indian National weekday 6 - KLocale::ShortName", "San").toString(locale()); + case 7: +- return ki18nc( "Indian National weekday 7 - KLocale::ShortName", "Rav" ).toString( locale() ); ++ return ki18nc("Indian National weekday 7 - KLocale::ShortName", "Rav").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Indian National weekday 1 - KLocale::LongName", "Somavãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 1 - KLocale::LongName", "Somavãra").toString(locale()); + case 2: +- return ki18nc( "Indian National weekday 2 - KLocale::LongName", "Mañgalvã" ).toString( locale() ); ++ return ki18nc("Indian National weekday 2 - KLocale::LongName", "Mañgalvã").toString(locale()); + case 3: +- return ki18nc( "Indian National weekday 3 - KLocale::LongName", "Budhavãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 3 - KLocale::LongName", "Budhavãra").toString(locale()); + case 4: +- return ki18nc( "Indian National weekday 4 - KLocale::LongName", "Guruvãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 4 - KLocale::LongName", "Guruvãra").toString(locale()); + case 5: +- return ki18nc( "Indian National weekday 5 - KLocale::LongName", "Sukravãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 5 - KLocale::LongName", "Sukravãra").toString(locale()); + case 6: +- return ki18nc( "Indian National weekday 6 - KLocale::LongName", "Sanivãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 6 - KLocale::LongName", "Sanivãra").toString(locale()); + case 7: +- return ki18nc( "Indian National weekday 7 - KLocale::LongName", "Raviãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 7 - KLocale::LongName", "Raviãra").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemIndianNational::KCalendarSystemIndianNational( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemIndianNationalPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemIndianNational::KCalendarSystemIndianNational(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIndianNationalPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemIndianNational::KCalendarSystemIndianNational( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemIndianNationalPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemIndianNational::KCalendarSystemIndianNational(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIndianNationalPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemIndianNational::KCalendarSystemIndianNational( KCalendarSystemIndianNationalPrivate &dd, +- const KSharedConfig::Ptr config, +- const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemIndianNational::KCalendarSystemIndianNational(KCalendarSystemIndianNationalPrivate &dd, ++ const KSharedConfig::Ptr config, ++ const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemIndianNational::~KCalendarSystemIndianNational() + { +- delete dont_use; + } + + QString KCalendarSystemIndianNational::calendarType() const + { +- return QLatin1String( "indian-national" ); ++ return QLatin1String("indian-national"); + } + + QDate KCalendarSystemIndianNational::epoch() const + { + //0000-01-01, has Year 0. + //0078-03-22 AD Gregorian / 0078-03-24 AD Julian +- return QDate::fromJulianDay( 1749994 ); ++ return QDate::fromJulianDay(1749994); + } + + QDate KCalendarSystemIndianNational::earliestValidDate() const +@@ -432,7 +428,7 @@ QDate KCalendarSystemIndianNational::earliestValidDate() const + //0000-01-01, has Year 0. + //0078-03-22 AD Gregorian / 0078-03-24 AD Julian + //Don't do proleptic yet, need to check +- return QDate::fromJulianDay( 1749630 ); ++ return QDate::fromJulianDay(1749630); + } + + QDate KCalendarSystemIndianNational::latestValidDate() const +@@ -440,188 +436,47 @@ QDate KCalendarSystemIndianNational::latestValidDate() const + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + //9999-12-30 + //10078-03-21 AD Gregorian +- return QDate::fromJulianDay( 5402054 ); ++ return QDate::fromJulianDay(5402054); + } + +-bool KCalendarSystemIndianNational::isValid( int year, int month, int day ) const ++bool KCalendarSystemIndianNational::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemIndianNational::isValid( const QDate &date ) const ++bool KCalendarSystemIndianNational::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemIndianNational::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemIndianNational::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemIndianNational::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemIndianNational::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setDate( date, y, m, d ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemIndianNational::year( const QDate &date ) const ++QString KCalendarSystemIndianNational::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemIndianNational::month( const QDate &date ) const ++QString KCalendarSystemIndianNational::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::month( date ); ++ return KCalendarSystem::monthName(date, format); + } + +-int KCalendarSystemIndianNational::day( const QDate &date ) const ++QString KCalendarSystemIndianNational::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::day( date ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemIndianNational::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemIndianNational::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemIndianNational::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemIndianNational::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemIndianNational::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemIndianNational::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemIndianNational::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemIndianNational::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemIndianNational::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemIndianNational::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemIndianNational::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemIndianNational::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemIndianNational::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemIndianNational::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemIndianNational::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemIndianNational::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemIndianNational::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemIndianNational::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemIndianNational::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemIndianNational::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemIndianNational::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemIndianNational::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemIndianNational::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemIndianNational::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemIndianNational::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemIndianNational::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemIndianNational::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemIndianNational::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemIndianNational::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemIndianNational::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemIndianNational::weekDayOfPray() const +@@ -649,22 +504,22 @@ bool KCalendarSystemIndianNational::isProleptic() const + return false; + } + +-bool KCalendarSystemIndianNational::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemIndianNational::julianDayToDate(int jd, int &year, int &month, int &day) const + { + int L, N, I, J, D, M, Y; + + // "Explanatory Supplement to the Astronomical Almanac" 2006 section 12.94 pp 605-606 + // Originally from "Report of the Calendar Reform Committee" 1955 + L = jd + 68518; +- N = ( 4 * L ) / 146097; +- L = L - ( 146097 * N + 3 ) / 4; +- I = ( 4000 * ( L + 1 ) ) / 1461001; +- L = L - ( 1461 * I ) / 4 + 1; +- J = ( ( L - 1 ) / 31 ) * ( 1 - L / 185 ) + ( L / 185 ) * ( ( L - 156 ) / 30 + 5 ) - L / 366; +- D = L - 31 * J + ( ( J + 2 ) / 8 ) * ( J - 5 ); ++ N = (4 * L) / 146097; ++ L = L - (146097 * N + 3) / 4; ++ I = (4000 * (L + 1)) / 1461001; ++ L = L - (1461 * I) / 4 + 1; ++ J = ((L - 1) / 31) * (1 - L / 185) + (L / 185) * ((L - 156) / 30 + 5) - L / 366; ++ D = L - 31 * J + ((J + 2) / 8) * (J - 5); + L = J / 11; + M = J + 2 - 12 * L; +- Y = 100 * ( N - 49 ) + L + I - 78; ++ Y = 100 * (N - 49) + L + I - 78; + + day = D; + month = M; +@@ -673,7 +528,7 @@ bool KCalendarSystemIndianNational::julianDayToDate( int jd, int &year, int &mon + return true; + } + +-bool KCalendarSystemIndianNational::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemIndianNational::dateToJulianDay(int year, int month, int day, int &jd) const + { + int Y = year; + int M = month; +@@ -682,11 +537,11 @@ bool KCalendarSystemIndianNational::dateToJulianDay( int year, int month, int da + // "Explanatory Supplement to the Astronomical Almanac" 2006 section 12.94 pp 605-606 + // Originally from "Report of the Calendar Reform Committee" 1955 + jd = 365 * Y +- + ( Y + 78 - 1 / M ) / 4 ++ + (Y + 78 - 1 / M) / 4 + + 31 * M +- - ( M + 9 ) / 11 +- - ( M / 7 ) * ( M - 7 ) +- - ( 3 * ( ( Y + 78 - 1 / M ) / 100 + 1 ) ) / 4 ++ - (M + 9) / 11 ++ - (M / 7) * (M - 7) ++ - (3 * ((Y + 78 - 1 / M) / 100 + 1)) / 4 + + D + + 1749579; + +diff --git a/kdecore/date/kcalendarsystemindiannational_p.h b/kdecore/date/kcalendarsystemindiannational_p.h +index 7399a39..0e8e036 100644 +--- a/kdecore/date/kcalendarsystemindiannational_p.h ++++ b/kdecore/date/kcalendarsystemindiannational_p.h +@@ -41,8 +41,8 @@ class KCalendarSystemIndianNationalPrivate; + class KCalendarSystemIndianNational: public KCalendarSystem + { + public: +- explicit KCalendarSystemIndianNational( const KLocale *locale = 0 ); +- explicit KCalendarSystemIndianNational( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemIndianNational(const KLocale *locale = 0); ++ explicit KCalendarSystemIndianNational(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemIndianNational(); + + virtual QString calendarType() const; +@@ -50,58 +50,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -109,15 +70,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemIndianNational( KCalendarSystemIndianNationalPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemIndianNational(KCalendarSystemIndianNationalPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemIndianNational ) +- KCalendarSystemIndianNationalPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemIndianNational) + }; + + #endif // KCALENDARSYSTEMINDIANNATIONAL_H +diff --git a/kdecore/date/kcalendarsystemislamiccivil.cpp b/kdecore/date/kcalendarsystemislamiccivil.cpp +new file mode 100644 +index 0000000..053ec55 +--- /dev/null ++++ b/kdecore/date/kcalendarsystemislamiccivil.cpp +@@ -0,0 +1,596 @@ ++/* ++ Copyright (c) 2002-2003 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2008, 2009, 2010 John Layt <john@layt.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#include "kcalendarsystemislamiccivil_p.h" ++#include "kcalendarsystemprivate_p.h" ++ ++#include <QtCore/QDate> ++ ++class KCalendarSystemIslamicCivilPrivate : public KCalendarSystemPrivate ++{ ++public: ++ explicit KCalendarSystemIslamicCivilPrivate(KCalendarSystemIslamicCivil *q); ++ ++ virtual ~KCalendarSystemIslamicCivilPrivate(); ++ ++ // Virtual methods each calendar system must re-implement ++ virtual KLocale::CalendarSystem calendarSystem() const; ++ virtual void loadDefaultEraList(); ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; ++ virtual int daysInWeek() const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool hasLeapMonths() const; ++ virtual bool hasYearZero() const; ++ virtual int maxDaysInWeek() const; ++ virtual int maxMonthsInYear() const; ++ virtual int earliestValidYear() const; ++ virtual int latestValidYear() const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; ++}; ++ ++// Shared d pointer base class definitions ++ ++KCalendarSystemIslamicCivilPrivate::KCalendarSystemIslamicCivilPrivate(KCalendarSystemIslamicCivil *q) ++ : KCalendarSystemPrivate(q) ++{ ++} ++ ++KCalendarSystemIslamicCivilPrivate::~KCalendarSystemIslamicCivilPrivate() ++{ ++} ++ ++KLocale::CalendarSystem KCalendarSystemIslamicCivilPrivate::calendarSystem() const ++{ ++ return KLocale::IslamicCivilCalendar; ++} ++ ++void KCalendarSystemIslamicCivilPrivate::loadDefaultEraList() ++{ ++ QString name, shortName, format; ++ // Islamic Era, Anno Hegirae, "Year of the Hijra". ++ name = i18nc("Calendar Era: Hijri Islamic Era, years > 0, LongFormat", "Anno Hegirae"); ++ shortName = i18nc("Calendar Era: Hijri Islamic Era, years > 0, ShortFormat", "AH"); ++ format = i18nc("(kdedt-format) Hijri, AH, full era year format used for %EY, e.g. 2000 AH", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); ++} ++ ++int KCalendarSystemIslamicCivilPrivate::monthsInYear(int year) const ++{ ++ Q_UNUSED(year) ++ return 12; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::daysInMonth(int year, int month) const ++{ ++ if (month == 12 && isLeapYear(year)) { ++ return 30; ++ } ++ ++ if (month % 2 == 0) { // Even number months have 29 days ++ return 29; ++ } else { // Odd number months have 30 days ++ return 30; ++ } ++} ++ ++int KCalendarSystemIslamicCivilPrivate::daysInYear(int year) const ++{ ++ if (isLeapYear(year)) { ++ return 355; ++ } else { ++ return 354; ++ } ++} ++ ++int KCalendarSystemIslamicCivilPrivate::daysInWeek() const ++{ ++ return 7; ++} ++ ++bool KCalendarSystemIslamicCivilPrivate::isLeapYear(int year) const ++{ ++ // Years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26, 29 of the 30 year cycle ++ ++ /* ++ The following C++ code is translated from the Lisp code ++ in ``Calendrical Calculations'' by Nachum Dershowitz and ++ Edward M. Reingold, Software---Practice & Experience, ++ vol. 20, no. 9 (September, 1990), pp. 899--928. ++ ++ This code is in the public domain, but any use of it ++ should publically acknowledge its source. ++ */ ++ ++ if ((((11 * year) + 14) % 30) < 11) { ++ return true; ++ } else { ++ return false; ++ } ++ ++ // The following variations will be implemented in separate classes in 4.5 ++ // May be cleaner to formally define using a case statement switch on (year % 30) ++ ++ // Variation used by Bar Habraeus / Graves / Birashk / Some Microsoft products ++ // Years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26, 29 of the 30 year cycle ++ // if ( ( ( ( 11 * year ) + 15 ) % 30 ) < 11 ) { ++ ++ // Variation used by Bohras / Sahifa with epoch 15 July 622 jd = 1948440 ++ // Years 2, 5, 8, 10, 13, 16, 19, 21, 24, 27, 29 of the 30 year cycle ++ // if ( ( ( ( 11 * year ) + 1 ) % 30 ) < 11 ) { ++} ++ ++bool KCalendarSystemIslamicCivilPrivate::hasLeapMonths() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivilPrivate::hasYearZero() const ++{ ++ return false; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::maxDaysInWeek() const ++{ ++ return 7; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::maxMonthsInYear() const ++{ ++ return 12; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::earliestValidYear() const ++{ ++ return 1; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::latestValidYear() const ++{ ++ return 9999; ++} ++ ++QString KCalendarSystemIslamicCivilPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const ++{ ++ Q_UNUSED(year); ++ ++ if (format == KLocale::NarrowName) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::NarrowName", "M").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::NarrowName", "S").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::NarrowName", "A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::NarrowName", "T").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::NarrowName", "A").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::NarrowName", "T").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::NarrowName", "R").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::NarrowName", "S").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::NarrowName", "R").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::NarrowName", "S").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::NarrowName", "Q").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::NarrowName", "H").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::ShortName Possessive", "of Muh").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::ShortName Possessive", "of Saf").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::ShortName Possessive", "of R.A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::ShortName Possessive", "of R.T").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::ShortName Possessive", "of J.A").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::ShortName Possessive", "of J.T").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::ShortName Possessive", "of Raj").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::ShortName Possessive", "of Sha").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::ShortName Possessive", "of Ram").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::ShortName Possessive", "of Shw").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::ShortName Possessive", "of Qid").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::ShortName Possessive", "of Hij").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::ShortName", "Muh").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::ShortName", "Saf").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::ShortName", "R.A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::ShortName", "R.T").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::ShortName", "J.A").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::ShortName", "J.T").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::ShortName", "Raj").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::ShortName", "Sha").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::ShortName", "Ram").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::ShortName", "Shw").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::ShortName", "Qid").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::ShortName", "Hij").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::LongName Possessive", "of Muharram").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::LongName Possessive", "of Safar").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::LongName Possessive", "of Rabi` al-Awal").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::LongName Possessive", "of Rabi` al-Thaani").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::LongName Possessive", "of Jumaada al-Awal").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::LongName Possessive", "of Jumaada al-Thaani").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::LongName Possessive", "of Rajab").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::LongName Possessive", "of Sha`ban").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::LongName Possessive", "of Ramadan").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::LongName Possessive", "of Shawwal").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::LongName Possessive", "of Thu al-Qi`dah").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::LongName Possessive", "of Thu al-Hijjah").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ // Default to LongName ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::LongName", "Muharram").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::LongName", "Safar").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::LongName", "Rabi` al-Awal").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::LongName", "Rabi` al-Thaani").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::LongName", "Jumaada al-Awal").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::LongName", "Jumaada al-Thaani").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::LongName", "Rajab").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::LongName", "Sha`ban").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::LongName", "Ramadan").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::LongName", "Shawwal").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::LongName", "Thu al-Qi`dah").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::LongName", "Thu al-Hijjah").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++QString KCalendarSystemIslamicCivilPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const ++{ ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Hijri weekday 1 - KLocale::NarrowName ", "I").toString(locale()); ++ case 2: ++ return ki18nc("Hijri weekday 2 - KLocale::NarrowName ", "T").toString(locale()); ++ case 3: ++ return ki18nc("Hijri weekday 3 - KLocale::NarrowName ", "A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri weekday 4 - KLocale::NarrowName ", "K").toString(locale()); ++ case 5: ++ return ki18nc("Hijri weekday 5 - KLocale::NarrowName ", "J").toString(locale()); ++ case 6: ++ return ki18nc("Hijri weekday 6 - KLocale::NarrowName ", "S").toString(locale()); ++ case 7: ++ return ki18nc("Hijri weekday 7 - KLocale::NarrowName ", "A").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Hijri weekday 1 - KLocale::ShortName", "Ith").toString(locale()); ++ case 2: ++ return ki18nc("Hijri weekday 2 - KLocale::ShortName", "Thl").toString(locale()); ++ case 3: ++ return ki18nc("Hijri weekday 3 - KLocale::ShortName", "Arb").toString(locale()); ++ case 4: ++ return ki18nc("Hijri weekday 4 - KLocale::ShortName", "Kha").toString(locale()); ++ case 5: ++ return ki18nc("Hijri weekday 5 - KLocale::ShortName", "Jum").toString(locale()); ++ case 6: ++ return ki18nc("Hijri weekday 6 - KLocale::ShortName", "Sab").toString(locale()); ++ case 7: ++ return ki18nc("Hijri weekday 7 - KLocale::ShortName", "Ahd").toString(locale()); ++ default: return QString(); ++ } ++ } ++ ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Hijri weekday 1 - KLocale::LongName", "Yaum al-Ithnain").toString(locale()); ++ case 2: ++ return ki18nc("Hijri weekday 2 - KLocale::LongName", "Yau al-Thulatha").toString(locale()); ++ case 3: ++ return ki18nc("Hijri weekday 3 - KLocale::LongName", "Yaum al-Arbi'a").toString(locale()); ++ case 4: ++ return ki18nc("Hijri weekday 4 - KLocale::LongName", "Yaum al-Khamees").toString(locale()); ++ case 5: ++ return ki18nc("Hijri weekday 5 - KLocale::LongName", "Yaum al-Jumma").toString(locale()); ++ case 6: ++ return ki18nc("Hijri weekday 6 - KLocale::LongName", "Yaum al-Sabt").toString(locale()); ++ case 7: ++ return ki18nc("Hijri weekday 7 - KLocale::LongName", "Yaum al-Ahad").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++ ++KCalendarSystemIslamicCivil::KCalendarSystemIslamicCivil(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIslamicCivilPrivate(this), KSharedConfig::Ptr(), locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemIslamicCivil::KCalendarSystemIslamicCivil(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIslamicCivilPrivate(this), config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemIslamicCivil::KCalendarSystemIslamicCivil(KCalendarSystemIslamicCivilPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemIslamicCivil::~KCalendarSystemIslamicCivil() ++{ ++} ++ ++QString KCalendarSystemIslamicCivil::calendarType() const ++{ ++ return QLatin1String("hijri"); ++} ++ ++QDate KCalendarSystemIslamicCivil::epoch() const ++{ ++ // 16 July 622 in the Julian calendar ++ return QDate::fromJulianDay(1948440); ++} ++ ++QDate KCalendarSystemIslamicCivil::earliestValidDate() const ++{ ++ return epoch(); ++} ++ ++QDate KCalendarSystemIslamicCivil::latestValidDate() const ++{ ++ // Set to last day of year 9999 ++ // Last day of Islamic Civil year 9999 is 9999-12-29 ++ return QDate::fromJulianDay(5491751); ++} ++ ++bool KCalendarSystemIslamicCivil::isValid(int year, int month, int day) const ++{ ++ return KCalendarSystem::isValid(year, month, day); ++} ++ ++bool KCalendarSystemIslamicCivil::isValid(const QDate &date) const ++{ ++ return KCalendarSystem::isValid(date); ++} ++ ++bool KCalendarSystemIslamicCivil::isLeapYear(int year) const ++{ ++ return KCalendarSystem::isLeapYear(year); ++} ++ ++bool KCalendarSystemIslamicCivil::isLeapYear(const QDate &date) const ++{ ++ return KCalendarSystem::isLeapYear(date); ++} ++ ++QString KCalendarSystemIslamicCivil::monthName(int month, int year, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(month, year, format); ++} ++ ++QString KCalendarSystemIslamicCivil::monthName(const QDate &date, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(date, format); ++} ++ ++QString KCalendarSystemIslamicCivil::weekDayName(int weekDay, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(weekDay, format); ++} ++ ++QString KCalendarSystemIslamicCivil::weekDayName(const QDate &date, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(date, format); ++} ++ ++int KCalendarSystemIslamicCivil::weekDayOfPray() const ++{ ++ return 5; // Friday ++} ++ ++bool KCalendarSystemIslamicCivil::isLunar() const ++{ ++ return true; ++} ++ ++bool KCalendarSystemIslamicCivil::isLunisolar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivil::isSolar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivil::isProleptic() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivil::julianDayToDate(int jd, int &year, int &month, int &day) const ++{ ++ Q_D(const KCalendarSystemIslamicCivil); ++ ++ /* ++ The following C++ code is translated from the Lisp code ++ in ``Calendrical Calculations'' by Nachum Dershowitz and ++ Edward M. Reingold, Software---Practice & Experience, ++ vol. 20, no. 9 (September, 1990), pp. 899--928. ++ ++ This code is in the public domain, but any use of it ++ should publically acknowledge its source. ++ */ ++ ++ // Search forward year by year from approximate year ++ year = (jd - epoch().toJulianDay()) / 355; ++ int testJd; ++ dateToJulianDay(year, 12, d->daysInMonth(year, 12), testJd); ++ while (jd > testJd) { ++ year++; ++ dateToJulianDay(year, 12, d->daysInMonth(year, 12), testJd); ++ } ++ ++ // Search forward month by month from Muharram ++ month = 1; ++ dateToJulianDay(year, month, d->daysInMonth(year, month), testJd); ++ while (jd > testJd) { ++ month++; ++ dateToJulianDay(year, month, d->daysInMonth(year, month), testJd); ++ } ++ ++ dateToJulianDay(year, month, 1, testJd); ++ day = jd - testJd + 1; ++ ++ return true; ++ ++ // Alternative implementations ++ ++ // More recent editions of "Calendrical Calculations" by Dershowitz & Reingold have a more ++ // efficient direct calculation without recusrion, but this cannot be used due to licensing ++ ++ /* ++ Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 ++ int L = jd - epoch().toJulianDay() + 10632; ++ int N = ( L - 1 ) / 10631; ++ L = L - 10631 * N + 354; ++ int J = ( ( 10985 - L ) / 5316 ) x ( ( 50* L ) / 17719 ) + ( L / 5670 ) * ( ( 43 * L ) / 15238 ); ++ L = L - ( ( 30 - J ) / 15 ) * ( ( 17719 * J ) / 50 ) - ( J / 16 ) * ( ( 15238 * J ) / 43 ) + 29; ++ year = ( 30 * N ) + J - 30; ++ month = ( 24 * L ) / 709; ++ day = L - ( ( 709 * month ) / 24 ); ++ */ ++ ++ /* ++ Formula from Fourmilab website ++ jd = Math.floor(jd) + 0.5; ++ year = Math.floor(((30 * (jd - epoch().toJulianDay())) + 10646) / 10631); ++ month = qMin(12, Math.ceil((jd - (29 + islamic_to_jd(year, 1, 1))) / 29.5) + 1); ++ day = (jd - islamic_to_jd(year, month, 1)) + 1; ++ */ ++} ++ ++bool KCalendarSystemIslamicCivil::dateToJulianDay(int year, int month, int day, int &jd) const ++{ ++ /* ++ The following C++ code is translated from the Lisp code ++ in ``Calendrical Calculations'' by Nachum Dershowitz and ++ Edward M. Reingold, Software---Practice & Experience, ++ vol. 20, no. 9 (September, 1990), pp. 899--928. ++ ++ This code is in the public domain, but any use of it ++ should publically acknowledge its source. ++ */ ++ ++ jd = epoch().toJulianDay() - 1 + // days before start of calendar ++ (year - 1) * 354 + // non-leap days in prior years ++ (3 + (11 * year)) / 30 + // leap days in prior years ++ 29 * (month - 1) + // days so far... ++ month / 2 + // ...this year ++ day; // days so far this month ++ ++ return true; ++ ++ // Alternative implementations ++ ++ /* ++ Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 ++ jd = ( 3 + ( 11 * year ) ) / 30 + 354 * year + 30 * month - ( month - 1 ) / 2 + day + epoch().toJulianDay() - 385; ++ */ ++} +diff --git a/kdecore/date/kcalendarsystemislamiccivil_p.h b/kdecore/date/kcalendarsystemislamiccivil_p.h +new file mode 100644 +index 0000000..59629cc +--- /dev/null ++++ b/kdecore/date/kcalendarsystemislamiccivil_p.h +@@ -0,0 +1,85 @@ ++/* ++ Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2010 John Layt <john@layt.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#ifndef KCALENDARSYSTEMISLAMICCIVIL_H ++#define KCALENDARSYSTEMISLAMICCIVIL_H ++ ++#include "kcalendarsystem.h" ++ ++class KCalendarSystemIslamicCivilPrivate; ++ ++/** ++ * @internal ++ * This is the Islamic Civil calendar implementation. ++ * ++ * The Islamic or Hijri calendar is the traditional calendar used in the Middle ++ * East. This implementation is of the civil calculation that does not take ++ * observed sunset into account and so may vary from actual dates by 1-2 days. ++ * ++ * @b license GNU-LGPL v2+ ++ * ++ * @see KLocale,KCalendarSystem ++ * ++ * @author Carlos Moro <cfmoro@correo.uniovi.es> ++ */ ++class KCalendarSystemIslamicCivil : public KCalendarSystem ++{ ++public: ++ explicit KCalendarSystemIslamicCivil(const KLocale *locale = 0); ++ explicit KCalendarSystemIslamicCivil(const KSharedConfig::Ptr config, const KLocale *locale = 0); ++ virtual ~KCalendarSystemIslamicCivil(); ++ ++ virtual QString calendarType() const; ++ ++ virtual QDate epoch() const; ++ virtual QDate earliestValidDate() const; ++ virtual QDate latestValidDate() const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; ++ ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; ++ ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; ++ ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; ++ ++ virtual int weekDayOfPray() const; ++ ++ virtual bool isLunar() const; ++ virtual bool isLunisolar() const; ++ virtual bool isSolar() const; ++ virtual bool isProleptic() const; ++ ++protected: ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemIslamicCivil(KCalendarSystemIslamicCivilPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); ++ ++private: ++ Q_DECLARE_PRIVATE(KCalendarSystemIslamicCivil) ++}; ++ ++#endif // KCALENDARSYSTEMISLAMICCIVIL_H +diff --git a/kdecore/date/kcalendarsystemjalali.cpp b/kdecore/date/kcalendarsystemjalali.cpp +index 543ba5a..1aaa804 100644 +--- a/kdecore/date/kcalendarsystemjalali.cpp ++++ b/kdecore/date/kcalendarsystemjalali.cpp +@@ -35,32 +35,32 @@ + class KCalendarSystemJalaliPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemJalaliPrivate( KCalendarSystemJalali *q ); ++ explicit KCalendarSystemJalaliPrivate(KCalendarSystemJalali *q); + + virtual ~KCalendarSystemJalaliPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemJalaliPrivate::KCalendarSystemJalaliPrivate( KCalendarSystemJalali *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemJalaliPrivate::KCalendarSystemJalaliPrivate(KCalendarSystemJalali *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -77,38 +77,38 @@ void KCalendarSystemJalaliPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Islamic Era (Hijri), Anno Persico. +- name = i18nc( "Calendar Era: Jalali Islamic Era, years > 0, LongFormat", "Anno Persico" ); +- shortName = i18nc( "Calendar Era: Jalali Islamic Era, years > 0, ShortFormat", "AP" ); +- format = i18nc( "(kdedt-format) Jalali, AP, full era year format used for %EY, e.g. 2000 AP", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Jalali Islamic Era, years > 0, LongFormat", "Anno Persico"); ++ shortName = i18nc("Calendar Era: Jalali Islamic Era, years > 0, ShortFormat", "AP"); ++ format = i18nc("(kdedt-format) Jalali, AP, full era year format used for %EY, e.g. 2000 AP", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemJalaliPrivate::monthsInYear( int year ) const ++int KCalendarSystemJalaliPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemJalaliPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemJalaliPrivate::daysInMonth(int year, int month) const + { +- if ( month == 12 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 12) { ++ if (isLeapYear(year)) { + return 30; + } else { + return 29; + } + } + +- if ( month <= 6 ) { ++ if (month <= 6) { + return 31; + } + + return 30; + } + +-int KCalendarSystemJalaliPrivate::daysInYear( int year ) const ++int KCalendarSystemJalaliPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -120,26 +120,26 @@ int KCalendarSystemJalaliPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemJalaliPrivate::isLeapYear( int year ) const ++bool KCalendarSystemJalaliPrivate::isLeapYear(int year) const + { + // From formilab Public Domain code http://www.fourmilab.ch/documents/calendar/ + // Use Birashk algorithm as it matches the to/from jd code below + + // Birashk algorithm is incorrect in two years in period AP 1244 to 1531, + // 1403/1404 and 1436/1437, and so catch them here first +- if ( year == 1403 || year == 1436 ) { ++ if (year == 1403 || year == 1436) { + return true; +- } else if ( year == 1404 || year == 1437 ) { ++ } else if (year == 1404 || year == 1437) { + return false; + } + +- if ( year >= 0 ) { ++ if (year >= 0) { + year = year - 474; + } else { + year = year - 473; + } + +- if ( ( ( ( ( ( year % 2820 ) + 474 ) + 38 ) * 682 ) % 2816 ) < 682 ) { ++ if ((((((year % 2820) + 474) + 38) * 682) % 2816) < 682) { + return true; + } else { + return false; +@@ -176,461 +176,315 @@ int KCalendarSystemJalaliPrivate::latestValidYear() const + return 1530; + } + +-QString KCalendarSystemJalaliPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemJalaliPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::NarrowName", "F" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::NarrowName", "F").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::NarrowName", "O" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::NarrowName", "O").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::NarrowName", "K").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::NarrowName", "T").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::NarrowName", "M").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::NarrowName", "S").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::NarrowName", "M").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::NarrowName", "A").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::NarrowName", "A").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::NarrowName", "D" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::NarrowName", "D").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::NarrowName", "B" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::NarrowName", "B").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::NarrowName", "E" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::NarrowName", "E").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::ShortName Possessive", "of Far" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::ShortName Possessive", "of Far").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::ShortName Possessive", "of Ord" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::ShortName Possessive", "of Ord").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::ShortName Possessive", "of Kho" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::ShortName Possessive", "of Kho").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::ShortName Possessive", "of Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::ShortName Possessive", "of Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::ShortName Possessive", "of Mor" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::ShortName Possessive", "of Mor").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::ShortName Possessive", "of Sha" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::ShortName Possessive", "of Sha").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::ShortName Possessive", "of Meh" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::ShortName Possessive", "of Meh").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::ShortName Possessive", "of Aba" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::ShortName Possessive", "of Aba").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::ShortName Possessive", "of Aza" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::ShortName Possessive", "of Aza").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::ShortName Possessive", "of Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::ShortName Possessive", "of Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::ShortName Possessive", "of Bah" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::ShortName Possessive", "of Bah").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::ShortName Possessive", "of Esf" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::ShortName Possessive", "of Esf").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::ShortName", "Far" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::ShortName", "Far").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::ShortName", "Ord" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::ShortName", "Ord").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::ShortName", "Kho" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::ShortName", "Kho").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::ShortName", "Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::ShortName", "Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::ShortName", "Mor" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::ShortName", "Mor").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::ShortName", "Sha" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::ShortName", "Sha").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::ShortName", "Meh" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::ShortName", "Meh").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::ShortName", "Aba" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::ShortName", "Aba").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::ShortName", "Aza" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::ShortName", "Aza").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::ShortName", "Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::ShortName", "Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::ShortName", "Bah" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::ShortName", "Bah").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::ShortName", "Esf" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::ShortName", "Esf").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::LongName Possessive", "of Farvardin" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::LongName Possessive", "of Farvardin").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::LongName Possessive", "of Ordibehesht" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::LongName Possessive", "of Ordibehesht").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::LongName Possessive", "of Khordad" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::LongName Possessive", "of Khordad").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::LongName Possessive", "of Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::LongName Possessive", "of Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::LongName Possessive", "of Mordad" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::LongName Possessive", "of Mordad").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::LongName Possessive", "of Shahrivar" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::LongName Possessive", "of Shahrivar").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::LongName Possessive", "of Mehr" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::LongName Possessive", "of Mehr").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::LongName Possessive", "of Aban" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::LongName Possessive", "of Aban").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::LongName Possessive", "of Azar" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::LongName Possessive", "of Azar").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::LongName Possessive", "of Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::LongName Possessive", "of Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::LongName Possessive", "of Bahman" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::LongName Possessive", "of Bahman").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::LongName Possessive", "of Esfand" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::LongName Possessive", "of Esfand").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::LongName", "Farvardin" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::LongName", "Farvardin").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::LongName", "Ordibehesht" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::LongName", "Ordibehesht").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::LongName", "Khordad" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::LongName", "Khordad").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::LongName", "Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::LongName", "Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::LongName", "Mordad" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::LongName", "Mordad").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::LongName", "Shahrivar" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::LongName", "Shahrivar").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::LongName", "Mehr" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::LongName", "Mehr").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::LongName", "Aban" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::LongName", "Aban").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::LongName", "Azar" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::LongName", "Azar").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::LongName", "Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::LongName", "Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::LongName", "Bahman" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::LongName", "Bahman").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::LongName", "Esfand" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::LongName", "Esfand").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemJalaliPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemJalaliPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Jalali weekday 1 - KLocale::NarrowName ", "2" ).toString( locale() ); ++ return ki18nc("Jalali weekday 1 - KLocale::NarrowName ", "2").toString(locale()); + case 2: +- return ki18nc( "Jalali weekday 2 - KLocale::NarrowName ", "3" ).toString( locale() ); ++ return ki18nc("Jalali weekday 2 - KLocale::NarrowName ", "3").toString(locale()); + case 3: +- return ki18nc( "Jalali weekday 3 - KLocale::NarrowName ", "4" ).toString( locale() ); ++ return ki18nc("Jalali weekday 3 - KLocale::NarrowName ", "4").toString(locale()); + case 4: +- return ki18nc( "Jalali weekday 4 - KLocale::NarrowName ", "5" ).toString( locale() ); ++ return ki18nc("Jalali weekday 4 - KLocale::NarrowName ", "5").toString(locale()); + case 5: +- return ki18nc( "Jalali weekday 5 - KLocale::NarrowName ", "J" ).toString( locale() ); ++ return ki18nc("Jalali weekday 5 - KLocale::NarrowName ", "J").toString(locale()); + case 6: +- return ki18nc( "Jalali weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Jalali weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Jalali weekday 7 - KLocale::NarrowName ", "1" ).toString( locale() ); ++ return ki18nc("Jalali weekday 7 - KLocale::NarrowName ", "1").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Jalali weekday 1 - KLocale::ShortName", "2sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 1 - KLocale::ShortName", "2sh").toString(locale()); + case 2: +- return ki18nc( "Jalali weekday 2 - KLocale::ShortName", "3sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 2 - KLocale::ShortName", "3sh").toString(locale()); + case 3: +- return ki18nc( "Jalali weekday 3 - KLocale::ShortName", "4sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 3 - KLocale::ShortName", "4sh").toString(locale()); + case 4: +- return ki18nc( "Jalali weekday 4 - KLocale::ShortName", "5sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 4 - KLocale::ShortName", "5sh").toString(locale()); + case 5: +- return ki18nc( "Jalali weekday 5 - KLocale::ShortName", "Jom" ).toString( locale() ); ++ return ki18nc("Jalali weekday 5 - KLocale::ShortName", "Jom").toString(locale()); + case 6: +- return ki18nc( "Jalali weekday 6 - KLocale::ShortName", "Shn" ).toString( locale() ); ++ return ki18nc("Jalali weekday 6 - KLocale::ShortName", "Shn").toString(locale()); + case 7: +- return ki18nc( "Jalali weekday 7 - KLocale::ShortName", "1sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 7 - KLocale::ShortName", "1sh").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Jalali weekday 1 - KLocale::LongName", "Do shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 1 - KLocale::LongName", "Do shanbe").toString(locale()); + case 2: +- return ki18nc( "Jalali weekday 2 - KLocale::LongName", "Se shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 2 - KLocale::LongName", "Se shanbe").toString(locale()); + case 3: +- return ki18nc( "Jalali weekday 3 - KLocale::LongName", "Chahar shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 3 - KLocale::LongName", "Chahar shanbe").toString(locale()); + case 4: +- return ki18nc( "Jalali weekday 4 - KLocale::LongName", "Panj shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 4 - KLocale::LongName", "Panj shanbe").toString(locale()); + case 5: +- return ki18nc( "Jalali weekday 5 - KLocale::LongName", "Jumee" ).toString( locale() ); ++ return ki18nc("Jalali weekday 5 - KLocale::LongName", "Jumee").toString(locale()); + case 6: +- return ki18nc( "Jalali weekday 6 - KLocale::LongName", "Shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 6 - KLocale::LongName", "Shanbe").toString(locale()); + case 7: +- return ki18nc( "Jalali weekday 7 - KLocale::LongName", "Yek-shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 7 - KLocale::LongName", "Yek-shanbe").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemJalali::KCalendarSystemJalali( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJalaliPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemJalali::KCalendarSystemJalali(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJalaliPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJalali::KCalendarSystemJalali( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJalaliPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemJalali::KCalendarSystemJalali(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJalaliPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJalali::KCalendarSystemJalali( KCalendarSystemJalaliPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemJalali::KCalendarSystemJalali(KCalendarSystemJalaliPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemJalali::~KCalendarSystemJalali() + { +- delete dont_use; + } + + QString KCalendarSystemJalali::calendarType() const + { +- return QLatin1String( "jalali" ); ++ return QLatin1String("jalali"); + } + + QDate KCalendarSystemJalali::epoch() const + { + // 19 March 622 in the Julian calendar +- return QDate::fromJulianDay( 1948321 ); ++ return QDate::fromJulianDay(1948321); + } + + QDate KCalendarSystemJalali::earliestValidDate() const + { + // Using the Birashk formula which is accurate in period AP 1244 to 1530 (AD 1865 to 2152) + // 1244-01-01 Jalali 1865-03-21 Gregorian +- return QDate::fromJulianDay( 2402317 ); ++ return QDate::fromJulianDay(2402317); + } + + QDate KCalendarSystemJalali::latestValidDate() const + { + // Using the Birashk formula which is accurate in period AP 1244 to 1530 (AD 1865 to 2152) + // 1530-12-29 Jalali 2152-03-19 Gregorian +- return QDate::fromJulianDay( 2507140 ); ++ return QDate::fromJulianDay(2507140); + } + +-bool KCalendarSystemJalali::isValid( int year, int month, int day ) const ++bool KCalendarSystemJalali::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemJalali::isValid( const QDate &date ) const ++bool KCalendarSystemJalali::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemJalali::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJalali::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemJalali::setYMD( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJalali::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setYMD( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemJalali::year( const QDate &date ) const ++QString KCalendarSystemJalali::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemJalali::month ( const QDate& date ) const +- +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemJalali::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemJalali::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemJalali::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemJalali::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemJalali::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemJalali::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemJalali::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemJalali::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemJalali::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemJalali::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemJalali::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemJalali::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemJalali::weekNumber( const QDate &date, int *yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemJalali::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemJalali::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemJalali::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemJalali::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemJalali::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemJalali::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemJalali::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemJalali::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemJalali::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemJalali::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJalali::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJalali::dayStringToInteger( const QString & sNum, int & iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemJalali::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemJalali::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemJalali::readDate( const QString &intstr, const QString &fmt, bool *ok ) const ++QString KCalendarSystemJalali::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::readDate( intstr, fmt, ok ); ++ return KCalendarSystem::monthName(date, format); + } + +-QDate KCalendarSystemJalali::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const ++QString KCalendarSystemJalali::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::readDate( str, flags, ok ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-int KCalendarSystemJalali::weekStartDay() const ++QString KCalendarSystemJalali::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemJalali::weekDayOfPray() const +@@ -658,20 +512,20 @@ bool KCalendarSystemJalali::isProleptic() const + return false; + } + +-bool KCalendarSystemJalali::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemJalali::julianDayToDate(int jd, int &year, int &month, int &day) const + { + // Birashk algorithm is incorrect in two years in period AP 1244 to 1531. + // This results in a leap day being added to the end of 1404 instead of 1403 + // and to the end of 1437 instead of 1436. Check for these dates first and + // return accordingly. Relies on later use of dateToJulianDay() to correctly + // calculate firstDayOfYear in 1404 and 1437, so no other adjustments needed. +- if ( jd == 2460755 ) { ++ if (jd == 2460755) { + year = 1403; + month = 12; + day = 30; + return true; + } +- if ( jd == 2472808 ) { ++ if (jd == 2472808) { + year = 1436; + month = 12; + day = 30; +@@ -686,54 +540,54 @@ bool KCalendarSystemJalali::julianDayToDate( int jd, int &year, int &month, int + int cycle; + int dayInCycle; + int yearInCycle; +- dateToJulianDay( 475, 1, 1, jdCycleStart ); ++ dateToJulianDay(475, 1, 1, jdCycleStart); + daysSinceCycleStart = jd - jdCycleStart; + cycle = daysSinceCycleStart / 1029983; + dayInCycle = daysSinceCycleStart % 1029983; +- if ( dayInCycle == 1029982 ) { ++ if (dayInCycle == 1029982) { + yearInCycle = 2820; + } else { + int aux1 = dayInCycle / 366; + int aux2 = dayInCycle % 366; +- yearInCycle = ( ( ( 2134 * aux1 ) + ( 2816 * aux2 ) + 2815 ) / 1028522 ) + aux1 + 1; ++ yearInCycle = (((2134 * aux1) + (2816 * aux2) + 2815) / 1028522) + aux1 + 1; + } +- year = yearInCycle + ( 2820 * cycle ) + 474; +- if ( year <= 0 ) { ++ year = yearInCycle + (2820 * cycle) + 474; ++ if (year <= 0) { + year = year - 1; + } + + int firstDayOfYear; +- dateToJulianDay( year, 1, 1, firstDayOfYear ); ++ dateToJulianDay(year, 1, 1, firstDayOfYear); + int dayinYear = jd - firstDayOfYear + 1; +- if( dayinYear <= 186 ) { +- month = ( ( dayinYear - 1 ) / 31 ) + 1; +- day = dayinYear - ( ( month - 1 ) * 31 ); ++ if (dayinYear <= 186) { ++ month = ((dayinYear - 1) / 31) + 1; ++ day = dayinYear - ((month - 1) * 31); + } else { +- month = ( ( dayinYear - 7 ) / 30 ) + 1; +- day = dayinYear - ( ( month - 1 ) * 30 ) - 6; ++ month = ((dayinYear - 7) / 30) + 1; ++ day = dayinYear - ((month - 1) * 30) - 6; + } + + return true; + } + +-bool KCalendarSystemJalali::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemJalali::dateToJulianDay(int year, int month, int day, int &jd) const + { +- Q_D( const KCalendarSystemJalali ); ++ Q_D(const KCalendarSystemJalali); + + // Birashk algorithm is incorrect in two years in period AP 1244 to 1531. + // This results in a leap day being added to the end of 1404 instead of 1403 + // and to the end of 1437 instead of 1436. Thus all dates in 1404 and 1437 + // are off by 1 JD. Check for these dates first and adjust accordingly. +- if ( year == 1403 && month == 12 && day == 30 ) { ++ if (year == 1403 && month == 12 && day == 30) { + jd = 2460755; + return true; + } +- if ( year == 1436 && month == 12 && day == 30 ) { ++ if (year == 1436 && month == 12 && day == 30) { + jd = 2472808; + return true; + } +- if ( year == 1404 || year == 1437 ) { +- if ( month < 12 && day + 1 > d->daysInMonth( year, month ) ) { ++ if (year == 1404 || year == 1437) { ++ if (month < 12 && day + 1 > d->daysInMonth(year, month)) { + day = 1; + month = month + 1; + } else { +@@ -747,24 +601,24 @@ bool KCalendarSystemJalali::dateToJulianDay( int year, int month, int day, int & + long epyear; + long monthDays; + +- if ( year >= 0 ) { ++ if (year >= 0) { + epbase = year - 474; + } else { + epbase = year - 473; + } + +- epyear = 474 + ( epbase % 2820 ); ++ epyear = 474 + (epbase % 2820); + +- if ( month <= 7 ) { +- monthDays = ( month - 1 ) * 31; ++ if (month <= 7) { ++ monthDays = (month - 1) * 31; + } else { +- monthDays = ( ( month - 1 ) * 30 ) + 6; ++ monthDays = ((month - 1) * 30) + 6; + } + +- jd = ( epoch().toJulianDay() - 1 ) + // days before epoch +- ( epyear - 1 ) * 365 + // normal days in previous years +- ( ( ( epyear * 682 ) - 110 ) / 2816 ) + // leap days in previous years +- ( epbase / 2820 ) * 1029983 + ++ jd = (epoch().toJulianDay() - 1) + // days before epoch ++ (epyear - 1) * 365 + // normal days in previous years ++ (((epyear * 682) - 110) / 2816) + // leap days in previous years ++ (epbase / 2820) * 1029983 + + monthDays + // days in previous months this year + day; // days in this month + +diff --git a/kdecore/date/kcalendarsystemjalali_p.h b/kdecore/date/kcalendarsystemjalali_p.h +index d1b8350..6ae44ea 100644 +--- a/kdecore/date/kcalendarsystemjalali_p.h ++++ b/kdecore/date/kcalendarsystemjalali_p.h +@@ -32,8 +32,8 @@ class KCalendarSystemJalaliPrivate; + class KCalendarSystemJalali : public KCalendarSystem + { + public: +- explicit KCalendarSystemJalali( const KLocale * locale = 0 ); +- explicit KCalendarSystemJalali( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemJalali(const KLocale * locale = 0); ++ explicit KCalendarSystemJalali(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemJalali(); + + virtual QString calendarType() const; +@@ -41,58 +41,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -100,15 +61,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemJalali( KCalendarSystemJalaliPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemJalali(KCalendarSystemJalaliPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemJalali ) +- KCalendarSystemJalaliPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemJalali) + }; + + #endif // KCALENDARSYSTEMJALALI_H +diff --git a/kdecore/date/kcalendarsystemjapanese.cpp b/kdecore/date/kcalendarsystemjapanese.cpp +index feabd38..4d4e58a 100644 +--- a/kdecore/date/kcalendarsystemjapanese.cpp ++++ b/kdecore/date/kcalendarsystemjapanese.cpp +@@ -18,18 +18,18 @@ + */ + + #include "kcalendarsystemjapanese_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + + #include "kdebug.h" + #include "klocale.h" + + #include <QtCore/QDate> + +-//Reuse the Gregorian Proleptic private implementation +-class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianProlepticPrivate ++//Reuse the Gregorian private implementation ++class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianPrivate + { + public: +- explicit KCalendarSystemJapanesePrivate( KCalendarSystemJapanese *q ); ++ explicit KCalendarSystemJapanesePrivate(KCalendarSystemJapanese *q); + virtual ~KCalendarSystemJapanesePrivate(); + + virtual KLocale::CalendarSystem calendarSystem() const; +@@ -37,10 +37,10 @@ public: + virtual int earliestValidYear() const; + }; + +-//Override only a few of the Gregorian Proleptic private methods ++//Override only a few of the Gregorian private methods + +-KCalendarSystemJapanesePrivate::KCalendarSystemJapanesePrivate( KCalendarSystemJapanese *q ) +- : KCalendarSystemGregorianProlepticPrivate( q ) ++KCalendarSystemJapanesePrivate::KCalendarSystemJapanesePrivate(KCalendarSystemJapanese *q) ++ : KCalendarSystemGregorianPrivate(q) + { + } + +@@ -60,38 +60,38 @@ void KCalendarSystemJapanesePrivate::loadDefaultEraList() + // Nengō, Only do most recent for now, use AD for the rest. + // Feel free to add more, but have mercy on the translators :-) + +- name = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD" ); +- format = i18nc( "(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, QDate( 1868, 9, 7 ), name, shortName, format ); ++ name = i18nc("Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD"); ++ format = i18nc("(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, QDate(1868, 9, 7), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Meiji Era, LongFormat", "Meiji" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Meiji Era, LongFormat", "Meiji"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Meiji, full era year format used for %EY, year = 1, e.g. Meiji 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1868, 9, 8 ), 1868, QDate( 1868, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Meiji, full era year format used for %EY, year > 1, e.g. Meiji 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1869, 1, 1 ), 1869, QDate( 1912, 7, 29 ), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Meiji, full era year format used for %EY, year = 1, e.g. Meiji 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1868, 9, 8), 1868, QDate(1868, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Meiji, full era year format used for %EY, year > 1, e.g. Meiji 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1869, 1, 1), 1869, QDate(1912, 7, 29), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Taishō Era, LongFormat", "Taishō" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Taishō Era, LongFormat", "Taishō"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Taishō, full era year format used for %EY, year = 1, e.g. Taishō 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1912, 7, 30 ), 1912, QDate( 1912, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Taishō, full era year format used for %EY, year > 1, e.g. Taishō 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1913, 1, 1 ), 1913, QDate( 1926, 12, 24 ), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Taishō, full era year format used for %EY, year = 1, e.g. Taishō 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1912, 7, 30), 1912, QDate(1912, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Taishō, full era year format used for %EY, year > 1, e.g. Taishō 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1913, 1, 1), 1913, QDate(1926, 12, 24), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Shōwa Era, LongFormat", "Shōwa" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Shōwa Era, LongFormat", "Shōwa"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year = 1, e.g. Shōwa 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1926, 12, 25 ), 1926, QDate( 1926, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year > 1, e.g. Shōwa 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1927, 1, 1 ), 1927, QDate( 1989, 1, 7 ), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year = 1, e.g. Shōwa 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1926, 12, 25), 1926, QDate(1926, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year > 1, e.g. Shōwa 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1927, 1, 1), 1927, QDate(1989, 1, 7), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Heisei Era, LongFormat", "Heisei" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Heisei Era, LongFormat", "Heisei"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Heisei, full era year format used for %EY, year = 1, e.g. Heisei 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1989, 1, 8 ), 1989, QDate( 1989, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Heisei, full era year format used for %EY, year > 1, e.g. Heisei 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1990, 1, 1 ), 1990, q->latestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Heisei, full era year format used for %EY, year = 1, e.g. Heisei 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1989, 1, 8), 1989, QDate(1989, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Heisei, full era year format used for %EY, year > 1, e.g. Heisei 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1990, 1, 1), 1990, q->latestValidDate(), name, shortName, format); + } + + int KCalendarSystemJapanesePrivate::earliestValidYear() const +@@ -100,23 +100,23 @@ int KCalendarSystemJapanesePrivate::earliestValidYear() const + } + + +-KCalendarSystemJapanese::KCalendarSystemJapanese( const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemJapanesePrivate( this ), KSharedConfig::Ptr(), locale ) ++KCalendarSystemJapanese::KCalendarSystemJapanese(const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemJapanesePrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJapanese::KCalendarSystemJapanese( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemJapanesePrivate( this ), config, locale ) ++KCalendarSystemJapanese::KCalendarSystemJapanese(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemJapanesePrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJapanese::KCalendarSystemJapanese( KCalendarSystemJapanesePrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( dd, config, locale ) ++KCalendarSystemJapanese::KCalendarSystemJapanese(KCalendarSystemJapanesePrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemJapanese::~KCalendarSystemJapanese() +@@ -125,215 +125,79 @@ KCalendarSystemJapanese::~KCalendarSystemJapanese() + + QString KCalendarSystemJapanese::calendarType() const + { +- return QLatin1String( "japanese" ); ++ return QLatin1String("japanese"); + } + + QDate KCalendarSystemJapanese::epoch() const + { + // 0001-01-01 Gregorian for now +- return QDate::fromJulianDay( 1721426 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemJapanese::earliestValidDate() const + { + // 0001-01-01 Gregorian for now +- return QDate::fromJulianDay( 1721426 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemJapanese::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 9999-12-31 Gregorian +- return QDate::fromJulianDay( 5373484 ); ++ return QDate::fromJulianDay(5373484); + } + +-bool KCalendarSystemJapanese::isValid( int year, int month, int day ) const ++bool KCalendarSystemJapanese::isValid(int year, int month, int day) const + { +- return KCalendarSystemGregorianProleptic::isValid( year, month, day ); ++ return KCalendarSystemGregorian::isValid(year, month, day); + } + +-bool KCalendarSystemJapanese::isValid( const QDate &date ) const ++bool KCalendarSystemJapanese::isValid(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::isValid( date ); ++ return KCalendarSystemGregorian::isValid(date); + } + +-bool KCalendarSystemJapanese::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJapanese::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, year, month, day ); ++ return KCalendarSystemGregorian::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemJapanese::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemJapanese::isLeapYear(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, y, m, d ); ++ return KCalendarSystemGregorian::isLeapYear(date); + } + +-int KCalendarSystemJapanese::year( const QDate &date ) const ++QString KCalendarSystemJapanese::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::year( date ); ++ return KCalendarSystemGregorian::monthName(month, year, format); + } + +-int KCalendarSystemJapanese::month( const QDate &date ) const ++QString KCalendarSystemJapanese::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::month( date ); ++ return KCalendarSystemGregorian::monthName(date, format); + } + +-int KCalendarSystemJapanese::day( const QDate &date ) const ++QString KCalendarSystemJapanese::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::day( date ); ++ return KCalendarSystemGregorian::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemJapanese::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemJapanese::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::addYears( date, nyears ); ++ return KCalendarSystemGregorian::weekDayName(date, format); + } + +-QDate KCalendarSystemJapanese::addMonths( const QDate &date, int nmonths ) const ++int KCalendarSystemJapanese::yearStringToInteger(const QString &sNum, int &iLength) const + { +- return KCalendarSystemGregorianProleptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemJapanese::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemGregorianProleptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemJapanese::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::monthsInYear( date ); +-} +- +-int KCalendarSystemJapanese::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( date ); +-} +- +-int KCalendarSystemJapanese::weeksInYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( year ); +-} +- +-int KCalendarSystemJapanese::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInYear( date ); +-} +- +-int KCalendarSystemJapanese::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInMonth( date ); +-} +- +-int KCalendarSystemJapanese::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInWeek( date ); +-} +- +-int KCalendarSystemJapanese::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfYear( date ); +-} +- +-int KCalendarSystemJapanese::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemJapanese::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemGregorianProleptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemJapanese::isLeapYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemJapanese::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemJapanese::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemJapanese::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( date, format ); +-} +- +-QString KCalendarSystemJapanese::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemJapanese::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemJapanese::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemJapanese::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemJapanese::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemJapanese::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- QString gannen = i18nc( "Japanese year 1 of era", "Gannen" ); +- if ( sNum.startsWith( gannen, Qt::CaseInsensitive ) ) { ++ QString gannen = i18nc("Japanese year 1 of era", "Gannen"); ++ if (sNum.startsWith(gannen, Qt::CaseInsensitive)) { + iLength = gannen.length(); + return 1; + } else { +- return KCalendarSystemGregorianProleptic::yearStringToInteger( sNum, iLength ); ++ return KCalendarSystemGregorian::yearStringToInteger(sNum, iLength); + } + } + +-int KCalendarSystemJapanese::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJapanese::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemJapanese::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemJapanese::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemJapanese::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemJapanese::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemJapanese::weekStartDay() const +-{ +- return KCalendarSystemGregorianProleptic::weekStartDay(); +-} +- + int KCalendarSystemJapanese::weekDayOfPray() const + { + return 7; // TODO JPL ??? +@@ -341,17 +205,17 @@ int KCalendarSystemJapanese::weekDayOfPray() const + + bool KCalendarSystemJapanese::isLunar() const + { +- return KCalendarSystemGregorianProleptic::isLunar(); ++ return KCalendarSystemGregorian::isLunar(); + } + + bool KCalendarSystemJapanese::isLunisolar() const + { +- return KCalendarSystemGregorianProleptic::isLunisolar(); ++ return KCalendarSystemGregorian::isLunisolar(); + } + + bool KCalendarSystemJapanese::isSolar() const + { +- return KCalendarSystemGregorianProleptic::isSolar(); ++ return KCalendarSystemGregorian::isSolar(); + } + + bool KCalendarSystemJapanese::isProleptic() const +@@ -359,12 +223,12 @@ bool KCalendarSystemJapanese::isProleptic() const + return false; + } + +-bool KCalendarSystemJapanese::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemJapanese::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- return KCalendarSystemGregorianProleptic::julianDayToDate( jd, year, month, day ); ++ return KCalendarSystemGregorian::julianDayToDate(jd, year, month, day); + } + +-bool KCalendarSystemJapanese::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemJapanese::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemGregorianProleptic::dateToJulianDay( year, month, day, jd ); ++ return KCalendarSystemGregorian::dateToJulianDay(year, month, day, jd); + } +diff --git a/kdecore/date/kcalendarsystemjapanese_p.h b/kdecore/date/kcalendarsystemjapanese_p.h +index 5409dfc..1781f8e 100644 +--- a/kdecore/date/kcalendarsystemjapanese_p.h ++++ b/kdecore/date/kcalendarsystemjapanese_p.h +@@ -20,7 +20,7 @@ + #ifndef KCALENDARSYSTEMJAPANESE_H + #define KCALENDARSYSTEMJAPANESE_H + +-#include "kcalendarsystemgregorianproleptic_p.h" ++#include "kcalendarsystemgregorian_p.h" + + class KCalendarSystemJapanesePrivate; + +@@ -35,11 +35,11 @@ class KCalendarSystemJapanesePrivate; + * + * @author John Layt <john@layt.net> + */ +-class KCalendarSystemJapanese: public KCalendarSystemGregorianProleptic ++class KCalendarSystemJapanese: public KCalendarSystemGregorian + { + public: +- explicit KCalendarSystemJapanese( const KLocale *locale = 0 ); +- explicit KCalendarSystemJapanese( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemJapanese(const KLocale *locale = 0); ++ explicit KCalendarSystemJapanese(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemJapanese(); + + virtual QString calendarType() const; +@@ -47,58 +47,21 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,11 +69,11 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemJapanese( KCalendarSystemJapanesePrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemJapanese(KCalendarSystemJapanesePrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemJapanese) +diff --git a/kdecore/date/kcalendarsystemjulian.cpp b/kdecore/date/kcalendarsystemjulian.cpp +index 5dbb71e..3372bb5 100644 +--- a/kdecore/date/kcalendarsystemjulian.cpp ++++ b/kdecore/date/kcalendarsystemjulian.cpp +@@ -31,34 +31,34 @@ + class KCalendarSystemJulianPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemJulianPrivate( KCalendarSystemJulian *q ); ++ explicit KCalendarSystemJulianPrivate(KCalendarSystemJulian *q); + + virtual ~KCalendarSystemJulianPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + + bool m_useCommonEra; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemJulianPrivate::KCalendarSystemJulianPrivate( KCalendarSystemJulian *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemJulianPrivate::KCalendarSystemJulianPrivate(KCalendarSystemJulian *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -75,56 +75,56 @@ void KCalendarSystemJulianPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- KConfigGroup cg( config(), QString::fromLatin1( "KCalendarSystem %1" ).arg( q->calendarType() ) ); +- m_useCommonEra = cg.readEntry( "UseCommonEra", false ); ++ KConfigGroup cg(config(), QString::fromLatin1("KCalendarSystem %1").arg(q->calendarType(q->calendarSystem()))); ++ m_useCommonEra = cg.readEntry("UseCommonEra", false); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Julian Common Era, years < 0, LongFormat", "Before Common Era" ); +- shortName = i18nc( "Calendar Era: Julian Common Era, years < 0, ShortFormat", "BCE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Julian Common Era, years < 0, LongFormat", "Before Common Era"); ++ shortName = i18nc("Calendar Era: Julian Common Era, years < 0, ShortFormat", "BCE"); + } else { +- name = i18nc( "Calendar Era: Julian Christian Era, years < 0, LongFormat", "Before Christ" ); +- shortName = i18nc( "Calendar Era: Julian Christian Era, years < 0, ShortFormat", "BC" ); ++ name = i18nc("Calendar Era: Julian Christian Era, years < 0, LongFormat", "Before Christ"); ++ shortName = i18nc("Calendar Era: Julian Christian Era, years < 0, ShortFormat", "BC"); + } +- format = i18nc( "(kdedt-format) Julian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC" ); +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Julian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC"); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), name, shortName, format); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Julian Common Era, years > 0, LongFormat", "Common Era" ); +- shortName = i18nc( "Calendar Era: Julian Common Era, years > 0, ShortFormat", "CE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Julian Common Era, years > 0, LongFormat", "Common Era"); ++ shortName = i18nc("Calendar Era: Julian Common Era, years > 0, ShortFormat", "CE"); + } else { +- name = i18nc( "Calendar Era: Julian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Julian Christian Era, years > 0, ShortFormat", "AD" ); ++ name = i18nc("Calendar Era: Julian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Julian Christian Era, years > 0, ShortFormat", "AD"); + } +- format = i18nc( "(kdedt-format) Julian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Julian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemJulianPrivate::monthsInYear( int year ) const ++int KCalendarSystemJulianPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemJulianPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemJulianPrivate::daysInMonth(int year, int month) const + { +- if ( month == 2 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 2) { ++ if (isLeapYear(year)) { + return 29; + } else { + return 28; + } + } + +- if ( month == 4 || month == 6 || month == 9 || month == 11 ) { ++ if (month == 4 || month == 6 || month == 9 || month == 11) { + return 30; + } + + return 31; + } + +-int KCalendarSystemJulianPrivate::daysInYear( int year ) const ++int KCalendarSystemJulianPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -136,13 +136,13 @@ int KCalendarSystemJulianPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemJulianPrivate::isLeapYear( int year ) const ++bool KCalendarSystemJulianPrivate::isLeapYear(int year) const + { +- if ( year < 1 ) { ++ if (year < 1) { + year = year + 1; + } + +- if ( year % 4 == 0 ) { ++ if (year % 4 == 0) { + return true; + } + +@@ -179,459 +179,314 @@ int KCalendarSystemJulianPrivate::latestValidYear() const + return 9999; + } + +-QString KCalendarSystemJulianPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemJulianPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::NarrowName", "J").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::NarrowName", "F" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::NarrowName", "F").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::NarrowName", "M").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::NarrowName", "A").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::NarrowName", "M").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::NarrowName", "J").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::NarrowName", "J").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::NarrowName", "A").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::NarrowName", "S").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::NarrowName", "O" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::NarrowName", "O").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::NarrowName", "N").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::NarrowName", "D" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::NarrowName", "D").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::ShortName Possessive", "of Jan" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::ShortName Possessive", "of Jan").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::ShortName Possessive", "of Feb" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::ShortName Possessive", "of Feb").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::ShortName Possessive", "of Mar" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::ShortName Possessive", "of Mar").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::ShortName Possessive", "of Apr" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::ShortName Possessive", "of Apr").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::ShortName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::ShortName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::ShortName Possessive", "of Jun" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::ShortName Possessive", "of Jun").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::ShortName Possessive", "of Jul" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::ShortName Possessive", "of Jul").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::ShortName Possessive", "of Aug" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::ShortName Possessive", "of Aug").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::ShortName Possessive", "of Sep" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::ShortName Possessive", "of Sep").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::ShortName Possessive", "of Oct" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::ShortName Possessive", "of Oct").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::ShortName Possessive", "of Nov" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::ShortName Possessive", "of Nov").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::ShortName Possessive", "of Dec" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::ShortName Possessive", "of Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::ShortName", "Jan" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::ShortName", "Jan").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::ShortName", "Feb" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::ShortName", "Feb").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::ShortName", "Mar" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::ShortName", "Mar").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::ShortName", "Apr" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::ShortName", "Apr").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::ShortName", "May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::ShortName", "May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::ShortName", "Jun" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::ShortName", "Jun").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::ShortName", "Jul" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::ShortName", "Jul").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::ShortName", "Aug" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::ShortName", "Aug").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::ShortName", "Sep" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::ShortName", "Sep").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::ShortName", "Oct" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::ShortName", "Oct").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::ShortName", "Nov" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::ShortName", "Nov").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::ShortName", "Dec" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::ShortName", "Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::LongName Possessive", "of January" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::LongName Possessive", "of January").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::LongName Possessive", "of February" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::LongName Possessive", "of February").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::LongName Possessive", "of March" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::LongName Possessive", "of March").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::LongName Possessive", "of April" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::LongName Possessive", "of April").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::LongName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::LongName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::LongName Possessive", "of June" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::LongName Possessive", "of June").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::LongName Possessive", "of July" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::LongName Possessive", "of July").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::LongName Possessive", "of August" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::LongName Possessive", "of August").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::LongName Possessive", "of September" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::LongName Possessive", "of September").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::LongName Possessive", "of October" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::LongName Possessive", "of October").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::LongName Possessive", "of November" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::LongName Possessive", "of November").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::LongName Possessive", "of December" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::LongName Possessive", "of December").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::LongName", "January" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::LongName", "January").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::LongName", "February" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::LongName", "February").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::LongName", "March" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::LongName", "March").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::LongName", "April" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::LongName", "April").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::LongName", "May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::LongName", "May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::LongName", "June" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::LongName", "June").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::LongName", "July" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::LongName", "July").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::LongName", "August" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::LongName", "August").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::LongName", "September" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::LongName", "September").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::LongName", "October" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::LongName", "October").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::LongName", "November" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::LongName", "November").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::LongName", "December" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::LongName", "December").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemJulianPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemJulianPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Julian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Julian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); + case 2: +- return ki18nc( "Julian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Julian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); + case 3: +- return ki18nc( "Julian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); ++ return ki18nc("Julian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); + case 4: +- return ki18nc( "Julian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Julian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); + case 5: +- return ki18nc( "Julian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); ++ return ki18nc("Julian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); + case 6: +- return ki18nc( "Julian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Julian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Julian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Julian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Julian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); ++ return ki18nc("Julian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); + case 2: +- return ki18nc( "Julian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); ++ return ki18nc("Julian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); + case 3: +- return ki18nc( "Julian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); ++ return ki18nc("Julian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); + case 4: +- return ki18nc( "Julian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); ++ return ki18nc("Julian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); + case 5: +- return ki18nc( "Julian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); ++ return ki18nc("Julian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); + case 6: +- return ki18nc( "Julian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); ++ return ki18nc("Julian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); + case 7: +- return ki18nc( "Julian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); ++ return ki18nc("Julian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Julian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); ++ return ki18nc("Julian weekday 1 - KLocale::LongName", "Monday").toString(locale()); + case 2: +- return ki18nc( "Julian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); ++ return ki18nc("Julian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); + case 3: +- return ki18nc( "Julian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); ++ return ki18nc("Julian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); + case 4: +- return ki18nc( "Julian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); ++ return ki18nc("Julian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); + case 5: +- return ki18nc( "Julian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); ++ return ki18nc("Julian weekday 5 - KLocale::LongName", "Friday").toString(locale()); + case 6: +- return ki18nc( "Julian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); ++ return ki18nc("Julian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); + case 7: +- return ki18nc( "Julian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); ++ return ki18nc("Julian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemJulian::KCalendarSystemJulian( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJulianPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemJulian::KCalendarSystemJulian(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJulianPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJulian::KCalendarSystemJulian( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJulianPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemJulian::KCalendarSystemJulian(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJulianPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJulian::KCalendarSystemJulian( KCalendarSystemJulianPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemJulian::KCalendarSystemJulian(KCalendarSystemJulianPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemJulian::~KCalendarSystemJulian() + { +- delete dont_use; + } + + QString KCalendarSystemJulian::calendarType() const + { +- return QLatin1String( "julian" ); ++ return QLatin1String("julian"); + } + + QDate KCalendarSystemJulian::epoch() const + { +- return QDate::fromJulianDay( 1721426 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemJulian::earliestValidDate() const + { + // 1 Jan 4712 BC, no year zero, cant be 4713BC due to error in QDate that day 0 is not valid + // and we really need the first in each year to be valid for the date maths +- return QDate::fromJulianDay( 366 ); ++ return QDate::fromJulianDay(366); + } + + QDate KCalendarSystemJulian::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 31 Dec 9999 AD, no year zero +- return QDate::fromJulianDay( 5373557 ); ++ return QDate::fromJulianDay(5373557); + } + +-bool KCalendarSystemJulian::isValid( int year, int month, int day ) const ++bool KCalendarSystemJulian::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemJulian::isValid( const QDate &date ) const ++bool KCalendarSystemJulian::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemJulian::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJulian::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemJulian::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemJulian::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setDate( date, y, m, d ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemJulian::year( const QDate &date ) const ++QString KCalendarSystemJulian::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemJulian::month( const QDate &date ) const ++QString KCalendarSystemJulian::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::month( date ); ++ return KCalendarSystem::monthName(date, format); + } + +-int KCalendarSystemJulian::day( const QDate &date ) const ++QString KCalendarSystemJulian::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::day( date ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemJulian::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemJulian::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemJulian::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemJulian::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemJulian::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemJulian::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemJulian::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemJulian::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemJulian::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemJulian::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemJulian::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemJulian::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemJulian::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemJulian::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemJulian::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemJulian::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemJulian::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemJulian::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemJulian::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemJulian::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemJulian::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemJulian::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemJulian::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJulian::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJulian::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemJulian::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemJulian::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemJulian::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemJulian::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemJulian::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemJulian::weekDayOfPray() const +@@ -659,7 +514,7 @@ bool KCalendarSystemJulian::isProleptic() const + return true; + } + +-bool KCalendarSystemJulian::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemJulian::julianDayToDate(int jd, int &year, int &month, int &day) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -668,23 +523,23 @@ bool KCalendarSystemJulian::julianDayToDate( int jd, int &year, int &month, int + + int b = 0; + int c = jd + 32082; +- int d = ( ( 4 * c ) + 3 ) / 1461; +- int e = c - ( ( 1461 * d ) / 4 ); +- int m = ( ( 5 * e ) + 2 ) / 153; +- day = e - ( ( (153 * m ) + 2 ) / 5 ) + 1; +- month = m + 3 - ( 12 * ( m / 10 ) ); +- year = ( 100 * b ) + d - 4800 + ( m / 10 ); ++ int d = ((4 * c) + 3) / 1461; ++ int e = c - ((1461 * d) / 4); ++ int m = ((5 * e) + 2) / 153; ++ day = e - (((153 * m) + 2) / 5) + 1; ++ month = m + 3 - (12 * (m / 10)); ++ year = (100 * b) + d - 4800 + (m / 10); + + // If year is -ve then is BC. In Julian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- if ( year < 1 ) { ++ if (year < 1) { + year = year - 1; + } + + return true; + } + +-bool KCalendarSystemJulian::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemJulian::dateToJulianDay(int year, int month, int day, int &jd) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -694,20 +549,20 @@ bool KCalendarSystemJulian::dateToJulianDay( int year, int month, int day, int & + // If year is -ve then is BC. In Julian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally + int y; +- if ( year < 1 ) { ++ if (year < 1) { + y = year + 1; + } else { + y = year; + } + +- int a = ( 14 - month ) / 12; ++ int a = (14 - month) / 12; + y = y + 4800 - a; +- int m = month + ( 12 * a ) - 3; ++ int m = month + (12 * a) - 3; + + jd = day +- + ( ( ( 153 * m ) + 2 ) / 5 ) +- + ( 365 * y ) +- + ( y / 4 ) ++ + (((153 * m) + 2) / 5) ++ + (365 * y) ++ + (y / 4) + - 32083; + + return true; +diff --git a/kdecore/date/kcalendarsystemjulian_p.h b/kdecore/date/kcalendarsystemjulian_p.h +index 5976567..ebcad4a 100644 +--- a/kdecore/date/kcalendarsystemjulian_p.h ++++ b/kdecore/date/kcalendarsystemjulian_p.h +@@ -41,8 +41,8 @@ class KCalendarSystemJulianPrivate; + class KCalendarSystemJulian: public KCalendarSystem + { + public: +- explicit KCalendarSystemJulian( const KLocale *locale = 0 ); +- explicit KCalendarSystemJulian( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemJulian(const KLocale *locale = 0); ++ explicit KCalendarSystemJulian(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemJulian(); + + virtual QString calendarType() const; +@@ -50,58 +50,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -109,15 +70,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemJulian( KCalendarSystemJulianPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemJulian(KCalendarSystemJulianPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemJulian ) +- KCalendarSystemJulianPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemJulian) + }; + + #endif // KCALENDARSYSTEMJULIAN_H +diff --git a/kdecore/date/kcalendarsystemminguo.cpp b/kdecore/date/kcalendarsystemminguo.cpp +index 0230f93..66aea58 100644 +--- a/kdecore/date/kcalendarsystemminguo.cpp ++++ b/kdecore/date/kcalendarsystemminguo.cpp +@@ -18,30 +18,30 @@ + */ + + #include "kcalendarsystemminguo_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + + #include "kdebug.h" + #include "klocale.h" + + #include <QtCore/QDate> + +-//Reuse the Gregorian Proleptic private implementation +-class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianProlepticPrivate ++//Reuse the Gregorian private implementation ++class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianPrivate + { + public: +- explicit KCalendarSystemMinguoPrivate( KCalendarSystemMinguo *q ); ++ explicit KCalendarSystemMinguoPrivate(KCalendarSystemMinguo *q); + virtual ~KCalendarSystemMinguoPrivate(); + + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual int earliestValidYear() const; + }; + +-//Override only a few of the Gregorian Proleptic private methods ++//Override only a few of the Gregorian private methods + +-KCalendarSystemMinguoPrivate::KCalendarSystemMinguoPrivate( KCalendarSystemMinguo *q ) +- : KCalendarSystemGregorianProlepticPrivate( q ) ++KCalendarSystemMinguoPrivate::KCalendarSystemMinguoPrivate(KCalendarSystemMinguo *q) ++ : KCalendarSystemGregorianPrivate(q) + { + } + +@@ -58,15 +58,15 @@ void KCalendarSystemMinguoPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- name = i18nc( "Calendar Era: Taiwan Republic of China Era, years > 0, LongFormat", "Republic of China Era" ); +- shortName = i18nc( "Calendar Era: Taiwan Republic of China Era, years > 0, ShortFormat", "ROC" ); +- format = i18nc( "(kdedt-format) Taiwan, ROC, full era year format used for %EY, e.g. ROC 99", "%EC %Ey" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Taiwan Republic of China Era, years > 0, LongFormat", "Republic of China Era"); ++ shortName = i18nc("Calendar Era: Taiwan Republic of China Era, years > 0, ShortFormat", "ROC"); ++ format = i18nc("(kdedt-format) Taiwan, ROC, full era year format used for %EY, e.g. ROC 99", "%EC %Ey"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-bool KCalendarSystemMinguoPrivate::isLeapYear( int year ) const ++bool KCalendarSystemMinguoPrivate::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProlepticPrivate::isLeapYear( year + 1911 ); ++ return KCalendarSystemGregorianPrivate::isLeapYear(year + 1911); + } + + int KCalendarSystemMinguoPrivate::earliestValidYear() const +@@ -75,23 +75,23 @@ int KCalendarSystemMinguoPrivate::earliestValidYear() const + } + + +-KCalendarSystemMinguo::KCalendarSystemMinguo( const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemMinguoPrivate( this ), KSharedConfig::Ptr(), locale ) ++KCalendarSystemMinguo::KCalendarSystemMinguo(const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemMinguoPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemMinguo::KCalendarSystemMinguo( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemMinguoPrivate( this ), config, locale ) ++KCalendarSystemMinguo::KCalendarSystemMinguo(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemMinguoPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemMinguo::KCalendarSystemMinguo( KCalendarSystemMinguoPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( dd, config, locale ) ++KCalendarSystemMinguo::KCalendarSystemMinguo(KCalendarSystemMinguoPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemMinguo::~KCalendarSystemMinguo() +@@ -100,13 +100,13 @@ KCalendarSystemMinguo::~KCalendarSystemMinguo() + + QString KCalendarSystemMinguo::calendarType() const + { +- return QLatin1String( "minguo" ); ++ return QLatin1String("minguo"); + } + + QDate KCalendarSystemMinguo::epoch() const + { + // 0001-01-01 = 1912-01-01 AD Gregorian +- return QDate::fromJulianDay( 2419403 ); ++ return QDate::fromJulianDay(2419403); + } + + QDate KCalendarSystemMinguo::earliestValidDate() const +@@ -118,188 +118,47 @@ QDate KCalendarSystemMinguo::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 9999-12-31 = 11910-12-31 AD Gregorian +- return QDate::fromJulianDay( 6071462 ); ++ return QDate::fromJulianDay(6071462); + } + +-bool KCalendarSystemMinguo::isValid( int year, int month, int day ) const ++bool KCalendarSystemMinguo::isValid(int year, int month, int day) const + { +- return KCalendarSystemGregorianProleptic::isValid( year, month, day ); ++ return KCalendarSystemGregorian::isValid(year, month, day); + } + +-bool KCalendarSystemMinguo::isValid( const QDate &date ) const ++bool KCalendarSystemMinguo::isValid(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::isValid( date ); ++ return KCalendarSystemGregorian::isValid(date); + } + +-bool KCalendarSystemMinguo::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemMinguo::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, year, month, day ); ++ return KCalendarSystemGregorian::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemMinguo::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemMinguo::isLeapYear(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, y, m, d ); ++ return KCalendarSystemGregorian::isLeapYear(date); + } + +-int KCalendarSystemMinguo::year( const QDate &date ) const ++QString KCalendarSystemMinguo::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::year( date ); ++ return KCalendarSystemGregorian::monthName(month, year, format); + } + +-int KCalendarSystemMinguo::month( const QDate &date ) const ++QString KCalendarSystemMinguo::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::month( date ); ++ return KCalendarSystemGregorian::monthName(date, format); + } + +-int KCalendarSystemMinguo::day( const QDate &date ) const ++QString KCalendarSystemMinguo::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::day( date ); ++ return KCalendarSystemGregorian::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemMinguo::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemMinguo::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemMinguo::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystemGregorianProleptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemMinguo::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemGregorianProleptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemMinguo::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::monthsInYear( date ); +-} +- +-int KCalendarSystemMinguo::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( date ); +-} +- +-int KCalendarSystemMinguo::weeksInYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( year ); +-} +- +-int KCalendarSystemMinguo::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInYear( date ); +-} +- +-int KCalendarSystemMinguo::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInMonth( date ); +-} +- +-int KCalendarSystemMinguo::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInWeek( date ); +-} +- +-int KCalendarSystemMinguo::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfYear( date ); +-} +- +-int KCalendarSystemMinguo::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemMinguo::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemGregorianProleptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemMinguo::isLeapYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemMinguo::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemMinguo::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemMinguo::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( date, format ); +-} +- +-QString KCalendarSystemMinguo::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemMinguo::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemMinguo::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemMinguo::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemMinguo::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemMinguo::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemMinguo::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemMinguo::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemMinguo::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemMinguo::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemMinguo::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemMinguo::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemMinguo::weekStartDay() const +-{ +- return KCalendarSystemGregorianProleptic::weekStartDay(); ++ return KCalendarSystemGregorian::weekDayName(date, format); + } + + int KCalendarSystemMinguo::weekDayOfPray() const +@@ -309,17 +168,17 @@ int KCalendarSystemMinguo::weekDayOfPray() const + + bool KCalendarSystemMinguo::isLunar() const + { +- return KCalendarSystemGregorianProleptic::isLunar(); ++ return KCalendarSystemGregorian::isLunar(); + } + + bool KCalendarSystemMinguo::isLunisolar() const + { +- return KCalendarSystemGregorianProleptic::isLunisolar(); ++ return KCalendarSystemGregorian::isLunisolar(); + } + + bool KCalendarSystemMinguo::isSolar() const + { +- return KCalendarSystemGregorianProleptic::isSolar(); ++ return KCalendarSystemGregorian::isSolar(); + } + + bool KCalendarSystemMinguo::isProleptic() const +@@ -327,15 +186,15 @@ bool KCalendarSystemMinguo::isProleptic() const + return false; + } + +-bool KCalendarSystemMinguo::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemMinguo::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- bool result = KCalendarSystemGregorianProleptic::julianDayToDate( jd, year, month, day ); ++ bool result = KCalendarSystemGregorian::julianDayToDate(jd, year, month, day); + year = year - 1911; + return result; + } + +-bool KCalendarSystemMinguo::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemMinguo::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemGregorianProleptic::dateToJulianDay( year + 1911, month, day, jd ); ++ return KCalendarSystemGregorian::dateToJulianDay(year + 1911, month, day, jd); + } + +diff --git a/kdecore/date/kcalendarsystemminguo_p.h b/kdecore/date/kcalendarsystemminguo_p.h +index a3f0acc..6e257af 100644 +--- a/kdecore/date/kcalendarsystemminguo_p.h ++++ b/kdecore/date/kcalendarsystemminguo_p.h +@@ -20,7 +20,7 @@ + #ifndef KCALENDARSYSTEMMINGUO_H + #define KCALENDARSYSTEMMINGUO_H + +-#include "kcalendarsystemgregorianproleptic_p.h" ++#include "kcalendarsystemgregorian_p.h" + + class KCalendarSystemMinguoPrivate; + +@@ -35,11 +35,11 @@ class KCalendarSystemMinguoPrivate; + * + * @author John Layt <john@layt.net> + */ +-class KCalendarSystemMinguo: public KCalendarSystemGregorianProleptic ++class KCalendarSystemMinguo: public KCalendarSystemGregorian + { + public: +- explicit KCalendarSystemMinguo( const KLocale *locale = 0 ); +- explicit KCalendarSystemMinguo( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemMinguo(const KLocale *locale = 0); ++ explicit KCalendarSystemMinguo(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemMinguo(); + + virtual QString calendarType() const; +@@ -47,58 +47,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,11 +67,11 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemMinguo( KCalendarSystemMinguoPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemMinguo(KCalendarSystemMinguoPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemMinguo) +diff --git a/kdecore/date/kcalendarsystemprivate_p.h b/kdecore/date/kcalendarsystemprivate_p.h +index ce3a6bc..406fece 100644 +--- a/kdecore/date/kcalendarsystemprivate_p.h ++++ b/kdecore/date/kcalendarsystemprivate_p.h +@@ -28,8 +28,7 @@ class KCalendarSystem; + class KCalendarEra; + class KLocale; + +-struct DateComponents +-{ ++struct DateComponents { + int day; + int month; + int year; +@@ -47,74 +46,74 @@ struct DateComponents + class KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemPrivate( KCalendarSystem *q ); ++ explicit KCalendarSystemPrivate(KCalendarSystem *q); + + virtual ~KCalendarSystemPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive = false ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive = false) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + + // Virtual methods to re-implement if special maths needed +- virtual int week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum ) const; +- virtual int isoWeekNumber( const QDate &date, int *yearNum ) const; +- virtual int regularWeekNumber( const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear ) const; +- virtual int simpleWeekNumber( const QDate &date, int *yearNum ) const; +- virtual int weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const; +- virtual int isoWeeksInYear( int year ) const; +- virtual int regularWeeksInYear( int year, int weekStartDay, int firstWeekNumber ) const; +- virtual int simpleWeeksInYear( int year ) const; ++ virtual int week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const; ++ virtual int isoWeekNumber(const QDate &date, int *yearNum) const; ++ virtual int regularWeekNumber(const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear) const; ++ virtual int simpleWeekNumber(const QDate &date, int *yearNum) const; ++ virtual int weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const; ++ virtual int isoWeeksInYear(int year) const; ++ virtual int regularWeeksInYear(int year, int weekStartDay, int firstWeekNumber) const; ++ virtual int simpleWeeksInYear(int year) const; + + // Virtual methods to re-implement if special maths needed + // Currently only Hebrew may need special conversion, rest should be OK +- virtual int yearsDifference( const QDate &fromDate, const QDate &toDate ) const; +- virtual int monthsDifference( const QDate &fromDate, const QDate &toDate ) const; +- virtual void dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const; ++ virtual int yearsDifference(const QDate &fromDate, const QDate &toDate) const; ++ virtual int monthsDifference(const QDate &fromDate, const QDate &toDate) const; ++ virtual void dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const; + + // Virtual methods to re-implement if special number/string conversion needed + // Currently only Hebrew needs special conversion, rest use KLocale DigitSet +- virtual int integerFromString( const QString &string, int maxLength, int &readLength ) const; +- virtual QString stringFromInteger( int number, int padWidth = 0, QChar padChar = QLatin1Char('0') ) const; +- virtual QString stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const; ++ virtual int integerFromString(const QString &string, int maxLength, int &readLength) const; ++ virtual QString stringFromInteger(int number, int padWidth = 0, QChar padChar = QLatin1Char('0')) const; ++ virtual QString stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const; + + // Utility functions +- bool setAnyDate( QDate &date, int year, int month, int day ) const; +- int addYears( int startYear, int yearsToAdd ) const; +- int differenceYearNumbers( int fromYear, int toYear ) const; ++ bool setAnyDate(QDate &date, int year, int month, int day) const; ++ int addYears(int startYear, int yearsToAdd) const; ++ int differenceYearNumbers(int fromYear, int toYear) const; + QDate invalidDate() const; +- QString simpleDateString( const QString &str ) const; +- int dayOfYear( const QDate &date ) const; +- int dayOfWeek( const QDate &date ) const; +- QDate firstDayOfYear( int year ) const; +- QDate lastDayOfYear( int year ) const; +- QDate firstDayOfMonth( int year, int month ) const; +- QDate lastDayOfMonth( int year, int month ) const; ++ QString simpleDateString(const QString &str) const; ++ int dayOfYear(const QDate &date) const; ++ int dayOfWeek(const QDate &date) const; ++ QDate firstDayOfYear(int year) const; ++ QDate lastDayOfYear(int year) const; ++ QDate firstDayOfMonth(int year, int month) const; ++ QDate lastDayOfMonth(int year, int month) const; + const KLocale *locale() const; +- void loadEraList( const KConfigGroup & cg ); +- void addEra( char direction, int offset, const QDate &startDate, int startYear, const QDate &endDate, +- const QString &name, const QString &shortName, const QString &format ); ++ void loadEraList(const KConfigGroup & cg); ++ void addEra(char direction, int offset, const QDate &startDate, int startYear, const QDate &endDate, ++ const QString &name, const QString &shortName, const QString &format); + QList<KCalendarEra> *eraList() const; +- KCalendarEra era( const QDate &eraDate ) const; +- KCalendarEra era( const QString &eraName, int yearInEra ) const; ++ KCalendarEra era(const QDate &eraDate) const; ++ KCalendarEra era(const QString &eraName, int yearInEra) const; + int shortYearWindowStartYear() const; +- int applyShortYearWindow( int inputYear ) const; +- void loadShortYearWindowStartYear( const KConfigGroup & cg ); ++ int applyShortYearWindow(int inputYear) const; ++ void loadShortYearWindowStartYear(const KConfigGroup & cg); + KSharedConfig::Ptr config(); +- void loadConfig( const QString & calendarType ); ++ void loadConfig(const QString & calendarType); + + // Global variables each calendar system must initialise + const KCalendarSystem *q; +diff --git a/kdecore/date/kcalendarsystemqdate.cpp b/kdecore/date/kcalendarsystemqdate.cpp +new file mode 100644 +index 0000000..1acf3be +--- /dev/null ++++ b/kdecore/date/kcalendarsystemqdate.cpp +@@ -0,0 +1,561 @@ ++/* ++ Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2010 John Layt <john@layt.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++// Derived QDate kde calendar class ++ ++#include "kcalendarsystemqdate_p.h" ++#include "kcalendarsystemprivate_p.h" ++#include "kcalendarera_p.h" ++ ++#include "kdebug.h" ++#include "klocale.h" ++#include "kglobal.h" ++#include "kconfiggroup.h" ++ ++#include <QtCore/QDate> ++#include <QtCore/QCharRef> ++ ++class KCalendarSystemQDatePrivate : public KCalendarSystemPrivate ++{ ++public: ++ explicit KCalendarSystemQDatePrivate(KCalendarSystemQDate *q); ++ ++ virtual ~KCalendarSystemQDatePrivate(); ++ ++ // Virtual methods each calendar system must re-implement ++ virtual KLocale::CalendarSystem calendarSystem() const; ++ virtual void loadDefaultEraList(); ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; ++ virtual int daysInWeek() const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool hasLeapMonths() const; ++ virtual bool hasYearZero() const; ++ virtual int maxDaysInWeek() const; ++ virtual int maxMonthsInYear() const; ++ virtual int earliestValidYear() const; ++ virtual int latestValidYear() const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; ++ ++ bool m_useCommonEra; ++}; ++ ++// Shared d pointer implementations ++ ++KCalendarSystemQDatePrivate::KCalendarSystemQDatePrivate(KCalendarSystemQDate *q) ++ : KCalendarSystemPrivate(q), ++ m_useCommonEra(false) ++ ++{ ++} ++ ++KCalendarSystemQDatePrivate::~KCalendarSystemQDatePrivate() ++{ ++} ++ ++KLocale::CalendarSystem KCalendarSystemQDatePrivate::calendarSystem() const ++{ ++ return KLocale::QDateCalendar; ++} ++ ++void KCalendarSystemQDatePrivate::loadDefaultEraList() ++{ ++ QString name, shortName, format; ++ ++ KConfigGroup lcg(config(), QString::fromLatin1("Locale")); ++ KConfigGroup cg = lcg.group(QString::fromLatin1("KCalendarSystem %1").arg(q->calendarType(q->calendarSystem()))); ++ m_useCommonEra = cg.readEntry("UseCommonEra", false); ++ ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE"); ++ } else { ++ name = i18nc("Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC"); ++ } ++ format = i18nc("(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC"); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), name, shortName, format); ++ ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE"); ++ } else { ++ name = i18nc("Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD"); ++ } ++ format = i18nc("(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); ++} ++ ++int KCalendarSystemQDatePrivate::monthsInYear(int year) const ++{ ++ Q_UNUSED(year) ++ return 12; ++} ++ ++int KCalendarSystemQDatePrivate::daysInMonth(int year, int month) const ++{ ++ QDate tempDate(year, month, 1); ++ return tempDate.daysInMonth(); ++} ++ ++int KCalendarSystemQDatePrivate::daysInYear(int year) const ++{ ++ QDate tempDate(year, 1, 1); ++ return tempDate.daysInYear(); ++} ++ ++int KCalendarSystemQDatePrivate::daysInWeek() const ++{ ++ return 7; ++} ++ ++bool KCalendarSystemQDatePrivate::isLeapYear(int year) const ++{ ++ return QDate::isLeapYear(year); ++} ++ ++bool KCalendarSystemQDatePrivate::hasLeapMonths() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDatePrivate::hasYearZero() const ++{ ++ return false; ++} ++ ++int KCalendarSystemQDatePrivate::maxDaysInWeek() const ++{ ++ return 7; ++} ++ ++int KCalendarSystemQDatePrivate::maxMonthsInYear() const ++{ ++ return 12; ++} ++ ++int KCalendarSystemQDatePrivate::earliestValidYear() const ++{ ++ return -4712; ++} ++ ++int KCalendarSystemQDatePrivate::latestValidYear() const ++{ ++ return 9999; ++} ++ ++QString KCalendarSystemQDatePrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const ++{ ++ Q_UNUSED(year); ++ ++ if (format == KLocale::NarrowName) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::NarrowName", "J").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::NarrowName", "F").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::NarrowName", "M").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::NarrowName", "A").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::NarrowName", "M").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::NarrowName", "J").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::NarrowName", "J").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::NarrowName", "A").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::NarrowName", "S").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::NarrowName", "O").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::NarrowName", "N").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::NarrowName", "D").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::ShortName Possessive", "of Jan").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::ShortName Possessive", "of Feb").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::ShortName Possessive", "of Mar").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::ShortName Possessive", "of Apr").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::ShortName Possessive", "of May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::ShortName Possessive", "of Jun").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::ShortName Possessive", "of Jul").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::ShortName Possessive", "of Aug").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::ShortName Possessive", "of Sep").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::ShortName Possessive", "of Oct").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::ShortName Possessive", "of Nov").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::ShortName Possessive", "of Dec").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::ShortName", "Jan").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::ShortName", "Feb").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::ShortName", "Mar").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::ShortName", "Apr").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::ShortName", "May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::ShortName", "Jun").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::ShortName", "Jul").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::ShortName", "Aug").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::ShortName", "Sep").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::ShortName", "Oct").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::ShortName", "Nov").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::ShortName", "Dec").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::LongName Possessive", "of January").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::LongName Possessive", "of February").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::LongName Possessive", "of March").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::LongName Possessive", "of April").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::LongName Possessive", "of May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::LongName Possessive", "of June").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::LongName Possessive", "of July").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::LongName Possessive", "of August").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::LongName Possessive", "of September").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::LongName Possessive", "of October").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::LongName Possessive", "of November").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::LongName Possessive", "of December").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ // Default to LongName ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::LongName", "January").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::LongName", "February").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::LongName", "March").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::LongName", "April").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::LongName", "May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::LongName", "June").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::LongName", "July").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::LongName", "August").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::LongName", "September").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::LongName", "October").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::LongName", "November").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::LongName", "December").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++QString KCalendarSystemQDatePrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const ++{ ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Gregorian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Gregorian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); ++ default: return QString(); ++ } ++ } ++ ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Gregorian weekday 1 - KLocale::LongName", "Monday").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian weekday 5 - KLocale::LongName", "Friday").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++ ++KCalendarSystemQDate::KCalendarSystemQDate(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemQDatePrivate(this), KSharedConfig::Ptr(), locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemQDate::KCalendarSystemQDate(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemQDatePrivate(this), config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemQDate::KCalendarSystemQDate(KCalendarSystemQDatePrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemQDate::~KCalendarSystemQDate() ++{ ++} ++ ++QString KCalendarSystemQDate::calendarType() const ++{ ++ return QLatin1String("gregorian"); ++} ++ ++QDate KCalendarSystemQDate::epoch() const ++{ ++ // 1 Jan 1 AD in Julian ++ return QDate::fromJulianDay(1721424); ++} ++ ++QDate KCalendarSystemQDate::earliestValidDate() const ++{ ++ // 1 Jan 4712 BC, no year zero, cant be 4713BC due to error in QDate that day 0 is not valid ++ // and we really need the first in each year to be valid for the date maths ++ return QDate::fromJulianDay(366); ++} ++ ++QDate KCalendarSystemQDate::latestValidDate() const ++{ ++ // Set to last day of year 9999 until confirm date formats & widets support > 9999 ++ // In Gregorian this is 9999-12-31, which is is jd 5373484 ++ // Can't call setDate( 9999, 12, 31 ) as it creates circular reference! ++ return QDate::fromJulianDay(5373484); ++} ++ ++bool KCalendarSystemQDate::isValid(int year, int month, int day) const ++{ ++ // Limit to max year 9999 for now, QDate allows to be greater ++ if (year <= 9999) { ++ return QDate::isValid(year, month, day); ++ } ++ ++ return false; ++} ++ ++bool KCalendarSystemQDate::isValid(const QDate &date) const ++{ ++ return KCalendarSystem::isValid(date); ++} ++ ++int KCalendarSystemQDate::year(const QDate &date) const ++{ ++ return date.year(); ++} ++ ++int KCalendarSystemQDate::month(const QDate &date) const ++{ ++ return date.month(); ++} ++ ++int KCalendarSystemQDate::day(const QDate &date) const ++{ ++ return date.day(); ++} ++ ++int KCalendarSystemQDate::daysInYear(const QDate &date) const ++{ ++ return date.daysInYear(); ++} ++ ++int KCalendarSystemQDate::daysInMonth(const QDate &date) const ++{ ++ return date.daysInMonth(); ++} ++ ++int KCalendarSystemQDate::dayOfYear(const QDate &date) const ++{ ++ return date.dayOfYear(); ++} ++ ++int KCalendarSystemQDate::dayOfWeek(const QDate &date) const ++{ ++ return date.dayOfWeek(); ++} ++ ++bool KCalendarSystemQDate::isLeapYear(int year) const ++{ ++ return QDate::isLeapYear(year); ++} ++ ++bool KCalendarSystemQDate::isLeapYear(const QDate &date) const ++{ ++ return QDate::isLeapYear(date.year()); ++} ++ ++QString KCalendarSystemQDate::monthName(int month, int year, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(month, year, format); ++} ++ ++QString KCalendarSystemQDate::monthName(const QDate &date, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(date, format); ++} ++ ++QString KCalendarSystemQDate::weekDayName(int weekDay, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(weekDay, format); ++} ++ ++QString KCalendarSystemQDate::weekDayName(const QDate &date, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(date, format); ++} ++ ++int KCalendarSystemQDate::weekDayOfPray() const ++{ ++ return 7; // sunday ++} ++ ++bool KCalendarSystemQDate::isLunar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDate::isLunisolar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDate::isSolar() const ++{ ++ return true; ++} ++ ++bool KCalendarSystemQDate::isProleptic() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDate::julianDayToDate(int jd, int &year, int &month, int &day) const ++{ ++ QDate date = QDate::fromJulianDay(jd); ++ ++ date.getDate(&year, &month, &day); ++ ++ return date.isValid(); ++} ++ ++bool KCalendarSystemQDate::dateToJulianDay(int year, int month, int day, int &jd) const ++{ ++ QDate date; ++ ++ date.setDate(year, month, day); ++ jd = date.toJulianDay(); ++ ++ return date.isValid(); ++} +diff --git a/kdecore/date/kcalendarsystemqdate_p.h b/kdecore/date/kcalendarsystemqdate_p.h +new file mode 100644 +index 0000000..5d86bd6 +--- /dev/null ++++ b/kdecore/date/kcalendarsystemqdate_p.h +@@ -0,0 +1,93 @@ ++/* ++ Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2010 John Layt <john@layt.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#ifndef KCALENDARSYSTEMQDATE_H ++#define KCALENDARSYSTEMQDATE_H ++ ++#include "kcalendarsystem.h" ++ ++class KCalendarSystemQDatePrivate; ++ ++/** ++ * @internal ++ * This is the QDate calendar implementation which combines the Julian and Gregorian ++ * calculations into a single calendar. It should always be used by default in Qt ++ * applications for consistency. ++ * ++ * @b license GNU-LGPL v.2+ ++ * ++ * @see KLocale,KCalendarSystem ++ * ++ * @author John Layt <john@layt.net> ++ */ ++class KCalendarSystemQDate: public KCalendarSystem ++{ ++public: ++ explicit KCalendarSystemQDate(const KLocale *locale = 0); ++ explicit KCalendarSystemQDate(const KSharedConfig::Ptr config, const KLocale *locale = 0); ++ virtual ~KCalendarSystemQDate(); ++ ++ virtual QString calendarType() const; ++ ++ virtual QDate epoch() const; ++ virtual QDate earliestValidDate() const; ++ virtual QDate latestValidDate() const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; ++ ++ virtual int year(const QDate &date) const; ++ virtual int month(const QDate &date) const; ++ virtual int day(const QDate &date) const; ++ ++ virtual int daysInYear(const QDate &date) const; ++ virtual int daysInMonth(const QDate &date) const; ++ ++ virtual int dayOfYear(const QDate &date) const; ++ virtual int dayOfWeek(const QDate &date) const; ++ ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; ++ ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; ++ ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; ++ ++ virtual int weekDayOfPray() const; ++ ++ virtual bool isLunar() const; ++ virtual bool isLunisolar() const; ++ virtual bool isSolar() const; ++ virtual bool isProleptic() const; ++ ++protected: ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemQDate(KCalendarSystemQDatePrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); ++ ++private: ++ Q_DECLARE_PRIVATE(KCalendarSystemQDate) ++}; ++ ++#endif +diff --git a/kdecore/date/kcalendarsystemthai.cpp b/kdecore/date/kcalendarsystemthai.cpp +index ab51aaa..9a1ca5a 100644 +--- a/kdecore/date/kcalendarsystemthai.cpp ++++ b/kdecore/date/kcalendarsystemthai.cpp +@@ -18,31 +18,31 @@ + */ + + #include "kcalendarsystemthai_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + + #include "kdebug.h" + #include "klocale.h" + + #include <QtCore/QDate> + +-//Reuse the Gregorian Proleptic private implementation +-class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianProlepticPrivate ++//Reuse the Gregorian private implementation ++class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianPrivate + { + public: +- explicit KCalendarSystemThaiPrivate( KCalendarSystemThai *q ); ++ explicit KCalendarSystemThaiPrivate(KCalendarSystemThai *q); + virtual ~KCalendarSystemThaiPrivate(); + + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasYearZero() const; + virtual int earliestValidYear() const; + }; + +-//Override only a few of the Gregorian Proleptic private methods ++//Override only a few of the Gregorian private methods + +-KCalendarSystemThaiPrivate::KCalendarSystemThaiPrivate( KCalendarSystemThai *q ) +- : KCalendarSystemGregorianProlepticPrivate( q ) ++KCalendarSystemThaiPrivate::KCalendarSystemThaiPrivate(KCalendarSystemThai *q) ++ : KCalendarSystemGregorianPrivate(q) + { + } + +@@ -59,15 +59,15 @@ void KCalendarSystemThaiPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- name = i18nc( "Calendar Era: Thai Buddhist Era, years > 0, LongFormat", "Buddhist Era" ); +- shortName = i18nc( "Calendar Era: Thai Buddhist Era, years > 0, ShortFormat", "BE" ); +- format = i18nc( "(kdedt-format) Thai, BE, full era year format used for %EY, e.g. 2000 BE", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Thai Buddhist Era, years > 0, LongFormat", "Buddhist Era"); ++ shortName = i18nc("Calendar Era: Thai Buddhist Era, years > 0, ShortFormat", "BE"); ++ format = i18nc("(kdedt-format) Thai, BE, full era year format used for %EY, e.g. 2000 BE", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-bool KCalendarSystemThaiPrivate::isLeapYear( int year ) const ++bool KCalendarSystemThaiPrivate::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProlepticPrivate::isLeapYear( year - 543 ); ++ return KCalendarSystemGregorianPrivate::isLeapYear(year - 543); + } + + bool KCalendarSystemThaiPrivate::hasYearZero() const +@@ -81,23 +81,23 @@ int KCalendarSystemThaiPrivate::earliestValidYear() const + } + + +-KCalendarSystemThai::KCalendarSystemThai( const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemThaiPrivate( this ), KSharedConfig::Ptr(), locale ) ++KCalendarSystemThai::KCalendarSystemThai(const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemThaiPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemThai::KCalendarSystemThai( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemThaiPrivate( this ), config, locale ) ++KCalendarSystemThai::KCalendarSystemThai(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemThaiPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemThai::KCalendarSystemThai( KCalendarSystemThaiPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( dd, config, locale ) ++KCalendarSystemThai::KCalendarSystemThai(KCalendarSystemThaiPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemThai::~KCalendarSystemThai() +@@ -106,13 +106,13 @@ KCalendarSystemThai::~KCalendarSystemThai() + + QString KCalendarSystemThai::calendarType() const + { +- return QLatin1String( "thai" ); ++ return QLatin1String("thai"); + } + + QDate KCalendarSystemThai::epoch() const + { + // 0000-01-01 = 0544-01-01 BC Gregorian = 0544-01-07 BC Julian +- return QDate::fromJulianDay( 1522734 ); ++ return QDate::fromJulianDay(1522734); + } + + QDate KCalendarSystemThai::earliestValidDate() const +@@ -124,188 +124,27 @@ QDate KCalendarSystemThai::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 9999-12-31 = 9456-12-31 AD Gregorian +- return QDate::fromJulianDay( 5175158 ); ++ return QDate::fromJulianDay(5175158); + } + +-bool KCalendarSystemThai::isValid( int year, int month, int day ) const ++bool KCalendarSystemThai::isValid(int year, int month, int day) const + { +- return KCalendarSystemGregorianProleptic::isValid( year, month, day ); ++ return KCalendarSystemGregorian::isValid(year, month, day); + } + +-bool KCalendarSystemThai::isValid( const QDate &date ) const ++bool KCalendarSystemThai::isValid(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::isValid( date ); ++ return KCalendarSystemGregorian::isValid(date); + } + +-bool KCalendarSystemThai::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemThai::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, year, month, day ); ++ return KCalendarSystemGregorian::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemThai::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemThai::isLeapYear(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, y, m, d ); +-} +- +-int KCalendarSystemThai::year( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::year( date ); +-} +- +-int KCalendarSystemThai::month( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::month( date ); +-} +- +-int KCalendarSystemThai::day( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::day( date ); +-} +- +-QDate KCalendarSystemThai::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystemGregorianProleptic::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemThai::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystemGregorianProleptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemThai::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemGregorianProleptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemThai::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::monthsInYear( date ); +-} +- +-int KCalendarSystemThai::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( date ); +-} +- +-int KCalendarSystemThai::weeksInYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( year ); +-} +- +-int KCalendarSystemThai::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInYear( date ); +-} +- +-int KCalendarSystemThai::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInMonth( date ); +-} +- +-int KCalendarSystemThai::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInWeek( date ); +-} +- +-int KCalendarSystemThai::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfYear( date ); +-} +- +-int KCalendarSystemThai::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemThai::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemGregorianProleptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemThai::isLeapYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemThai::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemThai::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemThai::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( date, format ); +-} +- +-QString KCalendarSystemThai::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemThai::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemThai::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemThai::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemThai::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemThai::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemThai::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemThai::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemThai::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemThai::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemThai::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemThai::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemThai::weekStartDay() const +-{ +- return KCalendarSystemGregorianProleptic::weekStartDay(); ++ return KCalendarSystemGregorian::isLeapYear(date); + } + + int KCalendarSystemThai::weekDayOfPray() const +@@ -315,17 +154,17 @@ int KCalendarSystemThai::weekDayOfPray() const + + bool KCalendarSystemThai::isLunar() const + { +- return KCalendarSystemGregorianProleptic::isLunar(); ++ return KCalendarSystemGregorian::isLunar(); + } + + bool KCalendarSystemThai::isLunisolar() const + { +- return KCalendarSystemGregorianProleptic::isLunisolar(); ++ return KCalendarSystemGregorian::isLunisolar(); + } + + bool KCalendarSystemThai::isSolar() const + { +- return KCalendarSystemGregorianProleptic::isSolar(); ++ return KCalendarSystemGregorian::isSolar(); + } + + bool KCalendarSystemThai::isProleptic() const +@@ -333,15 +172,15 @@ bool KCalendarSystemThai::isProleptic() const + return false; + } + +-bool KCalendarSystemThai::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemThai::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- bool result = KCalendarSystemGregorianProleptic::julianDayToDate( jd, year, month, day ); ++ bool result = KCalendarSystemGregorian::julianDayToDate(jd, year, month, day); + year = year + 543; + return result; + } + +-bool KCalendarSystemThai::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemThai::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemGregorianProleptic::dateToJulianDay( year - 543, month, day, jd ); ++ return KCalendarSystemGregorian::dateToJulianDay(year - 543, month, day, jd); + } + +diff --git a/kdecore/date/kcalendarsystemthai_p.h b/kdecore/date/kcalendarsystemthai_p.h +index c0007c0..9aa02a2 100644 +--- a/kdecore/date/kcalendarsystemthai_p.h ++++ b/kdecore/date/kcalendarsystemthai_p.h +@@ -20,7 +20,7 @@ + #ifndef KCALENDARSYSTEMTHAI_H + #define KCALENDARSYSTEMTHAI_H + +-#include "kcalendarsystemgregorianproleptic_p.h" ++#include "kcalendarsystemgregorian_p.h" + + class KCalendarSystemThaiPrivate; + +@@ -35,11 +35,11 @@ class KCalendarSystemThaiPrivate; + * + * @author John Layt <john@layt.net> + */ +-class KCalendarSystemThai: public KCalendarSystemGregorianProleptic ++class KCalendarSystemThai: public KCalendarSystemGregorian + { + public: +- explicit KCalendarSystemThai( const KLocale *locale = 0 ); +- explicit KCalendarSystemThai( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemThai(const KLocale *locale = 0); ++ explicit KCalendarSystemThai(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemThai(); + + virtual QString calendarType() const; +@@ -47,58 +47,13 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,11 +61,11 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemThai( KCalendarSystemThaiPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemThai(KCalendarSystemThaiPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemThai) +diff --git a/kdecore/date/kdatetime.cpp b/kdecore/date/kdatetime.cpp +index 5d24fdf..4ba627b 100644 +--- a/kdecore/date/kdatetime.cpp ++++ b/kdecore/date/kdatetime.cpp +@@ -39,7 +39,7 @@ + + #include <kglobal.h> + #include <klocale.h> +-#include "kcalendarsystemgregorian_p.h" ++#include "kcalendarsystemqdate_p.h" + #include <ksystemtimezone.h> + #include <kdebug.h> + +@@ -1427,7 +1427,7 @@ QString KDateTime::toString(const QString &format) const + return QString(); + enum { TZNone, UTCOffsetShort, UTCOffset, UTCOffsetColon, TZAbbrev, TZName }; + KLocale *locale = KGlobal::locale(); +- KCalendarSystemGregorian calendar(locale); ++ KCalendarSystemQDate calendar(locale); + QString result; + QString s; + int num, numLength, zone; +@@ -2484,7 +2484,7 @@ QDateTime fromStr(const QString& string, const QString& format, int& utcOffset, + + enum { TZNone, UTCOffset, UTCOffsetColon, TZAbbrev, TZName }; + KLocale *locale = KGlobal::locale(); +- KCalendarSystemGregorian calendar(locale); ++ KCalendarSystemQDate calendar(locale); + int zone; + int s = 0; + int send = str.length(); +diff --git a/kdecore/date/kdatetimeformatter.cpp b/kdecore/date/kdatetimeformatter.cpp +index 9d8e271..82bbe9e 100644 +--- a/kdecore/date/kdatetimeformatter.cpp ++++ b/kdecore/date/kdatetimeformatter.cpp +@@ -33,8 +33,8 @@ + #include "kdebug.h" + + KDateTimeFormatter::KDateTimeFormatter() +- : m_englishLocale(0), +- m_englishCalendar(0) ++ : m_englishLocale(0), ++ m_englishCalendar(0) + { + } + +@@ -44,70 +44,70 @@ KDateTimeFormatter::~KDateTimeFormatter() + delete m_englishLocale; + } + +-QString KDateTimeFormatter::formatDate( const QDate &fromDate, +- const QString &toFormat, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatDate(const QDate &fromDate, ++ const QString &toFormat, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + // If not valid input, don't waste our time +- if ( !calendar->isValid( fromDate ) || toFormat.isEmpty() ) { ++ if (!calendar->isValid(fromDate) || toFormat.isEmpty()) { + return QString(); + } + +- return formatDateTime( KDateTime( fromDate ), toFormat, 0, calendar, locale, digitSet, formatStandard ); ++ return formatDateTime(KDateTime(fromDate), toFormat, 0, calendar, locale, digitSet, formatStandard); + } + +-QString KDateTimeFormatter::formatTime( const QTime &fromTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatTime(const QTime &fromTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + // If not valid input, don't waste our time +- if ( fromTime.isValid() || toFormat.isEmpty() ) { ++ if (fromTime.isValid() || toFormat.isEmpty()) { + return QString(); + } + +- return formatDateTime( KDateTime( QDate::currentDate(), fromTime ), toFormat, timeOptions, calendar, locale, digitSet, formatStandard ); ++ return formatDateTime(KDateTime(QDate::currentDate(), fromTime), toFormat, timeOptions, calendar, locale, digitSet, formatStandard); + } + + // Format an input date to match a POSIX date format string +-QString KDateTimeFormatter::formatDateTime( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatDateTime(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + // If not valid input, don't waste our time +- if ( !fromDateTime.isValid() || !calendar->isValid( fromDateTime.date() ) || toFormat.isEmpty() ) { ++ if (!fromDateTime.isValid() || !calendar->isValid(fromDateTime.date()) || toFormat.isEmpty()) { + return QString(); + } + +- if ( formatStandard == KLocale::UnicodeFormat ) { +- return formatDateTimeUnicode( fromDateTime, toFormat, timeOptions, calendar, locale, digitSet ); ++ if (formatStandard == KLocale::UnicodeFormat) { ++ return formatDateTimeUnicode(fromDateTime, toFormat, timeOptions, calendar, locale, digitSet); + } else { +- return formatDateTimePosix( fromDateTime, toFormat, timeOptions, calendar, locale, digitSet, formatStandard ); ++ return formatDateTimePosix(fromDateTime, toFormat, timeOptions, calendar, locale, digitSet, formatStandard); + } + } + + // Format an input date to match a POSIX date format string +-QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatDateTimePosix(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + //kDebug() << "formatDateTimePosix(" << fromDateTime << toFormat << ")"; + // If not valid input, don't waste our time +- if ( !fromDateTime.isValid() || toFormat.isEmpty() ) { ++ if (!fromDateTime.isValid() || toFormat.isEmpty()) { + return QString(); + } + +@@ -131,55 +131,55 @@ QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, + // Pre-fetch the core date components as they get used a lot + // and it is 1/3rd more efficient than 3 separatre calls + int year, month, day; +- calendar->getDate( fromDateTime.date(), &year, &month, &day ); ++ calendar->getDate(fromDateTime.date(), &year, &month, &day); + +- for ( int formatIndex = 0; formatIndex < toFormat.length(); ++formatIndex ) { ++ for (int formatIndex = 0; formatIndex < toFormat.length(); ++formatIndex) { + +- thisChar = toFormat.at( formatIndex ); ++ thisChar = toFormat.at(formatIndex); + +- if ( !escape ) { ++ if (!escape) { + +- if ( thisChar == QLatin1Char('%') ) { ++ if (thisChar == QLatin1Char('%')) { + escape = true; + escapeIndex = formatIndex; + } else { +- result.append( toFormat.at( formatIndex ) ); ++ result.append(toFormat.at(formatIndex)); + } + +- } else if ( !escapeMod && !escapeWidth && thisChar == QLatin1Char('-') ) { // no padding ++ } else if (!escapeMod && !escapeWidth && thisChar == QLatin1Char('-')) { // no padding + + padChar = QChar(); + escapePad = true; + +- } else if ( !escapeMod && !escapeWidth && thisChar == QLatin1Char('_') ) { // space padding ++ } else if (!escapeMod && !escapeWidth && thisChar == QLatin1Char('_')) { // space padding + + padChar = QLatin1Char(' '); + escapePad = true; + +- } else if ( !escapeMod && !escapeWidth && thisChar == QLatin1Char('0') ) { // 0 padding ++ } else if (!escapeMod && !escapeWidth && thisChar == QLatin1Char('0')) { // 0 padding + + padChar = QLatin1Char('0'); + escapePad = true; + +- } else if ( !escapeMod && !escapeWidth && ( thisChar == QLatin1Char('^') || thisChar == QLatin1Char('#') ) ) { // Change case ++ } else if (!escapeMod && !escapeWidth && (thisChar == QLatin1Char('^') || thisChar == QLatin1Char('#'))) { // Change case + + caseChar = thisChar; + +- } else if ( !escapeMod && +- ( ( !escapeWidth && thisChar >= QLatin1Char('1') && thisChar <= QLatin1Char('9') ) || +- ( escapeWidth && thisChar >= QLatin1Char('0') && thisChar <= QLatin1Char('9') ) ) ) { // Change width ++ } else if (!escapeMod && ++ ((!escapeWidth && thisChar >= QLatin1Char('1') && thisChar <= QLatin1Char('9')) || ++ (escapeWidth && thisChar >= QLatin1Char('0') && thisChar <= QLatin1Char('9')))) { // Change width + +- if ( escapeWidth ) { ++ if (escapeWidth) { + padWidth = padWidth * 10; + } +- padWidth = padWidth + QString( thisChar ).toInt(); ++ padWidth = padWidth + QString(thisChar).toInt(); + escapeWidth = true; + +- } else if ( !escapeMod && ( thisChar == QLatin1Char('E') || thisChar == QLatin1Char('O') || thisChar == QLatin1Char(':') ) ) { // Set modifier ++ } else if (!escapeMod && (thisChar == QLatin1Char('E') || thisChar == QLatin1Char('O') || thisChar == QLatin1Char(':'))) { // Set modifier + + escapeMod = true; + modifierChar = thisChar; +- if ( thisChar == QLatin1Char(':') ) { ++ if (thisChar == QLatin1Char(':')) { + invalidModifier = true; + } + +@@ -196,414 +196,414 @@ QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, + //Default settings unless overridden by pad and case flags and width: are 0 pad to 0 width no sign + //Names will override 0 pad with no pad unless flagged + //Numbers will override with correct width unless flagged +- QChar thisChar = toFormat.at( formatIndex ).unicode(); +- switch ( thisChar.unicode() ) { +- case '%': //Literal % +- if ( modifierChar != QLatin1Char(':') ) { // E and O mods are ignored if not used, but : is treated as literal +- componentString = QLatin1Char('%'); +- if ( !escapePad ) { +- padChar = QChar(); +- } ++ QChar thisChar = toFormat.at(formatIndex).unicode(); ++ switch (thisChar.unicode()) { ++ case '%': //Literal % ++ if (modifierChar != QLatin1Char(':')) { // E and O mods are ignored if not used, but : is treated as literal ++ componentString = QLatin1Char('%'); ++ if (!escapePad) { ++ padChar = QChar(); + } +- break; +- case 't': //Tab +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = QString::fromLatin1("\t"); +- if ( !escapePad ) { +- padChar = QChar(); +- } ++ } ++ break; ++ case 't': //Tab ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = QString::fromLatin1("\t"); ++ if (!escapePad) { ++ padChar = QChar(); + } +- break; +- case 'Y': +- if ( modifierChar == QLatin1Char('E') ) { //Era Year, default no pad to 0 places no sign +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- componentString = calendar->eraYear( fromDateTime.date() ); +- } else if ( modifierChar != QLatin1Char(':') ) { //Long year numeric, default 0 pad to 4 places with sign +- componentInteger = qAbs( year ); +- minWidth = 4; +- if ( year < 0 ) { +- signChar = QLatin1Char('-'); +- } ++ } ++ break; ++ case 'Y': ++ if (modifierChar == QLatin1Char('E')) { //Era Year, default no pad to 0 places no sign ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); + } +- break; +- case 'C': +- if ( modifierChar == QLatin1Char('E') ) { //Era name, default no pad to 0 places no sign +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- componentString = calendar->eraName( fromDateTime.date() ); +- } else if ( modifierChar != QLatin1Char(':') ) { //Century numeric, default 0 pad to 2 places with sign +- componentInteger = qAbs( year ) / 100 ; +- minWidth = 2; +- if ( year < 0 ) { +- signChar = QLatin1Char('-'); +- } ++ componentString = calendar->eraYear(fromDateTime.date()); ++ } else if (modifierChar != QLatin1Char(':')) { //Long year numeric, default 0 pad to 4 places with sign ++ componentInteger = qAbs(year); ++ minWidth = 4; ++ if (year < 0) { ++ signChar = QLatin1Char('-'); + } +- break; +- case 'y': +- if ( modifierChar == QLatin1Char('E') ) { //Year in Era number, default 0 pad to 1 places no sign +- componentInteger = calendar->yearInEra( fromDateTime.date() ); +- minWidth = 1; +- } else if ( modifierChar != QLatin1Char(':') ) { //Short year numeric, default 0 pad to 2 places with sign +- componentInteger = qAbs( year ) % 100; +- minWidth = 2; +- if ( year < 0 ) { +- signChar = QLatin1Char('-'); +- } ++ } ++ break; ++ case 'C': ++ if (modifierChar == QLatin1Char('E')) { //Era name, default no pad to 0 places no sign ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); + } +- break; +- case 'm': // Month numeric ++ componentString = calendar->eraName(fromDateTime.date()); ++ } else if (modifierChar != QLatin1Char(':')) { //Century numeric, default 0 pad to 2 places with sign ++ componentInteger = qAbs(year) / 100 ; ++ minWidth = 2; ++ if (year < 0) { ++ signChar = QLatin1Char('-'); ++ } ++ } ++ break; ++ case 'y': ++ if (modifierChar == QLatin1Char('E')) { //Year in Era number, default 0 pad to 1 places no sign ++ componentInteger = calendar->yearInEra(fromDateTime.date()); ++ minWidth = 1; ++ } else if (modifierChar != QLatin1Char(':')) { //Short year numeric, default 0 pad to 2 places with sign ++ componentInteger = qAbs(year) % 100; ++ minWidth = 2; ++ if (year < 0) { ++ signChar = QLatin1Char('-'); ++ } ++ } ++ break; ++ case 'm': // Month numeric ++ componentInteger = month; ++ if (modifierChar == QLatin1Char(':')) { //Short month numeric, default no pad to 1 places no sign ++ minWidth = 1; ++ if (!escapePad) { ++ padChar = QChar(); ++ } ++ invalidModifier = false; ++ } else { //Long month numeric, default 0 pad to 2 places no sign + componentInteger = month; +- if ( modifierChar == QLatin1Char(':') ) { //Short month numeric, default no pad to 1 places no sign ++ minWidth = 2; ++ } ++ break; ++ case 'n': ++ //PosixFormat %n is newline ++ //KdeFormat %n is short month numeric ++ if (modifierChar != QLatin1Char(':')) { ++ if (formatStandard == KLocale::KdeFormat) { ++ //Copy what %e does, no padding by default ++ //Short month numeric, default no pad to 1 places no sign ++ componentInteger = month; + minWidth = 1; +- if ( !escapePad ) { ++ if (!escapePad) { + padChar = QChar(); + } +- invalidModifier = false; +- } else { //Long month numeric, default 0 pad to 2 places no sign +- componentInteger = month; +- minWidth = 2; ++ } else { // formatStandard == KLocale::PosixFormat ++ componentString = QLatin1Char('\n'); + } +- break; +- case 'n': +- //PosixFormat %n is newline +- //KdeFormat %n is short month numeric +- if ( modifierChar != QLatin1Char(':') ) { +- if ( formatStandard == KLocale::KdeFormat ) { +- //Copy what %e does, no padding by default +- //Short month numeric, default no pad to 1 places no sign +- componentInteger = month; +- minWidth = 1; +- if ( !escapePad ) { +- padChar = QChar(); +- } +- } else { // formatStandard == KLocale::PosixFormat +- componentString = QLatin1Char('\n'); ++ } ++ break; ++ case 'd': //Long day numeric, default 0 pad to 2 places no sign ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = day; ++ minWidth = 2; ++ } ++ break; ++ case 'e': //Short day numeric, default no sign ++ //PosixFormat %e is space pad to 2 places ++ //KdeFormat %e is no pad to 1 place ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = day; ++ if (formatStandard == KLocale::KdeFormat) { ++ minWidth = 1; ++ if (!escapePad) { ++ padChar = QChar(); + } +- } +- break; +- case 'd': //Long day numeric, default 0 pad to 2 places no sign +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = day; ++ } else { // formatStandard == KLocale::PosixFormat + minWidth = 2; +- } +- break; +- case 'e': //Short day numeric, default no sign +- //PosixFormat %e is space pad to 2 places +- //KdeFormat %e is no pad to 1 place +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = day; +- if ( formatStandard == KLocale::KdeFormat ) { +- minWidth = 1; +- if ( !escapePad ) { +- padChar = QChar(); +- } +- } else { // formatStandard == KLocale::PosixFormat +- minWidth = 2; +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); + } + } +- break; +- case 'B': //Long month name, default space pad to 0 places no sign +- if ( locale->dateMonthNamePossessive() ) { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::LongNamePossessive ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::LongNamePossessive ); +- } ++ } ++ break; ++ case 'B': //Long month name, default space pad to 0 places no sign ++ if (locale->dateMonthNamePossessive()) { ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::LongNamePossessive); + } else { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::LongName ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::LongName ); +- } +- } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); ++ componentString = calendar->monthName(month, year, KCalendarSystem::LongNamePossessive); + } +- break; +- case 'h': //Short month name, default space pad to 0 places no sign +- case 'b': //Short month name, default space pad to 0 places no sign +- if ( locale->dateMonthNamePossessive() ) { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::ShortNamePossessive ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::ShortNamePossessive ); +- } ++ } else { ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::LongName); + } else { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::ShortName ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::ShortName ); +- } ++ componentString = calendar->monthName(month, year, KCalendarSystem::LongName); + } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- break; +- case 'A': //Long weekday name, default space pad to 0 places no sign +- if ( modifierChar == QLatin1Char(':') ) { ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'h': //Short month name, default space pad to 0 places no sign ++ case 'b': //Short month name, default space pad to 0 places no sign ++ if (locale->dateMonthNamePossessive()) { ++ if (modifierChar == QLatin1Char(':')) { + invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->weekDayName( fromDateTime.date(), KCalendarSystem::LongDayName ); ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::ShortNamePossessive); + } else { +- componentString = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::LongDayName ); ++ componentString = calendar->monthName(month, year, KCalendarSystem::ShortNamePossessive); + } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- break; +- case 'a': //Short weekday name, default space pad to 0 places no sign +- if ( modifierChar == QLatin1Char(':') ) { ++ } else { ++ if (modifierChar == QLatin1Char(':')) { + invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->weekDayName( fromDateTime.date(), KCalendarSystem::ShortDayName ); ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::ShortName); + } else { +- componentString = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::ShortDayName ); +- } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); ++ componentString = calendar->monthName(month, year, KCalendarSystem::ShortName); + } +- break; +- case 'j': //Long day of year numeric, default 0 pad to 3 places no sign +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = calendar->dayOfYear( fromDateTime.date() ); +- minWidth = 3; ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'A': //Long weekday name, default space pad to 0 places no sign ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->weekDayName(fromDateTime.date(), KCalendarSystem::LongDayName); ++ } else { ++ componentString = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::LongDayName); ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'a': //Short weekday name, default space pad to 0 places no sign ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->weekDayName(fromDateTime.date(), KCalendarSystem::ShortDayName); ++ } else { ++ componentString = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::ShortDayName); ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'j': //Long day of year numeric, default 0 pad to 3 places no sign ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = calendar->dayOfYear(fromDateTime.date()); ++ minWidth = 3; ++ } ++ break; ++ case 'V': //Long ISO week of year numeric, default 0 pad to 2 places no sign ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = calendar->week(fromDateTime.date(), KLocale::IsoWeekNumber); ++ minWidth = 2; ++ } ++ break; ++ case 'G': //Long year of ISO week of year numeric, default 0 pad to 4 places with sign ++ if (modifierChar != QLatin1Char(':')) { ++ calendar->week(fromDateTime.date(), KLocale::IsoWeekNumber, &isoWeekYear); ++ calendar->setDate(yearDate, isoWeekYear, 1, 1); ++ componentInteger = qAbs(isoWeekYear); ++ minWidth = 4; ++ if (isoWeekYear < 0) { ++ signChar = QLatin1Char('-'); + } +- break; +- case 'V': //Long ISO week of year numeric, default 0 pad to 2 places no sign +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = calendar->weekNumber( fromDateTime.date() ); +- minWidth = 2; ++ } ++ break; ++ case 'g': //Short year of ISO week of year numeric, default 0 pad to 2 places with sign ++ if (modifierChar != QLatin1Char(':')) { ++ calendar->week(fromDateTime.date(), KLocale::IsoWeekNumber, &isoWeekYear); ++ calendar->setDate(yearDate, isoWeekYear, 1, 1); ++ componentInteger = qAbs(isoWeekYear) % 100; ++ minWidth = 2; ++ if (isoWeekYear < 0) { ++ signChar = QLatin1Char('-'); + } +- break; +- case 'G': //Long year of ISO week of year numeric, default 0 pad to 4 places with sign +- if ( modifierChar != QLatin1Char(':') ) { +- calendar->weekNumber( fromDateTime.date(), &isoWeekYear ); +- calendar->setDate( yearDate, isoWeekYear, 1, 1 ); +- componentInteger = qAbs( isoWeekYear ); +- minWidth = 4; +- if ( isoWeekYear < 0 ) { ++ } ++ break; ++ case 'u': ++ if (modifierChar == QLatin1Char(':')) { // TZ UTC offset hours ++ invalidModifier = false; ++ KDateTime::SpecType timeSpecType = fromDateTime.timeType(); ++ if (timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || ++ timeSpecType == KDateTime::OffsetFromUTC) { ++ componentInteger = fromDateTime.utcOffset() / 3600; ++ if (componentInteger >= 0) { ++ signChar = QLatin1Char('+'); ++ } else { ++ componentInteger = -componentInteger; + signChar = QLatin1Char('-'); + } +- } +- break; +- case 'g': //Short year of ISO week of year numeric, default 0 pad to 2 places with sign +- if ( modifierChar != QLatin1Char(':') ) { +- calendar->weekNumber( fromDateTime.date(), &isoWeekYear ); +- calendar->setDate( yearDate, isoWeekYear, 1, 1 ); +- componentInteger = qAbs( isoWeekYear ) % 100; + minWidth = 2; +- if ( isoWeekYear < 0 ) { +- signChar = QLatin1Char('-'); +- } + } +- break; +- case 'u': +- if ( modifierChar == QLatin1Char(':') ) { // TZ UTC offset hours +- invalidModifier = false; +- KDateTime::SpecType timeSpecType = fromDateTime.timeType(); +- if ( timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || +- timeSpecType == KDateTime::OffsetFromUTC ) { +- componentInteger = fromDateTime.utcOffset() / 3600; +- if ( componentInteger >= 0 ) { +- signChar = QLatin1Char('+'); +- } else { +- componentInteger = -componentInteger; +- signChar = QLatin1Char('-'); +- } +- minWidth = 2; +- } +- } else { // Short day of week numeric +- componentInteger = calendar->dayOfWeek( fromDateTime.date() ); +- minWidth = 1; +- } +- break; +- case 'D': // US short date format, ignore any overrides +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = formatDateTimePosix( fromDateTime, QString::fromLatin1("%m/%d/%y"), timeOptions, calendar, locale, digitSet, formatStandard ); +- padWidth = 0; +- padChar = QChar(); +- caseChar = QChar(); +- } +- break; +- case 'F': // Full or ISO short date format, ignore any overrides +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = formatDateTimePosix( fromDateTime, QString::fromLatin1("%Y-%m-%d"), timeOptions, calendar, locale, digitSet, formatStandard ); +- padWidth = 0; +- padChar = QChar(); +- caseChar = QChar(); +- } +- break; +- case 'x': // Locale short date format, ignore any overrides +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = formatDateTimePosix( fromDateTime, locale->dateFormatShort(), timeOptions, calendar, locale, digitSet, formatStandard ); +- padWidth = 0; ++ } else { // Short day of week numeric ++ componentInteger = calendar->dayOfWeek(fromDateTime.date()); ++ minWidth = 1; ++ } ++ break; ++ case 'D': // US short date format, ignore any overrides ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = formatDateTimePosix(fromDateTime, QString::fromLatin1("%m/%d/%y"), timeOptions, calendar, locale, digitSet, formatStandard); ++ padWidth = 0; ++ padChar = QChar(); ++ caseChar = QChar(); ++ } ++ break; ++ case 'F': // Full or ISO short date format, ignore any overrides ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = formatDateTimePosix(fromDateTime, QString::fromLatin1("%Y-%m-%d"), timeOptions, calendar, locale, digitSet, formatStandard); ++ padWidth = 0; ++ padChar = QChar(); ++ caseChar = QChar(); ++ } ++ break; ++ case 'x': // Locale short date format, ignore any overrides ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = formatDateTimePosix(fromDateTime, locale->dateFormatShort(), timeOptions, calendar, locale, digitSet, formatStandard); ++ padWidth = 0; ++ padChar = QChar(); ++ caseChar = QChar(); ++ } ++ break; ++ case 'H': // Long 24 hour ++ case 'k': // Short 24 hour ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = fromDateTime.time().hour(); ++ minWidth = 1; ++ if (!escapePad) { + padChar = QChar(); +- caseChar = QChar(); + } +- break; +- case 'H': // Long 24 hour +- case 'k': // Short 24 hour +- if ( modifierChar != QLatin1Char(':') ) { ++ } ++ break; ++ case 'I': // Long 12 hour ++ case 'l': // Short 12 hour ++ if (modifierChar != QLatin1Char(':')) { ++ if ((timeOptions & KLocale::TimeDuration) == KLocale::TimeDuration) { + componentInteger = fromDateTime.time().hour(); ++ } else { ++ componentInteger = locale->d->dayPeriodForTime(fromDateTime.time()).hourInPeriod(fromDateTime.time()); ++ } ++ if (thisChar == QLatin1Char('I')) { ++ minWidth = 2; ++ } else { + minWidth = 1; +- if ( !escapePad ) { ++ if (!escapePad) { + padChar = QChar(); + } + } +- break; +- case 'I': // Long 12 hour +- case 'l': // Short 12 hour +- if ( modifierChar != QLatin1Char(':') ) { +- if ( (timeOptions & KLocale::TimeDuration) == KLocale::TimeDuration ) { +- componentInteger = fromDateTime.time().hour(); +- } else { +- componentInteger = locale->d->dayPeriodForTime( fromDateTime.time() ).hourInPeriod( fromDateTime.time() ); +- } +- if ( thisChar == QLatin1Char('I') ) { ++ } ++ break; ++ case 'M': // Long minutes ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = fromDateTime.time().minute(); ++ minWidth = 2; ++ } ++ break; ++ case 'S': // Long seconds ++ invalidModifier = false; ++ if ((timeOptions & KLocale::TimeWithoutSeconds) == KLocale::TimeWithoutSeconds) { ++ //TODO strip the preceding/following punctuation ++ } else { ++ componentInteger = fromDateTime.time().second(); ++ if (modifierChar == QLatin1Char(':')) { // Only if not 00 seconds ++ if (componentInteger > 0 || fromDateTime.time().msec() > 0) { ++ result.append(QLatin1Char(':')); + minWidth = 2; +- } else { +- minWidth = 1; +- if ( !escapePad ) { +- padChar = QChar(); +- } + } +- } +- break; +- case 'M': // Long minutes +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = fromDateTime.time().minute(); ++ } else { + minWidth = 2; + } +- break; +- case 'S': // Long seconds ++ } ++ break; ++ case 's': ++ if (modifierChar == QLatin1Char(':')) { // Milliseconds + invalidModifier = false; +- if ( (timeOptions & KLocale::TimeWithoutSeconds) == KLocale::TimeWithoutSeconds ) { +- //TODO strip the preceeding/following punctuation ++ componentInteger = fromDateTime.time().msec(); ++ minWidth = 3; ++ } else { // Whole seconds since Unix Epoch ++ KDateTime unixEpoch; ++ unixEpoch.setTime_t(0); ++ componentInteger = unixEpoch.secsTo(fromDateTime); ++ } ++ break; ++ case 'p': // AM/PM symbol ++ case 'P': // AM/PM symbol in lowercase ++ if ((timeOptions & KLocale::TimeWithoutAmPm) == KLocale::TimeWithoutAmPm) { ++ //TODO strip the preceding/following punctuation ++ } else { ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishLocale->d->dayPeriodForTime(fromDateTime.time()).periodName(KLocale::ShortName); + } else { +- componentInteger = fromDateTime.time().second(); +- if ( modifierChar == QLatin1Char(':') ) { // Only if not 00 seconds +- if ( componentInteger > 0 || fromDateTime.time().msec() > 0 ) { +- result.append( QLatin1Char(':') ); +- minWidth = 2; +- } +- } else { +- minWidth = 2; +- } ++ componentString = locale->d->dayPeriodForTime(fromDateTime.time()).periodName(KLocale::ShortName); + } +- break; +- case 's': +- if ( modifierChar == QLatin1Char(':') ) { // Milliseconds +- invalidModifier = false; +- componentInteger = fromDateTime.time().msec(); +- minWidth = 3; +- } else { // Whole seconds since Unix Epoch +- KDateTime unixEpoch; +- unixEpoch.setTime_t( 0 ); +- componentInteger = unixEpoch.secsTo( fromDateTime ); ++ if (thisChar == QLatin1Char('P')) { ++ componentString = componentString.toLower(); + } +- break; +- case 'p': // AM/PM symbol +- case 'P': // AM/PM symbol in lowercase +- if ( (timeOptions & KLocale::TimeWithoutAmPm) == KLocale::TimeWithoutAmPm ) { +- //TODO strip the preceeding/following punctuation +- } else { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishLocale->d->dayPeriodForTime( fromDateTime.time() ).periodName( KLocale::ShortName ); ++ } ++ break; ++ case 'z': // TZ UTC Offset ++ invalidModifier = false; ++ timeSpecType = fromDateTime.timeType(); ++ if (timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || ++ timeSpecType == KDateTime::OffsetFromUTC) { ++ if (modifierChar == QLatin1Char(':')) { // TZ UTC offset hours & minutes with colon ++ int offsetInSeconds = fromDateTime.utcOffset(); ++ if (offsetInSeconds >= 0) { ++ signChar = QLatin1Char('+'); + } else { +- componentString = locale->d->dayPeriodForTime( fromDateTime.time() ).periodName( KLocale::ShortName ); +- } +- if ( thisChar == QLatin1Char('P') ) { +- componentString = componentString.toLower(); ++ offsetInSeconds = -offsetInSeconds; ++ signChar = QLatin1Char('-'); + } +- } +- break; +- case 'z': // TZ UTC Offset +- invalidModifier = false; +- timeSpecType = fromDateTime.timeType(); +- if ( timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || +- timeSpecType == KDateTime::OffsetFromUTC ) { +- if ( modifierChar == QLatin1Char(':') ) { // TZ UTC offset hours & minutes with colon +- int offsetInSeconds = fromDateTime.utcOffset(); +- if ( offsetInSeconds >= 0 ) { +- signChar = QLatin1Char('+'); +- } else { +- offsetInSeconds = -offsetInSeconds; +- signChar = QLatin1Char('-'); +- } +- int offsetHours = offsetInSeconds / 3600; +- int offsetMinutes = ( offsetInSeconds / 60 ) % 60; +- //int offsetSeconds = offsetInSeconds % 60; +- QString hourComponent = stringFromInteger( offsetHours, 2, QLatin1Char('0'), signChar, digitSet, locale ); +- QString minuteComponent = stringFromInteger( offsetMinutes, 2, QLatin1Char('0'), QChar(), digitSet, locale ); +- componentString = hourComponent + QLatin1Char(':') + minuteComponent; +- minWidth = 0; +- padChar = QChar(); +- padWidth = 0; +- } else { // TZ UTC offset hours & minutes +- componentInteger = fromDateTime.utcOffset() / 60; +- if ( componentInteger >= 0 ) { +- signChar = QLatin1Char('+'); +- } else { +- componentInteger = -componentInteger; +- signChar = QLatin1Char('-'); +- } +- minWidth = 4; ++ int offsetHours = offsetInSeconds / 3600; ++ int offsetMinutes = (offsetInSeconds / 60) % 60; ++ //int offsetSeconds = offsetInSeconds % 60; ++ QString hourComponent = stringFromInteger(offsetHours, 2, QLatin1Char('0'), signChar, digitSet, locale); ++ QString minuteComponent = stringFromInteger(offsetMinutes, 2, QLatin1Char('0'), QChar(), digitSet, locale); ++ componentString = hourComponent + QLatin1Char(':') + minuteComponent; ++ minWidth = 0; ++ padChar = QChar(); ++ padWidth = 0; ++ } else { // TZ UTC offset hours & minutes ++ componentInteger = fromDateTime.utcOffset() / 60; ++ if (componentInteger >= 0) { ++ signChar = QLatin1Char('+'); ++ } else { ++ componentInteger = -componentInteger; ++ signChar = QLatin1Char('-'); + } ++ minWidth = 4; + } +- break; +- case 'Z': // TZ Name +- invalidModifier = false; +- timeSpecType = fromDateTime.timeType(); +- if ( timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone ) { +- KTimeZone tz = fromDateTime.timeZone(); +- if ( tz.isValid() ) { +- if ( modifierChar == QLatin1Char(':') ) { // TZ full name +- componentString = QString::fromLatin1(tz.abbreviation(fromDateTime.toUtc().dateTime())); +- } else { // TZ abbreviated name +- componentString = tz.name(); +- } ++ } ++ break; ++ case 'Z': // TZ Name ++ invalidModifier = false; ++ timeSpecType = fromDateTime.timeType(); ++ if (timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone) { ++ KTimeZone tz = fromDateTime.timeZone(); ++ if (tz.isValid()) { ++ if (modifierChar == QLatin1Char(':')) { // TZ full name ++ componentString = QString::fromLatin1(tz.abbreviation(fromDateTime.toUtc().dateTime())); ++ } else { // TZ abbreviated name ++ componentString = tz.name(); + } + } +- break; +- default: //No valid format code, treat as literal +- invalidComponent = true; +- break; ++ } ++ break; ++ default: //No valid format code, treat as literal ++ invalidComponent = true; ++ break; + } + +- if ( invalidComponent || invalidModifier ) { // If escape sequence invalid treat as literal +- componentString = toFormat.mid( escapeIndex, formatIndex ); +- } else if ( componentString.isEmpty() ) { //i.e. is a number component +- padWidth = qMax( minWidth, padWidth ); +- componentString = stringFromInteger( componentInteger, padWidth, padChar, signChar, digitSet, locale ); ++ if (invalidComponent || invalidModifier) { // If escape sequence invalid treat as literal ++ componentString = toFormat.mid(escapeIndex, formatIndex); ++ } else if (componentString.isEmpty()) { //i.e. is a number component ++ padWidth = qMax(minWidth, padWidth); ++ componentString = stringFromInteger(componentInteger, padWidth, padChar, signChar, digitSet, locale); + } else { //i.e. is a string component +- if ( padChar != QChar() && padWidth != 0 ) { +- componentString = componentString.rightJustified( padWidth, padChar ); ++ if (padChar != QChar() && padWidth != 0) { ++ componentString = componentString.rightJustified(padWidth, padChar); + } + +- if ( caseChar == QLatin1Char('^') ) { ++ if (caseChar == QLatin1Char('^')) { + componentString = componentString.toUpper(); +- } else if ( caseChar == QLatin1Char('#') ) { ++ } else if (caseChar == QLatin1Char('#')) { + componentString = componentString.toUpper(); // JPL ??? + } + } + +- result.append( componentString ); ++ result.append(componentString); + + escape = false; + escapePad = false; +@@ -623,16 +623,16 @@ QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, + return result; + } + +-void KDateTimeFormatter::initEnglish( const KCalendarSystem *calendar, const KLocale *locale ) const ++void KDateTimeFormatter::initEnglish(const KCalendarSystem *calendar, const KLocale *locale) const + { +- if ( !m_englishCalendar || m_englishCalendar->calendarType() != calendar->calendarType() ) { +- // Set up an English locale and calendar for use with ':' modifier which forces English names +- if ( !m_englishLocale ) { +- m_englishLocale = new KLocale( *locale ); +- m_englishLocale->setLanguage( QStringList() << QString::fromLatin1("en_US") ); +- } +- delete m_englishCalendar; +- m_englishCalendar = KCalendarSystem::create( calendar->calendarType(), m_englishLocale ); ++ if (!m_englishCalendar || m_englishCalendar->calendarSystem() != calendar->calendarSystem()) { ++ // Set up an English locale and calendar for use with ':' modifier which forces English names ++ if (!m_englishLocale) { ++ m_englishLocale = new KLocale(*locale); ++ m_englishLocale->setLanguage(QStringList() << QString::fromLatin1("en_US")); ++ } ++ delete m_englishCalendar; ++ m_englishCalendar = KCalendarSystem::create(calendar->calendarSystem(), m_englishLocale); + } + } + +@@ -640,12 +640,12 @@ void KDateTimeFormatter::initEnglish( const KCalendarSystem *calendar, const KLo + // Format an input date to match a UNICODE date format string + // Original QDate::fmtDateTime() code taken from Qt 4.7 under LGPL, now heavily modifed + // Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +-QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const ++QString KDateTimeFormatter::formatDateTimeUnicode(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const + { + const QLatin1Char quote('\''); + +@@ -661,7 +661,7 @@ QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime + status = QLatin1Char('0'); + } else { + if (!format.isEmpty()) { +- result += getUnicodeString( fromDateTime, format, timeOptions, calendar, locale, digitSet ); ++ result += getUnicodeString(fromDateTime, format, timeOptions, calendar, locale, digitSet); + format.clear(); + } + status = quote; +@@ -669,27 +669,27 @@ QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime + } else if (status == quote) { + result += toFormat.at(i); + } else if (toFormat.at(i) == status) { +- if ( toFormat.at(i) == QLatin1Char('P') || +- toFormat.at(i) == QLatin1Char('p') ) { ++ if (toFormat.at(i) == QLatin1Char('P') || ++ toFormat.at(i) == QLatin1Char('p')) { + status = QLatin1Char('0'); + } +- format += toFormat.at( i ); ++ format += toFormat.at(i); + } else { +- result += getUnicodeString( fromDateTime, format, timeOptions, calendar, locale, digitSet ); ++ result += getUnicodeString(fromDateTime, format, timeOptions, calendar, locale, digitSet); + format.clear(); +- if ( ( toFormat.at(i) == QLatin1Char('d') ) || +- ( toFormat.at(i) == QLatin1Char('M') ) || +- ( toFormat.at(i) == QLatin1Char('y') ) ) { +- status = toFormat.at( i ); +- format += toFormat.at( i ); ++ if ((toFormat.at(i) == QLatin1Char('d')) || ++ (toFormat.at(i) == QLatin1Char('M')) || ++ (toFormat.at(i) == QLatin1Char('y'))) { ++ status = toFormat.at(i); ++ format += toFormat.at(i); + } else { +- result += toFormat.at( i ); ++ result += toFormat.at(i); + status = QLatin1Char('0'); + } + } + } + +- result += getUnicodeString( fromDateTime, format, timeOptions, calendar, locale, digitSet ); ++ result += getUnicodeString(fromDateTime, format, timeOptions, calendar, locale, digitSet); + + return result; + } +@@ -697,99 +697,98 @@ QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime + // Original QDate::getFmtString() code taken from Qt 4.7 under LGPL, now heavily modifed + // Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + // Replaces tokens by their value. See QDateTime::toString() for a list of valid tokens +-QString KDateTimeFormatter::getUnicodeString( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const ++QString KDateTimeFormatter::getUnicodeString(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const + { +- if ( toFormat.isEmpty() ) { ++ if (toFormat.isEmpty()) { + return QString(); + } + + QString result = toFormat; + int removed = 0; + +- if ( toFormat.startsWith( QLatin1String( "dddd" ) ) ) { +- result = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::LongDayName ); ++ if (toFormat.startsWith(QLatin1String("dddd"))) { ++ result = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::LongDayName); + removed = 4; +- } else if ( toFormat.startsWith(QLatin1String( "ddd" ) ) ) { +- result = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::ShortDayName ); ++ } else if (toFormat.startsWith(QLatin1String("ddd"))) { ++ result = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::ShortDayName); + removed = 3; +- } else if ( toFormat.startsWith( QLatin1String( "dd" ) ) ) { +- result = QString::number( calendar->day( fromDateTime.date() ) ).rightJustified( 2, QLatin1Char('0'), true ); ++ } else if (toFormat.startsWith(QLatin1String("dd"))) { ++ result = QString::number(calendar->day(fromDateTime.date())).rightJustified(2, QLatin1Char('0'), true); + removed = 2; +- } else if ( toFormat.at(0) == QLatin1Char('d') ) { +- result = QString::number( calendar->day( fromDateTime.date() ) ); ++ } else if (toFormat.at(0) == QLatin1Char('d')) { ++ result = QString::number(calendar->day(fromDateTime.date())); + removed = 1; + } else if (toFormat.startsWith(QLatin1String("MMMM"))) { +- result = calendar->monthName( calendar->month( fromDateTime.date() ), calendar->year( fromDateTime.date() ), KCalendarSystem::LongName ); ++ result = calendar->monthName(calendar->month(fromDateTime.date()), calendar->year(fromDateTime.date()), KCalendarSystem::LongName); + removed = 4; + } else if (toFormat.startsWith(QLatin1String("MMM"))) { +- result = calendar->monthName( calendar->month( fromDateTime.date() ), calendar->year( fromDateTime.date() ), KCalendarSystem::ShortName ); ++ result = calendar->monthName(calendar->month(fromDateTime.date()), calendar->year(fromDateTime.date()), KCalendarSystem::ShortName); + removed = 3; + } else if (toFormat.startsWith(QLatin1String("MM"))) { +- result = QString::number( calendar->month( fromDateTime.date() ) ).rightJustified( 2, QLatin1Char('0'), true ); ++ result = QString::number(calendar->month(fromDateTime.date())).rightJustified(2, QLatin1Char('0'), true); + removed = 2; + } else if (toFormat.at(0) == QLatin1Char('M')) { +- result = QString::number( calendar->month( fromDateTime.date() ) ); ++ result = QString::number(calendar->month(fromDateTime.date())); + removed = 1; + } else if (toFormat.startsWith(QLatin1String("yyyy"))) { +- const int year = calendar->year( fromDateTime.date() ); +- result = QString::number( qAbs( year ) ).rightJustified( 4, QLatin1Char('0') ); +- if( year > 0 ) ++ const int year = calendar->year(fromDateTime.date()); ++ result = QString::number(qAbs(year)).rightJustified(4, QLatin1Char('0')); ++ if (year > 0) + removed = 4; +- else +- { +- result.prepend( QLatin1Char('-') ); ++ else { ++ result.prepend(QLatin1Char('-')); + removed = 5; + } +- } else if ( toFormat.startsWith( QLatin1String("yy") ) ) { +- result = QString::number( calendar->year(fromDateTime.date()) ).right( 2 ).rightJustified( 2, QLatin1Char('0') ); ++ } else if (toFormat.startsWith(QLatin1String("yy"))) { ++ result = QString::number(calendar->year(fromDateTime.date())).right(2).rightJustified(2, QLatin1Char('0')); + removed = 2; + } + +- if ( removed == 0 || removed >= toFormat.size() ) { ++ if (removed == 0 || removed >= toFormat.size()) { + return result; + } + +- return result + getUnicodeString( fromDateTime, toFormat.mid( removed ), timeOptions, calendar, locale, digitSet ); ++ return result + getUnicodeString(fromDateTime, toFormat.mid(removed), timeOptions, calendar, locale, digitSet); + } + + // Reimplement if special integer to string handling required, e.g. Hebrew. + // Utility to convert an integer into the correct display string form +-QString KDateTimeFormatter::stringFromInteger( int number, int padWidth, QChar padChar, QChar signChar, +- KLocale::DigitSet digitSet, const KLocale *locale ) const ++QString KDateTimeFormatter::stringFromInteger(int number, int padWidth, QChar padChar, QChar signChar, ++ KLocale::DigitSet digitSet, const KLocale *locale) const + { +-if ( padChar == QChar() && signChar == QChar() ) { ++ if (padChar == QChar() && signChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << "null" << "null" << ")"; +-} else if ( padChar == QChar() ) { ++ } else if (padChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << "null" << signChar << ")"; +-} else if ( signChar == QChar() ) { ++ } else if (signChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << padChar << "null" << ")"; +-} else if ( signChar == QChar() ) { ++ } else if (signChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << padChar << signChar << ")"; +-} ++ } + QString result; +- if ( padChar == QChar() || padWidth == 0 ) { // If null pad char or 0 width don't bother padding ++ if (padChar == QChar() || padWidth == 0) { // If null pad char or 0 width don't bother padding + //kDebug() << " no pad"; +- if ( signChar == QChar() ) { +- result = locale->convertDigits( QString::number( number ), digitSet ); ++ if (signChar == QChar()) { ++ result = locale->convertDigits(QString::number(number), digitSet); + } else { +- result = locale->convertDigits( QString::number( number ).prepend( signChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).prepend(signChar), digitSet); + } +- } else if ( signChar != QChar() ) { // If sign required +- if ( padChar == QLatin1Char('0') ) { // If zero-padded, zero considered part of the number, so pad the number then prepend the sign ++ } else if (signChar != QChar()) { // If sign required ++ if (padChar == QLatin1Char('0')) { // If zero-padded, zero considered part of the number, so pad the number then prepend the sign + //kDebug() << " zero pad with sign"; +- result = locale->convertDigits( QString::number( number ).rightJustified( padWidth, padChar ).prepend( signChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).rightJustified(padWidth, padChar).prepend(signChar), digitSet); + } else { // If space-padded space not considered part of the number, so prepend the sign and then pad the number + //kDebug() << " space pad with sign"; +- result = locale->convertDigits( QString::number( number ).prepend( signChar ).rightJustified( padWidth, padChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).prepend(signChar).rightJustified(padWidth, padChar), digitSet); + } + } else { // No sign required so just pad + //kDebug() << " pad no sign"; +- result = locale->convertDigits( QString::number( number ).rightJustified( padWidth, padChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).rightJustified(padWidth, padChar), digitSet); + } + //kDebug() << " result = " << result; + return result; +diff --git a/kdecore/date/kdatetimeformatter_p.h b/kdecore/date/kdatetimeformatter_p.h +index 7f64e08..bfa04dc 100644 +--- a/kdecore/date/kdatetimeformatter_p.h ++++ b/kdecore/date/kdatetimeformatter_p.h +@@ -38,56 +38,56 @@ public: + + virtual ~KDateTimeFormatter(); + +- virtual QString formatDate( const QDate &fromDate, +- const QString &toFormat, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; +- +- virtual QString formatTime( const QTime &fromTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions = 0, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; +- +- virtual QString formatDateTime( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions = 0, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; ++ virtual QString formatDate(const QDate &fromDate, ++ const QString &toFormat, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; ++ ++ virtual QString formatTime(const QTime &fromTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions = 0, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; ++ ++ virtual QString formatDateTime(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions = 0, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; + + private: +- virtual QString formatDateTimePosix( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard standard ) const; +- +- virtual void initEnglish( const KCalendarSystem *calendar, const KLocale *locale ) const; +- +- virtual QString formatDateTimeUnicode( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const; +- +- virtual QString getUnicodeString( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const; +- +- virtual QString stringFromInteger( int number, int padWidth, QChar padChar, QChar signChar, +- KLocale::DigitSet digitSet, const KLocale *locale ) const; ++ virtual QString formatDateTimePosix(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard standard) const; ++ ++ virtual void initEnglish(const KCalendarSystem *calendar, const KLocale *locale) const; ++ ++ virtual QString formatDateTimeUnicode(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const; ++ ++ virtual QString getUnicodeString(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const; ++ ++ virtual QString stringFromInteger(int number, int padWidth, QChar padChar, QChar signChar, ++ KLocale::DigitSet digitSet, const KLocale *locale) const; + + // Is private class, but if ever made public need to move these into a d-> + // Some format modifiers force English names to be returned +diff --git a/kdecore/date/kdatetimeparser.cpp b/kdecore/date/kdatetimeparser.cpp +index ba50373..a416808 100644 +--- a/kdecore/date/kdatetimeparser.cpp ++++ b/kdecore/date/kdatetimeparser.cpp +@@ -34,46 +34,46 @@ KDateTimeParser::~KDateTimeParser() + } + + // Parse a DateTime input string and return just the Date component +-QDate KDateTimeParser::parseDate( const QString &inputString, +- const QString &formatString, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QDate KDateTimeParser::parseDate(const QString &inputString, ++ const QString &formatString, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + DateTimeComponents result; +- if ( formatStandard == KLocale::UnicodeFormat ) { +- result = parseDateUnicode( inputString, formatString, calendar, locale, digitSet ); ++ if (formatStandard == KLocale::UnicodeFormat) { ++ result = parseDateUnicode(inputString, formatString, calendar, locale, digitSet); + } else { +- result = parseDatePosix( inputString, formatString, calendar, locale, digitSet, formatStandard ); ++ result = parseDatePosix(inputString, formatString, calendar, locale, digitSet, formatStandard); + } + + QDate resultDate; + +- if ( !result.error && +- formatString.simplified().length() <= result.formatPosition && +- inputString.simplified().length() <= result.inputPosition ) { ++ if (!result.error && ++ formatString.simplified().length() <= result.formatPosition && ++ inputString.simplified().length() <= result.inputPosition) { + + // If there were no parsing errors, and we have reached the end of both the input and + // format strings, then see if we have a valid date based on the components parsed + + // If we haven't parsed a year component, then assume this year +- if ( !result.parsedYear ) { +- result.year = calendar->year( QDate::currentDate() ); ++ if (!result.parsedYear) { ++ result.year = calendar->year(QDate::currentDate()); + } + +- if ( ( !result.eraName.isEmpty() || result.yearInEra > -1 ) && result.month > 0 && result.day > 0 ) { ++ if ((!result.eraName.isEmpty() || result.yearInEra > -1) && result.month > 0 && result.day > 0) { + // Have parsed Era components as well as month and day components +- calendar->setDate( resultDate, result.eraName, result.yearInEra, result.month, result.day ); +- } else if ( result.month > 0 && result.day > 0 ) { ++ calendar->setDate(resultDate, result.eraName, result.yearInEra, result.month, result.day); ++ } else if (result.month > 0 && result.day > 0) { + // Have parsed month and day components +- calendar->setDate( resultDate, result.year, result.month, result.day ); +- } else if ( result.dayInYear > 0 ) { ++ calendar->setDate(resultDate, result.year, result.month, result.day); ++ } else if (result.dayInYear > 0) { + // Have parsed Day In Year component +- calendar->setDate( resultDate, result.year, result.dayInYear ); +- } else if ( result.isoWeekNumber > 0 && result.dayOfIsoWeek > 0 ) { ++ calendar->setDate(resultDate, result.year, result.dayInYear); ++ } else if (result.isoWeekNumber > 0 && result.dayOfIsoWeek > 0) { + // Have parsed ISO Week components +- calendar->setDateIsoWeek( resultDate, result.year, result.isoWeekNumber, result.dayOfIsoWeek ); ++ calendar->setDateIsoWeek(resultDate, result.year, result.isoWeekNumber, result.dayOfIsoWeek); + } + + } +@@ -81,12 +81,12 @@ QDate KDateTimeParser::parseDate( const QString &inputString, + return resultDate; + } + +-DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, +- const QString &formatString, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard standard ) const ++DateTimeComponents KDateTimeParser::parseDatePosix(const QString &inputString, ++ const QString &formatString, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard standard) const + { + QString str = inputString.simplified().toLower(); + QString fmt = formatString.simplified(); +@@ -104,15 +104,15 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + int readLength; // Temporary variable used when reading input + bool error = false; + +- while ( fmt.length() > fmtpos && str.length() > strpos && !error ) { ++ while (fmt.length() > fmtpos && str.length() > strpos && !error) { + +- QChar fmtChar = fmt.at( fmtpos++ ); ++ QChar fmtChar = fmt.at(fmtpos++); + +- if ( fmtChar != QLatin1Char('%') ) { ++ if (fmtChar != QLatin1Char('%')) { + +- if ( fmtChar.isSpace() && str.at(strpos).isSpace() ) { ++ if (fmtChar.isSpace() && str.at(strpos).isSpace()) { + strpos++; +- } else if ( fmtChar.toLower() == str.at(strpos) ) { ++ } else if (fmtChar.toLower() == str.at(strpos)) { + strpos++; + } else { + error = true; +@@ -123,169 +123,168 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + QString shortName, longName; + QChar modifierChar; + // remove space at the beginning +- if ( str.length() > strpos && str.at( strpos ).isSpace() ) { ++ if (str.length() > strpos && str.at(strpos).isSpace()) { + strpos++; + } + +- fmtChar = fmt.at( fmtpos++ ); +- if ( fmtChar == QLatin1Char('E') ) { ++ fmtChar = fmt.at(fmtpos++); ++ if (fmtChar == QLatin1Char('E')) { + modifierChar = fmtChar; +- fmtChar = fmt.at( fmtpos++ ); ++ fmtChar = fmt.at(fmtpos++); + } + +- switch ( fmtChar.unicode() ) +- { +- case 'a': // Weekday Name Short +- case 'A': // Weekday Name Long +- error = true; +- j = 1; +- while ( error && j <= calendar->d_ptr->maxDaysInWeek() ) { +- shortName = calendar->weekDayName( j, KCalendarSystem::ShortDayName ).toLower(); +- longName = calendar->weekDayName( j, KCalendarSystem::LongDayName ).toLower(); +- if ( str.mid( strpos, longName.length() ) == longName ) { +- strpos += longName.length(); +- error = false; +- } else if ( str.mid( strpos, shortName.length() ) == shortName ) { +- strpos += shortName.length(); +- error = false; +- } +- ++j; ++ switch (fmtChar.unicode()) { ++ case 'a': // Weekday Name Short ++ case 'A': // Weekday Name Long ++ error = true; ++ j = 1; ++ while (error && j <= calendar->d_ptr->maxDaysInWeek()) { ++ shortName = calendar->weekDayName(j, KCalendarSystem::ShortDayName).toLower(); ++ longName = calendar->weekDayName(j, KCalendarSystem::LongDayName).toLower(); ++ if (str.mid(strpos, longName.length()) == longName) { ++ strpos += longName.length(); ++ error = false; ++ } else if (str.mid(strpos, shortName.length()) == shortName) { ++ strpos += shortName.length(); ++ error = false; + } +- break; +- case 'b': // Month Name Short +- case 'h': // Month Name Short +- case 'B': // Month Name Long +- error = true; +- j = 1; +- while ( error && j <= calendar->d_ptr->maxMonthsInYear() ) { +- // This may be a problem in calendar systems with variable number of months +- // in the year and/or names of months that change depending on the year, e.g +- // Hebrew. We really need to know the correct year first, but we may not have +- // read it yet and will be using the current year instead +- int monthYear; +- if ( parsedYear ) { +- monthYear = yy; +- } else { +- monthYear = calendar->year( QDate::currentDate() ); +- } +- if ( calendar->locale()->dateMonthNamePossessive() ) { +- shortName = calendar->monthName( j, monthYear, KCalendarSystem::ShortNamePossessive ).toLower(); +- longName = calendar->monthName( j, monthYear, KCalendarSystem::LongNamePossessive ).toLower(); +- } else { +- shortName = calendar->monthName( j, monthYear, KCalendarSystem::ShortName ).toLower(); +- longName = calendar->monthName( j, monthYear, KCalendarSystem::LongName ).toLower(); +- } +- if ( str.mid( strpos, longName.length() ) == longName ) { +- mm = j; +- strpos += longName.length(); +- error = false; +- } else if ( str.mid( strpos, shortName.length() ) == shortName ) { +- mm = j; +- strpos += shortName.length(); +- error = false; +- } +- ++j; ++ ++j; ++ } ++ break; ++ case 'b': // Month Name Short ++ case 'h': // Month Name Short ++ case 'B': // Month Name Long ++ error = true; ++ j = 1; ++ while (error && j <= calendar->d_ptr->maxMonthsInYear()) { ++ // This may be a problem in calendar systems with variable number of months ++ // in the year and/or names of months that change depending on the year, e.g ++ // Hebrew. We really need to know the correct year first, but we may not have ++ // read it yet and will be using the current year instead ++ int monthYear; ++ if (parsedYear) { ++ monthYear = yy; ++ } else { ++ monthYear = calendar->year(QDate::currentDate()); + } +- break; +- case 'd': // Day Number Long +- case 'e': // Day Number Short +- dd = calendar->dayStringToInteger( str.mid( strpos ), readLength ); +- strpos += readLength; +- error = readLength <= 0; +- break; +- case 'n': +- // PosixFormat %n is Newline +- // KdeFormat %n is Month Number Short +- if ( standard == KLocale::KdeFormat ) { +- mm = calendar->monthStringToInteger( str.mid( strpos ), readLength ); +- strpos += readLength; +- error = readLength <= 0; ++ if (calendar->locale()->dateMonthNamePossessive()) { ++ shortName = calendar->monthName(j, monthYear, KCalendarSystem::ShortNamePossessive).toLower(); ++ longName = calendar->monthName(j, monthYear, KCalendarSystem::LongNamePossessive).toLower(); ++ } else { ++ shortName = calendar->monthName(j, monthYear, KCalendarSystem::ShortName).toLower(); ++ longName = calendar->monthName(j, monthYear, KCalendarSystem::LongName).toLower(); + } +- // standard == KLocale::PosixFormat +- // all whitespace already 'eaten', no action required +- break; +- case 'm': // Month Number Long +- mm = calendar->monthStringToInteger( str.mid( strpos ), readLength ); ++ if (str.mid(strpos, longName.length()) == longName) { ++ mm = j; ++ strpos += longName.length(); ++ error = false; ++ } else if (str.mid(strpos, shortName.length()) == shortName) { ++ mm = j; ++ strpos += shortName.length(); ++ error = false; ++ } ++ ++j; ++ } ++ break; ++ case 'd': // Day Number Long ++ case 'e': // Day Number Short ++ dd = calendar->dayStringToInteger(str.mid(strpos), readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'n': ++ // PosixFormat %n is Newline ++ // KdeFormat %n is Month Number Short ++ if (standard == KLocale::KdeFormat) { ++ mm = calendar->monthStringToInteger(str.mid(strpos), readLength); + strpos += readLength; + error = readLength <= 0; +- break; +- case 'Y': // Year Number Long +- case 'y': // Year Number Short +- if ( modifierChar == QLatin1Char('E') ) { // Year In Era +- if ( fmtChar == QLatin1Char('y') ) { +- ey = calendar->yearStringToInteger( str.mid( strpos ), readLength ); +- strpos += readLength; +- error = readLength <= 0; +- } else { +- error = true; +- j = calendar->eraList()->count() -1; // Start with the most recent +- while ( error && j >= 0 ) { +- QString subFormat = calendar->eraList()->at( j ).format(); +- QString subInput = str.mid( strpos ); +- DateTimeComponents subResult = parseDatePosix( subInput, subFormat, calendar, locale, digitSet, standard ); +- if ( !subResult.error ) { +- if ( subResult.parsedYear ) { +- yy = subResult.year; +- parsedYear = true; +- error = false; +- strpos += subResult.inputPosition; +- } else if ( !subResult.eraName.isEmpty() && subResult.yearInEra >= 0 ) { +- ee = subResult.eraName; +- ey = subResult.yearInEra; +- error = false; +- strpos += subResult.inputPosition; +- } +- } +- --j; +- } +- } +- } else { +- yy = calendar->yearStringToInteger( str.mid( strpos ), readLength ); ++ } ++ // standard == KLocale::PosixFormat ++ // all whitespace already 'eaten', no action required ++ break; ++ case 'm': // Month Number Long ++ mm = calendar->monthStringToInteger(str.mid(strpos), readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'Y': // Year Number Long ++ case 'y': // Year Number Short ++ if (modifierChar == QLatin1Char('E')) { // Year In Era ++ if (fmtChar == QLatin1Char('y')) { ++ ey = calendar->yearStringToInteger(str.mid(strpos), readLength); + strpos += readLength; +- if ( fmtChar == QLatin1Char('y') ) { +- yy = calendar->applyShortYearWindow( yy ); +- } + error = readLength <= 0; +- if ( !error ) { +- parsedYear = true; +- } +- } +- break; +- case 'C': // Era +- error = true; +- if ( modifierChar == QLatin1Char('E') ) { +- j = calendar->eraList()->count() -1; // Start with the most recent +- while ( error && j >= 0 ) { +- shortName = calendar->d_ptr->m_eraList->at( j ).name( KLocale::ShortName ).toLower(); +- longName = calendar->eraList()->at( j ).name( KLocale::LongName ).toLower(); +- if ( str.mid( strpos, longName.length() ) == longName ) { +- strpos += longName.length(); +- ee = longName; +- error = false; +- } else if ( str.mid( strpos, shortName.length() ) == shortName ) { +- strpos += shortName.length(); +- ee = shortName; +- error = false; ++ } else { ++ error = true; ++ j = calendar->eraList()->count() - 1; // Start with the most recent ++ while (error && j >= 0) { ++ QString subFormat = calendar->eraList()->at(j).format(); ++ QString subInput = str.mid(strpos); ++ DateTimeComponents subResult = parseDatePosix(subInput, subFormat, calendar, locale, digitSet, standard); ++ if (!subResult.error) { ++ if (subResult.parsedYear) { ++ yy = subResult.year; ++ parsedYear = true; ++ error = false; ++ strpos += subResult.inputPosition; ++ } else if (!subResult.eraName.isEmpty() && subResult.yearInEra >= 0) { ++ ee = subResult.eraName; ++ ey = subResult.yearInEra; ++ error = false; ++ strpos += subResult.inputPosition; ++ } + } + --j; + } + } +- break; +- case 'j': // Day Of Year Number +- dayInYear = integerFromString( str.mid( strpos ), 3, readLength ); +- strpos += readLength; +- error = readLength <= 0; +- break; +- case 'V': // ISO Week Number +- isoWeekNumber = integerFromString( str.mid( strpos ), 2, readLength ); +- strpos += readLength; +- error = readLength <= 0; +- break; +- case 'u': // ISO Day Of Week +- dayOfIsoWeek = integerFromString( str.mid( strpos ), 1, readLength ); ++ } else { ++ yy = calendar->yearStringToInteger(str.mid(strpos), readLength); + strpos += readLength; ++ if (fmtChar == QLatin1Char('y')) { ++ yy = calendar->applyShortYearWindow(yy); ++ } + error = readLength <= 0; +- break; ++ if (!error) { ++ parsedYear = true; ++ } ++ } ++ break; ++ case 'C': // Era ++ error = true; ++ if (modifierChar == QLatin1Char('E')) { ++ j = calendar->eraList()->count() - 1; // Start with the most recent ++ while (error && j >= 0) { ++ shortName = calendar->d_ptr->m_eraList->at(j).name(KLocale::ShortName).toLower(); ++ longName = calendar->eraList()->at(j).name(KLocale::LongName).toLower(); ++ if (str.mid(strpos, longName.length()) == longName) { ++ strpos += longName.length(); ++ ee = longName; ++ error = false; ++ } else if (str.mid(strpos, shortName.length()) == shortName) { ++ strpos += shortName.length(); ++ ee = shortName; ++ error = false; ++ } ++ --j; ++ } ++ } ++ break; ++ case 'j': // Day Of Year Number ++ dayInYear = integerFromString(str.mid(strpos), 3, readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'V': // ISO Week Number ++ isoWeekNumber = integerFromString(str.mid(strpos), 2, readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'u': // ISO Day Of Week ++ dayOfIsoWeek = integerFromString(str.mid(strpos), 1, readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; + } + } + } +@@ -294,12 +293,12 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + result.error = error; + result.inputPosition = strpos; + result.formatPosition = fmtpos; +- if ( error ) { ++ if (error) { + result.day = -1; + result.month = -1; + result.year = 0; + result.parsedYear = false; +- result.eraName = QString(); ++ result.eraName.clear(); + result.yearInEra = -1; + result.dayInYear = -1; + result.isoWeekNumber = -1; +@@ -319,12 +318,15 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + } + + // Parse an input string to match a UNICODE DateTime format string and return any components found +-DateTimeComponents KDateTimeParser::parseDateUnicode( const QString &inputString, +- const QString &formatString, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const ++DateTimeComponents KDateTimeParser::parseDateUnicode(const QString &inputString, ++ const QString &formatString, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const + { ++ Q_UNUSED(calendar); ++ Q_UNUSED(locale); ++ Q_UNUSED(digitSet); + QString str = inputString.simplified().toLower(); + QString fmt = formatString.simplified(); + int dd = -1; +@@ -338,19 +340,19 @@ DateTimeComponents KDateTimeParser::parseDateUnicode( const QString &inputString + int dayOfIsoWeek = -1; + int strpos = 0; + int fmtpos = 0; +- int readLength; // Temporary variable used when reading input ++ //int readLength; // Temporary variable used when reading input + bool error = false; + + DateTimeComponents result; + result.error = error; + result.inputPosition = strpos; + result.formatPosition = fmtpos; +- if ( error ) { ++ if (error) { + result.day = -1; + result.month = -1; + result.year = 0; + result.parsedYear = false; +- result.eraName = QString(); ++ result.eraName.clear(); + result.yearInEra = -1; + result.dayInYear = -1; + result.isoWeekNumber = -1; +@@ -371,26 +373,26 @@ DateTimeComponents KDateTimeParser::parseDateUnicode( const QString &inputString + + // Peel a number off the front of a string which may have other trailing chars after the number + // Stop either at either maxLength, eos, or first non-digit char +-int KDateTimeParser::integerFromString( const QString &string, int maxLength, int &readLength ) const ++int KDateTimeParser::integerFromString(const QString &string, int maxLength, int &readLength) const + { + int value = -1; + int position = 0; + readLength = 0; + bool ok = false; + +- if ( maxLength < 0 ) { ++ if (maxLength < 0) { + maxLength = string.length(); + } + +- while ( position < string.length() && ++ while (position < string.length() && + position < maxLength && +- string.at( position ).isDigit() ) { ++ string.at(position).isDigit()) { + position++; + } + +- if ( position > 0 ) { +- value = string.left( position ).toInt( &ok ); +- if ( ok ) { ++ if (position > 0) { ++ value = string.left(position).toInt(&ok); ++ if (ok) { + readLength = position; + } else { + value = -1; +diff --git a/kdecore/date/kdatetimeparser_p.h b/kdecore/date/kdatetimeparser_p.h +index 7a47c3a..4a25b34 100644 +--- a/kdecore/date/kdatetimeparser_p.h ++++ b/kdecore/date/kdatetimeparser_p.h +@@ -31,8 +31,7 @@ class QTime; + class KDateTime; + class KCalendarSystem; + +-struct DateTimeComponents +-{ ++struct DateTimeComponents { + int day; + int month; + int year; +@@ -54,28 +53,28 @@ public: + + virtual ~KDateTimeParser(); + +- virtual QDate parseDate( const QString &dateString, +- const QString &format, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KLocale::ArabicDigits, +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; ++ virtual QDate parseDate(const QString &dateString, ++ const QString &format, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KLocale::ArabicDigits, ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; + + private: +- virtual DateTimeComponents parseDatePosix( const QString &dateString, +- const QString &format, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard standard ) const; ++ virtual DateTimeComponents parseDatePosix(const QString &dateString, ++ const QString &format, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard standard) const; + +- virtual DateTimeComponents parseDateUnicode( const QString &inputString, +- const QString &format, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const; ++ virtual DateTimeComponents parseDateUnicode(const QString &inputString, ++ const QString &format, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const; + +- virtual int integerFromString( const QString &string, int maxLength, int &readLength ) const; ++ virtual int integerFromString(const QString &string, int maxLength, int &readLength) const; + }; + + #endif // KDATETIMEPARSER_H +diff --git a/kdecore/date/kdayperiod.cpp b/kdecore/date/kdayperiod.cpp +index 84170b4..c810552 100644 +--- a/kdecore/date/kdayperiod.cpp ++++ b/kdecore/date/kdayperiod.cpp +@@ -167,8 +167,8 @@ QTime KDayPeriod::time(int hip, int minute, int second, int millisecond) const + } + int hour; + if (periodStart() <= periodEnd() || +- (hip >= hourInPeriod(periodStart()) && +- hip <= hourInPeriod(QTime(23, 59, 59, 999)))) { ++ (hip >= hourInPeriod(periodStart()) && ++ hip <= hourInPeriod(QTime(23, 59, 59, 999)))) { + hour = hip + periodStart().hour() - d->m_offsetFromStart; + } else { + hour = hip; +@@ -197,7 +197,7 @@ bool KDayPeriod::isValid(const QTime &time) const + return time >= periodStart() && time <= periodEnd(); + } else { + return ((time >= periodStart() && time <= QTime(23, 59, 59, 999)) || +- (time >= QTime( 0, 0, 0 ) && time <= periodEnd())); ++ (time >= QTime(0, 0, 0) && time <= periodEnd())); + } + } else { + return false; +diff --git a/kdecore/date/klocalizeddate.cpp b/kdecore/date/klocalizeddate.cpp +index b624a34..b918e9e 100644 +--- a/kdecore/date/klocalizeddate.cpp ++++ b/kdecore/date/klocalizeddate.cpp +@@ -42,22 +42,22 @@ public: + }; + + KLocalizedDatePrivate::KLocalizedDatePrivate(const QDate &date, const KCalendarSystem *calendar, bool manageCalendar) +- : QSharedData(), +- m_date(date), +- m_calendar(calendar), +- m_manageCalendar(manageCalendar) ++ : QSharedData(), ++ m_date(date), ++ m_calendar(calendar), ++ m_manageCalendar(manageCalendar) + { + } + + KLocalizedDatePrivate::KLocalizedDatePrivate(const KLocalizedDatePrivate &rhs) +- : QSharedData(rhs), +- m_date(rhs.m_date), +- m_calendar(rhs.m_calendar), +- m_manageCalendar(rhs.m_manageCalendar) ++ : QSharedData(rhs), ++ m_date(rhs.m_date), ++ m_calendar(rhs.m_calendar), ++ m_manageCalendar(rhs.m_manageCalendar) + { + // If we're managing the calendar object, then take a copy, + // i.e. user called setCalendarSystem() rather than passing a custom one into the constructor +- if(m_manageCalendar) { ++ if (m_manageCalendar) { + m_calendar = KCalendarSystem::create(m_calendar->calendarSystem(), new KLocale(*m_calendar->locale())); + } + } +@@ -69,7 +69,7 @@ KLocalizedDatePrivate &KLocalizedDatePrivate::operator=(const KLocalizedDatePriv + m_manageCalendar = rhs.m_manageCalendar; + // If we're managing the calendar object, then take a copy, + // i.e. user called setCalendarSystem() rather than passing a custom one into the constructor +- if(rhs.m_manageCalendar) { ++ if (rhs.m_manageCalendar) { + m_calendar = KCalendarSystem::create(m_calendar->calendarSystem(), new KLocale(*m_calendar->locale())); + } + return *this; +@@ -91,18 +91,18 @@ KLocalizedDatePrivate::~KLocalizedDatePrivate() + *****************************************************************************/ + + KLocalizedDate::KLocalizedDate(const QDate &date, const KCalendarSystem *calendarSystem) +- : d(new KLocalizedDatePrivate(date, calendarSystem, false)) ++ : d(new KLocalizedDatePrivate(date, calendarSystem, false)) + { + } + + KLocalizedDate::KLocalizedDate(int year, int month, int day, const KCalendarSystem *calendarSystem) +- : d(new KLocalizedDatePrivate(QDate(), calendarSystem, false)) ++ : d(new KLocalizedDatePrivate(QDate(), calendarSystem, false)) + { + setDate(year, month, day); + } + + KLocalizedDate::KLocalizedDate(const KLocalizedDate &rhs) +- : d(new KLocalizedDatePrivate(*rhs.d)) ++ : d(new KLocalizedDatePrivate(*rhs.d)) + { + } + +@@ -148,7 +148,7 @@ KLocale::CalendarSystem KLocalizedDate::calendarSystem() + + const KCalendarSystem *KLocalizedDate::calendar() const + { +- if ( d->m_calendar ) { ++ if (d->m_calendar) { + return d->m_calendar; + } + return KGlobal::locale()->calendar(); +@@ -167,7 +167,7 @@ bool KLocalizedDate::isNull() const + + bool KLocalizedDate::isValid() const + { +- return calendar()->isValid( date() ); ++ return calendar()->isValid(date()); + } + + /***************************************************************************** +@@ -297,13 +297,12 @@ int KLocalizedDate::dayOfWeek() const + + int KLocalizedDate::week(int *yearNum) const + { +- return calendar()->weekNumber(date(), yearNum); ++ return calendar()->week(date(), yearNum); + } + + int KLocalizedDate::week(KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const + { +- Q_UNUSED(weekNumberSystem); +- return calendar()->weekNumber(date(), yearNum); ++ return calendar()->week(date(), weekNumberSystem, yearNum); + } + + int KLocalizedDate::monthsInYear() const +@@ -318,8 +317,7 @@ int KLocalizedDate::weeksInYear() const + + int KLocalizedDate::weeksInYear(KLocale::WeekNumberSystem weekNumberSystem) const + { +- Q_UNUSED(weekNumberSystem); +- return calendar()->weeksInYear(date()); ++ return calendar()->weeksInYear(date(), weekNumberSystem); + } + + int KLocalizedDate::daysInYear() const +@@ -454,13 +452,13 @@ bool KLocalizedDate::addDaysTo(int days) + } + + void KLocalizedDate::dateDifference(const KLocalizedDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { + dateDifference(toDate.date(), yearsDiff, monthsDiff, daysDiff, direction); + } + + void KLocalizedDate::dateDifference(const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { + calendar()->dateDifference(date(), toDate, yearsDiff, monthsDiff, daysDiff, direction); + } +@@ -606,7 +604,7 @@ QDataStream &operator>>(QDataStream &in, KLocalizedDate &date) + + QDebug operator<<(QDebug dbg, const KLocalizedDate &date) + { +- if (date.calendar()->calendarType() == QLatin1String("gregorian")) { ++ if (date.calendar()->calendarSystem() == KLocale::QDateCalendar) { + dbg.nospace() << "KLocalizedDate(" << date.formatDate(KLocale::IsoDate) << ", " + << date.calendar()->calendarLabel() << ')'; + } else { +diff --git a/kdecore/date/klocalizeddate.h b/kdecore/date/klocalizeddate.h +index 2d1d611..6842577 100644 +--- a/kdecore/date/klocalizeddate.h ++++ b/kdecore/date/klocalizeddate.h +@@ -17,8 +17,8 @@ + Boston, MA 02110-1301, USA. + */ + +-#ifndef KDATE_H +-#define KDATE_H ++#ifndef KLOCALIZEDDATE_H ++#define KLOCALIZEDDATE_H + + #include <QtCore/QString> + #include <QtCore/QDate> +@@ -151,7 +151,7 @@ public: + * See @ref custom for more details on using custom Calendar Systems. + * + * @param date the QDate to set the KLocalizedDate to, defaults to invalid date +- * @param locale the locale to use for date formats, defaults to the global ++ * @param calendar the calendar system to use, defaults to the global + */ + explicit KLocalizedDate(const QDate &date = QDate(), const KCalendarSystem *calendar = 0); + +@@ -169,6 +169,7 @@ public: + * @param year the year to set the KLocalizedDate to + * @param month the month to set the KLocalizedDate to + * @param day the day to set the KLocalizedDate to ++ * @param calendar the calendar system to use, defaults to the global + */ + KLocalizedDate(int year, int month, int day, const KCalendarSystem *calendar = 0); + +@@ -297,7 +298,7 @@ public: + * @see eraName() + * @see yearInEra() + * @param eraName Era string +- * @param year Year In Era number ++ * @param yearInEra Year In Era number + * @param month Month number + * @param day Day Of Month number + * @return @c true if the date is valid, @c false otherwise +@@ -421,7 +422,6 @@ public: + * See @ref formatting for more details on Date Formatting. + * + * @see formatDate() +- * @param format format to return, either short or long + * @return the localized era name, empty string if date is invalid + */ + QString eraName() const; +@@ -433,7 +433,6 @@ public: + * See @ref formatting for more details on Date Formatting. + * + * @see formatDate() +- * @param format format to return, either short or long + * @return the localized era year string, empty string if date is invalid + */ + QString eraYear() const; +@@ -1166,22 +1165,25 @@ Q_DECLARE_METATYPE(KLocalizedDate) + /** + * Data stream output operator + * +- * @param other the date to compare ++ * @param out the datastream to write to ++ * @param date the date to write to the stream + */ + QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KLocalizedDate &date); + + /** + * Data stream input operator + * +- * @param other the date to compare ++ * @param out the datastream to read from ++ * @param date the date to read from the stream + */ + QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date); + + /** + * Debug stream output operator + * +- * @param other the date to print ++ * @param out the debug datastream to write to ++ * @param date the date to write to the stream + */ +-QDebug KDECORE_EXPORT operator<<(QDebug, const KLocalizedDate &); ++QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date); + +-#endif // KDATE_H ++#endif // KLOCALIZEDDATE_H +diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt +index f78c115..276f005 100644 +--- a/kdecore/CMakeLists.txt ++++ b/kdecore/CMakeLists.txt +@@ -184,9 +184,9 @@ set(kdecore_LIB_SRCS + date/kcalendarsystem.cpp + date/kcalendarsystemcoptic.cpp + date/kcalendarsystemethiopian.cpp ++ date/kcalendarsystemqdate.cpp + date/kcalendarsystemgregorian.cpp +- date/kcalendarsystemgregorianproleptic.cpp +- date/kcalendarsystemhijri.cpp ++ date/kcalendarsystemislamiccivil.cpp + date/kcalendarsystemhebrew.cpp + date/kcalendarsystemindiannational.cpp + date/kcalendarsystemjalali.cpp diff --git a/testing/kdelibs/kde-applications-menu.patch b/kde-unstable/kdelibs/kde-applications-menu.patch index 4b513298a..4b513298a 100644 --- a/testing/kdelibs/kde-applications-menu.patch +++ b/kde-unstable/kdelibs/kde-applications-menu.patch diff --git a/kde-unstable/kdelibs/kdelibs.install b/kde-unstable/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/kde-unstable/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..44d684966 --- /dev/null +++ b/kde-unstable/kdemultimedia/PKGBUILD @@ -0,0 +1,109 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' + 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'mplayerthumbs.config') +sha1sums=('60fa25d125aa77b66fd1c1e9e043df48abf35bd4' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xine=OFF + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'tunepimp') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/kde-unstable/kdemultimedia/kdemultimedia.install b/kde-unstable/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdemultimedia/kdemultimedia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdemultimedia/mplayerthumbs.config b/kde-unstable/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/kde-unstable/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD new file mode 100644 index 000000000..763acd722 --- /dev/null +++ b/kde-unstable/kdenetwork/PKGBUILD @@ -0,0 +1,114 @@ +# $Id: PKGBUILD 124770 2011-05-24 10:05:32Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdenetwork +pkgname=('kdenetwork-filesharing' + 'kdenetwork-kdnssd' + 'kdenetwork-kget' + 'kdenetwork-kopete' + 'kdenetwork-kppp' + 'kdenetwork-krdc' + 'kdenetwork-krfb') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' + 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp' + 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' + 'telepathy-qt4' 'libktorrent' 'libmms') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('8afe1547ea6f9f7acbdaf73b3ade4e3c752e645e') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ + -DWITH_Xmms=OFF \ + -DWITH_LibMeanwhile=OFF + make +} + +package_kdenetwork-filesharing() { + pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' + depends=('kdelibs' 'smbclient') + install='kdenetwork.install' + cd $srcdir/build/filesharing + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kdnssd() { + pkgdesc='Monitors the network for DNS-SD services' + depends=('kdelibs') + cd $srcdir/build/kdnssd + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kget() { + pkgdesc='Download Manager' + depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') + optdepends=('python2: YouTube plugin') + url="http://kde.org/applications/internet/kget/" + install='kdenetwork.install' + cd $srcdir/build/kget + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kget + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdenetwork-kopete() { + pkgdesc='Instant Messenger' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu') + url="http://kde.org/applications/internet/kopete/" + install='kdenetwork.install' + cd $srcdir/build/kopete + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kopete + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kppp() { + pkgdesc='Internet Dial-Up Tool' + depends=('kdebase-runtime' 'ppp') + url="http://kde.org/applications/internet/kppp/" + install='kdenetwork.install' + cd $srcdir/build/kppp + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kppp + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krdc() { + pkgdesc='Remote Desktop Client' + depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') + optdepends=('kdebase-keditbookmarks: to edit bookmarks') + url="http://kde.org/applications/internet/krdc/" + cd $srcdir/build/krdc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krdc + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krfb() { + pkgdesc='Desktop Sharing' + # note on libxdamage: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxdamage + depends=('kdebase-runtime' 'libvncserver' 'libxdamage') + cd $srcdir/build/krfb + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krfb + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdenetwork/kdenetwork.install b/kde-unstable/kdenetwork/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdenetwork/kdenetwork.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD index a6deb8923..b3e328a75 100644 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.5.95 +pkgver=4.6.80 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,10 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install -#source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -source=("http://download.kde.org/unstable/kdepim/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'disable-l10n.patch') -sha1sums=('0607224f725ee161d16d41a44bd02bacb8245434' - '991d81435205185dcb2285a6e728f7756ae92b0d') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('18cb10ea5a7373c4eea859b0d0518b6a9c0e6a4e') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/disable-l10n.patch - cd "${srcdir}" mkdir build cd build @@ -33,6 +27,6 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index e1b35c94e..378ef6a39 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121977 2011-05-01 00:22:38Z andrea $ +# $Id: PKGBUILD 124768 2011-05-24 09:38:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,25 +20,24 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.5.95 +pkgver=4.6.80 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' - 'pilot-link' 'kde-agent' 'docbook-xsl') -#source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -source=("http://download.kde.org/unstable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'disable-l10n.patch') -sha1sums=('5227ac466247f043643bb9eaa7568e8b936edafe' - '25e36f160ced051268e59fad6ed2de33a9c7657a') + 'pilot-link' 'kde-agent') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-console-build.patch') +sha1sums=('dc32fee3332df3bdb4395f3a229d88de34ae4de1' + 'e4b82bcee6c46aad39196a5bb2732fed72ff4541') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}"/disable-l10n.patch + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-console-build.patch - cd "${srcdir}" + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -52,10 +51,10 @@ build() { package_kdepim-akonadiconsole() { pkgdesc='Akonadi Management and Debugging Console' depends=('kdepim-libkdepim') - url='http://pim.kde.org' + url='http://pim.kde.org' install='kdepim.install' - cd $srcdir/build/akonadiconsole - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install } package_kdepim-akregator() { @@ -63,12 +62,12 @@ package_kdepim-akregator() { 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 + 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() { @@ -78,19 +77,19 @@ package_kdepim-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 + 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' + url='http://pim.kde.org' install='kdepim.install' - cd $srcdir/build/console - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install } package_kdepim-kaddressbook() { @@ -98,12 +97,12 @@ package_kdepim-kaddressbook() { 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 + 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() { @@ -111,10 +110,10 @@ package_kdepim-kalarm() { 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 + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install } package_kdepim-kjots() { @@ -122,22 +121,22 @@ package_kdepim-kjots() { 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 + 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 + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install } package_kdepim-kmail() { @@ -149,11 +148,11 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') + 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 + nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } @@ -162,12 +161,12 @@ package_kdepim-knode() { 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 + 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() { @@ -175,12 +174,12 @@ package_kdepim-knotes() { 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 + 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() { @@ -192,8 +191,8 @@ package_kdepim-kontact() { 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 + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } @@ -202,20 +201,20 @@ package_kdepim-korganizer() { 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 + 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 + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install } package_kdepim-ktimetracker() { @@ -223,36 +222,36 @@ package_kdepim-ktimetracker() { 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 + 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' + 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 + 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 + 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 new file mode 100644 index 000000000..552b8c0c1 --- /dev/null +++ b/kde-unstable/kdepim/fix-console-build.patch @@ -0,0 +1,11 @@ +--- a/console/kabcclient/src/main.cpp ++++ b/console/kabcclient/src/main.cpp +@@ -117,7 +117,7 @@ int main(int argc, char** argv) + + cmdLineOptions.add("match-case", ki18n("Match key fields case sensitive. UID is always matched case sensitive")); + +- cmdLineOptions.add(ki18n("+[input data]"), ki18n("Input to use instead of reading stdin")); ++ cmdLineOptions.add("+[input data]", ki18n("Input to use instead of reading stdin")); + + KCmdLineArgs::addCmdLineOptions(cmdLineOptions); + KCmdLineArgs::init(argc, argv, &aboutData); diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD new file mode 100644 index 000000000..2fff6052c --- /dev/null +++ b/kde-unstable/kdepimlibs/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124655 2011-05-23 19:42:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdepimlibs +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE PIM Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'gpgme' 'akonadi' 'libical' ) +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') +install='kdepimlibs.install' +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e07ba03177775ee6db6669123b944dd7c3b362f1') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdepimlibs/kdepimlibs.install b/kde-unstable/kdepimlibs/kdepimlibs.install new file mode 100644 index 000000000..99262607c --- /dev/null +++ b/kde-unstable/kdepimlibs/kdepimlibs.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..567e16086 --- /dev/null +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -0,0 +1,603 @@ +# $Id: PKGBUILD 124813 2011-05-24 15:14:21Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeplasma-addons +pkgname=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kdeobservatory' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-libs' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +groups=('kde' 'kdeplasma-addons') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' + 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('09b97248aa576991f9f5e9ddaa3392618e2337e7') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeplasma-addons-applets-bball() { + pkgdesc='A bouncy ball for plasma' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/bball + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-binary-clock() { + pkgdesc='Time displayed in binary format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/binary-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-blackboard() { + pkgdesc='Black Board' + depends=('kdebase-workspace') + cd $srcdir/build/applets/blackboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bookmarks() { + pkgdesc='Quick Access to the Bookmarks' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bookmarks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bubblemon() { + pkgdesc='A pretty bubble that monitors your system.' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bubblemon + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-calculator() { + pkgdesc='Calculate simple sums' + depends=('kdebase-workspace') + cd $srcdir/build/applets/calculator + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-charselect() { + pkgdesc='View, select, and copy characters from a font collection' + depends=('kdebase-workspace') + cd $srcdir/build/applets/charselect + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-comic() { + pkgdesc='View comic strips from the Internet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/comic + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-community() { + pkgdesc='Communicate using the Social Desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/community + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-dict() { + pkgdesc='Look up the meaning of words and their translation into different languages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/dict + make DESTDIR=$pkgdir install + # FIXME + # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz + rm -rf $pkgdir/usr/share/icons +} + +package_kdeplasma-addons-applets-eyes() { + pkgdesc='XEyes clone' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/eyes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fifteenpuzzle() { + pkgdesc='Put the pieces in order' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/fifteenPuzzle + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-filewatcher() { + pkgdesc='Watch for changes in specified files' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fileWatcher + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-frame() { + pkgdesc='Display your favorite pictures' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/applets/frame + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fuzzy-clock() { + pkgdesc='Time displayed in a less precise format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fuzzy-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-incomingmsg() { + pkgdesc='Notification of new messages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/incomingmsg + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kdeobservatory() { + pkgdesc='Visualize the KDE ecosystem' + depends=('kdebase-workspace' 'qwt') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/kdeobservatory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kimpanel() { + pkgdesc='A generic input method panel for Oriental languages' + depends=('kdebase-workspace') + optdepends=('scim: SCIM backend' + 'fcitx: FCITX backend') + cd $srcdir/build/applets/kimpanel + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-knowledgebase() { + pkgdesc='Opendesktop Knowledgebase' + depends=('kdebase-workspace') + cd $srcdir/build/applets/knowledgebase + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kolourpicker() { + pkgdesc='Pick a color from the desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/kolourpicker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konqprofiles() { + pkgdesc='List and launch Konqueror profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konqprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konsoleprofiles() { + pkgdesc='List and launch Konsole profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konsoleprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-lancelot() { + pkgdesc='Launcher to start applications' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + replaces=('lancelot') + provides=('lancelot') + conflicts=('lancelot') + install='kdeplasma-addons-applets-lancelot.install' + cd $srcdir/build/applets/lancelot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-leavenote() { + pkgdesc='Leave notes for users while they are away' + depends=('kdebase-workspace') + cd $srcdir/build/applets/leavenote + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-life() { + pkgdesc='Life' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/life + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-luna() { + pkgdesc='Display moon phases for your location' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/luna + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-magnifique() { + pkgdesc='A magnification glass for the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/magnifique + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-mediaplayer() { + pkgdesc='Widget that can play video and sound' + depends=('kdebase-workspace') + cd $srcdir/build/applets/mediaplayer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-microblog() { + pkgdesc='Update and view your microblog status.' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/microblog + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-news() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-notes() { + pkgdesc='Desktop sticky notes' + depends=('kdebase-workspace') + cd $srcdir/build/applets/notes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-nowplaying() { + pkgdesc='Displays currently playing audio' + depends=('kdebase-workspace') + cd $srcdir/build/applets/nowplaying + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-paste() { + pkgdesc='Paste text snippets' + depends=('kdebase-workspace') + cd $srcdir/build/applets/paste + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-pastebin() { + pkgdesc='Paste text/images to a remote server' + depends=('kdebase-workspace') + cd $srcdir/build/applets/pastebin + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-plasmaboard() { + pkgdesc='A virtual, on-screen keyboard' + depends=('kdebase-workspace') + cd $srcdir/build/applets/plasmaboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-previewer() { + pkgdesc='Preview This File' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/previewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-qalculate() { + pkgdesc='A powerful mathematical equation solver' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/qalculate + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rememberthemilk() { + pkgdesc='Remember The Milk Todo list applet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/rememberthemilk + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rssnow() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/rssnow + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdashboard() { + pkgdesc='Show the Plasma widget dashboard above other windows' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdashboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdesktop() { + pkgdesc='Show the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdesktop + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-social-news() { + pkgdesc='Stay informed with the Social Desktop' + replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + depends=('kdebase-workspace') + cd $srcdir/build/applets/social-news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-spellcheck() { + pkgdesc='Fast spell checking' + depends=('kdebase-workspace') + cd $srcdir/build/applets/spellcheck + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-systemloadviewer() { + pkgdesc='Tiny CPU/RAM/Swap monitor' + depends=('kdebase-workspace') + cd $srcdir/build/applets/systemloadviewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-timer() { + pkgdesc='Countdown over a specified time period' + depends=('kdebase-workspace') + cd $srcdir/build/applets/timer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-unitconverter() { + pkgdesc='Plasmoid for converting units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/unitconverter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weather() { + pkgdesc='Displays Weather information' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weather + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weatherstation() { + pkgdesc='Weather reports with an LCD display style' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weatherstation + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-webslice() { + pkgdesc='Show a part of a webpage' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/webslice + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-containments() { + pkgdesc='Activities types for Plasma shells' + depends=('kdebase-workspace') + cd $srcdir/build/containments + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-libs() { + pkgdesc='Plasma Addon Library' + depends=('kdebase-workspace') + groups=() + replaces=('kdeplasma-addons-dataengines') + provides=('kdeplasma-addons-dataengines') + conflicts=('kdeplasma-addons-dataengines') + cd $srcdir/build/libs + make DESTDIR=$pkgdir install + cd $srcdir/build/dataengines + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-audioplayercontrol() { + pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' + depends=('kdebase-workspace') + cd $srcdir/build/runners/audioplayercontrol + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-browserhistory() { + pkgdesc='Searches in Konqueror´s history' + depends=('kdebase-workspace') + cd $srcdir/build/runners/browserhistory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-characters() { + pkgdesc='special Characters' + depends=('kdebase-workspace') + cd $srcdir/build/runners/characters + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-contacts() { + pkgdesc='Finds entries in your address book' + depends=('kdebase-workspace') + cd $srcdir/build/runners/contacts + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-converter() { + pkgdesc='Convert values to different units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/runners/converter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-datetime() { + pkgdesc='The current date and time, locally or in any timezone' + depends=('kdebase-workspace') + cd $srcdir/build/runners/datetime + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-events() { + pkgdesc='Calendar Events runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/events + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-katesessions() { + pkgdesc='Matches Kate Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/katesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konquerorsessions() { + pkgdesc='Matches Konqueror Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konquerorsessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konsolesessions() { + pkgdesc='Matches Konsole Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konsolesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-kopete() { + pkgdesc='Kopete Contact runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/kopete + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-mediawiki() { + pkgdesc='Search on Wikitravel' + depends=('kdebase-workspace') + cd $srcdir/build/runners/mediawiki + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-spellchecker() { + pkgdesc='Check the spelling of a word' + depends=('kdebase-workspace') + cd $srcdir/build/runners/spellchecker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-mandelbrot() { + pkgdesc='Mandelbrot' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/mandelbrot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-marble() { + pkgdesc='Globe' + depends=('kdebase-workspace' 'kdeedu-marble') + cd $srcdir/build/wallpapers/marble + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-pattern() { + pkgdesc='Pattern' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/pattern + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-virus() { + pkgdesc='Virus' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/virus + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-weather() { + pkgdesc='Weather' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/weather + make DESTDIR=$pkgdir install +} diff --git a/testing/kdelibs/kdelibs.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install index ce5c32e1b..ce5c32e1b 100644 --- a/testing/kdelibs/kdelibs.install +++ b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD new file mode 100644 index 000000000..c64df1df3 --- /dev/null +++ b/kde-unstable/kdesdk-kate/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 124689 2011-05-23 21:22:48Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=kdesdk-kate +pkgname=('kdebase-kwrite' + 'kdesdk-kate') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +makedepends=('kdelibs ''cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2" + 'pkgbuild-syntax-highlight.patch') +sha1sums=('9c95690b9f967a0ed52afcf6c4d7ace3ef9284ff' + 'ab0c5d2a796b0f283154799add161c99f48ffcd5') + +build() { + cd "${srcdir}"/kate-${pkgver} + patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../kate-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_KTEXTEDITOR=OFF + make +} + +package_kdebase-kwrite() { + pkgdesc="Text Editor" + depends=('kdebase-runtime') + groups=('kde' 'kdebase') + install='kdebase-kwrite.install' + + cd "${srcdir}"/build/kwrite + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/part + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kwrite + make DESTDIR="${pkgdir}" install +} + +package_kdesdk-kate() { + pkgdesc="Advanced Text Editor" + depends=('kdebase-kwrite') + groups=('kde' 'kdesdk') + install='kdesdk-kate.install' + + cd "${srcdir}"/build/kate + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kate + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdesdk-kate/kdebase-kwrite.install b/kde-unstable/kdesdk-kate/kdebase-kwrite.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdesdk-kate/kdebase-kwrite.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdesdk-kate/kdesdk-kate.install b/kde-unstable/kdesdk-kate/kdesdk-kate.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdesdk-kate/kdesdk-kate.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdelibs/abs-syntax-highlight.patch b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch index 477479a9b..3c43eca0f 100644 --- a/testing/kdelibs/abs-syntax-highlight.patch +++ b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch @@ -1,12 +1,11 @@ -diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml ---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200 -+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200 +--- 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;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> ++<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl) Changes by Matthew Woehlke (mw_triad@users.sourceforge.net) diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD new file mode 100644 index 000000000..c01ad1d6e --- /dev/null +++ b/kde-unstable/kdesdk/PKGBUILD @@ -0,0 +1,247 @@ +# $Id: PKGBUILD 124846 2011-05-24 18:38:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdesdk +pkgname=('kdesdk-cervisia' + 'kdesdk-dolphin-plugins' + 'kdesdk-kapptemplate' + 'kdesdk-kcachegrind' + 'kdesdk-kdeaccounts-plugin' + 'kdesdk-kdepalettes' + 'kdesdk-kioslave' + 'kdesdk-kmtrace' + 'kdesdk-kompare' + 'kdesdk-kpartloader' + 'kdesdk-kprofilemethod' +# 'kdesdk-kspy' + 'kdesdk-kstartperf' + 'kdesdk-kuiviewer' + 'kdesdk-lokalize' + 'kdesdk-okteta' + 'kdesdk-poxml' +# 'kdesdk-scheck' + 'kdesdk-scripts' + 'kdesdk-strigi-analyzer' + 'kdesdk-umbrello') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdesdk') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' + 'kdepimlibs' 'kdebase-lib') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-python2-path.patch') +sha1sums=('2193e14b8373b833221dbf08ecdb0075e86abe44' + 'd05ca0231869c484fd3861955d960a60aff7dcfb') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + # Fix python2 path + patch -Np1 -i ${srcdir}/fix-python2-path.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdesdk-cervisia() { + pkgdesc='CVS Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/cervisia/" + install='kdesdk.install' + cd $srcdir/build/cervisia + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/cervisia + make DESTDIR=$pkgdir install +} + +package_kdesdk-dolphin-plugins() { + pkgdesc='Extra Dolphin plugins' + depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare') + install='kdesdk.install' + cd $srcdir/build/dolphin-plugins/git + make DESTDIR=$pkgdir install + cd $srcdir/build/dolphin-plugins/svn + make DESTDIR=$pkgdir install +} + +package_kdesdk-kapptemplate() { + pkgdesc='KDE Template Generator' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kapptemplate/" + install='kdesdk.install' + cd $srcdir/build/kapptemplate + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapptemplate + make DESTDIR=$pkgdir install +} + +package_kdesdk-kcachegrind() { + pkgdesc='Visualization of Performance Profiling Data' + depends=('kdebase-runtime' 'python2') + optdepends=('php: PHP support') + url="http://kde.org/applications/development/kcachegrind/" + install='kdesdk.install' + cd $srcdir/build/kcachegrind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcachegrind + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdeaccounts-plugin() { + pkgdesc='KDE Repository Accounts' + depends=('kdepim-runtime') + cd $srcdir/build/kdeaccounts-plugin + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdepalettes() { + pkgdesc='Palettes for the Gimp that match the KDE standard color palette' + optdepends=('gimp') + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \ + $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl +} + +package_kdesdk-kioslave() { + pkgdesc='KDED Subversion Module' + depends=('kdebase-runtime' 'subversion') + cd $srcdir/build/kioslave + make DESTDIR=$pkgdir install +} + +package_kdesdk-kmtrace() { + pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality' + depends=('kdebase-runtime') + cd $srcdir/build/kmtrace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmtrace + make DESTDIR=$pkgdir install +} + +package_kdesdk-kompare() { + pkgdesc='Diff/Patch Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kompare/" + install='kdesdk.install' + cd $srcdir/build/kompare + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kompare + make DESTDIR=$pkgdir install +} + +package_kdesdk-kpartloader() { + pkgdesc='A test application for KParts' + depends=('kdebase-runtime') + install='kdesdk.install' + cd $srcdir/build/kpartloader + make DESTDIR=$pkgdir install +} + +package_kdesdk-kprofilemethod() { + pkgdesc='Macros helping to profile' + cd $srcdir/build/kprofilemethod + make DESTDIR=$pkgdir install +} + +package_kdesdk-kspy() { + pkgdesc='An Object Inspector for Qt/KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kspy + make DESTDIR=$pkgdir install +} + +package_kdesdk-kstartperf() { + pkgdesc='Startup time measurement tool for KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kstartperf + make DESTDIR=$pkgdir install +} + +package_kdesdk-kuiviewer() { + pkgdesc='Qt Designer UI File Viewer' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kuiviewer/" + install='kdesdk.install' + cd $srcdir/build/kuiviewer + make DESTDIR=$pkgdir install +} + +package_kdesdk-lokalize() { + pkgdesc='Computer-Aided Translation System' + depends=('kdebase-runtime' 'kdebindings-python') + url="http://kde.org/applications/development/lokalize/" + optdepends=('translate-toolkit: enable extra python script') + install='kdesdk.install' + cd $srcdir/build/lokalize + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lokalize + make DESTDIR=$pkgdir install +} + +package_kdesdk-okteta() { + pkgdesc='Hex Editor' + depends=('kdebase-runtime') + replaces=('kdeutils-okteta') + conflicts=('kdeutils-okteta') + url="http://kde.org/applications/utilities/okteta" + install='kdesdk-okteta.install' + cd $srcdir/build/okteta + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okteta + make DESTDIR=$pkgdir install +} + +package_kdesdk-poxml() { + pkgdesc='Translates DocBook XML files using gettext po files' + depends=('qt' 'antlr2') + cd $srcdir/build/poxml + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/poxml + make DESTDIR=$pkgdir install +} + +package_kdesdk-scheck() { + pkgdesc='An interface style to highlight accel and style guide conflicts' + depends=('kdebase-runtime') + cd $srcdir/build/scheck + make DESTDIR=$pkgdir install +} + +package_kdesdk-scripts() { + pkgdesc='KDE SDK scripts' + depends=('python2') + cd $srcdir/build/scripts + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/scripts + make DESTDIR=$pkgdir install +} + +package_kdesdk-strigi-analyzer() { + pkgdesc='Strigi-Analyzer for KDE SDK' + depends=('kdelibs') + cd $srcdir/build/strigi-analyzer + make DESTDIR=$pkgdir install +} + +package_kdesdk-umbrello() { + pkgdesc='UML Modeller' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/umbrello/" + install='kdesdk.install' + cd $srcdir/build/umbrello + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/umbrello + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdesdk/fix-python2-path.patch b/kde-unstable/kdesdk/fix-python2-path.patch new file mode 100644 index 000000000..c2c0745d1 --- /dev/null +++ b/kde-unstable/kdesdk/fix-python2-path.patch @@ -0,0 +1,64 @@ +--- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100 ++++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # _*_ coding: latin1 _*_ + + # +--- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 +@@ -114,7 +114,7 @@ + print >>sys.stderr, "Execution failed:", e + + cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) +- if os.name!='nt': cmd='python '+cmd ++ if os.name!='nt': cmd='python2 '+cmd + else: cmd=cmd.replace('/','\\') + os.system(cmd) + +--- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 +@@ -42,7 +42,7 @@ + xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) + + ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] +- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) ++ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) + + try: convert() + except: print 'error occured' +--- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100 ++++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + # + # Copyright David Faure <faure@kde.org>, License LGPL v2 + # +--- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100 ++++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100 +@@ -17,6 +17,6 @@ + svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID + + echo "Creating changelog..."; +-svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 ++svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 + + rm /tmp/accounts.$PPID +--- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100 ++++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + + import os, sys, string + +--- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100 ++++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # encoding: utf-8 + # + # Generates reviewboard compatible diffs from git-svn repositories. diff --git a/kde-unstable/kdesdk/kdesdk-okteta.install b/kde-unstable/kdesdk/kdesdk-okteta.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/kde-unstable/kdesdk/kdesdk-okteta.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdesdk/kdesdk.install b/kde-unstable/kdesdk/kdesdk.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdesdk/kdesdk.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD new file mode 100644 index 000000000..1eba40691 --- /dev/null +++ b/kde-unstable/kdetoys/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 124780 2011-05-24 12:05:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdetoys +pkgname=('kdetoys-amor' + 'kdetoys-kteatime' + 'kdetoys-ktux') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdetoys') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('b268bb38f84199d33d3be1fe3e0389c0abb35e69') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdetoys-amor() { + pkgdesc='On-Screen Creature' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/amor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/amor + make DESTDIR=$pkgdir install +} + +package_kdetoys-kteatime() { + pkgdesc='Tea Cooker' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/kteatime + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kteatime + make DESTDIR=$pkgdir install +} + +package_kdetoys-ktux() { + pkgdesc='KTux' + depends=('kdebase-workspace' ) + install='kdetoys.install' + cd $srcdir/build/ktux + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdetoys/kdetoys.install b/kde-unstable/kdetoys/kdetoys.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdetoys/kdetoys.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeutils/PKGBUILD b/kde-unstable/kdeutils/PKGBUILD new file mode 100644 index 000000000..89915c6f6 --- /dev/null +++ b/kde-unstable/kdeutils/PKGBUILD @@ -0,0 +1,180 @@ +# $Id: PKGBUILD 124777 2011-05-24 11:52:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeutils +pkgname=('kdeutils-ark' + 'kdeutils-filelight' + 'kdeutils-kcalc' + 'kdeutils-kcharselect' + 'kdeutils-kdf' + 'kdeutils-kfloppy' + 'kdeutils-kgpg' + 'kdeutils-kremotecontrol' + 'kdeutils-ktimer' + 'kdeutils-kwallet' + 'kdeutils-printer-applet' + 'kdeutils-superkaramba' + 'kdeutils-sweeper') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeutils') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' + 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' + 'qjson') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('90b5e5bd95ec2de2d36db20c6155d23dbeab2d60') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeutils-ark() { + pkgdesc='Archiving Tool' + depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') + optdepends=('p7zip' 'zip' 'unzip' 'unrar') + url="http://kde.org/applications/utilities/ark/" + cd $srcdir/build/ark + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ark + make DESTDIR=$pkgdir install +} + +package_kdeutils-filelight() { + pkgdesc='View disk usage information' + depends=('kdebase-runtime' 'qimageblitz') + replaces=('filelight') + conflicts=('filelight') + install='kdeutils.install' + url="http://methylblue.com/filelight/" + cd $srcdir/build/filelight + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/filelight + make DESTDIR=$pkgdir install +} + +package_kdeutils-kcalc() { + pkgdesc='Scientific Calculator' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kcalc/" + cd $srcdir/build/kcalc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcalc + make DESTDIR=$pkgdir install +} + +package_kdeutils-kcharselect() { + pkgdesc='Character Selector' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kcharselect/" + cd $srcdir/build/kcharselect + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcharselect + make DESTDIR=$pkgdir install +} + +package_kdeutils-kdf() { + pkgdesc='View Disk Usage' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/kdiskfree/" + install='kdeutils.install' + cd $srcdir/build/kdf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdf + make DESTDIR=$pkgdir install +} + +package_kdeutils-kfloppy() { + pkgdesc='Floppy Formatter' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfloppy/" + install='kdeutils.install' + cd $srcdir/build/kfloppy + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfloppy + make DESTDIR=$pkgdir install +} + +package_kdeutils-kgpg() { + pkgdesc='A GnuPG frontend' + depends=('kdepim-runtime' 'kde-agent') + url="http://kde.org/applications/utilities/kgpg" + install='kdeutils.install' + cd $srcdir/build/kgpg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgpg + make DESTDIR=$pkgdir install +} + +package_kdeutils-kremotecontrol() { + pkgdesc='Configure your remote controls for use with applications' + replaces=('kdeutils-kdelirc') + conflicts=('kdeutils-kdelirc') + depends=('kdebase-workspace') + url="http://kde.org/applications/utilities/kremotecontrol" + install='kdeutils.install' + cd $srcdir/build/kremotecontrol + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/kremotecontrol + make DESTDIR=$pkgdir install +} + +package_kdeutils-ktimer() { + pkgdesc='Countdown Launcher' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/ktimer" + install='kdeutils.install' + cd $srcdir/build/ktimer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktimer + make DESTDIR=$pkgdir install +} + +package_kdeutils-kwallet() { + pkgdesc='Wallet Management Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/kwalletmanager/" + install='kdeutils.install' + cd $srcdir/build/kwallet + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kwallet + make DESTDIR=$pkgdir install +} + +package_kdeutils-printer-applet() { + pkgdesc='System tray icon for managing print jobs' + depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/printer-applet + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdeutils-superkaramba() { + pkgdesc='An engine for cool desktop eyecandy' + depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz') + url="http://kde.org/applications/utilities/superkaramba" + install='kdeutils.install' + cd $srcdir/build/superkaramba + make DESTDIR=$pkgdir install +} + +package_kdeutils-sweeper() { + pkgdesc='System Cleaner' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/sweeper/" + cd $srcdir/build/sweeper + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdeutils/kdeutils.install b/kde-unstable/kdeutils/kdeutils.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeutils/kdeutils.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD new file mode 100644 index 000000000..d70b92ee0 --- /dev/null +++ b/kde-unstable/kdewebdev/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 124779 2011-05-24 12:04:03Z andrea $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdewebdev +pkgname=('kdewebdev-kfilereplace' + 'kdewebdev-kimagemapeditor' + 'kdewebdev-klinkstatus' + 'kdewebdev-kommander') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdewebdev') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' + 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('d5e35391eb64265f66d81c5bdd8d95abf11d474a') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdewebdev-kfilereplace() { + pkgdesc='Search & Replace Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfilereplace/" + install='kdewebdev.install' + cd $srcdir/build/kfilereplace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfilereplace + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kimagemapeditor() { + pkgdesc='HTML Image Map Editor' + depends=('kdebase-runtime') + install='kdewebdev.install' + cd $srcdir/build/kimagemapeditor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kimagemapeditor + make DESTDIR=$pkgdir install +} + +package_kdewebdev-klinkstatus() { + pkgdesc='Link Checker' + depends=('kdepim-runtime' 'tidyhtml') + install='kdewebdev.install' + cd $srcdir/build/klinkstatus + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klinkstatus + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kommander() { + pkgdesc='Executor for Kommander dialogs' + depends=('kdebase-runtime') + cd $srcdir/build/kommander + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdewebdev/kdewebdev.install b/kde-unstable/kdewebdev/kdewebdev.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdewebdev/kdewebdev.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD new file mode 100644 index 000000000..95daa4280 --- /dev/null +++ b/kde-unstable/libkdcraw/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkdcraw +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A C++ interface used to decode RAW picture" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'lcms') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('19fe60a51ede7bf5b4047f8fff22cd8361ebd90c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkdcraw/libkdcraw.install b/kde-unstable/libkdcraw/libkdcraw.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libkdcraw/libkdcraw.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD new file mode 100644 index 000000000..fa4986b87 --- /dev/null +++ b/kde-unstable/libkdeedu/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124792 2011-05-24 13:04:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkdeedu +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Libraries used by KDE Education applications" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +replaces=('kdeedu-libkdeedu' 'kdeedu-data') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2349b0a1676b61c7915a272030d6388e8bd6c3b1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkdeedu/libkdeedu.install b/kde-unstable/libkdeedu/libkdeedu.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libkdeedu/libkdeedu.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD new file mode 100644 index 000000000..c80f8cd71 --- /dev/null +++ b/kde-unstable/libkexiv2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkexiv2 +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A library to manipulate pictures metadata" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('cff979e2bcc604ec422feff0bc1fee3483955e5d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkface/PKGBUILD b/kde-unstable/libkface/PKGBUILD new file mode 100644 index 000000000..9bdcab86b --- /dev/null +++ b/kde-unstable/libkface/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124682 2011-05-23 20:54:29Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkface +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A library to perform face recognition and detection over pictures" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'opencv') +makedepends=('cmake' 'automoc4') +#install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('197b7c26e70c45339745efc839698c3ad276bb65') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD new file mode 100644 index 000000000..b11e5a1cf --- /dev/null +++ b/kde-unstable/libkipi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkipi +pkgver=4.6.80 +pkgrel=1 +pkgdesc="An interface to use kipi-plugins from a KDE application" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('f87620e1eaa795129447473c3b89dbc5a27da161') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkipi/libkipi.install b/kde-unstable/libkipi/libkipi.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libkipi/libkipi.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkmap/PKGBUILD b/kde-unstable/libkmap/PKGBUILD new file mode 100644 index 000000000..b2ae07a94 --- /dev/null +++ b/kde-unstable/libkmap/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124764 2011-05-24 08:23:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkmap +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A library to browse and arrange photos over a map" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdeedu-marble') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('87a91c4076e4c8867d129679494a4de19ba2e1bd') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Kexiv2=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD new file mode 100644 index 000000000..b1f117368 --- /dev/null +++ b/kde-unstable/libksane/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libksane +pkgver=4.6.80 +pkgrel=1 +pkgdesc="An image scanning library" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'sane') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('19cf8532f5ea046343fcaa51b9a9c0df7aae2978') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libksane/libksane.install b/kde-unstable/libksane/libksane.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libksane/libksane.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libqzeitgeist/PKGBUILD b/kde-unstable/libqzeitgeist/PKGBUILD new file mode 100644 index 000000000..057ee2628 --- /dev/null +++ b/kde-unstable/libqzeitgeist/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 124473 2011-05-22 13:09:39Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libqzeitgeist +pkgver=0.1git20110522 +pkgrel=1 +pkgdesc="A Qt interface to the Zeitgeist event tracking system" +url="https://projects.kde.org/projects/kdesupport/libqzeitgeist" +arch=('i686' 'x86_64') +license=('GPL') +depends=('qt') +makedepends=('cmake') +source=("${pkgname}-${pkgver}.tar.bz2"::'http://quickgit.kde.org/?p=libqzeitgeist.git&a=snapshot&h=289c66f430dfb842afd36191a0ef82a26111c403&fmt=tbz2') +md5sums=('ba7d2c347e82b0aa6ab55f3136fb9468') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/phonon/PKGBUILD b/kde-unstable/phonon/PKGBUILD new file mode 100644 index 000000000..ad7852355 --- /dev/null +++ b/kde-unstable/phonon/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=phonon +pkgver=4.5.55 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://phonon.kde.org" +license=('LGPL') +pkgdesc="The multimedia framework for KDE4" +depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') +optdepends=('pulseaudio: PulseAudio support') +makedepends=('cmake' 'automoc4' 'pulseaudio') +source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2") +#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('ce1316c88df988320e75a2b4c3cb8804') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON + make +} + +package(){ + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/qt/PKGBUILD b/kde-unstable/qt/PKGBUILD new file mode 100644 index 000000000..89e96034f --- /dev/null +++ b/kde-unstable/qt/PKGBUILD @@ -0,0 +1,222 @@ +# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.7.3 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://qt.nokia.com/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2') +options=('!libtool') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop' + 'qtbug-16292.patch') +md5sums=('49b96eefb1224cc529af6fe5608654fe' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'dc7ed8c2e8c68a175f7f05a34dccc937') + +build() { + unset QMAKESPEC + export QT4DIR=$srcdir/$_pkgfqn + export PATH=${QT4DIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + cd $srcdir/$_pkgfqn + + # Already fixed upstream + patch -p1 -i "${srcdir}"/qtbug-16292.patch + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf + sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -largefile \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -xmlpatterns \ + -no-phonon \ + -no-phonon-backend \ + -svg \ + -webkit \ + -script \ + -scripttools \ + -system-zlib \ + -system-libtiff \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -no-rpath \ + -openssl-linked \ + -silent \ + -optimized-qmake \ + -dbus \ + -reduce-relocations \ + -no-separate-debug-info \ + -gtkstyle \ + -opengl \ + -no-openvg \ + -glib + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd $srcdir/$_pkgfqn + make INSTALL_ROOT=$pkgdir install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png + install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png + install -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + # Fix wrong path in prl files + find ${pkgdir}/usr/lib -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d ${pkgdir}/usr/include/phonon/private + cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/Qt3Support/private + cd ${srcdir}/$_pkgfqn/src/qt3support/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtCore/private + cd ${srcdir}/$_pkgfqn/src/corelib/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtDBus/private + cd ${srcdir}/$_pkgfqn/src/dbus/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtDeclarative/private + cd ${srcdir}/$_pkgfqn/src/declarative/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtDesigner/private + cd ${srcdir}/$_pkgfqn/tools/designer/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtGui/private + cd ${srcdir}/$_pkgfqn/src/gui/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtHelp/private + cd ${srcdir}/$_pkgfqn/tools/assistant/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtMultimedia/private + cd ${srcdir}/$_pkgfqn/src/multimedia/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtNetwork/private + cd ${srcdir}/$_pkgfqn/src/network/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtOpenGL/private + cd ${srcdir}/$_pkgfqn/src/opengl/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtScript/private + cd ${srcdir}/$_pkgfqn/src/script/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtScriptTools/private + cd ${srcdir}/$_pkgfqn/src/scripttools/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtSql/private + cd ${srcdir}/$_pkgfqn/src/sql/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtSvg/private + cd ${srcdir}/$_pkgfqn/src/svg/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtTest/private + cd ${srcdir}/$_pkgfqn/src/testlib/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtUiTools/private + cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtWebKit/private + cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtXmlPatterns/private + cd ${srcdir}/$_pkgfqn/src/xmlpatterns/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null +} diff --git a/kde-unstable/qt/assistant.desktop b/kde-unstable/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/kde-unstable/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/kde-unstable/qt/designer.desktop b/kde-unstable/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/kde-unstable/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/kde-unstable/qt/linguist.desktop b/kde-unstable/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/kde-unstable/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/kde-unstable/qt/qt.install b/kde-unstable/qt/qt.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/qt/qtbug-16292.patch b/kde-unstable/qt/qtbug-16292.patch new file mode 100644 index 000000000..9728e28f5 --- /dev/null +++ b/kde-unstable/qt/qtbug-16292.patch @@ -0,0 +1,62 @@ +From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 +From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> +Date: Tue, 15 Feb 2011 11:19:26 +0100 +Subject: [PATCH] Fix crash in KPackageKit + +QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex +after calling QTreeView::indexRowSizeHint(). + +Same thing inside QTreeView::indexRowSizeHint(), since +QHeaderView::count() will call +QAbstractItemViewPrivate::executePostedLayout() which may invalidate +all the QModelIndex. + +Reviewed-by: Olivier +Task-number: QTBUG-16292 +--- + src/gui/itemviews/qtreeview.cpp | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp +index f1f3236..c0573bb 100644 +--- a/src/gui/itemviews/qtreeview.cpp ++++ b/src/gui/itemviews/qtreeview.cpp +@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const + + int start = -1; + int end = -1; ++ int indexRow = index.row(); + int count = d->header->count(); + bool emptyHeader = (count == 0); + QModelIndex parent = index.parent(); +@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const + int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); + if (d->header->isSectionHidden(logicalColumn)) + continue; +- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); ++ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); + if (idx.isValid()) { + QWidget *editor = d->editorForIndex(idx).editor; + if (editor && d->persistent.contains(editor)) { +@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const + if (viewItems.isEmpty()) + return 0; + const QModelIndex &index = viewItems.at(item).index; ++ if (!index.isValid()) ++ return 0; + int height = viewItems.at(item).height; +- if (height <= 0 && index.isValid()) { ++ if (height <= 0) { + height = q_func()->indexRowSizeHint(index); + viewItems[item].height = height; + } +- if (!index.isValid() || height < 0) +- return 0; +- return height; ++ return qMax(height, 0); + } + + +-- +1.6.1 + diff --git a/kde-unstable/qt/qtconfig.desktop b/kde-unstable/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/kde-unstable/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/kde-unstable/soprano/PKGBUILD b/kde-unstable/soprano/PKGBUILD new file mode 100644 index 000000000..324ccc640 --- /dev/null +++ b/kde-unstable/soprano/PKGBUILD @@ -0,0 +1,34 @@ +# $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/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD index 82809afdf..1a12d1a68 100644 --- a/libre/aif-libre/PKGBUILD +++ b/libre/aif-libre/PKGBUILD @@ -2,11 +2,11 @@ # Maintainer: Dieter Plaetinck <dieter@plaetinck.be> pkgname=aif-libre -pkgver=2011.02.13 +pkgver=2011.05.22 pkgrel=1 pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)" arch=('any') -url="http://projects.parabolagnulinux.org/aif.git/" +url="https://projects.parabolagnulinux.org/aif.git" license=('GPL3') depends=('util-linux-ng' 'bash' 'pacman' 'coreutils' 'grub' 'grep' 'mkinitcpio' 'awk' 'sed' 'libui-sh') optdepends=('cryptsetup: for encryption support' @@ -22,12 +22,11 @@ optdepends=('cryptsetup: for encryption support' replaces=('aif') conflicts=('aif') provides=('aif') -source=(http://projects.parabolagnulinux.org/aif.git/snapshot/aif-${pkgver}-parabola.tar.bz2) -md5sums=('8727035c4bbadd24275aa3a27db88643') +source=($url/snapshot/aif-${pkgver}.tar.bz2) build() { - cd $srcdir/aif-$pkgver-parabola/ + cd $srcdir/aif-$pkgver/ make DESTDIR="$pkgdir/" install @@ -35,3 +34,4 @@ build() { # vim:set ts=2 sw=2 et: +md5sums=('2dbbdc5321111e6cb30a4a8f68018f12') diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index ac032e4af..80a61b2af 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer (Parabola): xihh pkgname=ghostscript-libre pkgver=9.02 -pkgrel=1 +pkgrel=2 pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') #non free files removed diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 6420d29f4..b76c4a0b9 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -4,11 +4,11 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') -pkgver=0.10.21 +pkgver=0.10.22 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.30' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'exempi' 'jack' 'neon' 'libexif' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2) @@ -26,9 +26,9 @@ build() { package_gstreamer0.10-bad-libre() { pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)" - depends=('gstreamer0.10-base>=0.10.32') + depends=('gstreamer0.10-base>=0.10.34') groups=('gstreamer0.10-plugins') - provides=('gstreamer0.10-bad') + provides=("gstreamer0.10-bad=$pkgver") conflicts=('gstreamer0.10-bad') replaces=('gstreamer0.10-bad') @@ -38,10 +38,10 @@ package_gstreamer0.10-bad-libre() { package_gstreamer0.10-bad-libre-plugins() { pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)" - depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'exempi' 'jack' 'neon' 'libexif' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme') + depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg') groups=('gstreamer0.10-plugins') install=gstreamer0.10-bad-plugins.install - provides=('gstreamer0.10-bad-plugins') + provides=("gstreamer0.10-bad-plugins-libre=$pkgver") conflicts=('gstreamer0.10-bad-plugins') replaces=('gstreamer0.10-bad-plugins') @@ -51,4 +51,4 @@ package_gstreamer0.10-bad-libre-plugins() { make -C sys DESTDIR="${pkgdir}" install make -C gst-libs DESTDIR="${pkgdir}" uninstall } -md5sums=('f501336ab1d18d2565f47c36ce653a82') +md5sums=('9a2acee1f386f71247003d0d7090fb1c') diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index fb29c76fe..2d77571ee 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2011.04.1 +pkgver=2011.05.2 pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64' 'mips64el') @@ -13,19 +13,19 @@ url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('bash' 'grep' 'coreutils' 'udev' +depends=('bash' 'grep' 'coreutils' 'udev>=167' 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') install=initscripts.install -source=("http://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" +source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') -md5sums=('9c9cca84f5601700f3f1d0303aa1e058' +md5sums=('f807b43a4dd43a6cf562f10651577ad2' '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} - DESTDIR=${pkgdir} ./install.sh + make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 37ee4bb2f..f29279ce6 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -5,8 +5,8 @@ pkgbase="kernel26-libre" pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Build stock -LIBRE kernel _kernelname=${pkgname#kernel26-libre} -_basekernel=2.6.38 -pkgver=${_basekernel}.6 +_basekernel=2.6.39 +pkgver=${_basekernel} pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -31,9 +31,9 @@ build() { # Add -LIBRE patches # See http://projects.parabolagnulinux.org/linux-libre-2.6-LIBRE.git/ patch -Np1 -i ${srcdir}/${_patchname} - sed -i "s|^EXTRAVERSION.*|EXTRAVERSION = .${pkgver##*.}-libre|" Makefile if [ "$CARCH" == "mips64el" ]; then + sed -i "s|^EXTRAVERSION.*|EXTRAVERSION = .${pkgver##*.}-libre|" Makefile msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/$pkgver-*-loongson-community.patch patch -Np0 -i ${srcdir}/lxo-config.patch @@ -48,7 +48,7 @@ build() { cat $srcdir/config.$CARCH > ./.config # simpler fi - for this_doesnt_build in CONFIG_WLAGS49_H2 CONFIG_WLAGS49_H25; do + for this_doesnt_build in CONFIG_WLAGS49_H2 CONFIG_WLAGS49_H25 CONFIG_VT6656; do sed -i "s|^${this_doesnt_build}=.*|# ${this_doesnt_build} is not set|g" ./.config done @@ -287,3 +287,9 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } +md5sums=('8feab9fb6c177052cb79248a223fbf66' + 'abad63eab1f9485f6b1af76f5109f1e4' + '5d40a23419b48f5b49f1f10be0e733c3' + 'af5937ac06a78907ceb499351bdff7ab' + '25584700a0a679542929c4bed31433b6' + 'ba583747f515e51ec0f16d535e4be6e0') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 1b4bd0608..0d9636f62 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.38 Kernel Configuration -# Fri Apr 22 17:32:05 2011 +# Linux/i386 2.6.39 Kernel Configuration +# Thu May 19 19:49:50 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -49,7 +49,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_KTIME_SCALAR=y CONFIG_ARCH_CPU_PROBE_RELEASE=y @@ -62,7 +61,6 @@ CONFIG_IRQ_WORK=y # General setup # CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE" @@ -84,6 +82,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_FHANDLE is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -98,13 +97,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y -# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PENDING_IRQ=y -# CONFIG_AUTO_IRQ_AFFINITY is not set -# CONFIG_IRQ_PER_CPU is not set -# CONFIG_HARDIRQS_SW_RESEND is not set +CONFIG_IRQ_FORCED_THREADING=y # CONFIG_SPARSE_IRQ is not set # @@ -132,6 +129,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +# CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -158,7 +156,6 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set -# CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y @@ -177,6 +174,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y # @@ -330,7 +328,6 @@ CONFIG_M686=y # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_X86_GENERIC=y -CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_CMPXCHG_LOCAL=y @@ -455,22 +452,21 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_VERBOSE is not set -CONFIG_CAN_PM_TRACE=y -# CONFIG_PM_TRACE_RTC is not set -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_SLEEP=y -# CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set CONFIG_SUSPEND=y -# CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y CONFIG_PM_RUNTIME=y -CONFIG_PM_OPS=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_VERBOSE is not set +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y @@ -499,6 +495,7 @@ CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m CONFIG_SFI=y @@ -590,6 +587,7 @@ CONFIG_PCI_STUB=m CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set @@ -597,8 +595,6 @@ CONFIG_ISA=y # CONFIG_SCx200 is not set CONFIG_OLPC=y CONFIG_OLPC_XO1=m -CONFIG_OLPC_OPENFIRMWARE=y -CONFIG_OLPC_OPENFIRMWARE_DT=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m @@ -631,6 +627,15 @@ CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y +CONFIG_RAPIDIO_DEBUG=y # # Executable file formats / Emulations @@ -660,12 +665,11 @@ CONFIG_NET_KEY=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y +CONFIG_IP_FIB_TRIE_STATS=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m @@ -746,6 +750,7 @@ CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -754,7 +759,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m @@ -768,10 +775,12 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m # # Xtables targets # +CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -796,6 +805,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # # Xtables matches # +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m @@ -804,6 +814,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CPU=m CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m @@ -833,6 +844,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_LIST_SET=m CONFIG_IP_VS=m # CONFIG_IP_VS_IPV6 is not set # CONFIG_IP_VS_DEBUG is not set @@ -877,7 +900,6 @@ CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m @@ -1016,7 +1038,6 @@ CONFIG_IPDDP_DECAP=y # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m -# CONFIG_PHONET_PIPECTRLR is not set CONFIG_IEEE802154=m CONFIG_NET_SCHED=y @@ -1030,6 +1051,7 @@ CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m @@ -1037,6 +1059,8 @@ CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_INGRESS=m # @@ -1046,7 +1070,6 @@ CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set @@ -1073,6 +1096,7 @@ CONFIG_NET_SCH_FIFO=y CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set CONFIG_RPS=y +CONFIG_RFS_ACCEL=y CONFIG_XPS=y # @@ -1140,8 +1164,8 @@ CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m @@ -1171,6 +1195,7 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m @@ -1237,11 +1262,11 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_ARCH_NO_SYSDEV_OPS=y CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=m -# CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_OF_PARTS=y @@ -1261,6 +1286,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SSFDC is not set CONFIG_SM_FTL=m # CONFIG_MTD_OOPS is not set +CONFIG_MTD_SWAP=m # # RAM/ROM/Flash chip drivers @@ -1332,6 +1358,7 @@ CONFIG_OF_I2C=m CONFIG_OF_NET=y CONFIG_OF_SPI=y CONFIG_OF_MDIO=m +CONFIG_OF_PCI=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -1380,6 +1407,7 @@ CONFIG_ATA_OVER_ETH=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m @@ -1430,6 +1458,7 @@ CONFIG_IWMC3200TOP=m # Texas Instruments shared transport line discipline # CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m CONFIG_HAVE_IDE=y CONFIG_IDE=m @@ -1554,7 +1583,6 @@ CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_HOST_SMP=y -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_LOWLEVEL=y @@ -1563,6 +1591,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_CXGB4_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_HPSA=m @@ -1719,6 +1748,7 @@ CONFIG_SATA_VITESSE=m # CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_ATP867X=m @@ -1799,10 +1829,13 @@ CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m @@ -1978,7 +2011,6 @@ CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_VLAN is not set CONFIG_SIS190=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set @@ -2001,11 +2033,8 @@ CONFIG_NETDEV_10000=y CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3_DEPENDS=y CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4_DEPENDS=y CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF_DEPENDS=y CONFIG_CHELSIO_T4VF=m CONFIG_ENIC=m CONFIG_IXGBE=m @@ -2056,6 +2085,7 @@ CONFIG_ATH_COMMON=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set CONFIG_ATH5K_PCI=y CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m @@ -2108,16 +2138,22 @@ CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m +CONFIG_IWLAGN=m # # Debugging Options # # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y +CONFIG_IWL_P2P=y +CONFIG_IWLWIFI_LEGACY=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_LEGACY_DEBUG is not set +# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWL4965=m CONFIG_IWL3945=m CONFIG_IWM=m # CONFIG_IWM_DEBUG is not set @@ -2152,6 +2188,7 @@ CONFIG_RT61PCI=m CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m @@ -2168,7 +2205,9 @@ CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_RTL8192CE=m +CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m @@ -2225,6 +2264,7 @@ CONFIG_USB_NET_INT51X1=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_IPHETH=m CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_3C574=m @@ -2274,6 +2314,9 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PLIP=m @@ -2477,6 +2520,7 @@ CONFIG_INPUT_EVDEV=m CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m @@ -2556,6 +2600,7 @@ CONFIG_TOUCHSCREEN_AD7877=m CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_DYNAPRO=m @@ -2571,10 +2616,10 @@ CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_HTCPEN=m CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_QT602240=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_WM831X=m CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y @@ -2598,6 +2643,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2005=m CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_PCAP=m CONFIG_TOUCHSCREEN_ST1232=m @@ -2656,25 +2702,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_COMPUTONE is not set CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set -# CONFIG_DIGIEPCA is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m # CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set CONFIG_N_HDLC=m CONFIG_N_GSM=m -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set +# CONFIG_DEVKMEM is not set # CONFIG_STALDRV is not set -CONFIG_NOZOMI=m # # Serial drivers @@ -2701,16 +2746,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 CONFIG_SERIAL_IFX6X60=m CONFIG_SERIAL_PCH_UART=m -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -2810,6 +2851,8 @@ CONFIG_I2C_GPIO=m CONFIG_I2C_INTEL_MID=m CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +CONFIG_I2C_PXA_PCI=y CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m CONFIG_I2C_EG20T=m @@ -2817,6 +2860,7 @@ CONFIG_I2C_EG20T=m # # External I2C/SMBus adapter drivers # +CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_TAOS_EVM=m @@ -2838,10 +2882,12 @@ CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # +CONFIG_SPI_ALTERA=m CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX_PCI=y CONFIG_SPI_TOPCLIFF_PCH=m @@ -2954,6 +3000,8 @@ CONFIG_BATTERY_DS2782=m CONFIG_BATTERY_OLPC=m CONFIG_BATTERY_BQ20Z75=m CONFIG_BATTERY_BQ27x00=m +CONFIG_BATTERY_BQ27X00_I2C=y +CONFIG_BATTERY_BQ27X00_PLATFORM=y CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m CONFIG_CHARGER_PCF50633=m @@ -3003,6 +3051,7 @@ CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM73=m @@ -3016,16 +3065,23 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SIS5595=m @@ -3036,6 +3092,8 @@ CONFIG_SENSORS_EMC2103=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_AMC6821=m @@ -3058,7 +3116,6 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_WM831X=m -CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_MC13783_ADC=m @@ -3066,7 +3123,6 @@ CONFIG_SENSORS_MC13783_ADC=m # ACPI drivers # CONFIG_SENSORS_ATK0110=m -CONFIG_SENSORS_LIS3LV02D=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y @@ -3155,6 +3211,7 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_HTC_PASIC3=m CONFIG_UCB1400_CORE=m +CONFIG_TPS6105X=m CONFIG_TPS65010=m CONFIG_TPS6507X=m # CONFIG_MFD_TMIO is not set @@ -3170,6 +3227,7 @@ CONFIG_ABX500_CORE=y CONFIG_EZX_PCAP=y CONFIG_AB8500_CORE=y # CONFIG_AB8500_DEBUG is not set +CONFIG_AB8500_GPADC=y CONFIG_MFD_CS5535=m CONFIG_MFD_TIMBERDALE=m CONFIG_LPC_SCH=m @@ -3177,14 +3235,42 @@ CONFIG_MFD_RDC321X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m -# CONFIG_REGULATOR is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_WM831X=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_AB8500=y +CONFIG_REGULATOR_TPS6524X=m CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # +CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_VIDEO_MEDIA=m @@ -3206,6 +3292,7 @@ CONFIG_IR_LIRC_CODEC=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m CONFIG_IR_NUVOTON=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m @@ -3242,6 +3329,9 @@ CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set @@ -3352,6 +3442,7 @@ CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_MPEG=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m @@ -3361,6 +3452,7 @@ CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_SR030PC30=m CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_NOON010PC30=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -3375,6 +3467,7 @@ CONFIG_SOC_CAMERA_OV2640=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -3391,6 +3484,7 @@ CONFIG_USB_GSPCA_JEILINJ=m CONFIG_USB_GSPCA_KONICA=m CONFIG_USB_GSPCA_MARS=m CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m CONFIG_USB_GSPCA_OV519=m CONFIG_USB_GSPCA_OV534=m CONFIG_USB_GSPCA_OV534_9=m @@ -3417,6 +3511,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m CONFIG_USB_GSPCA_TV8532=m CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m CONFIG_VIDEO_PVRUSB2=m @@ -3470,6 +3565,11 @@ CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m CONFIG_RADIO_TIMBERDALE=m CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y @@ -3521,6 +3621,7 @@ CONFIG_DVB_USB_FRIIO=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_AZ6027=m CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_SMS_SIANO_MDTV=m @@ -3553,9 +3654,11 @@ CONFIG_DVB_PLUTO2=m # Supported SDMC DM1105 Adapters # CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_FIREWIRE=y -# CONFIG_DVB_FIREDTV_IEEE1394 is not set CONFIG_DVB_FIREDTV_INPUT=y # @@ -3634,6 +3737,7 @@ CONFIG_DVB_DIB7000P=m CONFIG_DVB_TDA10048=m CONFIG_DVB_AF9013=m CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m # # DVB-C (cable) frontends @@ -3711,8 +3815,6 @@ CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -3750,6 +3852,7 @@ CONFIG_FB_CIRRUS=m CONFIG_FB_PM2=m CONFIG_FB_PM2_FIFO_DISCONNECT=y CONFIG_FB_CYBER2000=m +CONFIG_FB_CYBER2000_DDC=y # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set @@ -3822,11 +3925,12 @@ CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m CONFIG_BACKLIGHT_ADP8860=m @@ -3849,7 +3953,7 @@ CONFIG_VGA_CONSOLE=y # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set @@ -4052,6 +4156,10 @@ CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4089,15 +4197,16 @@ CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y CONFIG_HID_EMS_FF=m -CONFIG_HID_EGALAX=m CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m +CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m CONFIG_HID_LOGITECH=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y @@ -4120,8 +4229,11 @@ CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m CONFIG_HID_ROCCAT_KONE=m CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m @@ -4203,6 +4315,7 @@ CONFIG_USB_TMC=m # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m @@ -4214,6 +4327,7 @@ CONFIG_USB_STORAGE_ALAUDA=m CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set @@ -4330,6 +4444,7 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set # CONFIG_USB_GADGET_R8A66597 is not set # CONFIG_USB_GADGET_PXA_U2O is not set # CONFIG_USB_GADGET_M66592 is not set @@ -4421,12 +4536,14 @@ CONFIG_MSPRO_BLOCK=m # CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # # LED drivers # +CONFIG_LEDS_LM3530=m CONFIG_LEDS_NET5501=m # CONFIG_LEDS_ALIX2 is not set CONFIG_LEDS_PCA9532=m @@ -4440,6 +4557,7 @@ CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4599,6 +4717,10 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_COMPUTONE is not set CONFIG_ET131X=m # CONFIG_ET131X_DEBUG is not set CONFIG_SLICOSS=m @@ -4617,10 +4739,7 @@ CONFIG_VIDEO_CX25821_ALSA=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_USB_DABUSB=m -CONFIG_USB_SE401=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m +CONFIG_DVB_CXD2099=m CONFIG_USB_IP_COMMON=m CONFIG_USB_IP_VHCI_HCD=m CONFIG_USB_IP_HOST=m @@ -4629,8 +4748,9 @@ CONFIG_W35UND=m CONFIG_PRISM2_USB=m CONFIG_ECHO=m CONFIG_BRCM80211=m -CONFIG_BRCM80211_PCI=y +CONFIG_BRCMSMAC=y # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set CONFIG_RT2860=m CONFIG_RT2870=m CONFIG_COMEDI=m @@ -4760,6 +4880,9 @@ CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_8255=m CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_FC=m +CONFIG_FB_OLPC_DCON=m +CONFIG_FB_OLPC_DCON_1=y +CONFIG_FB_OLPC_DCON_1_5=y CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set CONFIG_R8187SE=m @@ -4767,11 +4890,12 @@ CONFIG_RTL8192U=m CONFIG_RTL8192E=m CONFIG_R8712U=m CONFIG_R8712_AP=y +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_POHMELFS=m # CONFIG_POHMELFS_DEBUG is not set CONFIG_POHMELFS_CRYPTO=y -# CONFIG_AUTOFS_FS is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_DEBUG is not set @@ -4799,30 +4923,25 @@ CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_BLOCK=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_MOUSE=m # CONFIG_VME_BUS is not set CONFIG_DX_SEP=m # CONFIG_IIO is not set CONFIG_CS5535_GPIO=m +CONFIG_XVMALLOC=y CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m -CONFIG_SAMSUNG_LAPTOP=m CONFIG_FB_SM7XX=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_CRYSTALHD=m - -# -# Texas Instruments shared transport line discipline -# -CONFIG_ST_BT=m CONFIG_FB_XGI=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_IMON=m -CONFIG_LIRC_IT87=m -CONFIG_LIRC_ITE8709=m CONFIG_LIRC_PARALLEL=m CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m @@ -4830,9 +4949,10 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set CONFIG_EASYCAP=m +CONFIG_EASYCAP_SND=y +# CONFIG_EASYCAP_OSS is not set +# CONFIG_EASYCAP_DEBUG is not set CONFIG_SOLO6X10=m CONFIG_ACPI_QUICKSTART=m CONFIG_MACH_NO_WESTBRIDGE=y @@ -4859,6 +4979,7 @@ CONFIG_USB_ENESTORAGE=m CONFIG_BCM_WIMAX=m CONFIG_FT1000=m CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m # # Speakup console speech @@ -4881,15 +5002,23 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_DRM_PSB=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m CONFIG_HP_WMI=m CONFIG_MSI_LAPTOP=m CONFIG_PANASONIC_LAPTOP=m @@ -4907,6 +5036,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_SENSORS_HDAPS=m CONFIG_INTEL_MENLOW=m CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m CONFIG_EEEPC_WMI=m CONFIG_ACPI_WMI=m CONFIG_MSI_WMI=m @@ -4918,6 +5049,8 @@ CONFIG_ACPI_CMPC=m CONFIG_INTEL_IPS=m CONFIG_IBM_RTL=m CONFIG_XO1_RFKILL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m # # Firmware Drivers @@ -4929,7 +5062,9 @@ CONFIG_EFI_VARS=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m # CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_SIGMA=m # # File systems @@ -4982,7 +5117,7 @@ CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y @@ -5083,6 +5218,7 @@ CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y # CONFIG_SYSV_FS is not set CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set @@ -5117,11 +5253,11 @@ CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y -# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_EXPERIMENTAL is not set @@ -5212,6 +5348,7 @@ CONFIG_DLM=m # CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 @@ -5220,10 +5357,13 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_DETECT_HUNG_TASK=y @@ -5241,7 +5381,6 @@ CONFIG_TIMER_STATS=y # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set CONFIG_DEBUG_MUTEXES=y -CONFIG_BKL=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set @@ -5562,6 +5701,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index f30cc2c10..5f6e24386 100644 --- a/libre/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.38 Kernel Configuration -# Tue May 10 07:45:46 2011 +# Linux/x86_64 2.6.39 Kernel Configuration +# Thu May 19 21:49:53 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -50,7 +50,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_64_SMP=y CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" # CONFIG_KTIME_SCALAR is not set CONFIG_ARCH_CPU_PROBE_RELEASE=y @@ -63,7 +62,6 @@ CONFIG_IRQ_WORK=y # General setup # CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE" @@ -85,6 +83,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_FHANDLE is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -99,13 +98,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y -# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PENDING_IRQ=y -# CONFIG_AUTO_IRQ_AFFINITY is not set -# CONFIG_IRQ_PER_CPU is not set -# CONFIG_HARDIRQS_SW_RESEND is not set +CONFIG_IRQ_FORCED_THREADING=y # CONFIG_SPARSE_IRQ is not set # @@ -133,6 +130,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +# CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -159,7 +157,6 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set -# CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y @@ -178,6 +175,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y # @@ -301,6 +299,7 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=128 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set +# CONFIG_XEN_DEBUG is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y @@ -314,7 +313,6 @@ CONFIG_NO_BOOTMEM=y # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_GENERIC_CPU=y -CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=7 CONFIG_X86_CMPXCHG=y CONFIG_CMPXCHG_LOCAL=y @@ -445,22 +443,21 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y # Power management and ACPI options # CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_VERBOSE is not set -CONFIG_CAN_PM_TRACE=y -# CONFIG_PM_TRACE_RTC is not set -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_SLEEP=y -# CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set CONFIG_SUSPEND=y -# CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y CONFIG_PM_RUNTIME=y -CONFIG_PM_OPS=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_VERBOSE is not set +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y @@ -491,6 +488,7 @@ CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m CONFIG_SFI=y @@ -566,6 +564,7 @@ CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_PCCARD=m @@ -593,6 +592,15 @@ CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y +CONFIG_RAPIDIO_DEBUG=y # # Executable file formats / Emulations @@ -607,6 +615,7 @@ CONFIG_IA32_AOUT=m CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y @@ -627,12 +636,11 @@ CONFIG_NET_KEY=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y +CONFIG_IP_FIB_TRIE_STATS=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m @@ -713,6 +721,7 @@ CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -721,7 +730,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m @@ -735,10 +746,12 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m # # Xtables targets # +CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -763,6 +776,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # # Xtables matches # +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m @@ -771,6 +785,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CPU=m CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m @@ -800,6 +815,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_LIST_SET=m CONFIG_IP_VS=m # CONFIG_IP_VS_IPV6 is not set # CONFIG_IP_VS_DEBUG is not set @@ -844,7 +871,6 @@ CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m @@ -979,7 +1005,6 @@ CONFIG_IPDDP_DECAP=y # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m -# CONFIG_PHONET_PIPECTRLR is not set CONFIG_IEEE802154=m CONFIG_NET_SCHED=y @@ -993,6 +1018,7 @@ CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m @@ -1000,6 +1026,8 @@ CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_INGRESS=m # @@ -1009,7 +1037,6 @@ CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set @@ -1036,6 +1063,7 @@ CONFIG_NET_SCH_FIFO=y CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set CONFIG_RPS=y +CONFIG_RFS_ACCEL=y CONFIG_XPS=y # @@ -1102,8 +1130,8 @@ CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m @@ -1133,6 +1161,7 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m @@ -1199,11 +1228,11 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y +CONFIG_ARCH_NO_SYSDEV_OPS=y CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=m -# CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set @@ -1222,6 +1251,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SSFDC is not set CONFIG_SM_FTL=m # CONFIG_MTD_OOPS is not set +CONFIG_MTD_SWAP=m # # RAM/ROM/Flash chip drivers @@ -1324,6 +1354,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m @@ -1374,6 +1405,7 @@ CONFIG_IWMC3200TOP=m # Texas Instruments shared transport line discipline # CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m CONFIG_HAVE_IDE=y CONFIG_IDE=m @@ -1481,7 +1513,6 @@ CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_HOST_SMP=y -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_LOWLEVEL=y @@ -1490,6 +1521,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_CXGB4_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_HPSA=m @@ -1625,6 +1657,7 @@ CONFIG_SATA_VITESSE=m # CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_ATP867X=m @@ -1701,10 +1734,13 @@ CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m @@ -1850,7 +1886,6 @@ CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_VLAN is not set CONFIG_SIS190=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set @@ -1873,11 +1908,8 @@ CONFIG_NETDEV_10000=y CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3_DEPENDS=y CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4_DEPENDS=y CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF_DEPENDS=y CONFIG_CHELSIO_T4VF=m CONFIG_ENIC=m CONFIG_IXGBE=m @@ -1928,6 +1960,7 @@ CONFIG_ATH_COMMON=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set CONFIG_ATH5K_PCI=y CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m @@ -1980,16 +2013,22 @@ CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m +CONFIG_IWLAGN=m # # Debugging Options # # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y +CONFIG_IWL_P2P=y +CONFIG_IWLWIFI_LEGACY=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_LEGACY_DEBUG is not set +# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWL4965=m CONFIG_IWL3945=m CONFIG_IWM=m # CONFIG_IWM_DEBUG is not set @@ -2024,6 +2063,7 @@ CONFIG_RT61PCI=m CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m @@ -2040,7 +2080,9 @@ CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_RTL8192CE=m +CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m @@ -2097,6 +2139,7 @@ CONFIG_USB_NET_INT51X1=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_IPHETH=m CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_3C574=m @@ -2147,6 +2190,10 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PLIP=m @@ -2327,7 +2374,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set -CONFIG_XEN_KBDDEV_FRONTEND=m # # Input Device Drivers @@ -2335,6 +2381,7 @@ CONFIG_XEN_KBDDEV_FRONTEND=m CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m @@ -2409,6 +2456,7 @@ CONFIG_TOUCHSCREEN_AD7877=m CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_DYNAPRO=m @@ -2423,10 +2471,10 @@ CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_QT602240=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_WM831X=m CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y @@ -2450,6 +2498,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2005=m CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_PCAP=m CONFIG_TOUCHSCREEN_ST1232=m @@ -2479,6 +2528,7 @@ CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m # # Hardware I/O ports @@ -2507,25 +2557,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_COMPUTONE is not set CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set -# CONFIG_DIGIEPCA is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m # CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set CONFIG_N_HDLC=m CONFIG_N_GSM=m -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set +# CONFIG_DEVKMEM is not set # CONFIG_STALDRV is not set -CONFIG_NOZOMI=m # # Serial drivers @@ -2557,9 +2606,6 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 CONFIG_SERIAL_IFX6X60=m CONFIG_SERIAL_PCH_UART=m -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -2656,6 +2702,7 @@ CONFIG_I2C_GPIO=m CONFIG_I2C_INTEL_MID=m CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m CONFIG_I2C_EG20T=m @@ -2663,6 +2710,7 @@ CONFIG_I2C_EG20T=m # # External I2C/SMBus adapter drivers # +CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_TAOS_EVM=m @@ -2682,10 +2730,12 @@ CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # +CONFIG_SPI_ALTERA=m CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_SPI_TOPCLIFF_PCH=m CONFIG_SPI_XILINX=m @@ -2796,6 +2846,8 @@ CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_DS2782=m CONFIG_BATTERY_BQ20Z75=m CONFIG_BATTERY_BQ27x00=m +CONFIG_BATTERY_BQ27X00_I2C=y +CONFIG_BATTERY_BQ27X00_PLATFORM=y CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m CONFIG_CHARGER_PCF50633=m @@ -2845,6 +2897,7 @@ CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM73=m @@ -2858,16 +2911,23 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SIS5595=m @@ -2878,6 +2938,8 @@ CONFIG_SENSORS_EMC2103=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_AMC6821=m @@ -2900,7 +2962,6 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_WM831X=m -CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_MC13783_ADC=m @@ -2908,7 +2969,6 @@ CONFIG_SENSORS_MC13783_ADC=m # ACPI drivers # CONFIG_SENSORS_ATK0110=m -CONFIG_SENSORS_LIS3LV02D=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y @@ -2954,6 +3014,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_XEN_WDT=m # # PCI-based Watchdog Cards @@ -2989,6 +3050,7 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_HTC_PASIC3=m CONFIG_UCB1400_CORE=m +CONFIG_TPS6105X=m CONFIG_TPS65010=m CONFIG_TPS6507X=m # CONFIG_MFD_TMIO is not set @@ -3004,6 +3066,7 @@ CONFIG_ABX500_CORE=y CONFIG_EZX_PCAP=y CONFIG_AB8500_CORE=y # CONFIG_AB8500_DEBUG is not set +CONFIG_AB8500_GPADC=y CONFIG_MFD_CS5535=m CONFIG_MFD_TIMBERDALE=m CONFIG_LPC_SCH=m @@ -3011,14 +3074,42 @@ CONFIG_MFD_RDC321X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m -# CONFIG_REGULATOR is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_WM831X=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_AB8500=y +CONFIG_REGULATOR_TPS6524X=m CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # +CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_VIDEO_MEDIA=m @@ -3040,6 +3131,7 @@ CONFIG_IR_LIRC_CODEC=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m CONFIG_IR_NUVOTON=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m @@ -3076,6 +3168,9 @@ CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set @@ -3185,6 +3280,7 @@ CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_MPEG=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m @@ -3194,6 +3290,7 @@ CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_SR030PC30=m CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_NOON010PC30=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -3208,6 +3305,7 @@ CONFIG_SOC_CAMERA_OV2640=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -3224,6 +3322,7 @@ CONFIG_USB_GSPCA_JEILINJ=m CONFIG_USB_GSPCA_KONICA=m CONFIG_USB_GSPCA_MARS=m CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m CONFIG_USB_GSPCA_OV519=m CONFIG_USB_GSPCA_OV534=m CONFIG_USB_GSPCA_OV534_9=m @@ -3250,6 +3349,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m CONFIG_USB_GSPCA_TV8532=m CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m CONFIG_VIDEO_PVRUSB2=m @@ -3291,6 +3391,11 @@ CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m CONFIG_RADIO_TIMBERDALE=m CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y @@ -3342,6 +3447,7 @@ CONFIG_DVB_USB_FRIIO=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_AZ6027=m CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_SMS_SIANO_MDTV=m @@ -3374,9 +3480,11 @@ CONFIG_DVB_PLUTO2=m # Supported SDMC DM1105 Adapters # CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_FIREWIRE=y -# CONFIG_DVB_FIREDTV_IEEE1394 is not set CONFIG_DVB_FIREDTV_INPUT=y # @@ -3455,6 +3563,7 @@ CONFIG_DVB_DIB7000P=m CONFIG_DVB_TDA10048=m CONFIG_DVB_AF9013=m CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m # # DVB-C (cable) frontends @@ -3526,8 +3635,6 @@ CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -3565,6 +3672,7 @@ CONFIG_FB_CIRRUS=m CONFIG_FB_PM2=m CONFIG_FB_PM2_FIFO_DISCONNECT=y CONFIG_FB_CYBER2000=m +CONFIG_FB_CYBER2000_DDC=y # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set @@ -3636,11 +3744,12 @@ CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m CONFIG_BACKLIGHT_ADP8860=m @@ -3828,6 +3937,10 @@ CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -3865,15 +3978,16 @@ CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y CONFIG_HID_EMS_FF=m -CONFIG_HID_EGALAX=m CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m +CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m CONFIG_HID_LOGITECH=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y @@ -3896,8 +4010,11 @@ CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m CONFIG_HID_ROCCAT_KONE=m CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m @@ -3979,6 +4096,7 @@ CONFIG_USB_TMC=m # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m @@ -3990,6 +4108,7 @@ CONFIG_USB_STORAGE_ALAUDA=m CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set @@ -4106,6 +4225,7 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set # CONFIG_USB_GADGET_R8A66597 is not set # CONFIG_USB_GADGET_PXA_U2O is not set # CONFIG_USB_GADGET_M66592 is not set @@ -4197,12 +4317,14 @@ CONFIG_MSPRO_BLOCK=m # CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # # LED drivers # +CONFIG_LEDS_LM3530=m CONFIG_LEDS_NET5501=m # CONFIG_LEDS_ALIX2 is not set CONFIG_LEDS_PCA9532=m @@ -4215,6 +4337,7 @@ CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4382,10 +4505,15 @@ CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_XENBUS_FRONTEND=m CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_PLATFORM_PCI=m CONFIG_SWIOTLB_XEN=y CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_COMPUTONE is not set CONFIG_ET131X=m # CONFIG_ET131X_DEBUG is not set CONFIG_SLICOSS=m @@ -4404,10 +4532,7 @@ CONFIG_VIDEO_CX25821_ALSA=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_USB_DABUSB=m -CONFIG_USB_SE401=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m +CONFIG_DVB_CXD2099=m CONFIG_USB_IP_COMMON=m CONFIG_USB_IP_VHCI_HCD=m CONFIG_USB_IP_HOST=m @@ -4416,8 +4541,9 @@ CONFIG_W35UND=m CONFIG_PRISM2_USB=m CONFIG_ECHO=m CONFIG_BRCM80211=m -CONFIG_BRCM80211_PCI=y +CONFIG_BRCMSMAC=y # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set CONFIG_RT2860=m CONFIG_RT2870=m CONFIG_COMEDI=m @@ -4512,11 +4638,12 @@ CONFIG_RTL8192U=m CONFIG_RTL8192E=m CONFIG_R8712U=m CONFIG_R8712_AP=y +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_POHMELFS=m # CONFIG_POHMELFS_DEBUG is not set CONFIG_POHMELFS_CRYPTO=y -# CONFIG_AUTOFS_FS is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_DEBUG is not set @@ -4544,29 +4671,24 @@ CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_BLOCK=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_MOUSE=m # CONFIG_VME_BUS is not set CONFIG_DX_SEP=m # CONFIG_IIO is not set +CONFIG_XVMALLOC=y CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m -CONFIG_SAMSUNG_LAPTOP=m CONFIG_FB_SM7XX=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_CRYSTALHD=m - -# -# Texas Instruments shared transport line discipline -# -CONFIG_ST_BT=m CONFIG_FB_XGI=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_IMON=m -CONFIG_LIRC_IT87=m -CONFIG_LIRC_ITE8709=m CONFIG_LIRC_PARALLEL=m CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m @@ -4574,9 +4696,10 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set CONFIG_EASYCAP=m +CONFIG_EASYCAP_SND=y +# CONFIG_EASYCAP_OSS is not set +# CONFIG_EASYCAP_DEBUG is not set CONFIG_SOLO6X10=m CONFIG_ACPI_QUICKSTART=m CONFIG_MACH_NO_WESTBRIDGE=y @@ -4603,6 +4726,7 @@ CONFIG_USB_ENESTORAGE=m CONFIG_BCM_WIMAX=m CONFIG_FT1000=m CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m # # Speakup console speech @@ -4625,14 +4749,22 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_DRM_PSB=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_HP_ACCEL=m CONFIG_HP_WMI=m CONFIG_MSI_LAPTOP=m CONFIG_PANASONIC_LAPTOP=m @@ -4650,6 +4782,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_SENSORS_HDAPS=m CONFIG_INTEL_MENLOW=m CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m CONFIG_EEEPC_WMI=m CONFIG_ACPI_WMI=m CONFIG_MSI_WMI=m @@ -4660,6 +4794,8 @@ CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_ACPI_CMPC=m CONFIG_INTEL_IPS=m CONFIG_IBM_RTL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m # # Firmware Drivers @@ -4671,7 +4807,9 @@ CONFIG_EFI_VARS=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m # CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_SIGMA=m # # File systems @@ -4724,7 +4862,7 @@ CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y @@ -4826,6 +4964,7 @@ CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y # CONFIG_SYSV_FS is not set CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set @@ -4860,11 +4999,11 @@ CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y -# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_EXPERIMENTAL is not set @@ -4955,6 +5094,7 @@ CONFIG_DLM=m # CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=2048 @@ -4963,10 +5103,13 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_DETECT_HUNG_TASK=y @@ -4983,7 +5126,6 @@ CONFIG_TIMER_STATS=y # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set CONFIG_DEBUG_MUTEXES=y -CONFIG_BKL=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set @@ -5301,6 +5443,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y diff --git a/libre/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install index fc84323fc..0a7bc7772 100644 --- a/libre/kernel26-libre/kernel26.install +++ b/libre/kernel26-libre/kernel26.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=2.6.38-LIBRE +KERNEL_VERSION=2.6.39-LIBRE post_install () { # updating module dependencies diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD index 24f3a89af..1fb9e9717 100644 --- a/libre/libui-sh/PKGBUILD +++ b/libre/libui-sh/PKGBUILD @@ -2,15 +2,15 @@ # Maintainer: Dieter Plaetinck <dieter@plaetinck.be> pkgname=libui-sh -pkgver=2010.12.31 +pkgver=2011.05.22 pkgrel=1 pkgdesc="a shell library providing useful UI functions" arch=('any') -url="http://github.com/Dieterbe/libui-sh/" +url="https://projects.parabolagnulinux.org/libui-sh.git" license=('GPL3') depends=('bash') optdepends=('dialog: for ncurses support') -source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz) +source=($url/snapshot/${pkgname}-${pkgver}.tar.bz2) build() { @@ -21,5 +21,4 @@ build() { } # vim:set ts=2 sw=2 et: - -md5sums=('8056134adf6ea8ba52d1f6e6e4eaf522') +md5sums=('44e422ca76ca99a7df99e2249ff3b4e5') diff --git a/core/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 336d5d9d6..e41ac938d 100644 --- a/core/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -20,11 +20,6 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf) -md5sums=('b4f1fdbc17100923071ebe8fe9377be5' - 'e99eb721b6b704f68c5f47468507c102' - 'f8b939d9b2beb79a0436961a2d707d7c' - '14eac9e54b81e1f87a498e90a81c19af' - 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' diff --git a/core/pacman/makepkg.conf b/libre/pacman/makepkg.conf index a655e935f..a655e935f 100644 --- a/core/pacman/makepkg.conf +++ b/libre/pacman/makepkg.conf diff --git a/core/pacman/pacman.conf b/libre/pacman/pacman.conf index 206ab23b4..675956d3d 100644 --- a/core/pacman/pacman.conf +++ b/libre/pacman/pacman.conf @@ -58,6 +58,12 @@ Architecture = auto # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/core/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 6f0423647..ed460dd8b 100644 --- a/core/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -58,6 +58,12 @@ Architecture = auto # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/core/pacman/pacman.install b/libre/pacman/pacman.install index 0e598bb4b..0e598bb4b 100644 --- a/core/pacman/pacman.install +++ b/libre/pacman/pacman.install diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD new file mode 100644 index 000000000..251d44d72 --- /dev/null +++ b/libre/pacman/rePKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=pacman +pkgver=3.5.2 +pkgrel=1.2 +_pkgrel=1 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist-libre') +optdepends=('fakeroot: for makepkg usage as normal user' + 'curl: for rankmirrors usage') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool !strip) +source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + pacman.conf + pacman.conf.x86_64 + makepkg.conf) + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd "${srcdir}/" + rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + +} + +package() { + cp -a ./* ${pkgdir} + rm $pkgdir/etc/pacman.conf $pkgdir/{pacman.conf{,.x86_64},makepkg.conf} + + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + ;; + esac +} + +# vim: set ts=2 sw=2 et: diff --git a/libre/sqlite3/PKGBUILD b/libre/sqlite3/PKGBUILD index 767488b55..9cf45373a 100644 --- a/libre/sqlite3/PKGBUILD +++ b/libre/sqlite3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108579 2011-02-01 18:59:24Z andyrtr $ +# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -8,7 +8,7 @@ pkgbase="sqlite3" pkgname=('sqlite3' 'sqlite3-tcl') -_amalgamationver=3070500 +_amalgamationver=3070603 _amalgamationver2=${_amalgamationver/00/} pkgver=${_amalgamationver2//0/.} pkgrel=1 @@ -17,31 +17,12 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.sqlite.org/" makedepends=('tcl' 'readline>=6.0.00') -source=( #http://www.sqlite.org/sqlite-src-${_amalgamationver}.zip - # the no more recommended ZIP archive of the complete source tree for SQLite - Makefile and configure script in this tarball are not supported - http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz # tarball containing the amalgamation for SQLite 3.7.5 together with an configure script and makefile for building it. - http://www.sqlite.org/sqlite-tea-$_amalgamationver.tar.gz # tarball of the amalgamation together with a Tcl Extension Architecture (TEA) compatible configure script and makefile +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -md5sums=('a9604a82613ade2e7f4c303f233e477f' - '3413e8cfb7990e39260bf45dca017bf0' - 'c1cdbc5544034d9012e421e75a5e4890') build() { -# 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 \ -# --enable-threadsafe \ -# --enable-cross-thread-connections \ -# --disable-static \ -# --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 - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" # build sqlite @@ -51,7 +32,7 @@ build() { make # build the tcl extension - cd "$srcdir"/sqlite-tea-$_amalgamationver + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea ./configure --prefix=/usr \ --with-system-sqlite make @@ -65,10 +46,6 @@ package_sqlite3() { conflicts=('sqlite') replaces=('sqlite') -# cd ${srcdir}/sqlite-src-${_amalgamationver} -# make DESTDIR=${pkgdir} install -# install -Dm0644 sqlite3.1 ${pkgdir}/usr/share/man/man1/sqlite3.1 - cd ${srcdir}/sqlite-autoconf-$_amalgamationver make DESTDIR=${pkgdir} install @@ -81,7 +58,7 @@ package_sqlite3-tcl() { pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" depends=('sqlite3>=3.7.5') - cd ${srcdir}/sqlite-tea-$_amalgamationver + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea make DESTDIR=${pkgdir} install } diff --git a/libre/xchat-gnome-libre/PKGBUILD b/libre/xchat-gnome-libre/PKGBUILD deleted file mode 100644 index 64099ba34..000000000 --- a/libre/xchat-gnome-libre/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 112861 2011-03-07 10:29:01Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=xchat-gnome -pkgver=0.26.1 -pkgrel=5 -pkgdesc="GNOME frontend to the popular X-Chat IRC client." -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://xchat-gnome.navi.cx/" -depends=('libgnomeui>=2.18.1-2' 'libsexy>=0.1.11' 'gconf>=2.18.0.1-4' - 'hicolor-icon-theme' 'desktop-file-utils' 'libcanberra' 'libsm') -makedepends=('gettext' 'perlxml' 'python2' 'tcl' 'libnotify' 'gnome-doc-utils>=0.10.3' - 'intltool' 'pkg-config') -optdepends=('libnotify: notifications' - 'python2: plugin' - 'tcl: plugin') -options=('!libtool') -install=xchat-gnome.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.26/${pkgname}-${pkgver}.tar.gz - gtk2-2.20.patch xchat-gnome-0.26.1-deprecated-symbol.patch - no-opera.patch) -md5sums=('e355d71d76cd97a0764e37bfacf09101' - 'dafc2536a0c5ee3f8015af81fce69656' - 'f82417277f0b5e83334147c4bf63d531' - 'b3e5a2e9f7ac96d36ee3567687a546bc') - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - patch -Np1 -i "$srcdir/gtk2-2.20.patch" - patch -Np1 -i "$srcdir/xchat-gnome-0.26.1-deprecated-symbol.patch" - patch -Np0 -i "$srcdir/no-opera.patch" - sed -i 's/notify_notification_new (summary, escaped, NULL, NULL);/notify_notification_new (summary, escaped, NULL);/' plugins/notify-osd/notify-osd.c - sed -i -e "s/ /\t/" src/common/dbus/Makefile.in - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-ipv6 --enable-shm \ - --disable-gtkfe --disable-scrollkeeper - make -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/${pkgname}.schemas" \ - "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/libre/xchat-gnome-libre/gtk2-2.20.patch b/libre/xchat-gnome-libre/gtk2-2.20.patch deleted file mode 100644 index 7a5dcedf2..000000000 --- a/libre/xchat-gnome-libre/gtk2-2.20.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c ---- xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c 2008-09-07 09:18:45.000000000 -0400 -+++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c 2010-03-28 16:16:52.181405173 -0400 -@@ -753,7 +753,7 @@ fe_gui_info (session * sess, int info_ty - { - switch (info_type) { - case 0: -- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (gui.main_window))) { -+ if (!gtk_widget_get_visible (GTK_WIDGET (gui.main_window))) { - return 2; - } - if (gtk_window_is_active (GTK_WINDOW (gui.main_window))) { -diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c xchat-gnome-0.26.1/src/fe-gnome/find-bar.c ---- xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c 2007-03-09 10:42:57.000000000 -0500 -+++ xchat-gnome-0.26.1/src/fe-gnome/find-bar.c 2010-03-28 16:26:24.300405158 -0400 -@@ -247,7 +247,7 @@ find_bar_close (FindBar *bar) - { - gint position; - -- if (!GTK_WIDGET_VISIBLE (bar)) { -+ if (!gtk_widget_get_visible (GTK_WIDGET (bar))) { - return; - } - -diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c xchat-gnome-0.26.1/src/fe-gnome/text-entry.c ---- xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c 2008-09-07 10:02:45.000000000 -0400 -+++ xchat-gnome-0.26.1/src/fe-gnome/text-entry.c 2010-03-28 16:39:48.755153605 -0400 -@@ -667,7 +667,7 @@ text_entry_set_current (TextEntry *entry - char *selection = NULL, *text = NULL; - int start, end; - -- g_return_if_fail (GTK_WIDGET_REALIZED (widget)); -+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (widget))); - - if (sess == priv->current) { - return; -diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c ---- xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c 2008-10-13 17:02:16.000000000 -0400 -+++ xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c 2010-03-28 16:47:55.703154452 -0400 -@@ -261,12 +261,12 @@ userlist_gui_show (void) - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui.userlist_toggle), TRUE); - -- if (!GTK_WIDGET_REALIZED (gui.userlist_window)) { -+ if (!gtk_widget_get_realized (GTK_WIDGET (gui.userlist_window))) { - gtk_widget_realize (gui.userlist_window); - } - gtk_widget_size_request (gui.userlist, &request); - -- if (GTK_WIDGET_REALIZED (gui.userlist_toggle)) -+ if (gtk_widget_get_realized (GTK_WIDGET (gui.userlist_toggle))) - anchor_widget = gui.userlist_toggle; - else - anchor_widget = gui.main_window; -diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c xchat-gnome-0.26.1/src/fe-gnome/xtext.c ---- xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c 2009-01-16 08:17:31.000000000 -0500 -+++ xchat-gnome-0.26.1/src/fe-gnome/xtext.c 2010-03-28 16:57:17.441402617 -0400 -@@ -1086,7 +1086,7 @@ gtk_xtext_size_allocate (GtkWidget * wid - xtext->avoid_trans = FALSE; - - widget->allocation = *allocation; -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (GTK_WIDGET (widget))) - { - xtext->buffer->window_width = allocation->width; - xtext->buffer->window_height = allocation->height; -@@ -4113,7 +4113,7 @@ gtk_xtext_set_palette (GtkXText * xtext, - xtext->palette[i] = palette[i].pixel; - } - -- if (GTK_WIDGET_REALIZED (xtext)) -+ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) - { - xtext_set_fg (xtext, xtext->fgc, XTEXT_FG); - xtext_set_bg (xtext, xtext->fgc, XTEXT_BG); -@@ -4211,7 +4211,7 @@ gtk_xtext_set_font (GtkXText *xtext, cha - - gtk_xtext_fix_indent (xtext->buffer); - -- if (GTK_WIDGET_REALIZED (xtext)) -+ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) - gtk_xtext_recalc_widths (xtext->buffer, TRUE); - - return TRUE; -@@ -4248,7 +4248,7 @@ gtk_xtext_set_background (GtkXText * xte - if (trans) - { - xtext->shaded = shaded; -- if (GTK_WIDGET_REALIZED (xtext)) -+ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) - gtk_xtext_load_trans (xtext); - return; - } -@@ -4260,14 +4260,14 @@ gtk_xtext_set_background (GtkXText * xte - if (pixmap != 0) - { - g_object_ref (pixmap); -- if (GTK_WIDGET_REALIZED (xtext)) -+ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) - { - gdk_gc_set_tile (xtext->bgc, pixmap); - gdk_gc_set_ts_origin (xtext->bgc, 0, 0); - xtext->ts_x = xtext->ts_y = 0; - gdk_gc_set_fill (xtext->bgc, GDK_TILED); - } -- } else if (GTK_WIDGET_REALIZED (xtext)) -+ } else if (gtk_widget_get_realized (GTK_WIDGET (xtext))) - { - g_object_unref (xtext->bgc); - val.subwindow_mode = GDK_INCLUDE_INFERIORS; -@@ -4516,7 +4516,7 @@ gtk_xtext_render_page (GtkXText * xtext) - int subline; - int startline = xtext->adj->value; - -- if(!GTK_WIDGET_REALIZED(xtext)) -+ if(!gtk_widget_get_realized (GTK_WIDGET (xtext))) - return; - - if (xtext->buffer->indent < MARGIN) -@@ -4636,7 +4636,7 @@ gtk_xtext_render_page (GtkXText * xtext) - void - gtk_xtext_refresh (GtkXText * xtext, int do_trans) - { -- if (GTK_WIDGET_REALIZED (GTK_WIDGET (xtext))) -+ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) - { - #if defined(USE_XLIB) || defined(WIN32) - if (xtext->transparent && do_trans) -@@ -5204,7 +5204,7 @@ gtk_xtext_buffer_show (GtkXText *xtext, - xtext->io_tag = 0; - } - -- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (xtext))) -+ if (!gtk_widget_get_realized (GTK_WIDGET (xtext))) - gtk_widget_realize (GTK_WIDGET (xtext)); - - gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &w, &h); diff --git a/libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch b/libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch deleted file mode 100644 index 5bf1e4ef5..000000000 --- a/libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8d35b36baa8204b68c9520ec92327e34c1d7c580 Mon Sep 17 00:00:00 2001 -From: Ritesh Khadgaray <khadgaray@gmail.com> -Date: Sun, 04 Jul 2010 09:52:07 +0000 -Subject: remove deprecated GTK+ symbols, GTK_WIDGET_SET_FLAGS. - ---- -diff --git a/src/fe-gnome/xtext.c b/src/fe-gnome/xtext.c -index 92562a3..51503f8 100644 ---- a/src/fe-gnome/xtext.c -+++ b/src/fe-gnome/xtext.c -@@ -963,7 +963,7 @@ gtk_xtext_realize (GtkWidget * widget) - GdkColor col; - GdkColormap *cmap; - -- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); -+ gtk_widget_set_realized (widget, TRUE); - xtext = GTK_XTEXT (widget); - - attributes.x = widget->allocation.x; --- -cgit v0.8.3.1 - diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 83f9070fc..df53ec0cb 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Parabola Project <dev@list.parabolagnulinux.org> pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=1 +pkgrel=3 pkgdesc="This package conflicts with every unfree package known to date." arch=('any') -url="http://parabolagnulinux.org" +url="https://parabolagnulinux.org" license=('GPL') groups=('base') install=${pkgname}.install @@ -21,5 +21,9 @@ build() { } package() { - conflicts=($(cut -d: -f1 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt)) + conflicts=($(cut -d: -f1,2 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt | \ + sed "s/:$//" | \ + grep -v ":" | \ + sort -u + )) } diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD deleted file mode 100644 index 78be6ccc6..000000000 --- a/multilib-testing/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') -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-testing/lib32-libffi/PKGBUILD b/multilib-testing/lib32-libffi/PKGBUILD new file mode 100644 index 000000000..3e7409124 --- /dev/null +++ b/multilib-testing/lib32-libffi/PKGBUILD @@ -0,0 +1,29 @@ +# $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 new file mode 100644 index 000000000..ff7f4f050 --- /dev/null +++ b/multilib-testing/lib32-llvm/PKGBUILD @@ -0,0 +1,153 @@ +# $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 new file mode 100644 index 000000000..ddaab690e --- /dev/null +++ b/multilib-testing/lib32-llvm/cindexer-clang-path.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..f46eb9fce --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +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 new file mode 100644 index 000000000..2e527300d --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..40d93104a --- /dev/null +++ b/multilib-testing/lib32-llvm/enable-lto.patch @@ -0,0 +1,36 @@ +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 index 4a8e1d5c4..a8a124b45 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45021 2011-04-14 09:13:42Z lcarlier $ +# $Id: PKGBUILD 47149 2011-05-17 17:48:52Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,7 +10,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110412 + pkgver=7.10.99.git20110429 else pkgver=7.10.2 fi @@ -18,13 +18,13 @@ 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-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 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05751aa2af1a8ec83c2d110385aab1b7e735238 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-f05751aa2af1a8ec83c2d110385aab1b7e735238.tar.bz2') - md5sums=('56d8862d1155f7e8054f9aa7f93ebebc') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0 + source=('ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2') + md5sums=('8d1a895110a6d3b7c51b3521f794bae2') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') @@ -37,6 +37,10 @@ build() { 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}" @@ -49,21 +53,26 @@ build() { if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ + --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 \ + --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-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 \ @@ -141,6 +150,7 @@ package_lib32-libegl() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install else cd "${srcdir}/Mesa-${pkgver}" fi diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD index e74ba71f2..cb1fb077f 100644 --- a/multilib/binutils-multilib/PKGBUILD +++ b/multilib/binutils-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46021 2011-05-02 00:26:22Z heftig $ +# $Id: PKGBUILD 46786 2011-05-11 15:43:26Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=binutils-multilib pkgver=2.21 -pkgrel=7 +pkgrel=8 _date=20110430 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64' 'mips64el') @@ -19,10 +19,16 @@ 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) -md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec') +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 diff --git a/testing/binutils/binutils-2.21-strip-segfault.patch b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch index 0133d879b..0133d879b 100644 --- a/testing/binutils/binutils-2.21-strip-segfault.patch +++ b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 1e02407eb..78d31942f 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46019 2011-05-02 00:10:26Z heftig $ +# $Id: PKGBUILD 47043 2011-05-14 11:08:03Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,8 +8,8 @@ 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=4 -_snapshot=4.6-20110429 +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') @@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran, ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('fa586a5634ae3b462c5fb2d55160b14f' - '2591b1fad977f7bd6136c9ac1298ef04' - '366f93c1867f35c8860b42965efde955' - '21779792ef7e0ed7abef611160b0099c' - 'cf518c56b968925a2eca3aa2b4cdbd7b' - 'f66ef8597b99961eda7573df505ea354' - '3d89dd233ceb6a837d14ee6b940a43ed' +md5sums=('2be769db16ac02f30fb62423b4c50145' + 'a310d230945f4b3093dd3ca72839c649' + '361a10c5a5545c80fd271b18036dd00c' + 'f7db2f6ed34398361de62cb6b8eb53d2' + '9b69c1d8874e8496c1965ee3e32eaa6d' + '248e53b461078bf1c89528fb8e4ba051' + 'e15a01b0d02ff12e975e4c2649e71e55' '1e9fd2eaf0ee47ea64e82c48998f1999' '22cec272f9cc2801d3cd348feaca888b' '4df25b623799b148a0703eaeec8fdf3f') diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD index 53a6d7de3..85be7ae08 100644 --- a/multilib/lib32-libcap/PKGBUILD +++ b/multilib/lib32-libcap/PKGBUILD @@ -3,8 +3,8 @@ _pkgbasename=libcap pkgname=lib32-$_pkgbasename -pkgver=2.19 -pkgrel=4 +pkgver=2.21 +pkgrel=1 pkgdesc="POSIX 1003.1e capabilities (32-bit)" arch=(x86_64 'mips64el') url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" @@ -12,7 +12,7 @@ license=('GPL') depends=('lib32-attr' $_pkgbasename) makedepends=('gcc-multilib') source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('9caa6dafc9e3db4cbaecdb8e48f23fa2') +md5sums=('61966ef40f2dee8731b69db895e4548d') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD index 9c2f230a9..c9ab1d72f 100644 --- a/multilib/nspluginwrapper/PKGBUILD +++ b/multilib/nspluginwrapper/PKGBUILD @@ -1,24 +1,20 @@ -# $Id: PKGBUILD 46102 2011-05-03 15:47:24Z bluewind $ +# $Id: PKGBUILD 47193 2011-05-18 13:14:48Z bluewind $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=nspluginwrapper -pkgver=1.3.2 -pkgrel=1 +pkgver=1.4.0 +pkgrel=3 pkgdesc="Cross-platform NPAPI compatible plugin viewer" -arch=('x86_64' 'mips64el') -url="http://freshmeat.net/projects/nspluginwrapper/" +arch=('x86_64') +url="http://nspluginwrapper.davidben.net/" license=('GPL') depends=('curl' 'lib32-libxt' 'lib32-gcc-libs' 'gtk2' 'lib32-gtk2') makedepends=('gcc-multilib') -source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz - nspluginwrapper-native-windows.patch) -sha256sums=('f3a40d160601520d36b6f5c342e1e9751b2bdc70dff5e2e880e1d18ed8830201' - '3796b66f53448f4668e70aec97a3d74db2b2fcd308b36f87373405547cae38b1') +install="install" +source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('39b9034dc840ac6a21701406d96449e578b787aad7f6a09d97113776cf8251b3') build() { cd "$srcdir/$pkgname-$pkgver" - # Patch taken from the openSuSE src.rpm - patch -p0 -i "$srcdir/nspluginwrapper-native-windows.patch" - ./configure --with-lib32=lib32 --with-lib64=lib make -j1 } @@ -27,8 +23,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir/" install - mkdir -p "$pkgdir"/usr/lib/mozilla/plugins/ - ln -s /usr/lib/nspluginwrapper/x86_64/linux/npwrapper.so "$pkgdir"/usr/lib/mozilla/plugins/ } # vim:set ts=2 sw=2 et: diff --git a/multilib/nspluginwrapper/install b/multilib/nspluginwrapper/install new file mode 100644 index 000000000..78e196fdb --- /dev/null +++ b/multilib/nspluginwrapper/install @@ -0,0 +1,5 @@ +post_upgrade() { + for i in `nspluginwrapper -l | grep -v "^ "`; do + /usr/bin/nspluginwrapper -u "$i" + done +} diff --git a/social/haveged/PKGBUILD b/social/haveged/PKGBUILD index 92369ab28..74d53a602 100644 --- a/social/haveged/PKGBUILD +++ b/social/haveged/PKGBUILD @@ -1,28 +1,28 @@ -# Maintainer: pootzko <pootzko@gmail.com> -# Contributor: kfgz <kfgz@interia.pl> +# Maintainer: kfgz <kfgz at interia dot pl> +# Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="A simple entropy daemon." arch=('i686' 'x86_64' 'mips64el') url="http://www.issihosts.com/haveged" license="GPL" -depends=() source=(${url}/${pkgname}-${pkgver}.tar.gz - haveged) -md5sums=('72df03658cafac35e087fb75f6d4100d' + haveged) +md5sums=('f7752f0355a0e89d8f196658db5f6884' '264b725be5271288b40f363d7cfc6b68') - build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/etc/init.d cd ${srcdir} install -D -m755 haveged ${pkgdir}/etc/rc.d/haveged } - - diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD new file mode 100644 index 000000000..3e181dafa --- /dev/null +++ b/staging/akonadi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=akonadi +pkgver=1.5.3 +pkgrel=2 +pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" +arch=('i686' 'x86_64') +url='http://pim.kde.org/akonadi' +license=('LGPL') +depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +install="${pkgname}.install" +source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2") +md5sums=('ad342acca61c2af27be4cce61b2d925a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/staging/akonadi/akonadi.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD new file mode 100644 index 000000000..6f1a6baf5 --- /dev/null +++ b/staging/avogadro/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Nick B <Shirakawasuna at gmail _dot_com> + +pkgname=avogadro +pkgver=1.0.3 +pkgrel=2 +pkgdesc="An advanced molecular editor based on Qt" +arch=('i686' 'x86_64') +url="http://avogadro.openmolecules.net/wiki/Main_Page" +license=('GPL2') +depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') +makedepends=('cmake' 'boost') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('92c2702c1980f70fb6d87a1a58147911') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install +} diff --git a/staging/boost/4994-compile-fix-for-Python32-v2.patch b/staging/boost/4994-compile-fix-for-Python32-v2.patch new file mode 100644 index 000000000..22613b3f2 --- /dev/null +++ b/staging/boost/4994-compile-fix-for-Python32-v2.patch @@ -0,0 +1,16 @@ +Index: libs/python/src/converter/builtin_converters.cpp +=================================================================== +--- libs/python/src/converter/builtin_converters.cpp (revision 67279) ++++ libs/python/src/converter/builtin_converters.cpp (working copy) +@@ -431,7 +431,11 @@ + if (!result.empty()) + { + int err = PyUnicode_AsWideChar( ++#if PY_VERSION_HEX >= 0x03020000 ++ intermediate ++#else + (PyUnicodeObject *)intermediate ++#endif + , &result[0] + , result.size()); + diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD new file mode 100644 index 000000000..d95541e63 --- /dev/null +++ b/staging/boost/PKGBUILD @@ -0,0 +1,112 @@ +# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Kritoke <kritoke@gamebox.net> +# Contributor: Luca Roccia <little_rock@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.46.1 +_boostver=${pkgver//./_} +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.boost.org/" +makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + 4994-compile-fix-for-Python32-v2.patch + boost-1.46.0-spirit.patch) +license=('custom') +md5sums=('341e5d993b19d099bf1a548495ea91ec' + 'cb59e8adbf2a45ef9264a2f4ab92b849' + '9d6e2f13fef23bf27d7bdddc104e182a') + +_stagedir="${srcdir}/stagedir" + +build() { + # set python path for bjam + cd "${srcdir}/${pkgbase}_${_boostver}/tools" + echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam + echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam + echo "using mpi ;" >> build/v2/user-config.jam + + # build bjam + cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src" + ./build.sh cc + + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + + install -d "${_stagedir}"/usr/bin + install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam + + # build bcp + cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp" + ../build/v2/engine/src/${_bindir}/bjam --toolset=gcc + install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \ + ${_stagedir}/usr/bin/bcp + + # build libs + cd "${srcdir}/${pkgbase}_${_boostver}" + #python 3.2 support + #https://svn.boost.org/trac/boost/ticket/4994 + patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch" + patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch" + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + + ./tools/build/v2/engine/src/${_bindir}/bjam \ + release debug-symbols=off threading=multi \ + runtime-link=shared link=shared,static \ + cflags=-fno-strict-aliasing \ + toolset=gcc \ + --prefix="${_stagedir}" \ + -sTOOLS=gcc \ + --layout=system \ + ${MAKEFLAGS} \ + install + + # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html + # build pyste + #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install" + #python2 setup.py install --root=${_stagedir} --optimize=1 +} + +package_boost() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings') + + install -d "${pkgdir}"/usr/{include,lib} + # headers/source files + cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ + + # static libs + cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + # utilities (bjam, bcp, pyste) + cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + + # license + install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt +} + +package_boost-libs() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" + depends=('gcc-libs' 'bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -d "${pkgdir}/usr/lib" + #shared libs + cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" + + # license + install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} diff --git a/staging/boost/boost-1.46.0-spirit.patch b/staging/boost/boost-1.46.0-spirit.patch new file mode 100644 index 000000000..6fae331ee --- /dev/null +++ b/staging/boost/boost-1.46.0-spirit.patch @@ -0,0 +1,59 @@ +Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp +=================================================================== +--- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68724) ++++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68725) +@@ -14,6 +14,7 @@ + + #include <boost/ref.hpp> + ++#include <boost/spirit/home/support/handles_container.hpp> + #include <boost/spirit/home/qi/parser.hpp> + + namespace boost { namespace spirit { namespace qi +@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam + }; + }}} + ++namespace boost { namespace spirit { namespace traits ++{ ++ /////////////////////////////////////////////////////////////////////////// ++ template <typename Subject, typename Params, typename Attribute ++ , typename Context, typename Iterator> ++ struct handles_container<qi::parameterized_nonterminal<Subject, Params> ++ , Attribute, Context, Iterator> ++ : handles_container<typename remove_const<Subject>::type ++ , Attribute, Context, Iterator> ++ {}; ++}}} ++ + #endif +Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp +=================================================================== +--- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68724) ++++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68725) +@@ -14,6 +14,7 @@ + + #include <boost/ref.hpp> + ++#include <boost/spirit/home/support/handles_container.hpp> + #include <boost/spirit/home/karma/generator.hpp> + + namespace boost { namespace spirit { namespace karma +@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam + }; + }}} + ++ ++namespace boost { namespace spirit { namespace traits ++{ ++ /////////////////////////////////////////////////////////////////////////// ++ template <typename Subject, typename Params, typename Attribute ++ , typename Context, typename Iterator> ++ struct handles_container<karma::parameterized_nonterminal<Subject, Params> ++ , Attribute, Context, Iterator> ++ : handles_container<typename remove_const<Subject>::type ++ , Attribute, Context, Iterator> ++ {}; ++}}} ++ + #endif diff --git a/staging/cairo-perl/PKGBUILD b/staging/cairo-perl/PKGBUILD new file mode 100644 index 000000000..b697e5e16 --- /dev/null +++ b/staging/cairo-perl/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..9d233d726 --- /dev/null +++ b/staging/claws-mail-extra-plugins/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 125144 2011-05-25 19:01:27Z foutrelis $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Mildred <mildred593 at online dot fr> + +pkgname=claws-mail-extra-plugins +pkgver=3.7.9 +pkgrel=4 +pkgdesc="Extra plugins for claws-mail" +url="http://www.claws-mail.org/plugins.php?branch=EXT" +license=('GPL3') +arch=('i686' 'x86_64') +depends=('claws-mail>=3.7.8') +makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13' + 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra') +optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' + 'perl: for perl plugin' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus-core: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin' + 'libytnef: for tnef_parse plugin' + 'libwebkit: for the fancy webkit html plugin' + 'libsoup-gnome: for the fancy webkit html plugin' + 'python2: for python plugin') +conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' + 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' + 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' + 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') +replaces=('sylpheed-claws-extra-plugins') +options=('!libtool' '!strip') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 + claws-mail-notification-0.26-libnotify-0.7.patch) +md5sums=('3d1ebc48f686ab10702380c776b5d5d0' + 'a02be84594ebd28b18811ccc358509be') + +build() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + + # fix for python2 + export PYTHON="/usr/bin/python2" + + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && ( + cd $dir + + [[ $dir == notification_plugin-* ]] && + patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch" + + ./configure --prefix=/usr --disable-static + make + ) + done +} + +package() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && + make -C $dir DESTDIR="$pkgdir" install + done + + # fix fileconflict with libical, #11485 + rm -f "$pkgdir/usr/include/ical.h" +} diff --git a/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch new file mode 100644 index 000000000..efc06a472 --- /dev/null +++ b/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch @@ -0,0 +1,25 @@ +diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c +--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c 2009-04-26 03:05:05.000000000 +0200 ++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c 2010-11-12 13:39:02.363909583 +0100 +@@ -339,7 +339,7 @@ + break; + } + +- ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); ++ ppopup->notification = notify_notification_new(summary, utf8_str, NULL); + g_free(utf8_str); + if(ppopup->notification == NULL) { + debug_print("Notification Plugin: Failed to create a new " +diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c +--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c 2010-03-25 09:56:34.000000000 +0100 ++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c 2010-11-12 13:38:30.809340907 +0100 +@@ -589,8 +589,7 @@ + summary = notification_trayicon_popup_assemble_summary(); + utf8_str = notification_trayicon_popup_assemble_body(msginfo); + +- popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL); +- notify_notification_attach_to_status_icon(popup.notification, trayicon); ++ popup.notification = notify_notification_new(summary, utf8_str, NULL); + + g_free(summary); + g_free(utf8_str); diff --git a/staging/dvdrip/PKGBUILD b/staging/dvdrip/PKGBUILD new file mode 100644 index 000000000..17838b169 --- /dev/null +++ b/staging/dvdrip/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 125147 2011-05-25 19:02:09Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> + +pkgname=dvdrip +pkgver=0.98.11 +pkgrel=7 +pkgdesc="A Gtk frontend for transcode writen in Perl" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.exit1.org/dvdrip/" +install=${pkgname}.install +depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' + 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') +optdepends=('ogmtools: for ogm/odd video creation' + 'lsdvd: fast reading of DVD table') +source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \ + ${pkgname}.desktop) +options=('!emptydirs' '!makeflags') +md5sums=('6dfa4199d451757a37eea233a07da4c0' + 'e91cf411928fd0500d07a0022b4ef546') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/dvdrip/dvdrip.desktop b/staging/dvdrip/dvdrip.desktop new file mode 100644 index 000000000..dd19b4aae --- /dev/null +++ b/staging/dvdrip/dvdrip.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=dvd::rip +Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs +Exec=/usr/bin/vendor_perl/dvdrip +Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm +Terminal=false +Type=Application +Categories=Application;AudioVideo;Video; diff --git a/staging/dvdrip/dvdrip.install b/staging/dvdrip/dvdrip.install new file mode 100644 index 000000000..4cd6160c4 --- /dev/null +++ b/staging/dvdrip/dvdrip.install @@ -0,0 +1,19 @@ +# 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/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD new file mode 100644 index 000000000..7d4d83910 --- /dev/null +++ b/staging/ekiga/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tom K <tomk@runbox.com> + +pkgname=ekiga +pkgver=3.3.0 +pkgrel=4 +pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" +url="http://www.ekiga.org" +license=(GPL) +arch=(i686 x86_64) +depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') +makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') +optdepends=('evolution-data-server: Evolution integration') +provides=('gnomemeeting') +replaces=('gnomemeeting') +options=(!emptydirs) +groups=('gnome-extra') +install=ekiga.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('3fb22704e44afebf4294632505fb7a13f3eccb152fcb5878e97aa556d9486d2c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-install \ + --disable-scrollkeeper --enable-dbus + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install new file mode 100644 index 000000000..b1d76a4a3 --- /dev/null +++ b/staging/ekiga/ekiga.install @@ -0,0 +1,22 @@ +pkgname=ekiga + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/staging/frozen-bubble/PKGBUILD b/staging/frozen-bubble/PKGBUILD new file mode 100644 index 000000000..eac81509b --- /dev/null +++ b/staging/frozen-bubble/PKGBUILD @@ -0,0 +1,36 @@ +# $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 new file mode 100644 index 000000000..76a7bcd88 --- /dev/null +++ b/staging/frozen-bubble/frozen-bubble.desktop @@ -0,0 +1,9 @@ +[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 new file mode 100644 index 000000000..e4f58af63 --- /dev/null +++ b/staging/gconf-perl/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..76298e68f --- /dev/null +++ b/staging/git/ChangeLog @@ -0,0 +1,53 @@ +Simple version bumps are omitted from the following ChangeLog. + +2011-05-05 Dan McGee <dan@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <dan@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <dan@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <allan@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild + +2010-06-29 Dan McGee <dan@archlinux.org> + Version 1.7.1.1-1 + * Add emacs completion files (FS#17968) + * Add git-daemon RC scripts (FS#19291) + +2009-06-05 Dan McGee <dan@archlinux.org> + Version 1.6.3.2-1 + * Remove gitweb from /usr/share; it needs customization to be helpful + * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) + +2008-09-14 Dan McGee <dan@archlinux.org> + Version 1.6.0.2-1 + * Moved optional depends from install file to optdepends array + +2008-06-15 Dan McGee <dan@archlinux.org> + Version 1.5.6-1 + * Removed 'cpio' dependency, clone is now a builtin and no longer needs it + +2008-02-02 Dan McGee <dan@archlinux.org> + Version 1.5.4-1 + * Upstream version 1.5.4 + * Enable pthreads support in pack-objects. To use, set the pack.threads + git config option. Read manpages of pack-objects and config for more + details. + * Changelog added (with entries going back a bit). + +2008-01-28 Kevin Piche <kevin@archlinux.org> + Version 1.5.3.7-2 + * Updated for new perl policy (vendor dirs) + * Change license to GPL2 + +2007-11-01 Eric Belanger <eric@archlinux.org> + Version 1.5.3.5-2 + * Fix Perl module location diff --git a/staging/git/PKGBUILD b/staging/git/PKGBUILD new file mode 100644 index 000000000..0a96745dd --- /dev/null +++ b/staging/git/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 125150 2011-05-25 19:02:49Z foutrelis $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=git +pkgver=1.7.5.2 +pkgrel=2 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2') +makedepends=('python2' 'emacs') +optdepends=('tk: gitk and git gui' + 'perl-libwww: git svn' + 'perl-term-readkey: git svn' + 'perl-mime-tools: git send-email' + 'perl-net-smtp-ssl: git send-email TLS support' + 'perl-authen-sasl: git send-email TLS support' + 'python2: various helper scripts' + 'subversion: git svn' + 'cvsps: git cvsimport') +replaces=('git-core') +provides=('git-core') +backup=('etc/conf.d/git-daemon.conf') +source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \ + "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2" + git-daemon + git-daemon.conf) +changelog=ChangeLog + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" + + cd contrib/emacs + make prefix=/usr +} + +package() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + INSTALLDIRS=vendor DESTDIR="$pkgdir" install + + # bash completion + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git + # more contrib stuff + cp -a ./contrib $pkgdir/usr/share/git/ + # scripts are for python 2.x + sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + $(find "$pkgdir" -name '*.py') \ + "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} + + # emacs interface + cd contrib/emacs + make prefix=/usr DESTDIR="$pkgdir" install + + # how 'bout some manpages? + for mansect in man1 man5 man7; do + for manpage in "$srcdir"/$mansect/*; do + install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) + done + done + + # remove perllocal.pod, .packlist, and empty directories. + rm -rf "$pkgdir"/usr/lib/perl5 + + # git daemon script + install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon + install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf +} + +md5sums=('f79ab8fe79b35346b499f131cbf381a4' + '43fc5538f137231f5c96e7da5eb6c934' + '8e2648910fd5dd4f1c41d3c7fa9e9156' + '2e42bf97779a1c6411d89043334c9e78') +sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' + '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' + '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' + 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/staging/git/git-daemon b/staging/git/git-daemon new file mode 100644 index 000000000..21ba73ed5 --- /dev/null +++ b/staging/git/git-daemon @@ -0,0 +1,70 @@ +#!/bin/bash + +daemon_bin="/usr/lib/git-core/git-daemon" +daemon_name=$(basename $daemon_bin) +PIDF="/var/run/$daemon_name.pid" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f $PIDF ] && rm -f $PIDF + # RUN + $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > $PIDF + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f $PIDF &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/staging/git/git-daemon.conf b/staging/git/git-daemon.conf new file mode 100644 index 000000000..3f9a12060 --- /dev/null +++ b/staging/git/git-daemon.conf @@ -0,0 +1,5 @@ +# path to git repositories served +GIT_REPO="/srv/git/" +# see `man git-daemon` for all available options +# $GIT_REPO will be present twice in most configs +GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD new file mode 100644 index 000000000..96d77bced --- /dev/null +++ b/staging/glade-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125153 2011-05-25 19:04:01Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glade-perl +_realname=Gtk2-GladeXML +pkgver=1.007 +pkgrel=4 +pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('libglade' 'gtk2-perl' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('e6ca234e2a9f0221263acd2a593c583b') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD new file mode 100644 index 000000000..6270e8c8f --- /dev/null +++ b/staging/glew/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: SleepyDog + +pkgname=glew +pkgver=1.6.0 +pkgrel=1 +pkgdesc="The OpenGL Extension Wrangler Library" +arch=('i686' 'x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('libxmu' 'libxi' 'mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|lib64|lib|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install.all + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a + chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +} diff --git a/staging/glib-perl/PKGBUILD b/staging/glib-perl/PKGBUILD new file mode 100644 index 000000000..89610fe1e --- /dev/null +++ b/staging/glib-perl/PKGBUILD @@ -0,0 +1,33 @@ +# $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 new file mode 100644 index 000000000..81f68ee25 --- /dev/null +++ b/staging/gnome-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125159 2011-05-25 19:04:51Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-perl +_realname=Gnome2 +pkgver=1.042 +pkgrel=6 +pkgdesc="Perl bindings for libgnome" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('eb7b624114e45e54e022a633ffc1cce6') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnome-vfs-perl/PKGBUILD b/staging/gnome-vfs-perl/PKGBUILD new file mode 100644 index 000000000..3960f5285 --- /dev/null +++ b/staging/gnome-vfs-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125162 2011-05-25 19:05:23Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-vfs-perl +_realname=Gnome2-VFS +pkgver=1.081 +pkgrel=4 +pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gtk2-perl' 'gnome-vfs' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('3d220cbbe9f1ebc78d7047593f9cd633') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnomecanvas-perl/PKGBUILD b/staging/gnomecanvas-perl/PKGBUILD new file mode 100644 index 000000000..2563caae4 --- /dev/null +++ b/staging/gnomecanvas-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125156 2011-05-25 19:04:24Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnomecanvas-perl +_realname=Gnome2-Canvas +pkgver=1.002 +pkgrel=8 +pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gtk2-perl' 'libgnomecanvas' 'perl') +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('93405a987ba4bbd03c2f91592b88f5cb') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR="${pkgdir}" +} diff --git a/staging/gnumeric/PKGBUILD b/staging/gnumeric/PKGBUILD new file mode 100644 index 000000000..2fd9e4799 --- /dev/null +++ b/staging/gnumeric/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125165 2011-05-25 19:05:49Z foutrelis $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Kritoke <typeolinux@yahoo.com> + +pkgname=gnumeric +pkgver=1.10.15 +pkgrel=2 +pkgdesc="A GNOME Spreadsheet Program" +arch=('i686' 'x86_64') +url="http://www.gnome.org/projects/gnumeric/" +license=('GPL') +depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv') +optdepends=('pygobject: for python plugin support' + 'psiconv: for Psion 5 file support' + 'yelp: for viewing the help manual') +install=gnumeric.install +options=('libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-install --enable-ssindex + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -rf "${pkgdir}/etc/gconf" +} diff --git a/staging/gnumeric/gnumeric.install b/staging/gnumeric/gnumeric.install new file mode 100644 index 000000000..50ee0a7e2 --- /dev/null +++ b/staging/gnumeric/gnumeric.install @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000..16cc69a52 --- /dev/null +++ b/staging/graphviz/LICENSE @@ -0,0 +1,87 @@ +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 new file mode 100644 index 000000000..c31b3977d --- /dev/null +++ b/staging/graphviz/PKGBUILD @@ -0,0 +1,50 @@ +# $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 new file mode 100644 index 000000000..00510e3f6 --- /dev/null +++ b/staging/graphviz/install @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 000000000..215b21109 --- /dev/null +++ b/staging/gtk2-perl/PKGBUILD @@ -0,0 +1,25 @@ +# $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 new file mode 100644 index 000000000..d09e302dd --- /dev/null +++ b/staging/hugin/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2010.4.0 +pkgrel=4 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('LGPL') +depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' + 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) +md5sums=('bfd716655461987312b2f2f00c90dcc5' + '4393c7b31da60f230c85e63a6a2e43a0') +sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' + '52798a155a037f853f41402f797e8a4cb6bb3e07') + +build() { + cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) + mkdir build && cd build + + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/hugin/hugin-gcc46.patch b/staging/hugin/hugin-gcc46.patch new file mode 100644 index 000000000..98a70ad50 --- /dev/null +++ b/staging/hugin/hugin-gcc46.patch @@ -0,0 +1,16 @@ + +diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + + + + diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/staging/hugin/hugin.install @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..39f9e8830 --- /dev/null +++ b/staging/imagemagick/PKGBUILD @@ -0,0 +1,81 @@ +# $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 new file mode 100644 index 000000000..958c0f2ee --- /dev/null +++ b/staging/imagemagick/perlmagick.rpath.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..bba878633 --- /dev/null +++ b/staging/irssi/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 125226 2011-05-25 19:11:10Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dan McGee <dan@archlinux.org> + +pkgname=irssi +pkgver=0.8.15 +pkgrel=5 +pkgdesc="Modular text mode IRC client with Perl scripting" +arch=('i686' 'x86_64') +url="http://irssi.org/" +license=('GPL') +depends=('glib2' 'openssl' 'perl') +optdepends=('perl-libwww: for the scriptassist script') +backup=(etc/irssi.conf) +source=(http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool') +md5sums=('1dcb3f511b88df94b0c996f36668c7da') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --enable-ipv6 \ + --with-proxy \ + --sysconfdir=/etc \ + --with-perl-lib=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD new file mode 100644 index 000000000..a5a24fb20 --- /dev/null +++ b/staging/kdeedu/PKGBUILD @@ -0,0 +1,280 @@ +# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeedu +pkgname=('kdeedu-blinken' + 'kdeedu-cantor' + 'kdeedu-data' + 'kdeedu-kalgebra' + 'kdeedu-kalzium' + 'kdeedu-kanagram' + 'kdeedu-kbruch' + 'kdeedu-kgeography' + 'kdeedu-khangman' + 'kdeedu-kig' + 'kdeedu-kiten' + 'kdeedu-klettres' + 'kdeedu-kmplot' + 'kdeedu-kstars' + 'kdeedu-ktouch' + 'kdeedu-kturtle' + 'kdeedu-kwordquiz' + 'kdeedu-libkdeedu' + 'kdeedu-marble' + 'kdeedu-parley' + 'kdeedu-rocs' + 'kdeedu-step') +pkgver=4.6.3 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' + 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre' + 'python2' 'avogadro') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'gpsd-2.96.patch') +sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396' + 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np1 -i ${srcdir}/gpsd-2.96.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeedu-blinken() { + pkgdesc='A memory enhancement game' + depends=('kdebase-runtime' 'kdeedu-libkdeedu') + install='kdeedu.install' + cd $srcdir/build/blinken + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/blinken + make DESTDIR=$pkgdir install +} + +package_kdeedu-cantor() { + pkgdesc='KDE Frontend to Mathematical Software' + depends=('kdeedu-libkdeedu' 'libspectre') + optdepends=('kdeedu-kalgebra: backend' + 'maxima: backend' + 'r: backend') + install='kdeedu.install' + cd $srcdir/build/cantor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/cantor + make DESTDIR=$pkgdir install +} + +package_kdeedu-data() { + pkgdesc='Data for KDE Educational Software' + groups=() + cd $srcdir/build/data + make DESTDIR=$pkgdir install +} + +package_kdeedu-kalgebra() { + pkgdesc='Math Expression Solver and Plotter' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kalgebra + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kalgebra + make DESTDIR=$pkgdir install +} + +package_kdeedu-kalzium() { + pkgdesc='KDE Periodic Table of Elements' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro') + install='kdeedu.install' + cd $srcdir/build/kalzium + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kalzium + make DESTDIR=$pkgdir install +} + +package_kdeedu-kanagram() { + pkgdesc='KDE Letter Order Game' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + install='kdeedu.install' + cd $srcdir/build/kanagram + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kanagram + make DESTDIR=$pkgdir install +} + +package_kdeedu-kbruch() { + pkgdesc='Practice exercises with fractions' + depends=('kdelibs' 'kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kbruch + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbruch + make DESTDIR=$pkgdir install +} + +package_kdeedu-kgeography() { + pkgdesc='A Geography Learning Program' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kgeography + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgeography + make DESTDIR=$pkgdir install +} + +package_kdeedu-khangman() { + pkgdesc='KDE Hangman Game' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + install='kdeedu.install' + cd $srcdir/build/khangman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/khangman + make DESTDIR=$pkgdir install +} + +package_kdeedu-kig() { + pkgdesc='Explore Geometric Constructions' + depends=('kdebase-runtime' 'boost-libs' 'python2') + install='kdeedu.install' + cd $srcdir/build/kig + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kig + make DESTDIR=$pkgdir install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py +} + +package_kdeedu-kiten() { + pkgdesc='Japanese Reference and Study Tool' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kiten + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiten + make DESTDIR=$pkgdir install +} + +package_kdeedu-klettres() { + pkgdesc='a KDE program to learn the alphabet' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/klettres + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klettres + make DESTDIR=$pkgdir install +} + +package_kdeedu-kmplot() { + pkgdesc='Function Plotter' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kmplot + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmplot + make DESTDIR=$pkgdir install +} + +package_kdeedu-kstars() { + pkgdesc='Desktop Planetarium' + depends=('kdebase-runtime' 'libindi') + install='kdeedu.install' + cd $srcdir/build/kstars + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kstars + make DESTDIR=$pkgdir install +} + +package_kdeedu-ktouch() { + pkgdesc='Touch Typing Tutor' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/ktouch + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktouch + make DESTDIR=$pkgdir install +} + +package_kdeedu-kturtle() { + pkgdesc='Educational Programming Environment' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kturtle + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kturtle + make DESTDIR=$pkgdir install +} + +package_kdeedu-kwordquiz() { + pkgdesc='A flashcard and vocabulary learning program' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + install='kdeedu.install' + cd $srcdir/build/kwordquiz + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kwordquiz + make DESTDIR=$pkgdir install +} + +package_kdeedu-libkdeedu() { + pkgdesc='Support library for KDE Educational Software' + groups=() + depends=('kdelibs') + install='kdeedu.install' + cd $srcdir/build/libkdeedu + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \ + $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake +} + +package_kdeedu-marble() { + pkgdesc='Desktop Globe' + depends=('kdebase-runtime' 'gpsd') + install='kdeedu.install' + cd $srcdir/build/marble + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/marble + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \ + $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake +} + +package_kdeedu-parley() { + pkgdesc='Vocabulary Trainer' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python') + install='kdeedu.install' + cd $srcdir/build/parley + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/parley + make DESTDIR=$pkgdir install +} + +package_kdeedu-rocs() { + pkgdesc='Graph Theory Tool for Professors and Students.' + depends=('kdebase-runtime' 'kdeedu-libkdeedu') + install='kdeedu.install' + cd $srcdir/build/rocs + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/rocs + make DESTDIR=$pkgdir install +} + +package_kdeedu-step() { + pkgdesc='Simulate physics experiments' + depends=('kdebase-runtime' 'gsl' 'libqalculate') + install='kdeedu.install' + cd $srcdir/build/step + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/step + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeedu/gpsd-2.96.patch b/staging/kdeedu/gpsd-2.96.patch new file mode 100644 index 000000000..ec515e99d --- /dev/null +++ b/staging/kdeedu/gpsd-2.96.patch @@ -0,0 +1,43 @@ +Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +=================================================================== +--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp ++++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +@@ -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/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu/kdeedu.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/libproxy/PKGBUILD b/staging/libproxy/PKGBUILD new file mode 100644 index 000000000..7fde7ae6d --- /dev/null +++ b/staging/libproxy/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libproxy +pkgver=0.4.6 +pkgrel=7 +pkgdesc="A library that provides automatic proxy configuration management" +arch=(i686 x86_64) +license=('LGPL') +depends=('gcc-libs') +optdepends=('gconf: GNOME configuration module' + 'kdelibs: KDE configuration module' + 'networkmanager: NetworkManager configuration module' + 'perl: Perl bindings' + 'python2: Python bindings') +makedepends=('gconf' 'cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl') +url="http://libproxy.googlecode.com" +source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +options=('!libtool') +md5sums=('199c6b120baf1f7258a55f38d5ec74f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \ + -DCMAKE_SKIP_RPATH=ON \ + -DPERL_VENDORINSTALL=yes \ + -DCMAKE_BUILD_TYPE=None \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_C_FLAGS="${CFLAGS}" \ + .. + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD new file mode 100644 index 000000000..275c56431 --- /dev/null +++ b/staging/libtorrent-rasterbar/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgname=libtorrent-rasterbar +pkgver=0.15.6 +pkgrel=2 +pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" +url="http://www.rasterbar.com/products/libtorrent/" +arch=('i686' 'x86_64') +license=('custom') +depends=('boost-libs' 'python2') +makedepends=('boost') +source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +sha1sums=('e6f33b139933ec245e8850558efe52e88081fc6d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-python-binding + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD new file mode 100644 index 000000000..33f4e7901 --- /dev/null +++ b/staging/mod_perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 125232 2011-05-25 19:12:54Z foutrelis $ +# Maintainer: Firmicus <francois.archlinux.org> +# Contributor: Tom K <tomk@runbox.com> + +pkgname=mod_perl +pkgver=2.0.5 +pkgrel=2 +pkgdesc="Apache module that embeds the Perl interpreter within the server" +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl=5.12.3' 'apache' 'db' 'apr-util') +license=('APACHE') +arch=('i686' 'x86_64') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz) +md5sums=('03d01d135a122bd8cebd0cd5b185d674') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD new file mode 100644 index 000000000..42faa88a3 --- /dev/null +++ b/staging/net-snmp/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=net-snmp +pkgver=5.6.1 +pkgrel=2 +pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" +arch=('i686' 'x86_64') +url="http://www.net-snmp.org/" +license=('custom') +depends=('openssl' 'tcp_wrappers' 'libnl') +makedepends=('setuptools') +optdepends=('perl-term-readkey: for snmpcheck application' + 'perl-tk: for snmpcheck and tkmib applications' + 'python2: for the python modules') +provides=('ucd-snmp') +options=('!libtool' '!makeflags' '!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'snmpd.rc') +md5sums=('b4e30ead5783b0bb1d280172c6095ea4' + '9f0d13676ba1fae1eb7eb178edd85b43') +sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility --enable-ipv6 --with-libwrap --with-python-modules \ + --with-default-snmp-version="3" --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" --with-logfile="/var/log/snmpd.log" \ + --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ + --with-persistent-directory="/var/net-snmp" \ + PYTHONPROG=/usr/bin/python2 + make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install + install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/staging/net-snmp/libnl-2.patch b/staging/net-snmp/libnl-2.patch new file mode 100644 index 000000000..7c140fe83 --- /dev/null +++ b/staging/net-snmp/libnl-2.patch @@ -0,0 +1,67 @@ +diff -Nur net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c +--- net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c 2009-06-13 04:02:02.000000000 +0200 ++++ net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c 2011-01-15 10:31:03.579735957 +0100 +@@ -555,8 +555,10 @@ + static int + tcpTable_load_netlink() + { ++ int err; ++ + /* TODO: perhaps use permanent nl handle? */ +- struct nl_handle *nl = nl_handle_alloc(); ++ struct nl_sock *nl = nl_socket_alloc(); + + if (nl == NULL) { + DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); +@@ -564,10 +566,10 @@ + return -1; + } + +- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + +@@ -579,10 +581,10 @@ + struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + +- if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_send_auto_complete(nl, nm)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + nlmsg_free(nm); +@@ -593,9 +595,9 @@ + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); ++ nl_socket_free(nl); + return -1; + } + +@@ -644,7 +646,7 @@ + free(buf); + } + +- nl_handle_destroy(nl); ++ nl_socket_free(nl); + + if (tcp_head) { + DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); diff --git a/testing/dovecot/dovecot.sh b/staging/net-snmp/snmpd.rc index b7555fe50..9f1b83f64 100755..100644 --- a/testing/dovecot/dovecot.sh +++ b/staging/net-snmp/snmpd.rc @@ -3,25 +3,27 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/dovecot` +PID=`pidof -o %PPID /usr/sbin/snmpd` case "$1" in start) - stat_busy "Starting Dovecot" - [ -z "$PID" ] && /usr/sbin/dovecot + stat_busy "Starting Net-SNMP" + [ -z "$PID" ] && /usr/sbin/snmpd if [ $? -gt 0 ]; then stat_fail else - add_daemon dovecot + echo $PID > /var/run/snmpd.pid + add_daemon snmpd stat_done fi ;; stop) - stat_busy "Stopping Dovecot" + stat_busy "Stopping Net-SNMP" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon dovecot + rm /var/run/snmpd.pid + rm_daemon snmpd stat_done fi ;; diff --git a/staging/pango-perl/PKGBUILD b/staging/pango-perl/PKGBUILD new file mode 100644 index 000000000..ad489dec4 --- /dev/null +++ b/staging/pango-perl/PKGBUILD @@ -0,0 +1,24 @@ +# $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 new file mode 100644 index 000000000..25bd18eeb --- /dev/null +++ b/staging/perl-alien-sdl/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..ebdc0719d --- /dev/null +++ b/staging/perl-bit-vector/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125243 2011-05-25 19:15:01Z foutrelis $ +# Maintainer: Kevin Piche <kevin@archlinux.org> +# Contributor: K. Piche <kpiche@rogers.com> + +pkgname=perl-bit-vector +_cpanname=Bit-Vector +pkgver=7.1 +pkgrel=3 +pkgdesc='Efficient bit vector, set of integers and "big int" math library' +arch=(i686 x86_64) +license=('GPL' 'LGPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_cpanname}/" +depends=('perl-carp-clan' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/${_cpanname}-${pkgver}.tar.gz) +md5sums=('164c8574b728f6171b2a6f564fcd2e50') + +build() { + cd ${srcdir}/${_cpanname}-$pkgver + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_cpanname}-$pkgver + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-compress-bzip2/PKGBUILD b/staging/perl-compress-bzip2/PKGBUILD new file mode 100644 index 000000000..ad5f788ac --- /dev/null +++ b/staging/perl-compress-bzip2/PKGBUILD @@ -0,0 +1,25 @@ +# $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 new file mode 100644 index 000000000..37f315f89 --- /dev/null +++ b/staging/perl-crypt-ssleay/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125246 2011-05-25 19:15:29Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-crypt-ssleay +pkgver=0.58 +pkgrel=3 +pkgdesc="OpenSSL glue that provides LWP https support" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/Crypt-SSLeay" +license=('GPL' 'PerlArtistic') +depends=('openssl') +options=('!emptydirs') +source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) +md5sums=('fbf3d12e58462cee00ea63239c0b13c7') + +build() { + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/staging/perl-dbd-mysql/PKGBUILD b/staging/perl-dbd-mysql/PKGBUILD new file mode 100644 index 000000000..42d22d211 --- /dev/null +++ b/staging/perl-dbd-mysql/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 125309 2011-05-25 19:54:00Z remy $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Eric Johnson <eric@coding-zone.com> + +pkgname=perl-dbd-mysql +_realname=DBD-mysql +pkgver=4.019 +pkgrel=1 +pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0') +makedepends=('mysql') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) +md5sums=('566d98ab8ffac9626a31f6f6d455558e') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql + make +} + +check() { + cd ${srcdir}/${_realname}-${pkgver} + mkdir -p /tmp/mysql_test + mysql_install_db \ + --basedir=/usr \ + --datadir=/tmp/mysql_test + mysqld -P 17999 \ + --socket=/tmp/socket.mysql \ + --datadir=/tmp/mysql_test & + sleep 10 + DAEMON_PORT=$! + make test || true + kill -9 $DAEMON_PORT +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-dbd-sqlite/PKGBUILD b/staging/perl-dbd-sqlite/PKGBUILD new file mode 100644 index 000000000..298cc2008 --- /dev/null +++ b/staging/perl-dbd-sqlite/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 125249 2011-05-25 19:15:53Z foutrelis $ +# Contributor: Tom Killian <tomk@runbox.com> +# Contributor: francois at archlinux dot org + +pkgname=perl-dbd-sqlite +_cpanname=DBD-SQLite +pkgver=1.31 +pkgrel=2 +pkgdesc="Self-contained RDBMS in a DBI driver" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_cpanname}" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.61' 'sqlite3') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) +md5sums=('67b3575104efd606c8093bc416e3338d') + +build() { + cd "${srcdir}/${_cpanname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_cpanname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-dbi/PKGBUILD b/staging/perl-dbi/PKGBUILD new file mode 100644 index 000000000..42f7a5770 --- /dev/null +++ b/staging/perl-dbi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124915 2011-05-25 07:47:08Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Matt Thompson <mattt@defunct.ca> + +pkgname=perl-dbi +_realname=DBI +pkgver=1.616 +pkgrel=2 +pkgdesc="Database independent interface for Perl" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.12.1') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) +md5sums=('799313e54a693beb635b47918458f7c4') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} + +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-nilsimsa/PKGBUILD b/staging/perl-digest-nilsimsa/PKGBUILD new file mode 100644 index 000000000..40e9ae353 --- /dev/null +++ b/staging/perl-digest-nilsimsa/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 125252 2011-05-25 19:16:38Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-digest-nilsimsa +_realname=Digest-Nilsimsa +pkgver=0.06 +pkgrel=7 +pkgdesc="Perl version of Nilsimsa code." +arch=('i686' 'x86_64') +license=('LGPL') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) +replaces=('digest-nilsimsa') +provides=('digest-nilsimsa') +md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-sha1/PKGBUILD b/staging/perl-digest-sha1/PKGBUILD new file mode 100644 index 000000000..eaae5e528 --- /dev/null +++ b/staging/perl-digest-sha1/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 125255 2011-05-25 19:17:02Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-digest-sha1 +_realname=Digest-SHA1 +pkgver=2.13 +pkgrel=2 +pkgdesc="Perl interface to the SHA-1 Algorithm" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +replaces=('digest-sha1') +provides=('digest-sha1') +md5sums=('bd22388f268434f2b24f64e28bf1aa35') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-event/PKGBUILD b/staging/perl-event/PKGBUILD new file mode 100644 index 000000000..3e20ec4c2 --- /dev/null +++ b/staging/perl-event/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125258 2011-05-25 19:17:24Z foutrelis $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: François Charette <francois.archlinux.org> + +pkgname=perl-event +_srcname=Event +pkgver=1.17 +pkgrel=1 +pkgdesc="Framework for GUI events" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +url="http://search.cpan.org/dist/${_srcname}/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) +md5sums=('c58cdf7c56cd5f10a58b234d2c81295f') + +build() { + cd "${srcdir}/${_srcname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_srcname}-${pkgver}" + + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-fcgi/PKGBUILD b/staging/perl-fcgi/PKGBUILD new file mode 100644 index 000000000..d44eddf2a --- /dev/null +++ b/staging/perl-fcgi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125303 2011-05-25 19:27:52Z remy $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-fcgi +pkgver=0.72 +pkgrel=1 +pkgdesc="Fast CGI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/FCGI" +license=('GPL' 'PerlArtistic') +depends=('perl>=5.14') +options=('!emptydirs') +source=(http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz) +md5sums=('7b793e177caa93d972c6fb7ebe7c7ae1') + +build() { + cd "${srcdir}/FCGI-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/FCGI-${pkgver}" + make test +} + +package() { + cd "${srcdir}/FCGI-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-html-parser/PKGBUILD b/staging/perl-html-parser/PKGBUILD new file mode 100644 index 000000000..7e3b0a701 --- /dev/null +++ b/staging/perl-html-parser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125261 2011-05-25 19:17:47Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis +# Contributor: Firmicus <francois.archlinux.org> + +pkgname=perl-html-parser +_realname=HTML-Parser +pkgver=3.68 +pkgrel=2 +pkgdesc="Perl HTML parser class" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-html-tagset' 'perl>=5.12.1') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +md5sums=('5550b2da7aa94341f1e8a17a4ac20c68') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-libintl-perl/PKGBUILD b/staging/perl-libintl-perl/PKGBUILD new file mode 100644 index 000000000..af266d871 --- /dev/null +++ b/staging/perl-libintl-perl/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125264 2011-05-25 19:18:10Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=perl-libintl-perl +_realname=libintl-perl +pkgver=1.20 +pkgrel=3 +pkgdesc="Perl Module: Localization support" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://search.cpan.org/dist/${_realname}/" +depends=('gettext' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) +md5sums=('cb36f58a7d2e15974f25b35381548b1b') + +build() { + cd ${srcdir}/${_realname}-$pkgver + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-locale-gettext/PKGBUILD b/staging/perl-locale-gettext/PKGBUILD new file mode 100644 index 000000000..6f916e28e --- /dev/null +++ b/staging/perl-locale-gettext/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 125267 2011-05-25 19:18:48Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Mark Rosenstand <mark@borkware.net> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=perl-locale-gettext +_realname=gettext +pkgver=1.05 +pkgrel=7 +pkgdesc="Permits access from Perl to the gettext() family of functions" +arch=('i686' 'x86_64') +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('gettext' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz + compatibility-with-POSIX-module.patch) +md5sums=('f3d3f474a1458f37174c410dfef61a46' + '854302f34d01a2f8ae739187788973dd') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + patch -Np1 -i ${srcdir}/compatibility-with-POSIX-module.patch + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete +} diff --git a/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch new file mode 100644 index 000000000..ad675516b --- /dev/null +++ b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch @@ -0,0 +1,10 @@ +--- a/gettext.pm 2005-05-31 20:11:16.000000000 -0700 ++++ b/gettext.pm 2009-10-07 12:39:42.000000000 -0700 +@@ -32,6 +32,7 @@ + =cut + + use Carp; ++use POSIX qw(:locale_h); + + require Exporter; + require DynaLoader; diff --git a/staging/perl-net-dns/PKGBUILD b/staging/perl-net-dns/PKGBUILD new file mode 100644 index 000000000..1a4f7c0cc --- /dev/null +++ b/staging/perl-net-dns/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125273 2011-05-25 19:19:34Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-net-dns +_realname=Net-DNS +pkgver=0.66 +pkgrel=4 +pkgdesc="Perl Module: Interface to the DNS resolver." +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-digest-hmac' 'perl-net-ip' 'perl>=5.10.0') +source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) +options=(!emptydirs) + +build() { + cd $srcdir/${_realname}-${pkgver} + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} +# vim: ts=2 sw=2 et ft=sh +md5sums=('1635d876324e3c2f6e277d5778bfe94c') diff --git a/staging/perl-net-ssleay/PKGBUILD b/staging/perl-net-ssleay/PKGBUILD new file mode 100644 index 000000000..6620fbd6f --- /dev/null +++ b/staging/perl-net-ssleay/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125276 2011-05-25 19:20:00Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-net-ssleay +_cpanname=Net-SSLeay +pkgver=1.36 +pkgrel=5 +pkgdesc="Perl extension for using OpenSSL" +arch=('i686' 'x86_64') +license=('custom:BSD') +url="http://search.cpan.org/dist/${_cpanname}/" +depends=('perl' 'openssl') +options=(!emptydirs) +replaces=('net-ssleay') +provides=('net-ssleay') +source=(http://www.cpan.org/authors/id/F/FL/FLORA/${_cpanname}-${pkgver}.tar.gz) +md5sums=('54061638720dd6a325395331c77f21d8') + +build() { + cd ${srcdir}/${_cpanname}-${pkgver} + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor + make + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-net-upnp/PKGBUILD b/staging/perl-net-upnp/PKGBUILD new file mode 100644 index 000000000..e54c70917 --- /dev/null +++ b/staging/perl-net-upnp/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 125279 2011-05-25 19:20:27Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> + +pkgname=perl-net-upnp +pkgver=1.4.2 +pkgrel=3 +pkgdesc="Perl Module UPnP" +arch=('i686' 'x86_64') +url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" +license=('BSD' 'PerlArtistic') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-${pkgver}.tar.gz") +depends=('perl') +md5sums=('bc009fd76b565df40a70aca49af82a7d') + +build() { + cd "${srcdir}/Net-UPnP-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/staging/perl-netaddr-ip/PKGBUILD b/staging/perl-netaddr-ip/PKGBUILD new file mode 100644 index 000000000..fa6549515 --- /dev/null +++ b/staging/perl-netaddr-ip/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 125270 2011-05-25 19:19:11Z foutrelis $ +# Maintainer: Dale Blount <dale@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgname=perl-netaddr-ip +_realname=NetAddr-IP +pkgver=4.037 +pkgrel=2 +pkgdesc="Perl module to manage IP addresses and subnets" +arch=(i686 x86_64) +license=('PerlArtistic' 'GPL') +depends=('perl>=5.10.0') +options=(!emptydirs) +url="http://search.cpan.org/dist/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) +md5sums=('d966eac6b5941af3f7c1fad839569cb4') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD new file mode 100644 index 000000000..27ef6a6c2 --- /dev/null +++ b/staging/perl-sdl/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..d955edfdd --- /dev/null +++ b/staging/perl-template-toolkit/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Firmicus <francois.archlinux.org> +# Contributor: Tom Killian <tomk@runbox.com> +# Contributor: FJ <joostef@gmail.com> + +pkgname=perl-template-toolkit +_realname=Template-Toolkit +pkgver=2.22 +pkgrel=4 +pkgdesc="Perl template processing system" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-appconfig' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) +md5sums=('d98277f6420e5da6b93d99a8db2b3934') + +build() { + cd ${srcdir}/${_realname}-$pkgver + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${startdir}/pkg + + # remove perllocal.pod and .packlist + find ${startdir}/pkg -name perllocal.pod -delete + find ${startdir}/pkg -name .packlist -delete +} diff --git a/staging/perl-term-readkey/PKGBUILD b/staging/perl-term-readkey/PKGBUILD new file mode 100644 index 000000000..25f9e397d --- /dev/null +++ b/staging/perl-term-readkey/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125285 2011-05-25 19:22:27Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgname=perl-term-readkey +_realname=TermReadKey +pkgver=2.30.01 +pkgrel=4 +pkgdesc="Provides simple control over terminal driver modes" +arch=('i686' 'x86_64') +license=('custom') +depends=('perl>=5.10.0' 'glibc') +url="http://search.cpan.org/~stsi/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) +options=('!emptydirs') +md5sums=('6c099eddb76ec9b92179f1ed929be71a') + +build() +{ + cd ${srcdir}/TermReadKey-$pkgver + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/TermReadKey-$pkgver + make DESTDIR=${pkgdir} install + install -d ${pkgdir}/usr/share/licenses/$pkgname/ + head -7 README > ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-text-iconv/PKGBUILD b/staging/perl-text-iconv/PKGBUILD new file mode 100644 index 000000000..acd6932e2 --- /dev/null +++ b/staging/perl-text-iconv/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 125288 2011-05-25 19:22:57Z foutrelis $ +# Maintainer: +# Contributor: Francois Charette <firmicus@gmx.net> + +pkgname=perl-text-iconv +_realname=Text-Iconv +pkgver=1.7 +pkgrel=6 +pkgdesc="Interface to iconv codeset conversion" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_realname}/" +license=('GPL' 'PerlArtistic') +depends=('perl>=5.10.0') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) +md5sums=('81b26e069eaebb084e91ea3c009b67ae') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/perl-time-hires/PKGBUILD b/staging/perl-time-hires/PKGBUILD new file mode 100644 index 000000000..db9ddcb7f --- /dev/null +++ b/staging/perl-time-hires/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 125291 2011-05-25 19:23:52Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: mezcal <fila at pruda dot com> + +pkgname=perl-time-hires +pkgver=1.9721 +pkgrel=4 +pkgdesc="Perl module: high resolution time, sleep, and alarm" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/Time-HiRes/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-${pkgver}.tar.gz) +md5sums=('bf09911a36b9481537c8e0d28fbb3aaf') + +build() { + cd "${srcdir}/Time-HiRes-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD new file mode 100644 index 000000000..2a80a320e --- /dev/null +++ b/staging/perl-tk/PKGBUILD @@ -0,0 +1,44 @@ +# $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 new file mode 100644 index 000000000..c8bcd6c7a --- /dev/null +++ b/staging/perl-unicode-string/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125294 2011-05-25 19:24:14Z foutrelis $ +# Maintainer: James Rayner <iphitus@gmail.com> +# Contributor: Andrew Simmons <andrew.simmons@gmail.com> + +pkgname=perl-unicode-string +_realname=Unicode-String +pkgver=2.09 +pkgrel=6 +pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +md5sums=('553e68e603723bf7c631f8701ab0d678') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + # in stall module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-xml-parser/PKGBUILD b/staging/perl-xml-parser/PKGBUILD new file mode 100644 index 000000000..46ffa0923 --- /dev/null +++ b/staging/perl-xml-parser/PKGBUILD @@ -0,0 +1,38 @@ +# $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 new file mode 100644 index 000000000..c2ab5a4f8 --- /dev/null +++ b/staging/perl-yaml-syck/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 125297 2011-05-25 19:24:39Z foutrelis $ +# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# Maintainer: kevin <kevin@archlinux.org> + +pkgname=perl-yaml-syck +_realname=YAML-Syck +pkgver=1.17 +pkgrel=2 +pkgdesc="Fast, lightweight YAML loader and dumper" +arch=('i686' 'x86_64') +license=('custom') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/A/AV/AVAR/${_realname}-$pkgver.tar.gz) +md5sums=('f788529ad4b2c2fd037ccdfd5e7a88ab') + +build() { + cd ${srcdir}/${_realname}-$pkgver + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + # license. + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog new file mode 100644 index 000000000..f6c2500df --- /dev/null +++ b/staging/perl/ChangeLog @@ -0,0 +1,57 @@ +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 new file mode 100644 index 000000000..aabf4dbc0 --- /dev/null +++ b/staging/perl/PKGBUILD @@ -0,0 +1,91 @@ +# $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 new file mode 100644 index 000000000..a2d176ec6 --- /dev/null +++ b/staging/perl/fix-h2ph-and-tests.patch @@ -0,0 +1,104 @@ +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 new file mode 100644 index 000000000..3f7d58f23 --- /dev/null +++ b/staging/perl/perl.install @@ -0,0 +1,18 @@ +# 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 new file mode 100755 index 000000000..09811a8b4 --- /dev/null +++ b/staging/perl/perlbin.sh @@ -0,0 +1,23 @@ +# 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 new file mode 100644 index 000000000..3ed646b74 --- /dev/null +++ b/staging/pidgin/PKGBUILD @@ -0,0 +1,114 @@ +# $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 new file mode 100644 index 000000000..8c708df9a --- /dev/null +++ b/staging/pidgin/nm09-more.patch @@ -0,0 +1,49 @@ +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 +@@ -833,8 +833,20 @@ purple_network_is_available(void) + purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); + } + +- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) +- return TRUE; ++ switch (nm_state) ++ { ++ case NM_STATE_UNKNOWN: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else ++ case NM_STATE_CONNECTED: ++#endif ++ return TRUE; ++ default: ++ break; ++ } + + return FALSE; + +@@ -1170,9 +1182,14 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); ++ /* NM 0.6 signal */ + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", + G_CALLBACK(nm_state_change_cb), NULL, NULL); ++ /* NM 0.7 and later signal */ ++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", ++ G_CALLBACK(nm_state_change_cb), NULL, NULL); + + dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, + DBUS_SERVICE_DBUS, +@@ -1207,6 +1224,7 @@ purple_network_uninit(void) + #ifdef HAVE_NETWORKMANAGER + if (nm_proxy) { + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); ++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); + g_object_unref(G_OBJECT(nm_proxy)); + } + if (dbus_proxy) { diff --git a/staging/pidgin/nm09-pidgin.patch b/staging/pidgin/nm09-pidgin.patch new file mode 100644 index 000000000..1c2471d1f --- /dev/null +++ b/staging/pidgin/nm09-pidgin.patch @@ -0,0 +1,38 @@ +diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c +--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 ++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 +@@ -71,6 +71,10 @@ + #include <dbus/dbus-glib.h> + #include <NetworkManager.h> + ++#if !defined(NM_CHECK_VERSION) ++#define NM_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static DBusGConnection *nm_conn = NULL; + static DBusGProxy *nm_proxy = NULL; + static DBusGProxy *dbus_proxy = NULL; +@@ -863,7 +867,13 @@ nm_update_state(NMState state) + + switch(state) + { ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else + case NM_STATE_CONNECTED: ++#endif + /* Call res_init in case DNS servers have changed */ + res_init(); + /* update STUN IP in case we it changed (theoretically we could +@@ -880,6 +890,9 @@ nm_update_state(NMState state) + case NM_STATE_ASLEEP: + case NM_STATE_CONNECTING: + case NM_STATE_DISCONNECTED: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_DISCONNECTING: ++#endif + if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) + break; + if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/staging/pidgin/pidgin.install b/staging/pidgin/pidgin.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/staging/pidgin/pidgin.install @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..d5a887585 --- /dev/null +++ b/staging/postgresql/PKGBUILD @@ -0,0 +1,141 @@ +# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgbase=postgresql +pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') +pkgver=9.0.4 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://www.postgresql.org" +license=('custom:PostgreSQL') +makedepends=('libxml2' 'python2' 'perl') +source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \ + postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate + perl-5.14-fix.patch) +install=postgresql.install + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # patch to remove regress/test make target (won't build with it present) + patch -Np1 -i ../build.patch + # fix for perl 5.14 + patch -Np1 -i ../perl-5.14-fix.patch + + # configure + ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \ + --with-openssl --with-perl \ + --with-python PYTHON=/usr/bin/python2 --with-pam \ + --with-system-tzdata=/usr/share/zoneinfo --enable-nls \ + --datadir=/usr/share/postgresql --enable-thread-safety + + sed -i -e '/interfaces/d' src/Makefile + + # build + make world + + # build libs + for dir in src/interfaces src/bin/pg_config; do + pushd ${dir} + make + popd + done +} + +package_postgresql-libs() { + pkgdesc="Libraries for use with PostgreSQL" + depends=('openssl>=1.0.0') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" + + # install libs + for dir in src/interfaces src/bin/pg_config; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + + install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" + + cd src/include + + mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} + + # these headers are needed by the public headers of the interfaces + install -m644 pg_config.h "${pkgdir}/usr/include/" + install -m644 pg_config_os.h "${pkgdir}/usr/include/" + install -m644 postgres_ext.h "${pkgdir}/usr/include/" + install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" + install -m644 pg_config_manual.h "${pkgdir}/usr/include/" + + # these headers are needed by the not-so-public headers of the interfaces + install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/" +} + +package_postgresql-docs() { + pkgdesc="HTML documentation for PostgreSQL" + options=(docs) + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" + + make -C doc/src/sgml DESTDIR="${pkgdir}" install-html + chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/" +} + +package_postgresql() { + pkgdesc="A sophisticated object-relational DBMS" + backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') + depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0') + optdepends=('python2: for PL/Python support' + 'perl: for PL/Perl support') + provides=('postgresql-client') + conflicts=('postgresql-client') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # install + make DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install + make -C doc/src/sgml DESTDIR="${pkgdir}" install-man + # we don't want this, it is in the -libs package + make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall + rm "${pkgdir}/usr/share/man/man1/pg_config.1" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" + + # clean up unneeded installed items + rm -rf "${pkgdir}/usr/include/postgresql/internal" + rm -rf "${pkgdir}/usr/include/libpq" + find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + + + # install launch script + install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql" + + # install conf file + install -D -m644 ${srcdir}/postgresql.confd \ + "${pkgdir}/etc/conf.d/postgresql" + + install -D -m644 ${srcdir}/postgresql.pam \ + "${pkgdir}/etc/pam.d/postgresql" + + install -D -m644 ${srcdir}/postgresql.logrotate \ + "${pkgdir}/etc/logrotate.d/postgresql" +} + +md5sums=('80390514d568a7af5ab61db1cda27e29' + 'eacf91f987d230f2dc2d040618ea1817' + 'd63a05943cf0a2726aa2070f3033c569' + '4d74f4227dc5e12bf95b3490758d86c9' + '96f82c38f3f540b53f3e5144900acf17' + 'd28e443f9f65a5712c52018b84e27137' + '6606e4279d91fc617b5c4dae0d76c603') diff --git a/staging/postgresql/build.patch b/staging/postgresql/build.patch new file mode 100644 index 000000000..c8f665d12 --- /dev/null +++ b/staging/postgresql/build.patch @@ -0,0 +1,11 @@ +diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile +--- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700 ++++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800 +@@ -23,7 +23,6 @@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local + diff --git a/staging/postgresql/perl-5.14-fix.patch b/staging/postgresql/perl-5.14-fix.patch new file mode 100644 index 000000000..82ef7d688 --- /dev/null +++ b/staging/postgresql/perl-5.14-fix.patch @@ -0,0 +1,25 @@ +--- a/src/pl/plperl/plperl.c ++++ b/src/pl/plperl/plperl.c +@@ -926,7 +926,7 @@ plperl_trusted_init(void) + if (!isGV_with_GP(sv) || !GvCV(sv)) + continue; + SvREFCNT_dec(GvCV(sv)); /* free the CV */ +- GvCV(sv) = NULL; /* prevent call via GV */ ++ GvCV_set(sv, NULL); /* prevent call via GV */ + } + hv_clear(stash); + +--- a/src/pl/plperl/plperl.h ++++ b/src/pl/plperl/plperl.h +@@ -49,6 +49,11 @@ + (U32)HeKUTF8(he)) + #endif + ++/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ ++#ifndef GvCV_set ++#define GvCV_set(gv, cv) (GvCV(gv) = cv) ++#endif ++ + /* declare routines from plperl.c for access by .xs files */ + HV *plperl_spi_exec(char *, int); + void plperl_return_next(SV *); diff --git a/staging/postgresql/postgresql b/staging/postgresql/postgresql new file mode 100755 index 000000000..0fbe94036 --- /dev/null +++ b/staging/postgresql/postgresql @@ -0,0 +1,79 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/postgresql + +# Default PGROOT if it wasn't defined in the conf.d file +PGROOT=${PGROOT:-/var/lib/postgres} +PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w" + +postgres_init() { + # initialization + if [ ! -d $PGROOT/data ]; then + mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT + su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" + fi + if [ ! -e /var/log/postgresql.log ]; then + touch /var/log/postgresql.log + chown postgres /var/log/postgresql.log + fi +} + +case "$1" in + start) + postgres_init + stat_busy "Starting PostgreSQL" + su - postgres -c \ + "$PG_CTL start" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon postgresql + stat_done + fi + ;; + stop) + stat_busy "Stopping PostgreSQL" + su - postgres -c \ + "$PG_CTL stop -m fast" + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon postgresql + stat_done + fi + ;; + reload) + stat_busy "Reloading PostgreSQL" + su - postgres -c \ + "$PG_CTL reload" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + stat_done + fi + ;; + restart) + postgres_init + stat_busy "Restarting PostgreSQL" + su - postgres -c \ + "$PG_CTL restart -m fast" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon postgresql + stat_done + fi + ;; + status) + stat_busy "Checking PostgreSQL status"; + ck_status postgresql + ;; + *) + echo "usage: $0 {start|stop|reload|restart|status}" +esac +exit 0 diff --git a/staging/postgresql/postgresql.confd b/staging/postgresql/postgresql.confd new file mode 100644 index 000000000..5f8fa034c --- /dev/null +++ b/staging/postgresql/postgresql.confd @@ -0,0 +1,5 @@ +# +# Parameters to be passed to postgresql +# +PGROOT="/var/lib/postgres" +INITOPTS="--locale $LANG" diff --git a/staging/postgresql/postgresql.install b/staging/postgresql/postgresql.install new file mode 100644 index 000000000..d65bb6a7f --- /dev/null +++ b/staging/postgresql/postgresql.install @@ -0,0 +1,22 @@ +post_install() { + if [ ! -d '/var/lib/postgres' ]; then + mkdir -p '/var/lib/postgres' + fi + getent group postgres >/dev/null || groupadd -g 88 postgres + getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres + passwd -l postgres >/dev/null +} + +post_upgrade() { + post_install $1 + # FS#23858, fix postgres user shell issue + postgres_shell=$(getent passwd postgres | cut -d: -f7) + if [ "$postgres_shell" = "/sbin/nologin" ]; then + chsh -s /bin/bash postgres + fi +} + +post_remove() { + getent passwd postgres >/dev/null && userdel postgres + getent group postgres >/dev/null && groupdel postgres +} diff --git a/staging/postgresql/postgresql.logrotate b/staging/postgresql/postgresql.logrotate new file mode 100644 index 000000000..9c36918be --- /dev/null +++ b/staging/postgresql/postgresql.logrotate @@ -0,0 +1,4 @@ +/var/log/postgresql.log { + copytruncate + missingok +} diff --git a/testing/cups/cups.pam b/staging/postgresql/postgresql.pam index 53724d1f8..53724d1f8 100644 --- a/testing/cups/cups.pam +++ b/staging/postgresql/postgresql.pam diff --git a/staging/razor/PKGBUILD b/staging/razor/PKGBUILD new file mode 100644 index 000000000..87905b577 --- /dev/null +++ b/staging/razor/PKGBUILD @@ -0,0 +1,41 @@ +# $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/rxvt-unicode/ChangeLog b/staging/rxvt-unicode/ChangeLog new file mode 100644 index 000000000..d4275a700 --- /dev/null +++ b/staging/rxvt-unicode/ChangeLog @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..a72fa7c11 --- /dev/null +++ b/staging/rxvt-unicode/PKGBUILD @@ -0,0 +1,53 @@ +# $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 new file mode 100644 index 000000000..68d613dbd --- /dev/null +++ b/staging/rxvt-unicode/rxvt-unicode.desktop @@ -0,0 +1,10 @@ +[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/spamassassin/PKGBUILD b/staging/spamassassin/PKGBUILD new file mode 100644 index 000000000..6b97ea8c1 --- /dev/null +++ b/staging/spamassassin/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 125325 2011-05-25 21:40:50Z remy $ +# Maintainer: Dale Blount <dale@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=spamassassin +pkgver=3.3.1 +pkgrel=5 +pkgdesc="A mail filter to identify spam." +arch=(i686 x86_64) +license=(APACHE) +url="http://spamassassin.apache.org" +depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ + 'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \ + 'perl-libwww' 'perl-mail-spf' \ + 'zlib' 're2c') + # perl-archive-tar perl-io-zlib) +makedepends=('razor' 'perl-dbi') +optdepends=('razor: to identify collaborately-flagged spam' + 'gnupg: gpg support, without this use --nogpg flag for sa-update' + 're2c: regexp compiler, for compiling rules with sa-compile') +backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ + etc/mail/spamassassin/init.pre \ + etc/mail/spamassassin/v310.pre \ + etc/mail/spamassassin/v312.pre \ + etc/mail/spamassassin/v320.pre) +install=${pkgname}.install +options=(!emptydirs) +source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ + spamd.conf.d spamd) +md5sums=('5a93f81fda315411560ff5da099382d2' + 'af501c6b0bb937a2775b747cc4b6d150' + '0534d3071a526a27ddc2b297afa03b04') + +build() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \ + CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no + /usr/bin/make +} + +check() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + /usr/bin/make test || true +} + +package() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + /usr/bin/make DESTDIR=${pkgdir} install + + /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd + /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd +} diff --git a/staging/spamassassin/spamassassin.install b/staging/spamassassin/spamassassin.install new file mode 100644 index 000000000..5109956c9 --- /dev/null +++ b/staging/spamassassin/spamassassin.install @@ -0,0 +1,25 @@ +# arg 1: the new package version +post_install() { + echo "You must run 'sa-update' to install spam rules before use." + /bin/true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + # Compile rules, if rules have previously been compiled, and it's possible + if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then + echo "Detected compiled rules, running sa-compile..." + sa-compile > /dev/null 2>&1 +fi +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} diff --git a/staging/spamassassin/spamd b/staging/spamassassin/spamd new file mode 100644 index 000000000..11d35f7cd --- /dev/null +++ b/staging/spamassassin/spamd @@ -0,0 +1,49 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd` +case "$1" in + start) + stat_busy "Starting spamd" + [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d ${SPAMD_OPTS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon spamd + stat_done + fi + ;; + stop) + stat_busy "Stopping spamd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + # Some users report that a second attempt at stopping the process + # works. So, take a little nap and give it another whirl... + sleep 2 + kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon spamd + stat_done + fi + else + rm_daemon spamd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/spamassassin/spamd.conf.d b/staging/spamassassin/spamd.conf.d new file mode 100644 index 000000000..4295e0073 --- /dev/null +++ b/staging/spamassassin/spamd.conf.d @@ -0,0 +1 @@ +SPAMD_OPTS="-c" diff --git a/staging/vim/PKGBUILD b/staging/vim/PKGBUILD new file mode 100644 index 000000000..603de624a --- /dev/null +++ b/staging/vim/PKGBUILD @@ -0,0 +1,198 @@ +# $Id: PKGBUILD 125313 2011-05-25 20:09:55Z heftig $ +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Maintainer: tobias [ tobias at archlinux org ] +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgbase=vim +pkgname=(vim gvim vim-runtime) +_topver=7.3 +_patchlevel=206 +pkgver=${_topver}.${_patchlevel} +__hgrev=e9538cfd0d9c +pkgrel=1 +arch=('i686' 'x86_64') +license=('custom:vim') +url="http://www.vim.org" +makedepends=('gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' + 'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed') +source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 + vimrc archlinux.vim gvim.desktop) +md5sums=('6e7adfbd5d26c1d161030ec203a7f243' + 'e57777374891063b9ca48a1fe392ac05' + '10353a61aadc3f276692d0e17db1478e' + '4b83e5fe0e534c53daaba91dd1cd4cbb') + +__hgroot='http://vim.googlecode.com/hg/' +__hgrepo='vim' +__hgbranch='default' + +_versiondir="vim${_topver//./}" + +##### Build ##### + +build() { + cd ${srcdir} + + msg2 'Checking out source from Mercurial...' + + if [[ -d ${__hgrepo} ]]; then + cd ${__hgrepo} + hg pull -b ${__hgbranch}|| warning 'hg pull failed!' + hg update -r ${__hgrev} + else + hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} + cd ${__hgrepo} + fi + + if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then + warning 'You are not building the latest revision!' + warning "Consider updating __hgrev to $(hg id -r ${__hgbranch})." + sleep 10 + fi + + cd .. + rm -rf vim-build gvim-build + rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build + + msg2 'Patching...' + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + # fix python name + sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \ + vim-build/src/configure.in + (cd vim-build/src && autoconf) + + msg2 'Building...' + + cp -a vim-build gvim-build + + cd ${srcdir}/vim-build + + ./configure --prefix=/usr --localstatedir=/var/lib/vim \ + --mandir=/usr/share/man --with-compiledby=ArchLinux \ + --with-features=big --enable-gpm --enable-acl --with-x=no \ + --disable-gui --enable-multibyte --enable-cscope \ + --disable-netbeans --enable-perlinterp --disable-pythoninterp \ + --disable-rubyinterp + + make + + cd ${srcdir}/gvim-build + + ./configure --prefix=/usr --localstatedir=/var/lib/vim \ + --mandir=/usr/share/man --with-compiledby=ArchLinux \ + --with-features=big --enable-gpm --enable-acl --with-x=yes \ + --enable-gui=gtk2 --enable-multibyte --enable-cscope \ + --enable-netbeans --enable-perlinterp --enable-pythoninterp \ + --enable-rubyinterp + + make +} + +##### Packaging ##### + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl') + conflicts=('gvim') + + cd ${srcdir}/vim-build + make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install + + # provided by (n)vi in core + rm ${pkgdir}/usr/bin/{ex,view} + + # delete some manpages + find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r ${pkgdir}/usr/share/vim + + # license + install -dm755 ${pkgdir}/usr/share/licenses/vim + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/vim/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' + 'desktop-file-utils' 'gtk2') + provides=("vim=${pkgver}-${pkgrel}") + conflicts=('vim') + install=gvim.install + + cd ${srcdir}/gvim-build + make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install + + # provided by (n)vi in core + rm ${pkgdir}/usr/bin/{ex,view} + + # delete some manpages + find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # Move the runtime for later packaging + mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install + + # freedesktop links + install -Dm644 ${srcdir}/gvim.desktop \ + ${pkgdir}/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png + + # license + install -dm755 ${pkgdir}/usr/share/licenses/gvim + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/gvim/license.txt +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim' + backup=(etc/vimrc) + + # Install the runtime split from gvim + install -dm755 ${pkgdir}/usr/share + mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim + + # Don't forget logtalk.dict + install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \ + ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # make Aaron happy + install -Dm644 ${srcdir}/pythoncomplete.vim \ + ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim + + # rc files + install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc + install -Dm644 ${srcdir}/archlinux.vim \ + ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim + + # license + install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: diff --git a/staging/vim/archlinux.vim b/staging/vim/archlinux.vim new file mode 100644 index 000000000..148bb930f --- /dev/null +++ b/staging/vim/archlinux.vim @@ -0,0 +1,26 @@ +" The ArchLinux global vimrc - setting only a few sane defaults +" +" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc + + +if has('gui_running') + " Make shift-insert work like in Xterm + map <S-Insert> <MiddleMouse> + map! <S-Insert> <MiddleMouse> +endif diff --git a/staging/vim/gvim.desktop b/staging/vim/gvim.desktop new file mode 100644 index 000000000..56fd61b8f --- /dev/null +++ b/staging/vim/gvim.desktop @@ -0,0 +1,42 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Name=gVim +Name[eo]=VIM-fasado +Name[sv]=gVim +Name[xx]=xx +Comment=GTK2 enhanced vim text editor +Comment[ar]=محرر نصوص +Comment[bg]=Текст Редактор +Comment[de]=Texteditor +Comment[el]=Διορθωτής Κειμένου +Comment[eo]=Tekstredaktilo +Comment[et]=Tekstiredaktor +Comment[eu]=Testu Editorea +Comment[fi]=Tekstieditori +Comment[he]=עורך טקסט +Comment[is]=Textaritill +Comment[ja]=テキストエディタ +Comment[lt]=Teksto redaktorius +Comment[mt]=Editur tat-test +Comment[pt_BR]=Editor de Texto +Comment[ro]=Editor de text +Comment[ru]=редактор +Comment[sk]=Textový editor +Comment[sl]=Urejevalnik besedil +Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷ +Comment[tr]=Metin Düzenleyici +Comment[uk]=Редактор текстів +Comment[vi]=Trình soạn văn bản +Comment[xx]=xx +Comment[zh_CN]=文本编辑器 +Comment[zh_TW]=文字編輯器 +GenericName=Text Editor +Type=Application +TryExec=gvim +Exec=gvim %u +Icon=gvim +Terminal=false +X-MultipleArgs=false +Categories=GTK;Application;Utility;TextEditor; +MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt; diff --git a/staging/vim/gvim.install b/staging/vim/gvim.install new file mode 100644 index 000000000..0a8d3b0a9 --- /dev/null +++ b/staging/vim/gvim.install @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..92d3ff980 --- /dev/null +++ b/staging/vim/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just +" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing archlinux.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! archlinux.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + diff --git a/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD new file mode 100644 index 000000000..7e2144efc --- /dev/null +++ b/staging/weechat/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125306 2011-05-25 19:29:12Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: lucke <lucke at o2 dot pl> + +pkgname=weechat +pkgver=0.3.5 +pkgrel=2 +pkgdesc="Fast, light and extensible IRC client (curses UI)" +arch=('i686' 'x86_64') +url="http://www.weechat.org/" +license=('GPL') +depends=('gnutls') +makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +options=('!libtool') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir build + cd build + cmake .. -DPREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + + make DESTDIR="${pkgdir}/" install +} diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD new file mode 100644 index 000000000..5f0c6e93a --- /dev/null +++ b/testing/accountsservice/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=accountsservice +pkgver=0.6.12 +pkgrel=1 +pkgdesc="D-Bus interface for user account query and manipulation" +arch=(i686 x86_64) +url="http://cgit.freedesktop.org/accountsservice/" +license=('GPL3') +depends=('dbus-glib' 'polkit') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) +md5sums=('2fcf38a65d574dd2fe6ba182ff4de053') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/accountsservice \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/acpid/PKGBUILD b/testing/acpid/PKGBUILD new file mode 100644 index 000000000..28d94a296 --- /dev/null +++ b/testing/acpid/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 124204 2011-05-17 17:28:41Z andrea $ +# Maintainer: +# Contributor: xduugu +# Contributor: Manolis Tzanidakis +# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us + +pkgname=acpid +pkgver=2.0.9 +pkgrel=3 +pkgdesc="A daemon for delivering ACPI power management events with netlink support" +arch=('i686' 'x86_64') +url="http://tedfelix.com/linux/acpid-netlink.html" +license=('GPL') +depends=('bash') +source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" + 'acpid' + 'anything' + 'handler.sh' + 'acpid.conf.d') +replaces=('acpid2') +backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install + + install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid" + install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything" + install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh" + install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid" + + chmod 755 "${pkgdir}"/usr/sbin/acpid +} +md5sums=('8b30aa1b31f607161745a4ac7a19699b' + '955490c4db5233ec44461db694b873a4' + '2d37b98d6e74bab815604b8b48c6cfd4' + '7b2e4c299af5eb87e1a81c07b6916c97' + '929c6d2e91295c22ed9ec6212d7eabef') diff --git a/testing/ypserv/yppasswd b/testing/acpid/acpid index c2b00b2ca..9177c8207 100755..100644 --- a/testing/ypserv/yppasswd +++ b/testing/acpid/acpid @@ -3,32 +3,35 @@ . /etc/rc.conf . /etc/rc.d/functions +[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid + +PID=`pidof -o %PPID /usr/sbin/acpid` case "$1" in start) - stat_busy "Starting NIS Password Daemon" - /usr/sbin/rpc.yppasswdd + stat_busy "Starting acpid" + [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS if [ $? -gt 0 ]; then stat_fail else - add_daemon yppasswd + add_daemon acpid stat_done fi ;; stop) - stat_busy "Stopping NIS Password Daemon" - killall -q /usr/sbin/rpc.yppasswdd + stat_busy "Stopping acpid" + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon yppasswd + rm_daemon acpid stat_done fi ;; restart) $0 stop - sleep 1 $0 start ;; *) echo "usage: $0 {start|stop|restart}" esac +exit 0 diff --git a/testing/acpid/acpid.conf.d b/testing/acpid/acpid.conf.d new file mode 100644 index 000000000..b60103a2d --- /dev/null +++ b/testing/acpid/acpid.conf.d @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the acpid daemon +# + +ACPID_ARGS="" diff --git a/testing/acpid/anything b/testing/acpid/anything new file mode 100644 index 000000000..d1828989b --- /dev/null +++ b/testing/acpid/anything @@ -0,0 +1,3 @@ +# Pass all events to our one handler script +event=.* +action=/etc/acpi/handler.sh %e diff --git a/testing/acpid/handler.sh b/testing/acpid/handler.sh new file mode 100644 index 000000000..518a62dea --- /dev/null +++ b/testing/acpid/handler.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Default acpi script that takes an entry for all actions + +# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to +# modify it to not use /sys + +minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` +maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` +setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" + +set $* + +case "$1" in + button/power) + #echo "PowerButton pressed!">/dev/tty5 + case "$2" in + PWRF) logger "PowerButton pressed: $2" ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/sleep) + case "$2" in + SLPB) echo -n mem >/sys/power/state ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + ac_adapter) + case "$2" in + AC|ACAD|ADP0) + case "$4" in + 00000000) + echo -n $minspeed >$setspeed + #/etc/laptop-mode/laptop-mode start + ;; + 00000001) + echo -n $maxspeed >$setspeed + #/etc/laptop-mode/laptop-mode stop + ;; + esac + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + battery) + case "$2" in + BAT0) + case "$4" in + 00000000) #echo "offline" >/dev/tty5 + ;; + 00000001) #echo "online" >/dev/tty5 + ;; + esac + ;; + CPU0) + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/lid) + #echo "LID switched!">/dev/tty5 + ;; + *) + logger "ACPI group/action undefined: $1 / $2" + ;; +esac diff --git a/testing/alpine/2.00-lpam.patch b/testing/alpine/2.00-lpam.patch deleted file mode 100644 index 69e66d7ef..000000000 --- a/testing/alpine/2.00-lpam.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- alpine-2.00.orig/alpine/Makefile.in -+++ alpine-2.00/alpine/Makefile.in -@@ -169,7 +169,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lpam - LIBTOOL = @LIBTOOL@ - LN = @LN@ - LN_S = @LN_S@ - LTLIBICONV = @LTLIBICONV@ - LTLIBINTL = @LTLIBINTL@ diff --git a/testing/alpine/CVE-2008-5514.patch b/testing/alpine/CVE-2008-5514.patch deleted file mode 100644 index 594bea0b2..000000000 --- a/testing/alpine/CVE-2008-5514.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- alpine-2.00/imap/src/c-client/rfc822.c -+++ alpine-2.00/imap/src/c-client/rfc822.c -@@ -1351,6 +1351,7 @@ - - static long rfc822_output_char (RFC822BUFFER *buf,int c) - { -+ if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL; - *buf->cur++ = c; /* add character, soutr buffer if full */ - return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT; - } -@@ -1374,7 +1375,8 @@ - len -= i; - } - /* soutr buffer now if full */ -- if (len && !rfc822_output_flush (buf)) return NIL; -+ if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf)) -+ return NIL; - } - return LONGT; - } diff --git a/testing/alpine/PKGBUILD b/testing/alpine/PKGBUILD deleted file mode 100644 index 6b2f9ee73..000000000 --- a/testing/alpine/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=alpine -pkgver=2.00 -pkgrel=13 -_patchlevel=79 -pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)" -arch=('i686' 'x86_64') -url="http://www.washington.edu/alpine/" -license=('APACHE') -depends=('libldap' 'krb5' 'gettext') -optdepends=('aspell: for spell-checking support') -provides=('pine') -conflicts=('pine') -replaces=('pine') -options=('!makeflags') -source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \ - http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \ - 2.00-lpam.patch CVE-2008-5514.patch) -md5sums=('84e44cbf71ed674800a5d57eed9c1c52' - 'd7dffd121c9a1cac4c458c0ff71df1ce' - 'cd3911c16fc6a072e853c0ccfc35857c' - '1b52a54a656979116c09fb1d948a4325') -sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' - 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294' - '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' - 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../all_${_patchlevel}.patch - patch -p1 < ../2.00-lpam.patch - patch -p1 < ../CVE-2008-5514.patch - ./configure --prefix=/usr --without-passfile --without-tcl \ - --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \ - --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD index 98a1c6730..eea7f3e07 100644 --- a/testing/anjuta/PKGBUILD +++ b/testing/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $ +# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.0.1.0 -pkgrel=2 +pkgver=3.0.2.0 +pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261') +sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD index 487e946f5..bb665e5e0 100644 --- a/testing/archboot/PKGBUILD +++ b/testing/archboot/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 110605 2011-02-20 16:37:56Z tpowa $ +# $Id: PKGBUILD 124155 2011-05-17 06:46:14Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=archboot -pkgver=2011.02 +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.8-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.02.1-1' 'subversion>=1.6.15-1' 'wget>=1.12-4' 'bash>=4.2-1' 'coreutils>=8.10-1' 'cryptsetup>=1.2.0-1' 'dialog>=1.1_20110118-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>=436-2' 'lvm2>=2.02.84-1' 'mdadm>=3.1.4-1' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.7-4' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2.0.0-4' 'pcmciautils>=017-1' '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.2-1' 'sysvinit>=2.88-2' 'tar>=1.25-1' 'util-linux-ng>=2.18-4' 'which>=2.20-4' 'kbd>=1.15.2-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.4-1' 'dnsutils>=9.7.2.P3-1' 'hdparm>=9.36-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p1-1' 'hwdetect>=2010.08-1' 'shadow>=4.1.4.2-4' 'bridge-utils>=1.4-3' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.10-1' 'glibc>=2.13-4' 'linux-api-headers>=2.6.37-1' 'kernel26>=2.6.37.1-1' 'kernel26-lts>=2.6.32.29-2' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-5' 'lilo>=23.1-2' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.1.15-1' 'pciutils>=3.1.7-3' 'usbutils>=001-2' 'vpnc>=0.5.3-3' 'openvpn>=2.1.4-1' 'b43-fwcutter>=013-2' 'wpa_supplicant>=0.7.3-1' 'rsync>=3.0.7-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.84-1' 'screen>=4.0.3-10' 'elfutils>=0.151-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.2-6' 'nfsidmap>=0.24-1' 'readline>=6.2-1' 'acl>=2.2.49-2' 'attr>=2.4.44-2' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.125-1' 'lzo2>=2.04-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.10-1' 'gcc-libs>=4.5.2-6' 'sdparm>=1.06-1' 'licenses>=2.6-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-7' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.6-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.10-1' 'openssl>=1.0.0.d-1' 'git>=1.7.4.1-1' 'dmraid>=1.0.0.rc16+CVS-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'tiacx>=20080210-19' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2011b-1' 'ntp>=4.2.6.p3-1' 'libgcrypt>=1.4.6-1' 'iw>=0.9.20-1' 'crda>=1.1.1-1' 'libnl>=1.1-2' 'iproute2>=2.6.37-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.9-11' 'dhclient>=4.2.0.2-1' 'syslinux>=4.03-2' 'mtools>=4.0.15-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.1-1' 'libtirpc>=0.2.1-2' 'librpcsecgss>=0.19-4' 'rpcbind>=0.2.0-3' 'testdisk>=6.11.3-3' 'wipe>=2.3.1-1' 'clamav>=0.97-1' 'ddrescue>=1.14-1' 'udev>=166-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-1' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-3' 'mkinitcpio-nfs-utils>=0.2-1' 'gdisk>=0.6.14-1' 'nilfs-utils>=2.0.21-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'ndiswrapper-lts>=1.56-3' 'nouveau-drm-lts>=0.0.16_20100313-4' 'linux-firmware>=20110201-1' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1') +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-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' @@ -44,5 +45,5 @@ build() gcc -o vmware-detect vmware-detect.c install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('608c6e8f30c159f345c08eee6842f17c' +md5sums=('e6d26e24c7491a3203421bd14e570c04' '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/testing/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$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 new file mode 100644 index 000000000..5af689c41 --- /dev/null +++ b/testing/bind/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z 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.P1 +_pkgver=9.8.0-P1 +pkgrel=3 + +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=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29' + 'ee52947062c1582858187716b776afa3613608fb' + '2f737f4e81186447ac2ef370fa8dcea0b3abec31' + '5277cf4d6fbc5728c55b51c77c9347d28393fb7c' + '46232e9db243c6c05e170a1781d7a7f413be5d03' + '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' + '7848edbfb9a848843f57c11c02b0289eefd42d00' + '9ffb5c3f72390a517aeae557e32349d5d278cb63' + '76a0d4cd1b913db177a5a375bebc47e5956866ec' + '53be0f1437ebe595240d8dbdd819939582b97fb9') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${_pkgver}" + + patch -p1 -i "${srcdir}"/so_bsdcompat.patch + patch -p1 -i "${srcdir}"/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 new file mode 100644 index 000000000..e3a1397cb --- /dev/null +++ b/testing/bind/install @@ -0,0 +1,21 @@ +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 new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/testing/bind/localhost.zone @@ -0,0 +1,10 @@ +$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 new file mode 100755 index 000000000..7907f9983 --- /dev/null +++ b/testing/bind/named @@ -0,0 +1,52 @@ +#!/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 new file mode 100644 index 000000000..38fb12cbe --- /dev/null +++ b/testing/bind/named.conf @@ -0,0 +1,64 @@ +// +// /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 new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/testing/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate new file mode 100644 index 000000000..ef1a2d032 --- /dev/null +++ b/testing/bind/named.logrotate @@ -0,0 +1,6 @@ +/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 new file mode 100644 index 000000000..2d16fdcd5 --- /dev/null +++ b/testing/bind/notools.patch @@ -0,0 +1,11 @@ +--- bind-9.7.0/bin/Makefile.in.orig 2010-03-14 21:19:23.000000000 -0400 ++++ bind-9.7.0/bin/Makefile.in 2010-03-14 21:19:37.000000000 -0400 +@@ -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 new file mode 100644 index 000000000..cae2b835c --- /dev/null +++ b/testing/bind/so_bsdcompat.patch @@ -0,0 +1,13 @@ +diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c +--- old/lib/isc/unix/socket.c 2010-03-12 04:25:20.000000000 +0100 ++++ new/lib/isc/unix/socket.c 2011-01-22 21:07:52.410000038 +0100 +@@ -681,6 +681,8 @@ + isc_sockstatscounter_fdwatchrecvfail + }; + ++#undef SO_BSDCOMPAT ++ + static void + manager_log(isc__socketmgr_t *sockmgr, + isc_logcategory_t *category, isc_logmodule_t *module, int level, +Only in new/lib/isc/unix: socket.c.orig diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD deleted file mode 100644 index 0d1d6a0bc..000000000 --- a/testing/binutils/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 123424 2011-05-11 10:41:25Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.21 -pkgrel=8 -_date=20110430 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base') -depends=('glibc>=2.13' 'zlib') -makedepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 - binutils-2.21-strip-segfault.patch) -md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' - '98e8dfaf1c0ededa586823ebfb27825a') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir}/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 - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # 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/testing/bison/ChangeLog b/testing/bison/ChangeLog new file mode 100644 index 000000000..5bb22be1d --- /dev/null +++ b/testing/bison/ChangeLog @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..ebf2c0fc5 --- /dev/null +++ b/testing/bison/PKGBUILD @@ -0,0 +1,32 @@ +# $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 new file mode 100644 index 000000000..0081a194f --- /dev/null +++ b/testing/bison/bison.install @@ -0,0 +1,16 @@ +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/cifs-utils/PKGBUILD b/testing/cifs-utils/PKGBUILD deleted file mode 100644 index 9c33cefba..000000000 --- a/testing/cifs-utils/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=cifs-utils -pkgver=4.9 -pkgrel=3 -pkgdesc="CIFS filesystem user-space tools" -arch=(i686 x86_64) -url="http://wiki.samba.org/index.php/LinuxCIFS_utils" -license=('GPL') -depends=('libcap' 'keyutils' 'krb5' 'talloc') -source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) -md5sums=('908d904e6b9e58f09f530de151a88ef8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm -r $pkgdir/usr/bin - # set mount.cifs uid, to enable none root mounting form fstab - chmod +s $pkgdir/sbin/mount.cifs -} diff --git a/testing/cups/PKGBUILD b/testing/cups/PKGBUILD deleted file mode 100644 index 64ab5d109..000000000 --- a/testing/cups/PKGBUILD +++ /dev/null @@ -1,110 +0,0 @@ -# $Id: PKGBUILD 121078 2011-04-29 00:03:07Z stephane $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=1.4.6 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' - 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - cups-avahi.patch - cups cups.logrotate cups.pam) -#options=('!emptydirs') -md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1' - '8ebd390197501ffd709f0ee546937fd5' - '5c85b7d8d2ddd02c2c64955cebbf55ea' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') - -# move client.conf man page for next update to the client pkg. - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - # Avahi support in the dnssd backend. patch from Fedora - patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1 - - # Rebuild configure script for --enable-avahi. - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \ - --disable-ldap --libdir=/usr/lib --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\ - --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS" - make || return 1 -} - -package_libcups() { -pkgdesc="The CUPS Printing System - client libraries and headers" -depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-headers install-libs || return 1 - # put this into the libs pkg to make other software find the libs(no pkg-config file included) - mkdir -p ${pkgdir}/usr/bin - install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config -} - -package_cups() { -pkgdesc="The CUPS Printing System - deamon package" -install=cups.install -backup=(etc/cups/cupsd.conf - etc/cups/mime.convs - etc/cups/mime.types - etc/cups/snmp.conf - etc/cups/printers.conf - etc/cups/classes.conf - etc/cups/client.conf - etc/cups/subscriptions.conf - etc/dbus-1/system.d/cups.conf - etc/logrotate.d/cups - etc/pam.d/cups - etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') -optdepends=('php: for included phpcups.so module') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-data install-exec || return 1 - - # this one we ship in the libcups pkg - rm -f ${pkgdir}/usr/bin/cups-config - - # kill the sysv stuff - rm -rf ${pkgdir}/etc/rc*.d - rm -rf ${pkgdir}/etc/init.d - install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups - install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups - install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups - - # fix perms on /var/spool and /etc - chmod 755 ${pkgdir}/var/spool - chmod 755 ${pkgdir}/etc - - # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) - chmod 700 ${pkgdir}/usr/lib/cups/backend/serial - - # install ssl directory where to store the certs, solves some samba issues - install -dm700 -g lp ${pkgdir}/etc/cups/ssl - install -dm511 -g lp ${pkgdir}/var/run/cups/certs - - # install some more configuration files that will get filled by cupsd - touch ${pkgdir}/etc/cups/printers.conf - touch ${pkgdir}/etc/cups/classes.conf - touch ${pkgdir}/etc/cups/client.conf - echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf - echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf - touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} - - # fix .desktop file - sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop - - # compress some driver files, adopted from Fedora - find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f -} diff --git a/testing/cups/cups-avahi.patch b/testing/cups/cups-avahi.patch deleted file mode 100644 index cf1056a75..000000000 --- a/testing/cups/cups-avahi.patch +++ /dev/null @@ -1,1089 +0,0 @@ -diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c ---- cups-1.4.5/backend/dnssd.c.avahi 2009-08-08 00:27:12.000000000 +0200 -+++ cups-1.4.5/backend/dnssd.c 2010-11-12 13:13:31.000000000 +0100 -@@ -22,6 +22,7 @@ - * exec_backend() - Execute the backend that corresponds to the - * resolved service name. - * get_device() - Create or update a device. -+* find_device() - * query_callback() - Process query data. - * sigterm_handler() - Handle termination signals... - * unquote() - Unquote a name string. -@@ -33,7 +34,18 @@ - - #include "backend-private.h" - #include <cups/array.h> --#include <dns_sd.h> -+#ifdef HAVE_DNSSD -+# include <dns_sd.h> -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+# include <avahi-common/domain.h> -+# include <avahi-common/error.h> -+# include <avahi-common/malloc.h> -+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX -+#endif /* HAVE_AVAHI */ - - - /* -@@ -52,7 +64,12 @@ typedef enum - - typedef struct - { -+#ifdef HAVE_DNSSD - DNSServiceRef ref; /* Service reference for resolve */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int resolved; /* Did we resolve the device? */ -+#endif /* HAVE_AVAHI */ - char *name, /* Service name */ - *domain, /* Domain name */ - *fullName, /* Full name */ -@@ -64,6 +81,20 @@ typedef struct - sent; /* Did we list the device? */ - } cups_device_t; - -+typedef struct -+{ -+ char key[256]; -+ char value[256]; -+ -+#ifdef HAVE_DNSSD -+ const uint8_t *data; -+ const uint8_t *datanext; -+ const uint8_t *dataend; -+#else /* HAVE_AVAHI */ -+ AvahiStringList *txt; -+#endif /* HAVE_DNSSD */ -+} cups_txt_records_t; -+ - - /* - * Local globals... -@@ -77,6 +108,7 @@ static int job_canceled = 0; - * Local functions... - */ - -+#ifdef HAVE_DNSSD - static void browse_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -92,12 +124,6 @@ static void browse_local_callback(DNSSe - const char *regtype, - const char *replyDomain, - void *context); --static int compare_devices(cups_device_t *a, cups_device_t *b); --static void exec_backend(char **argv); --static cups_device_t *get_device(cups_array_t *devices, -- const char *serviceName, -- const char *regtype, -- const char *replyDomain); - static void query_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -106,9 +132,111 @@ static void query_callback(DNSServiceRe - uint16_t rrclass, uint16_t rdlen, - const void *rdata, uint32_t ttl, - void *context); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+static void avahi_client_callback (AvahiClient *client, -+ AvahiClientState state, -+ void *context); -+static void avahi_browse_callback (AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey); -+static int compare_devices(cups_device_t *a, cups_device_t *b); -+static void exec_backend(char **argv); -+static cups_device_t *get_device(cups_array_t *devices, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain); - static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); - -+#ifdef HAVE_AVAHI -+static AvahiSimplePoll *simple_poll = NULL; -+static int avahi_got_callback; -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * cups_txt_records_t access functions -+ */ -+static cups_txt_records_t * -+next_txt_record (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ txt->data = txt->datanext; -+#else /* HAVE_AVAHI */ -+ txt->txt = avahi_string_list_get_next (txt->txt); -+ if (txt->txt == NULL) -+ return NULL; -+#endif /* HAVE_DNSSD */ -+ -+ return txt; -+} -+ -+static int -+parse_txt_record_pair (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ uint8_t datalen; -+ uint8_t *data = txt->data; -+ char *ptr; -+ -+ /* -+ * Read a key/value pair starting with an 8-bit length. Since the -+ * length is 8 bits and the size of the key/value buffers is 256, we -+ * don't need to check for overflow... -+ */ -+ -+ datalen = *data++; -+ if (!datalen || (data + datalen) >= txt->dataend) -+ return NULL; -+ txt->datanext = data + datalen; -+ -+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) -+ *ptr++ = *data; -+ *ptr = '\0'; -+ -+ if (data < txt->datanext && *data == '=') -+ { -+ data++; -+ -+ if (data < datanext) -+ memcpy (txt->value, data, txt->datanext - data); -+ value[txt->datanext - data] = '\0'; -+ } -+ else -+ return 1; -+#else /* HAVE_AVAHI */ -+ char *key, *value; -+ size_t len; -+ avahi_string_list_get_pair (txt->txt, &key, &value, &len); -+ if (len > sizeof (txt->value) - 1) -+ len = sizeof (txt->value) - 1; -+ -+ memcpy (txt->value, value, len); -+ txt->value[len] = '\0'; -+ len = strlen (key); -+ if (len > sizeof (txt->key) - 1) -+ len = sizeof (txt->key) - 1; -+ -+ memcpy (txt->key, key, len); -+ txt->key[len] = '\0'; -+ avahi_free (key); -+ avahi_free (value); -+#endif /* HAVE_AVAHI */ -+ -+ return 0; -+} - - /* - * 'main()' - Browse for printers. -@@ -119,6 +247,13 @@ main(int argc, /* I - Number of comm - char *argv[]) /* I - Command-line arguments */ - { - const char *name; /* Backend name */ -+ cups_array_t *devices; /* Device array */ -+ cups_device_t *device; /* Current device */ -+ char uriName[1024]; /* Unquoted fullName for URI */ -+#ifdef HAVE_DNSSD -+ int fd; /* Main file descriptor */ -+ fd_set input; /* Input set for select() */ -+ struct timeval timeout; /* Timeout for select() */ - DNSServiceRef main_ref, /* Main service reference */ - fax_ipp_ref, /* IPP fax service reference */ - ipp_ref, /* IPP service reference */ -@@ -130,12 +265,11 @@ main(int argc, /* I - Number of comm - pdl_datastream_ref, /* AppSocket service reference */ - printer_ref, /* LPD service reference */ - riousbprint_ref; /* Remote IO service reference */ -- int fd; /* Main file descriptor */ -- fd_set input; /* Input set for select() */ -- struct timeval timeout; /* Timeout for select() */ -- cups_array_t *devices; /* Device array */ -- cups_device_t *device; /* Current device */ -- char uriName[1024]; /* Unquoted fullName for URI */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiClient *client; -+ int error; -+#endif /* HAVE_AVAHI */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -194,6 +328,49 @@ main(int argc, /* I - Number of comm - * Browse for different kinds of printers... - */ - -+#ifdef HAVE_AVAHI -+ if ((simple_poll = avahi_simple_poll_new ()) == NULL) -+ { -+ perror ("ERROR: Unable to create avahi simple poll object"); -+ return (1); -+ } -+ -+ client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_client_callback, NULL, &error); -+ if (!client) -+ { -+ perror ("ERROR: Unable to create avahi client"); -+ return (1); -+ } -+ -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_fax-ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp-tls._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_pdl-datastream._tcp", -+ NULL, 0, -+ avahi_browse_callback, -+ devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_printer._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_riousbprint._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+#endif /* HAVE_AVAHI */ -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) - { - perror("ERROR: Unable to create service connection"); -@@ -245,6 +422,7 @@ main(int argc, /* I - Number of comm - riousbprint_ref = main_ref; - DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, - "_riousbprint._tcp", NULL, browse_callback, devices); -+#endif /* HAVE_DNSSD */ - - /* - * Loop until we are killed... -@@ -252,6 +430,9 @@ main(int argc, /* I - Number of comm - - while (!job_canceled) - { -+ int announce = 0; -+ -+#ifdef HAVE_DNSSD - FD_ZERO(&input); - FD_SET(fd, &input); - -@@ -271,11 +452,35 @@ main(int argc, /* I - Number of comm - } - else - { -+ announce = 1; -+ } -+#else /* HAVE_AVAHI */ -+ int r; -+ avahi_got_callback = 0; -+ r = avahi_simple_poll_iterate (simple_poll, 1); -+ if (r != 0 && r != EINTR) -+ { -+ /* -+ * We've been told to exit the loop. Perhaps the connection to -+ * avahi failed. -+ */ -+ -+ break; -+ } -+ -+ if (avahi_got_callback) -+ announce = 1; -+#endif /* HAVE_DNSSD */ -+ -+ if (announce) -+ { - /* - * Announce any devices we've found... - */ - -+#ifdef HAVE_DNSSD - DNSServiceErrorType status; /* DNS query status */ -+#endif /* HAVE_DNSSD */ - cups_device_t *best; /* Best matching device */ - char device_uri[1024]; /* Device URI */ - int count; /* Number of queries */ -@@ -285,6 +490,7 @@ main(int argc, /* I - Number of comm - best = NULL, count = 0; - device; - device = (cups_device_t *)cupsArrayNext(devices)) -+#ifdef HAVE_DNSSD - if (!device->ref && !device->sent) - { - /* -@@ -313,14 +519,23 @@ main(int argc, /* I - Number of comm - count ++; - } - } -- else if (!device->sent) -+ else -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!device->resolved) -+ continue; -+ else -+#endif /* HAVE_AVAHI */ -+ if (!device->sent) - { -+#ifdef HAVE_DNSSD - /* - * Got the TXT records, now report the device... - */ - - DNSServiceRefDeallocate(device->ref); - device->ref = 0; -+#endif /* HAVE_DNSSD */ - - if (!best) - best = device; -@@ -372,6 +587,7 @@ main(int argc, /* I - Number of comm - * 'browse_callback()' - Browse devices. - */ - -+#ifdef HAVE_DNSSD - static void - browse_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -405,12 +621,14 @@ browse_callback( - - get_device((cups_array_t *)context, serviceName, regtype, replyDomain); - } -+#endif /* HAVE_DNSSD */ - - - /* - * 'browse_local_callback()' - Browse local devices. - */ - -+#ifdef HAVE_DNSSD - static void - browse_local_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -456,6 +674,7 @@ browse_local_callback( - device->fullName); - device->sent = 1; - } -+#endif /* HAVE_DNSSD */ - - - /* -@@ -528,6 +747,32 @@ exec_backend(char **argv) /* I - Comman - exit(CUPS_BACKEND_STOP); - } - -+static int -+device_type (const char *regtype) -+{ -+#ifdef HAVE_AVAHI -+ if (!strcmp(regtype, "_ipp._tcp") || -+ !strcmp(regtype, "_ipp-tls._tcp")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#else -+ if (!strcmp(regtype, "_ipp._tcp.") || -+ !strcmp(regtype, "_ipp-tls._tcp.")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp.")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp.")) -+ return (CUPS_DEVICE_PRINTER); -+ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#endif /* HAVE_AVAHI */ -+ -+ return (CUPS_DEVICE_RIOUSBPRINT); -+} -+ - - /* - * 'get_device()' - Create or update a device. -@@ -550,18 +795,7 @@ get_device(cups_array_t *devices, /* I - - */ - - key.name = (char *)serviceName; -- -- if (!strcmp(regtype, "_ipp._tcp.") || -- !strcmp(regtype, "_ipp-tls._tcp.")) -- key.type = CUPS_DEVICE_IPP; -- else if (!strcmp(regtype, "_fax-ipp._tcp.")) -- key.type = CUPS_DEVICE_FAX_IPP; -- else if (!strcmp(regtype, "_printer._tcp.")) -- key.type = CUPS_DEVICE_PRINTER; -- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -- key.type = CUPS_DEVICE_PDL_DATASTREAM; -- else -- key.type = CUPS_DEVICE_RIOUSBPRINT; -+ key.type = device_type (regtype); - - for (device = cupsArrayFind(devices, &key); - device; -@@ -581,8 +815,14 @@ get_device(cups_array_t *devices, /* I - - free(device->domain); - device->domain = strdup(replyDomain); - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, device->name, regtype, - replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - free(device->fullName); - device->fullName = strdup(fullName); - } -@@ -602,6 +842,9 @@ get_device(cups_array_t *devices, /* I - - device->domain = strdup(replyDomain); - device->type = key.type; - device->priority = 50; -+#ifdef HAVE_AVAHI -+ device->resolved = 0; -+#endif /* HAVE_AVAHI */ - - cupsArrayAdd(devices, device); - -@@ -609,7 +852,13 @@ get_device(cups_array_t *devices, /* I - - * Set the "full name" of this service, which is used for queries... - */ - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - device->fullName = strdup(fullName); - - return (device); -@@ -620,6 +869,7 @@ get_device(cups_array_t *devices, /* I - - * 'query_callback()' - Process query data. - */ - -+#ifdef HAVE_DNSSD - static void - query_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -639,7 +889,7 @@ query_callback( - *ptr; /* Pointer into string */ - cups_device_t dkey, /* Search key */ - *device; /* Device */ -- -+ cups_txt_records_t txt; - - fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -673,84 +923,212 @@ query_callback( - if ((ptr = strstr(name, "._")) != NULL) - *ptr = '\0'; - -- if (strstr(fullName, "_ipp._tcp.") || -- strstr(fullName, "_ipp-tls._tcp.")) -- dkey.type = CUPS_DEVICE_IPP; -- else if (strstr(fullName, "_fax-ipp._tcp.")) -- dkey.type = CUPS_DEVICE_FAX_IPP; -- else if (strstr(fullName, "_printer._tcp.")) -- dkey.type = CUPS_DEVICE_PRINTER; -- else if (strstr(fullName, "_pdl-datastream._tcp.")) -- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; -+ dkey.type = device_type (fullName); -+ -+ txt.data = rdata; -+ txt.dataend = rdata + rdlen; -+ device = find_device ((cups_array_t *) context, &txt, &dkey); -+ if (!device) -+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+} -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+static void -+avahi_client_callback(AvahiClient *client, -+ AvahiClientState state, -+ void *context) -+{ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ { -+ fprintf (stderr, "ERROR: Avahi connection failed\n"); -+ avahi_simple_poll_quit (simple_poll); -+ } -+} -+ -+static void -+avahi_query_callback(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client; -+ cups_device_t key, -+ *device; -+ char uqname[1024], -+ *ptr; -+ cups_txt_records_t txtr; -+ -+ client = avahi_service_resolver_get_client (resolver); -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ if (event == AVAHI_RESOLVER_FAILURE) -+ { -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ } -+ -+ avahi_service_resolver_free (resolver); -+ return; -+ } -+ -+ /* -+ * Set search key for device. -+ */ -+ -+ key.name = uqname; -+ unquote (uqname, name, sizeof (uqname)); -+ if ((ptr = strstr(name, "._")) != NULL) -+ *ptr = '\0'; -+ -+ key.domain = (char *) domain; -+ key.type = device_type (type); -+ -+ /* -+ * Find the device and the the TXT information. -+ */ -+ -+ txtr.txt = txt; -+ device = find_device ((cups_array_t *) context, &txtr, &key); -+ if (device) -+ { -+ /* -+ * Let the main loop know to announce the device. -+ */ -+ -+ device->resolved = 1; -+ avahi_got_callback = 1; -+ } - else -- dkey.type = CUPS_DEVICE_RIOUSBPRINT; -+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); -+ -+ avahi_service_resolver_free (resolver); -+} -+ -+static void -+avahi_browse_callback(AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client = avahi_service_browser_get_client (browser); -+ -+ switch (event) -+ { -+ case AVAHI_BROWSER_FAILURE: -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ avahi_simple_poll_quit (simple_poll); -+ return; -+ -+ case AVAHI_BROWSER_NEW: -+ /* -+ * This object is new on the network. -+ */ -+ -+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) -+ { -+ /* -+ * This comes from the local machine so ignore it. -+ */ -+ -+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); -+ } -+ else -+ { -+ /* -+ * Create a device entry for it if it doesn't yet exist. -+ */ -+ -+ get_device ((cups_array_t *)context, name, type, domain); -+ -+ /* -+ * Now look for a TXT entry. -+ */ -+ -+ if (avahi_service_resolver_new (client, interface, protocol, -+ name, type, domain, -+ AVAHI_PROTO_UNSPEC, 0, -+ avahi_query_callback, context) == NULL) -+ { -+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", -+ name, avahi_strerror (avahi_client_errno (client))); -+ } -+ } -+ -+ break; - -- for (device = cupsArrayFind(devices, &dkey); -+ case AVAHI_BROWSER_REMOVE: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ break; -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * -+find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey) -+{ -+ cups_device_t *device; -+ char *ptr; -+ -+ for (device = cupsArrayFind(devices, dkey); - device; - device = cupsArrayNext(devices)) - { -- if (strcasecmp(device->name, dkey.name) || -- strcasecmp(device->domain, dkey.domain)) -+ if (strcasecmp(device->name, dkey->name) || -+ strcasecmp(device->domain, dkey->domain)) - { - device = NULL; - break; - } -- else if (device->type == dkey.type) -+ else if (device->type == dkey->type) - { - /* - * Found it, pull out the priority and make and model from the TXT - * record and save it... - */ - -- const uint8_t *data, /* Pointer into data */ -- *datanext, /* Next key/value pair */ -- *dataend; /* End of entire TXT record */ -- uint8_t datalen; /* Length of current key/value pair */ -- char key[256], /* Key string */ -- value[256], /* Value string */ -- make_and_model[512], -+ char make_and_model[512], - /* Manufacturer and model */ - model[256], /* Model */ -- device_id[2048];/* 1284 device ID */ -- -+ device_id[2048]; /* 1284 device ID */ - - device_id[0] = '\0'; - make_and_model[0] = '\0'; - - strcpy(model, "Unknown"); - -- for (data = rdata, dataend = data + rdlen; -- data < dataend; -- data = datanext) -+ for (;;) - { -- /* -- * Read a key/value pair starting with an 8-bit length. Since the -- * length is 8 bits and the size of the key/value buffers is 256, we -- * don't need to check for overflow... -- */ -- -- datalen = *data++; -- -- if (!datalen || (data + datalen) >= dataend) -- break; -- -- datanext = data + datalen; -+ char *key; -+ char *value; - -- for (ptr = key; data < datanext && *data != '='; data ++) -- *ptr++ = *data; -- *ptr = '\0'; -- -- if (data < datanext && *data == '=') -- { -- data ++; -- -- if (data < datanext) -- memcpy(value, data, datanext - data); -- value[datanext - data] = '\0'; -- } -- else -- continue; -+ if (parse_txt_record_pair (txt)) -+ goto next; - -+ key = txt->key; -+ value = txt->value; - if (!strncasecmp(key, "usb_", 4)) - { - /* -@@ -805,6 +1183,10 @@ query_callback( - if (device->type == CUPS_DEVICE_PRINTER) - device->sent = 1; - } -+ -+ next: -+ if (next_txt_record (txt) == NULL) -+ break; - } - - if (device->device_id) -@@ -854,11 +1236,9 @@ query_callback( - } - } - -- if (!device) -- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+ return device; - } - -- - /* - * 'sigterm_handler()' - Handle termination signals... - */ -diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in ---- cups-1.4.5/config.h.in.avahi 2010-08-13 06:11:46.000000000 +0200 -+++ cups-1.4.5/config.h.in 2010-11-12 13:13:31.000000000 +0100 -@@ -344,6 +344,13 @@ - - - /* -+ * Do we have Avahi for DNS Service Discovery? -+ */ -+ -+#undef HAVE_AVAHI -+ -+ -+/* - * Do we have <sys/ioctl.h>? - */ - -diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4 ---- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi 2009-08-29 00:54:34.000000000 +0200 -+++ cups-1.4.5/config-scripts/cups-dnssd.m4 2010-11-12 13:13:31.000000000 +0100 -@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn - DNSSDLIBS="" - DNSSD_BACKEND="" - -+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], -+ [if test x$enable_avahi = xyes; then -+ AC_MSG_CHECKING(for Avahi) -+ if $PKGCONFIG --exists avahi-client; then -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" -+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" -+ DNSSD_BACKEND="dnssd" -+ AC_DEFINE(HAVE_AVAHI) -+ enable_dnssd=no -+ else -+ AC_MSG_RESULT(no) -+ fi -+ fi]) -+ - if test x$enable_dnssd != xno; then - AC_CHECK_HEADER(dns_sd.h, [ - case "$uname" in -diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c ---- cups-1.4.5/cups/http-support.c.avahi 2010-10-02 00:40:38.000000000 +0200 -+++ cups-1.4.5/cups/http-support.c 2010-11-12 13:28:45.000000000 +0100 -@@ -55,6 +55,11 @@ - # include <dns_sd.h> - # include <poll.h> - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+#endif /* HAVE_AVAHI */ - - - /* -@@ -121,6 +126,24 @@ static void resolve_callback(DNSService - void *context); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void avahi_resolve_uri_client_cb(AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll); -+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ - - /* - * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1351,16 +1374,27 @@ _httpResolveURI( - - if (strstr(hostname, "._tcp")) - { -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *regtype, /* Pointer to type in hostname */ -+ *domain; /* Pointer to domain in hostname */ - #ifdef HAVE_DNSSD - DNSServiceRef ref, /* DNS-SD master service reference */ - domainref, /* DNS-SD service reference for domain */ - localref; /* DNS-SD service reference for .local */ - int domainsent = 0, /* Send the domain resolve? */ - offline = 0; /* offline-report state set? */ -- char *regtype, /* Pointer to type in hostname */ -- *domain; /* Pointer to domain in hostname */ - _http_uribuf_t uribuf; /* URI buffer */ - struct pollfd polldata; /* Polling data */ -+#else /* HAVE_AVAHI */ -+ AvahiSimplePoll *simple_poll; -+ AvahiClient *client; -+ int error; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } user_data; -+#endif /* HAVE_DNSSD */ - - - if (logit) -@@ -1398,8 +1432,13 @@ _httpResolveURI( - if (domain) - *domain++ = '\0'; - -+#ifdef HAVE_DNSSD - uribuf.buffer = resolved_uri; - uribuf.bufsize = resolved_size; -+#else -+ user_data.uribuf.buffer = resolved_uri; -+ user_data.uribuf.bufsize = resolved_size; -+#endif - - resolved_uri[0] = '\0'; - -@@ -1414,6 +1453,7 @@ _httpResolveURI( - - uri = NULL; - -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) - { - localref = ref; -@@ -1500,6 +1540,36 @@ _httpResolveURI( - - DNSServiceRefDeallocate(ref); - } -+#else /* HAVE_AVAHI */ -+ if ((simple_poll = avahi_simple_poll_new ()) != NULL) -+ { -+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_resolve_uri_client_cb, -+ &simple_poll, &error)) != NULL) -+ { -+ user_data.poll = simple_poll; -+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, hostname, -+ regtype, domain, AVAHI_PROTO_UNSPEC, 0, -+ avahi_resolve_uri_resolver_cb, -+ &user_data) != NULL) -+ { -+ avahi_simple_poll_loop (simple_poll); -+ -+ /* -+ * Collect the result. -+ */ -+ -+ if (resolved_uri[0]) -+ uri = resolved_uri; -+ } -+ -+ avahi_client_free (client); -+ } -+ -+ avahi_simple_poll_free (simple_poll); -+ } -+#endif /* HAVE_DNSSD */ - - if (logit) - { -@@ -1511,13 +1581,13 @@ _httpResolveURI( - fputs("STATE: -connecting-to-device,offline-report\n", stderr); - } - --#else -+#else /* HAVE_DNSSD || HAVE_AVAHI */ - /* - * No DNS-SD support... - */ - - uri = NULL; --#endif /* HAVE_DNSSD */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - - if (logit && !uri) - _cupsLangPuts(stderr, _("Unable to find printer!\n")); -@@ -1722,6 +1792,105 @@ resolve_callback( - } - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void -+avahi_resolve_uri_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll) -+{ -+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " -+ "simple_poll=%p)\n", client, state, simple_poll)); -+ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ avahi_simple_poll_quit (simple_poll); -+} -+ -+static void -+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ const char *scheme; /* URI scheme */ -+ char rp[256]; /* Remote printer */ -+ AvahiStringList *pair; -+ char *value; -+ size_t valueLen = 0; -+ char addr[AVAHI_ADDRESS_STR_MAX]; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } *poll_uribuf = context; -+ -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " -+ "interface=%d, protocol=%d, event=%d, name=\"%s\", " -+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " -+ "port=%d, txt=%p, flags=%d, context=%p)\n", -+ resolver, interface, protocol, event, name, type, domain, -+ host_name, address, port, txt, flags, context)); -+ -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ avahi_service_resolver_free (resolver); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+ return; -+ } -+ -+ /* -+ * Figure out the scheme from the full name... -+ */ -+ -+ if (strstr(type, "_ipp.")) -+ scheme = "ipp"; -+ else if (strstr(type, "_printer.")) -+ scheme = "lpd"; -+ else if (strstr(type, "_pdl-datastream.")) -+ scheme = "socket"; -+ else -+ scheme = "riousbprint"; -+ -+ /* -+ * Extract the "remote printer key from the TXT record... -+ */ -+ -+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) -+ { -+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); -+ rp[0] = '/'; -+ memcpy (rp + 1, value, valueLen); -+ rp[valueLen + 1] = '\0'; -+ } -+ else -+ rp[0] = '\0'; -+ -+ /* -+ * Assemble the final device URI... -+ */ -+ -+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); -+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, -+ poll_uribuf->uribuf.bufsize, scheme, NULL, -+ addr, port, rp); -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", -+ poll_uribuf->uribuf.buffer)); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+} -+#endif /* HAVE_AVAHI */ -+ - - /* - * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $". diff --git a/testing/cups/cups.install b/testing/cups/cups.install deleted file mode 100644 index e92e17ed3..000000000 --- a/testing/cups/cups.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - echo ">> If you use an HTTPS connection to CUPS, the first time you access" - echo ">> the interface it may take a very long time before the site comes up." - echo ">> This is because the first request triggers the generation of the CUPS" - echo ">> SSL certificates which can be a very time-consuming job." -} - -post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} diff --git a/testing/cups/cups.logrotate b/testing/cups/cups.logrotate deleted file mode 100644 index 9c49bbdaf..000000000 --- a/testing/cups/cups.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/cups/*log { - missingok - notifempty - delaycompress - postrotate - /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..13048e9d9 --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.21.6 +pkgrel=2 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +options=('!libtool') +source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 + curlbuild.h) + +[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h +[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h +md5sums=('6611989a81ebd7b03a35adc3001ddee0' + '751bd433ede935c8fae727377625a8ae') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure \ + --with-random=/dev/urandom \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --enable-ipv6 \ + --disable-ldaps \ + --disable-ldap \ + --enable-manual \ + --enable-versioned-symbols \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --without-libidn \ + --enable-threaded-resolver + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + install -Dm644 COPYING \ + ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -Dm644 docs/libcurl/libcurl.m4 \ + ${pkgdir}/usr/share/aclocal/libcurl.m4 + mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}" + install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/testing/cvs/PKGBUILD b/testing/cvs/PKGBUILD deleted file mode 100644 index 76f71a2a1..000000000 --- a/testing/cvs/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $ -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=cvs -pkgver=1.11.23 -pkgrel=7 -pkgdesc="Concurrent Versions System - a source control system" -arch=(i686 x86_64) -url="http://cvs.nongnu.org" -license=('GPL') -depends=('krb5') -optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') -install=cvs.install -source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - cvs-1.11.23-getline64.patch - cvs-1.11.23-cve-2010-3846.patch) -sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9' - '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf' - 'c6506d0a5efc7b0cab6415f26e070ec214fb9781fac8d295506f4d0825431a8f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - unset EDITOR VISUAL - - patch -Np1 -i ../cvs-1.11.23-getline64.patch - - # CVE-2010-3864, see https://www.redhat.com/security/data/cve/CVE-2010-3846.html - patch -Np1 -i ../cvs-1.11.23-cve-2010-3846.patch - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/share/info/dir -} diff --git a/testing/cvs/cvs-1.11.23-cve-2010-3846.patch b/testing/cvs/cvs-1.11.23-cve-2010-3846.patch deleted file mode 100644 index e1560cef8..000000000 --- a/testing/cvs/cvs-1.11.23-cve-2010-3846.patch +++ /dev/null @@ -1,167 +0,0 @@ -From b122edcb68ff05bb6eb22f6e50423e7f1050841b Mon Sep 17 00:00:00 2001 -From: Larry Jones <lawrence.jones@siemens.com> -Date: Thu, 21 Oct 2010 10:08:16 +0200 -Subject: [PATCH] Fix for CVE-2010-3846 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Mallformed RCS revision (delete after the end of input file, or overlayed -deleted regions) screws output file image size computation. This leads to -write attempt after the allocated memory opening hiden memory corruption -driven by CVS server. - -Signed-off-by: Petr Písař <ppisar@redhat.com> ---- - src/rcs.c | 52 +++++++++++++++++++++++++++++----------------------- - 1 files changed, 29 insertions(+), 23 deletions(-) - -diff --git a/src/rcs.c b/src/rcs.c -index 7d0d078..2f88f85 100644 ---- a/src/rcs.c -+++ b/src/rcs.c -@@ -7128,7 +7128,7 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - struct deltafrag *dfhead; - struct deltafrag **dftail; - struct deltafrag *df; -- unsigned long numlines, lastmodline, offset; -+ unsigned long numlines, offset; - struct linevector lines; - int err; - -@@ -7202,12 +7202,12 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - - /* New temp data structure to hold new org before - copy back into original structure. */ -- lines.nlines = lines.lines_alloced = numlines; -+ lines.lines_alloced = numlines; - lines.vector = xmalloc (numlines * sizeof *lines.vector); - - /* We changed the list order to first to last -- so the - list never gets larger than the size numlines. */ -- lastmodline = 0; -+ lines.nlines = 0; - - /* offset created when adding/removing lines - between new and original structure */ -@@ -7216,25 +7216,24 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - for (df = dfhead; df != NULL; ) - { - unsigned int ln; -- unsigned long deltaend; -+ unsigned long newpos = df->pos - offset; - -- if (df->pos > orig_lines->nlines) -+ if (newpos < lines.nlines || newpos > numlines) - err = 1; - - /* On error, just free the rest of the list. */ - if (!err) - { -- /* Here we need to get to the line where the next insert will -+ /* Here we need to get to the line where the next change will - begin, which is DF->pos in ORIG_LINES. We will fill up to - DF->pos - OFFSET in LINES with original items. */ -- for (deltaend = df->pos - offset; -- lastmodline < deltaend; -- lastmodline++) -+ while (lines.nlines < newpos) - { - /* we need to copy from the orig structure into new one */ -- lines.vector[lastmodline] = -- orig_lines->vector[lastmodline + offset]; -- lines.vector[lastmodline]->refcount++; -+ lines.vector[lines.nlines] = -+ orig_lines->vector[lines.nlines + offset]; -+ lines.vector[lines.nlines]->refcount++; -+ lines.nlines++; - } - - switch (df->type) -@@ -7246,7 +7245,12 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - struct line *q; - int nextline_newline; - size_t nextline_len; -- -+ -+ if (newpos + df->nlines > numlines) -+ { -+ err = 1; -+ break; -+ } - textend = df->new_lines + df->len; - nextline_newline = 0; - nextline_text = df->new_lines; -@@ -7271,8 +7275,7 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - q->has_newline = nextline_newline; - q->refcount = 1; - memcpy (q->text, nextline_text, nextline_len); -- lines.vector[lastmodline++] = q; -- offset--; -+ lines.vector[lines.nlines++] = q; - - nextline_text = (char *)p + 1; - nextline_newline = 0; -@@ -7286,11 +7289,11 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - q->has_newline = nextline_newline; - q->refcount = 1; - memcpy (q->text, nextline_text, nextline_len); -- lines.vector[lastmodline++] = q; -+ lines.vector[lines.nlines++] = q; - - /* For each line we add the offset between the #'s - decreases. */ -- offset--; -+ offset -= df->nlines; - break; - } - -@@ -7301,7 +7304,9 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - if (df->pos + df->nlines > orig_lines->nlines) - err = 1; - else if (delvers) -+ { - for (ln = df->pos; ln < df->pos + df->nlines; ++ln) -+ { - if (orig_lines->vector[ln]->refcount > 1) - /* Annotate needs this but, since the original - * vector is disposed of before returning from -@@ -7309,6 +7314,8 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - * there are multiple references. - */ - orig_lines->vector[ln]->vers = delvers; -+ } -+ } - break; - } - } -@@ -7328,21 +7335,20 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - else - { - /* add the rest of the remaining lines to the data vector */ -- for (; lastmodline < numlines; lastmodline++) -+ while (lines.nlines < numlines) - { - /* we need to copy from the orig structure into new one */ -- lines.vector[lastmodline] = orig_lines->vector[lastmodline -+ lines.vector[lines.nlines] = orig_lines->vector[lines.nlines - + offset]; -- lines.vector[lastmodline]->refcount++; -+ lines.vector[lines.nlines]->refcount++; -+ lines.nlines++; - } - - /* Move the lines vector to the original structure for output, - * first deleting the old. - */ - linevector_free (orig_lines); -- orig_lines->vector = lines.vector; -- orig_lines->lines_alloced = numlines; -- orig_lines->nlines = lines.nlines; -+ *orig_lines = lines; - } - - return !err; --- -1.7.2.3 - diff --git a/testing/cvs/cvs-1.11.23-getline64.patch b/testing/cvs/cvs-1.11.23-getline64.patch deleted file mode 100644 index 99942e058..000000000 --- a/testing/cvs/cvs-1.11.23-getline64.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- cvs-1.11.23/lib/getline.c 2005-04-04 22:46:05.000000000 +0200 -+++ cvs-1.11.23/lib/getline.c.old 2008-06-03 19:06:25.000000000 +0200 -@@ -154,7 +154,7 @@ - return ret; - } - --int -+ssize_t - getline (lineptr, n, stream) - char **lineptr; - size_t *n; -@@ -163,7 +163,7 @@ - return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); - } - --int -+ssize_t - getline_safe (lineptr, n, stream, limit) - char **lineptr; - size_t *n; ---- cvs-1.11.23/lib/getline.h 2005-04-04 22:46:05.000000000 +0200 -+++ cvs-1.11.23/lib/getline.h.old 2008-06-03 19:06:27.000000000 +0200 -@@ -11,9 +11,9 @@ - - #define GETLINE_NO_LIMIT -1 - --int -+ssize_t - getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); --int -+ssize_t - getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, - int limit)); - int diff --git a/testing/cvs/cvs.install b/testing/cvs/cvs.install deleted file mode 100644 index f1cdd1f3e..000000000 --- a/testing/cvs/cvs.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(cvs.info cvs-info-1 cvs-info-2 cvsclient.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/cyrus-sasl-plugins/PKGBUILD b/testing/cyrus-sasl-plugins/PKGBUILD deleted file mode 100644 index 5817bb657..000000000 --- a/testing/cyrus-sasl-plugins/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=cyrus-sasl-plugins -pkgver=2.1.23 -pkgrel=5 -pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" -arch=('i686' 'x86_64') -url="http://cyrusimap.web.cmu.edu/" -license=('custom') -depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4' - 'libmysqlclient>=5.5.10') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.22-gcc44.patch - cyrus-sasl-2.1.23-db5-fix.patch) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - '5deb4d67b53ecba20c7887fc8fdebee1' - '3ae4347705141145f31cf786c38ea9ef') -options=('!libtool') - -build() { - cd ${srcdir}/cyrus-sasl-${pkgver} - patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch - # from http://bugs.gentoo.org/show_bug.cgi?id=319935 - patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-login \ - --disable-plain \ - --enable-sql \ - --disable-sqlite \ - --enable-gssapi=/usr/include/gssapi \ - --with-mysql=/usr \ - --with-pgsql=/usr \ - --enable-postgresql \ - --enable-ldapdb \ - --with-ldap=/usr - cd sasldb - make - cd ../plugins - make -} - -package () { - cd ${srcdir}/cyrus-sasl-${pkgver}/plugins - make DESTDIR=${pkgdir} install - - install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - - rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.* -} diff --git a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch deleted file mode 100644 index e2621278b..000000000 --- a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch +++ /dev/null @@ -1,24 +0,0 @@ -fix warnings with gcc-4.4 - -http://bugs.gentoo.org/248738 - ---- cyrus-sasl-2.1.22/plugins/digestmd5.c -+++ cyrus-sasl-2.1.22/plugins/digestmd5.c -@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch deleted file mode 100644 index 2ccd6cdb3..000000000 --- a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- sasldb/db_berkeley.c.orig 2010-10-04 21:11:15.044010468 -0400 -+++ sasldb/db_berkeley.c 2010-10-04 21:12:18.921998718 -0400 -@@ -100,7 +100,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); - ---- utils/dbconverter-2.c.orig 2010-10-04 21:23:39.778000256 -0400 -+++ utils/dbconverter-2.c 2010-10-04 21:24:50.384999893 -0400 -@@ -214,7 +214,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD deleted file mode 100644 index 6d42f9f75..000000000 --- a/testing/cyrus-sasl/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=cyrus-sasl -pkgver=2.1.23 -pkgrel=5 -pkgdesc="SASL authentication daemon" -arch=('i686' 'x86_64') -license=('custom') -url="http://asg.web.cmu.edu/cyrus/download/" -depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0') -replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql) -conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql) -backup=(etc/conf.d/saslauthd) -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz - saslauthd - saslauthd.conf.d - cyrus-sasl-2.1.23-gcc4.patch - cyrus-sasl-2.1.23+db-5.0.patch) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - '697dfb51206c398bc976ce9f4cffe72d' - '96d8a2f6189501f8044838e04d5cae7f' - '3a71688df7d5724cd55a8de17d74f34e' - '35c189c8e93ad37e3ae3c49386fdeb2c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix building with db v5.x - patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch - - # Fix error: #elif with no expression - patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch - - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \ - --disable-krb4 --with-gss_impl=mit --disable-otp - cd saslauthd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/saslauthd" - make DESTDIR="${pkgdir}" install - make testsaslauthd - install -m755 testsaslauthd "${pkgdir}/usr/sbin" - - install -dm766 "${pkgdir}/var/run/saslauthd" - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" - install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" - - install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING" -} diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch deleted file mode 100644 index 62df3e67e..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c ---- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c 2009-04-28 08:09:18.000000000 -0700 -+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2011-05-02 07:16:42.748675977 -0700 -@@ -100,7 +100,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); -diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c ---- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c 2003-02-13 11:56:17.000000000 -0800 -+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2011-05-02 07:16:42.748675977 -0700 -@@ -214,7 +214,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch deleted file mode 100644 index 0d8627b1f..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c ---- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c 2009-04-28 08:09:17.000000000 -0700 -+++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2011-05-02 07:56:55.375403814 -0700 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd deleted file mode 100644 index c470c801c..000000000 --- a/testing/cyrus-sasl/saslauthd +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN` - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid - fi - add_daemon $DAEMON_NAME - stat_done - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ ! -z "$SASLAUTHD_PID" ] && kill $SASLAUTHD_PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm /var/run/$DAEMON_NAME.pid &> /dev/null - fi - rm_daemon $DAEMON_NAME - stat_done - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/cyrus-sasl/saslauthd.conf.d b/testing/cyrus-sasl/saslauthd.conf.d deleted file mode 100644 index b42b5d0b0..000000000 --- a/testing/cyrus-sasl/saslauthd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam" diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD deleted file mode 100644 index 110e42c14..000000000 --- a/testing/dbus-core/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 123268 2011-05-09 14:39:58Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Link Dupont <link@subpop.net> -# -pkgname=dbus-core -pkgver=1.4.8 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=(i686 x86_64) -license=('GPL' 'custom') -depends=('expat>=2.0.1' 'coreutils' 'filesystem') -conflicts=('dbus<1.2.3-2') -options=(!libtool) -install=dbus.install -source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz - dbus) -md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c' - '08f93dd19cffd1b45ab05c1fd4efb560') - -build() { - cd "${srcdir}/dbus-${pkgver}" - sed -i -e 's/#ifdef DBUS_BUILD_X11/#if 1/' dbus/dbus-sysdeps-unix.c - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --enable-inotify --disable-dnotify \ - --disable-verbose-mode --disable-static \ - --disable-tests --disable-asserts --without-x \ - --with-systemdsystemunitdir=/lib/systemd/system - make - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/bin/dbus-launch" - rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" - - chown 81:81 "${pkgdir}/var/run/dbus" - - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" - - #Fix configuration file - sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf" - - #install .keep files so pacman doesn't delete empty dirs - touch "${pkgdir}/usr/share/dbus-1/services/.keep" - touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" - touch "${pkgdir}/etc/dbus-1/session.d/.keep" - touch "${pkgdir}/etc/dbus-1/system.d/.keep" - - rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1" - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" - install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" -} diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus deleted file mode 100644 index 66b84cae0..000000000 --- a/testing/dbus-core/dbus +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting D-BUS system messagebus" - if [ ! -x /var/run/dbus ] ; then - install -m755 -g 81 -o 81 -d /var/run/dbus - fi - if [ -x /usr/bin/dbus-uuidgen ] ; then - /usr/bin/dbus-uuidgen --ensure - fi - - /usr/bin/dbus-daemon --system - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dbus - stat_done - fi - ;; - stop) - stat_busy "Stopping D-BUS system messagebus" - [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/dbus.pid - rm_daemon dbus - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading D-BUS configuration" - [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ - --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install deleted file mode 100644 index 44f4475ee..000000000 --- a/testing/dbus-core/dbus.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus - getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus - usr/bin/passwd -l dbus &>/dev/null - dbus-uuidgen --ensure -} - -post_upgrade() { - post_install - - #Make sure new rc script can shutdown running dbus - if [ -f var/run/dbus/pid ]; then - mv var/run/dbus/pid var/run/dbus.pid - fi -} - -post_remove() { - if getent passwd dbus >/dev/null; then - usr/sbin/userdel dbus - fi - if getent group dbus >/dev/null; then - usr/sbin/groupdel dbus - fi -} diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus deleted file mode 100644 index 603e92d3e..000000000 --- a/testing/dbus/30-dbus +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# launches a session dbus instance - -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --sh-syntax --exit-with-session` -fi - diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD deleted file mode 100644 index 633b0b3d3..000000000 --- a/testing/dbus/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 123271 2011-05-09 14:50:22Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Link Dupont <link@subpop.net> -# -pkgname=dbus -pkgver=1.4.8 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=(i686 x86_64) -license=('GPL' 'custom') -depends=("dbus-core>=${pkgver}" 'libx11') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - 30-dbus) -md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c' - 'd14e59575f04e55d21a04907b6fd9f3c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --disable-verbose-mode --disable-static \ - --enable-inotify --disable-dnotify \ - --disable-tests --disable-asserts - make -C tools dbus-launch - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m755 tools/dbus-launch "${pkgdir}/usr/bin/" - install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" - install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus" - install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/" -} diff --git a/testing/dovecot/PKGBUILD b/testing/dovecot/PKGBUILD deleted file mode 100644 index 7b9a0304c..000000000 --- a/testing/dovecot/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 121982 2011-05-01 01:05:24Z stephane $ -# Contributor: Paul Mattal <paul@mattal.com> -# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> -# Contributor: GARETTE Emmanuel <gnunux at laposte dot net> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=dovecot -pkgver=2.0.12 -pkgrel=2 -pkgdesc="An IMAP and POP3 server written with security primarily in mind" -arch=('i686' 'x86_64') -url="http://dovecot.org/" -license=("LGPL") -depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10' - 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') -makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22') -optdepends=('libldap: ldap plugin') -provides=('imap-server' 'pop3-server') -options=('!libtool') -backup=(etc/dovecot/dovecot.conf - etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf - etc/dovecot/conf.d/{15-lda,20-imap,20-lmtp,20-pop3}.conf - etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf - etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext - etc/ssl/dovecot-openssl.cnf) -install=$pkgname.install -source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('689e1a8863d4fb2fd252e1a6121dd181' - 'd020d43eab4ded6fb379dadc570a9490') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - # configure with openssl, mysql, and postgresql support - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ - --disable-static \ - --with-nss \ - --with-pam \ - --with-mysql \ - --with-pgsql \ - --with-sqlite \ - --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \ - --with-gssapi \ - --with-ldap=plugin \ - --with-zlib --with-bzlib \ - --with-libcap \ - --with-solr \ - --with-docs - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - - # install the launch script - install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname - - # install example conf files and ssl.conf - install -d -m755 ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/ - install -d -m755 ${pkgdir}/etc/ssl - install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ - - rm ${pkgdir}/etc/dovecot/README - - # install dovecot userdir - https://bugs.archlinux.org/task/20533 - install -d -m755 ${pkgdir}/var/run/dovecot/{login,empty} - chmod 755 ${pkgdir}/var/run/dovecot - chmod 750 ${pkgdir}/var/run/dovecot/login -} diff --git a/testing/dovecot/dovecot.install b/testing/dovecot/dovecot.install deleted file mode 100644 index 51d1509ee..000000000 --- a/testing/dovecot/dovecot.install +++ /dev/null @@ -1,57 +0,0 @@ -# arg 1: the new package version -post_install() { - - # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values - - # dovecot - if grep -q "^dovecot:" /etc/group &> /dev/null ; then - groupmod -g 76 -n dovecot dovecot &> /dev/null - else - groupadd -g 76 dovecot &> /dev/null - fi - - if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot dovecot &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot -m -r dovecot &> /dev/null - fi - - # dovenull - if grep -q "^dovenull:" /etc/group &> /dev/null ; then - groupmod -g 74 -n dovenull dovenull &> /dev/null - else - groupadd -g 74 dovenull &> /dev/null - fi - - if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull dovenull &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull -m -r dovenull &> /dev/null - fi - - # harden some permissions - chgrp dovenull /var/run/dovecot/login -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - if [ "`vercmp $2 2.0.0`" -lt 0 ]; then - # important upgrade notice - echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE" - echo "> ------------------------------------" - echo "> see http://wiki2.dovecot.org/Upgrading/2.0" - echo "> make sure, you convert the dovecot.conf file" - fi - -} - -# arg 1: the old package version -pre_remove() { - userdel dovecot &> /dev/null - userdel dovenull &> /dev/null - groupdel dovecot &> /dev/null || /bin/true - groupdel dovenull &> /dev/null || /bin/true - rm -rf /var/run/dovecot/ &> /dev/null || /bin/true -} diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD new file mode 100644 index 000000000..8b758fd16 --- /dev/null +++ b/testing/empathy/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=empathy +pkgver=3.0.2 +pkgrel=1 +pkgdesc="A GNOME instant messaging client using the Telepathy framework." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Empathy" +license=('GPL2') +depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server' + 'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates') +makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center') +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-butterfly: MSN support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-sofiasip: SIP support' + 'telepathy-haze: libpurple support') +options=('!libtool') +groups=('gnome-extra') +install=empathy.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install new file mode 100644 index 000000000..63dd6b907 --- /dev/null +++ b/testing/empathy/empathy.install @@ -0,0 +1,16 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD new file mode 100644 index 000000000..872b9228a --- /dev/null +++ b/testing/eog/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=eog +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Eye of Gnome: An image viewing and cataloging program" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi' + 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') +makedepends=('gtk-doc' 'intltool') +install=eog.install +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # remove it from Xfce menu that ships its own thingy + echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop +} diff --git a/testing/eog/eog.install b/testing/eog/eog.install new file mode 100644 index 000000000..284b24b18 --- /dev/null +++ b/testing/eog/eog.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall eog + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD new file mode 100644 index 000000000..ae1141789 --- /dev/null +++ b/testing/evince/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evince +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Simply a document viewer" +url="http://projects.gnome.org/evince/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' + 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') +optdepends=('texlive-bin: DVI support') +groups=('gnome-extra') +install=evince.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + introspection-fix.patch) +sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97' + '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/introspection-fix.patch" + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/evince \ + --disable-static --enable-nautilus \ + --enable-pdf --enable-tiff \ + --enable-djvu --enable-dvi \ + --enable-t1lib --enable-comics \ + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/evince/evince.install b/testing/evince/evince.install new file mode 100644 index 000000000..9643a9ba0 --- /dev/null +++ b/testing/evince/evince.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall evince + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/evince/introspection-fix.patch b/testing/evince/introspection-fix.patch new file mode 100644 index 000000000..6a64517bd --- /dev/null +++ b/testing/evince/introspection-fix.patch @@ -0,0 +1,11 @@ +diff a/libview/Makefile.am b/libview/Makefile.am +--- a/libview/Makefile.am ++++ b/libview/Makefile.am +@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte + --output $@ \ + --pkg evince-document-$(EV_API_VERSION) \ + --pkg evince-view-$(EV_API_VERSION) \ ++ -L$(top_builddir)/libdocument/ \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DEVINCE_COMPILATION \ diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD index 195be21c6..040385490 100644 --- a/testing/evolution-data-server/PKGBUILD +++ b/testing/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $ +# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0') +sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD index 963b54508..c494c1fba 100644 --- a/testing/evolution-exchange/PKGBUILD +++ b/testing/evolution-exchange/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $ +# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64') license=('GPL') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02') +sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD new file mode 100644 index 000000000..0c91802b7 --- /dev/null +++ b/testing/evolution/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Integrated Workgroup and Personal Information Management for Gnome" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libsm' 'gstreamer0.10' 'libunique3' 'libnotify' 'libpst' 'libytnef' + 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') +optdepends=('bogofilter: possible junk filter plugin' + 'spamassassin: possible junk filter plugin') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=evolution.install +url=http://www.gnome.org/projects/evolution/ +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --disable-scrollkeeper \ + --enable-nss=yes \ + --with-openldap=yes \ + --enable-smime=yes \ + --with-krb5=/usr \ + --disable-image-inline + make + make -C plugins/tnef-attachments +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/libre/xchat-gnome-libre/xchat-gnome.install b/testing/evolution/evolution.install index b0816ece3..a2c3aaa54 100644 --- a/libre/xchat-gnome-libre/xchat-gnome.install +++ b/testing/evolution/evolution.install @@ -1,9 +1,9 @@ -pkgname=xchat-gnome +pkgname=evolution post_install() { usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { @@ -19,6 +19,6 @@ pre_remove() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/testing/file-roller/PKGBUILD b/testing/file-roller/PKGBUILD new file mode 100644 index 000000000..5d7d1c2ec --- /dev/null +++ b/testing/file-roller/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=file-roller +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Archive manipulator for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') +makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') +optdepends=('unrar: the RAR uncompression program' + 'zip: creates PKZIP-compatible .zip files' + 'unzip: unpacks .zip archives' + 'p7zip: 7zip compression utility' + 'xz: managing LZMA and XZ compressed files' + 'arj: ARJ archiver' + 'unace: extraction tool for the proprietary ace archive format') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=file-roller.install +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/file-roller \ + --localstatedir=/var --disable-static \ + --disable-scrollkeeper --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/file-roller/file-roller.install b/testing/file-roller/file-roller.install new file mode 100644 index 000000000..10a148241 --- /dev/null +++ b/testing/file-roller/file-roller.install @@ -0,0 +1,22 @@ +pkgname=file-roller + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD index be9e1c172..9869a976c 100644 --- a/testing/file/PKGBUILD +++ b/testing/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $ +# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file pkgver=5.07 -pkgrel=1 +pkgrel=3 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -13,9 +13,11 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch) + file-5.05-zip64.patch + file-5.07-zip-detect.patch) md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' - '385f020467debd98bd2d8df6143f93d0') + '385f020467debd98bd2d8df6143f93d0' + 'bcbf2e152f38003a2736298bbd0f37f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +25,7 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - + patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/testing/file/file-5.07-zip-detect.patch b/testing/file/file-5.07-zip-detect.patch new file mode 100644 index 000000000..3e8f128d8 --- /dev/null +++ b/testing/file/file-5.07-zip-detect.patch @@ -0,0 +1,13 @@ +--- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200 ++++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200 +@@ -654,6 +654,10 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + ++>26 byte x Zip archive data ++ ++ ++ + # StarView Metafile + # From Pierre Ducroquet <pinaraf@pinaraf.info> + 0 string VCLMTF StarView MetaFile diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD new file mode 100644 index 000000000..a20a92c9b --- /dev/null +++ b/testing/gdl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gdl +pkgver=3.0.2 +pkgrel=1 +pkgdesc="GNOME Docking Library" +arch=(i686 x86_64) +license=('GPL') +url="http://www.gnome.org/" +depends=('gtk3') +makedepends=('pkgconfig' 'intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gdm/2.91_fix_external_program_directories.patch b/testing/gdm/2.91_fix_external_program_directories.patch new file mode 100644 index 000000000..912b5cdae --- /dev/null +++ b/testing/gdm/2.91_fix_external_program_directories.patch @@ -0,0 +1,48 @@ +diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c +--- gdm-2.91.91.orig/daemon/gdm-server.c 2011-02-17 19:27:53.000000000 -0800 ++++ gdm-2.91.91/daemon/gdm-server.c 2011-02-27 16:56:51.283347074 -0800 +@@ -131,7 +131,7 @@ + g_return_val_if_fail (GDM_IS_SERVER (server), NULL); + + error = NULL; +- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", ++ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", + server->priv->display_name); + + g_debug ("GdmServer: Running helper %s", command); +diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +--- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 ++++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-26 08:43:28.700009251 -0800 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Type=Application + _Name=GNOME Settings Daemon +-TryExec=@LIBEXECDIR@/gnome-settings-daemon +-Exec=@LIBEXECDIR@/gnome-settings-daemon ++TryExec=/usr/bin/gnome-settings-daemon ++Exec=/usr/bin/gnome-settings-daemon + OnlyShowIn=GNOME; + X-GNOME-Autostart-Phase=Initialization + X-GNOME-Autostart-Notify=true +diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in +--- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 ++++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-26 08:44:06.810009153 -0800 +@@ -1,5 +1,5 @@ + [Desktop Entry] + Type=Application + _Name=PolicyKit Authentication Agent +-Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 ++Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + OnlyShowIn=GNOME; +diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c +--- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-02-17 19:27:53.000000000 -0800 ++++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c 2011-02-26 08:45:01.946675918 -0800 +@@ -131,7 +131,7 @@ + ret = FALSE; + + error = NULL; +- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); ++ g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error); + if (error != NULL) { + g_warning ("Error starting settings daemon: %s", error->message); + g_error_free (error); diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD new file mode 100644 index 000000000..a5768c9ec --- /dev/null +++ b/testing/gdm/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +pkgname=gdm +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Gnome Display Manager (a reimplementation of xdm)" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') +groups=('gnome-extra') +options=('!libtool') +depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') +makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') +conflicts=('fast-user-switch-applet') +replaces=('fast-user-switch-applet') +install=gdm.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + 2.91_fix_external_program_directories.patch + gdm-vt-allocation-hack.patch + gdm.pam + gdm-autologin.pam + gdm) +sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05' + '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1' + '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' + 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' + '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5' + '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch" + patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \ + --with-at-spi-registryd-directory=/usr/lib/at-spi \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas + rm -r "${pkgdir}/etc/gconf/schemas/" + + install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm" + install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin" + + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/" + + rmdir "${pkgdir}/var/gdm" + chmod 1770 "${pkgdir}/var/log/gdm" + rm -rf "${pkgdir}/var/run" +} diff --git a/testing/ypserv/ypserv b/testing/gdm/gdm index c36e6901b..c3e635a6d 100755 --- a/testing/ypserv/ypserv +++ b/testing/gdm/gdm @@ -5,30 +5,32 @@ case "$1" in start) - stat_busy "Starting NIS Server" - /usr/sbin/ypserv + stat_busy "Starting GDM" + /usr/sbin/gdm & if [ $? -gt 0 ]; then stat_fail else - add_daemon ypserv + + add_daemon gdm stat_done fi ;; stop) - stat_busy "Stopping NIS Server" - killall -q /usr/sbin/ypserv + stat_busy "Stopping GDM" + [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon ypserv + rm_daemon gdm stat_done fi ;; restart) $0 stop - sleep 1 + sleep 2 $0 start ;; *) echo "usage: $0 {start|stop|restart}" esac +exit 0 diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam new file mode 100644 index 000000000..7c2f9a985 --- /dev/null +++ b/testing/gdm/gdm-autologin.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_permit.so +account required pam_unix.so +password required pam_unix.so +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch new file mode 100644 index 000000000..56fa5a151 --- /dev/null +++ b/testing/gdm/gdm-vt-allocation-hack.patch @@ -0,0 +1,118 @@ +diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c +index 39def47..03488fd 100644 +--- a/daemon/gdm-server.c ++++ b/daemon/gdm-server.c +@@ -33,6 +33,8 @@ + #include <grp.h> + #include <signal.h> + #include <sys/resource.h> ++#include <sys/ioctl.h> ++#include <sys/vt.h> + + #include <glib.h> + #include <glib/gi18n.h> +@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) + return out; + } + ++#ifndef O_NOCTTY ++# define O_NOCTTY 0 ++#endif ++ ++static int ++open_vt (int vtno) ++{ ++ char *vtname; ++ int fd; ++ ++ vtname = g_strdup_printf ("/dev/tty%d", vtno); ++ ++ do { ++ errno = 0; ++ fd = open (vtname, O_RDWR | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ g_free (vtname); ++ return fd; ++} ++ ++static gint ++find_first_probably_free_vt (void) ++{ ++ int fd, fdv; ++ int vtno; ++ unsigned short vtmask; ++ struct vt_stat vtstat; ++ guint v_state; ++ ++ fdv = -1; ++ ++ do { ++ errno = 0; ++ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ if (fd >= 0) { ++ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { ++ v_state = vtstat.v_state; ++ } else { ++ close (fd); ++ v_state = 0; ++ fd = -1; ++ } ++ } else { ++ v_state = 0; ++ } ++ ++ if (fd < 0) { ++ do { ++ errno = 0; ++ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ if (fd >= 0) { ++ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) ++ v_state = vtstat.v_state; ++ } ++ } ++ ++ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { ++ /* Is this console in use? */ ++ if (v_state & vtmask) ++ continue; ++ ++ /* No, try to open it */ ++ fdv = open_vt (vtno); ++ if (fdv >= 0) ++ break; ++ ++ /* If we're here, kernel indicated that the console was free, ++ * but we failed to open it. Just go on to higher VTs. */ ++ } ++ ++ if (fdv >= 0) ++ close (fdv); ++ else ++ vtno = -1; ++ ++ if (fd >= 0) ++ close (fd); ++ ++ return vtno; ++} ++ + char * + gdm_server_get_display_device (GdmServer *server) + { +@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, + + if (vtarg != NULL && ! gotvtarg) { + argv[len++] = g_strdup (vtarg); ++ } else if (!query_in_arglist && !gotvtarg) { ++ gint vtnum = find_first_probably_free_vt (); ++ ++ if (vtnum > 0) ++ argv [len++] = g_strdup_printf ("vt%d", vtnum); + } + + argv[len++] = NULL; diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install new file mode 100644 index 000000000..6cd981d77 --- /dev/null +++ b/testing/gdm/gdm.install @@ -0,0 +1,27 @@ +pkgname=gdm + +post_install() { + getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm + getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm + passwd -l gdm > /dev/null + chown -R gdm:gdm /var/lib/gdm > /dev/null + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gconfpkg --install ${pkgname} +} + +pre_remove() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + getent passwd gdm >/dev/null 2>&1 && userdel gdm + getent group gdm >/dev/null 2>&1 && groupdel gdm +} diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam new file mode 100644 index 000000000..655299cb7 --- /dev/null +++ b/testing/gdm/gdm.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +auth optional pam_gnome_keyring.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start +password required pam_unix.so diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD new file mode 100644 index 000000000..445dfff8c --- /dev/null +++ b/testing/gedit/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 124957 2011-05-25 12:36:33Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gedit +pkgver=3.0.3 +pkgrel=1 +pkgdesc="A text editor for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' + 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject') +makedepends=('gnome-doc-utils' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gedit.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-scrollkeeper \ + --disable-updater --disable-schemas-compile \ + --enable-python + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install new file mode 100644 index 000000000..9d88a1341 --- /dev/null +++ b/testing/gedit/gedit.install @@ -0,0 +1,18 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/gedit.schemas ]; then + usr/sbin/gconfpkg --uninstall gedit + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD new file mode 100644 index 000000000..ca799b5ba --- /dev/null +++ b/testing/glib-networking/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=glib-networking +pkgver=2.28.7 +pkgrel=1 +pkgdesc="Network-related giomodules for glib" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas') +makedepends=('intltool') +options=('!libtool') +install=glib-networking.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/glib-networking --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install new file mode 100644 index 000000000..595f1c75b --- /dev/null +++ b/testing/glib-networking/glib-networking.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD new file mode 100644 index 000000000..24bd5dfe2 --- /dev/null +++ b/testing/glib2/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 124444 2011-05-21 07:53:58Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glib2 +pkgver=2.28.7 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre>=8.02') +makedepends=('pkgconfig' 'python2') +options=('!libtool' '!docs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2 + glib2.sh + glib2.csh) +sha256sums=('0e1b3816a8934371d4ea2313dfbe25d10d16c950f8d02e0a7879ae10d91b1631' + '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + +build() { + cd "${srcdir}/glib-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd "${srcdir}/glib-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/etc/profile.d" + install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" + install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" + + for _i in "${pkgdir}/etc/bash_completion.d/"*; do + chmod -x "${_i}" + done +} diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh new file mode 100644 index 000000000..7aa3a2ffa --- /dev/null +++ b/testing/glib2/glib2.csh @@ -0,0 +1 @@ +setenv G_BROKEN_FILENAMES 1 diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh new file mode 100644 index 000000000..96a056e1e --- /dev/null +++ b/testing/glib2/glib2.sh @@ -0,0 +1 @@ +export G_BROKEN_FILENAMES=1 diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD deleted file mode 100644 index 6092809d9..000000000 --- a/testing/gmp/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 123886 2011-05-14 03:40:36Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gmp -pkgver=5.0.2 -pkgrel=1 -pkgdesc="A free library for arbitrary precision arithmetic" -arch=('i686' 'x86_64') -url="http://gmplib.org/" -depends=('gcc-libs' 'sh') -license=('LGPL3') -options=(!libtool) -install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('0bbaedc82fb30315b06b1588b9077cd3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - [ "${CARCH}" = "i686" ] && export ABI="32" - ./configure --build=${CHOST} \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD index 1031b6b1d..c75fc2c4a 100644 --- a/testing/gnome-control-center/PKGBUILD +++ b/testing/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $ +# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') @@ -15,8 +15,8 @@ groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79') +source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD new file mode 100644 index 000000000..65002fb58 --- /dev/null +++ b/testing/gnome-desktop/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $ +# Maintainer: Jan de Groot <jan@archlinux.org> + +pkgname=gnome-desktop +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Library with common API for various GNOME modules" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Arch Linux" \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD new file mode 100644 index 000000000..853bcfe8a --- /dev/null +++ b/testing/gnome-games/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-games +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Some Games for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +provides=('glchess') +conflicts=('glchess') +options=('!emptydirs' '!libtool') +install=gnome-games.install +url="http://www.gnome.org" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper \ + --disable-static \ + --with-scores-user=root --with-scores-group=games \ + --enable-introspection=yes + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + # Remove all scores, we generate them from postinstall + rm -rf "${pkgdir}/var" + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku +} diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install new file mode 100644 index 000000000..1f67c2e01 --- /dev/null +++ b/testing/gnome-games/gnome-games.install @@ -0,0 +1,153 @@ +pkgname=gnome-games +scores=(glines.Large.scores + glines.Medium.scores + glines.Small.scores + gnibbles.1.0.scores + gnibbles.1.1.scores + gnibbles.2.0.scores + gnibbles.2.1.scores + gnibbles.3.0.scores + gnibbles.3.1.scores + gnibbles.4.0.scores + gnibbles.4.1.scores + gnobots2.classic_robots-safe.scores + gnobots2.classic_robots-super-safe.scores + gnobots2.classic_robots.scores + gnobots2.nightmare-safe.scores + gnobots2.nightmare-super-safe.scores + gnobots2.nightmare.scores + gnobots2.robots2-safe.scores + gnobots2.robots2-super-safe.scores + gnobots2.robots2.scores + gnobots2.robots2_easy-safe.scores + gnobots2.robots2_easy-super-safe.scores + gnobots2.robots2_easy.scores + gnobots2.robots_with_safe_teleport-safe.scores + gnobots2.robots_with_safe_teleport-super-safe.scores + gnobots2.robots_with_safe_teleport.scores + gnomine.Custom.scores + gnomine.Large.scores + gnomine.Medium.scores + gnomine.Small.scores + gnotravex.2x2.scores + gnotravex.3x3.scores + gnotravex.4x4.scores + gnotravex.5x5.scores + gnotravex.6x6.scores + gnotski.1.scores + gnotski.10.scores + gnotski.11.scores + gnotski.12.scores + gnotski.13.scores + gnotski.14.scores + gnotski.15.scores + gnotski.16.scores + gnotski.17.scores + gnotski.18.scores + gnotski.19.scores + gnotski.2.scores + gnotski.20.scores + gnotski.21.scores + gnotski.22.scores + gnotski.23.scores + gnotski.24.scores + gnotski.25.scores + gnotski.26.scores + gnotski.27.scores + gnotski.28.scores + gnotski.29.scores + gnotski.3.scores + gnotski.30.scores + gnotski.31.scores + gnotski.32.scores + gnotski.33.scores + gnotski.34.scores + gnotski.35.scores + gnotski.36.scores + gnotski.37.scores + gnotski.4.scores + gnotski.5.scores + gnotski.6.scores + gnotski.7.scores + gnotski.8.scores + gnotski.9.scores + gtali.Colors.scores + gtali.Regular.scores + mahjongg.bridges.scores + mahjongg.cloud.scores + mahjongg.confounding.scores + mahjongg.difficult.scores + mahjongg.dragon.scores + mahjongg.easy.scores + mahjongg.pyramid.scores + mahjongg.tictactoe.scores + mahjongg.ziggurat.scores + swell-foop.Large.scores + swell-foop.Medium.scores + swell-foop.Small.scores + quadrapassel.scores) + +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + + for sz in Large Medium Small; do + if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then + mv "opt/gnome/var/games/same-gnome.${sz}.scores" \ + "var/games/swell-foop.${sz}.scores" + elif [ -e "var/games/same-gnome.${sz}.scores" ]; then + mv "var/games/same-gnome.${sz}.scores" \ + "var/games/swell-foop.${sz}.scores" + fi + done + if [ -e "opt/gnome/var/games/gnometris.scores" ]; then + mv "opt/gnome/var/games/gnometris.scores" \ + "var/games/quadrapassel.scores" + elif [ -e "var/games/gnometris.scores" ]; then + mv "var/games/gnometris.scores" \ + "var/games/quadrapassel.scores" + fi + + for score in "${scores[@]}" ; do + if [ -e "var/games/${score}" ]; then + continue + fi + if [ -e "opt/gnome/var/games/${score}" ]; then + mv "opt/gnome/var/games/${score}" var/games/ + else + touch "var/games/${score}" + fi + chown root:games "var/games/${score}" + chmod 664 "var/games/${score}" + done +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} + + if [ -f usr/share/ggz/gnect-client.dsc ]; then + ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null + ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null + ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null + fi +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + + for score in "${scores[@]}" ; do + rm -f "var/games/${score}" + done +} diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD new file mode 100644 index 000000000..2ecec8404 --- /dev/null +++ b/testing/gnome-panel/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-panel +pkgver=3.0.2 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL') +pkgdesc="The GNOME Panel" +url="http://www.gnome.org" +depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') +install=gnome-panel.install +groups=('gnome') +replaces=('gnome-panel-bonobo') +provides=("gnome-panel-bonobo=${pkgver}") +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-panel \ + --disable-scrollkeeper \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install new file mode 100644 index 000000000..e3175df5e --- /dev/null +++ b/testing/gnome-panel/gnome-panel.install @@ -0,0 +1,24 @@ +pkgname=gnome-panel + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +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 +} diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD new file mode 100644 index 000000000..e731c944b --- /dev/null +++ b/testing/gnome-power-manager/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-power-manager +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." +arch=(i686 x86_64) +url="http://www.gnome.org/projects/gnome-power-manager/" +license=('GPL') +depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower' + 'libgnome-keyring' 'dconf') +makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center') +options=(!emptydirs) +install=gnome-power-manager.install +groups=(gnome) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-power-manager \ + --disable-scrollkeeper \ + --with-dbus-services=/usr/share/dbus-1/services \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install new file mode 100644 index 000000000..4666938db --- /dev/null +++ b/testing/gnome-power-manager/gnome-power-manager.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/gnome +} + +pre_upgrade() { + if (( $(vercmp $2 2.91.92) < 0 )); then + usr/sbin/gconfpkg --uninstall gnome-power-manager + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD new file mode 100644 index 000000000..aefd90ecd --- /dev/null +++ b/testing/gnome-session/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-session +pkgver=3.0.2 +pkgrel=1 +pkgdesc="The GNOME Session Handler" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg' + 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') +makedepends=('intltool' 'mesa' 'xtrans') +options=('!emptydirs') +install=gnome-session.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install new file mode 100644 index 000000000..74cf4ed22 --- /dev/null +++ b/testing/gnome-session/gnome-session.install @@ -0,0 +1,18 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.91.91.3-3) < 0 )); then + usr/sbin/gconfpkg --uninstall gnome-session + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD index 06f71588b..25433294c 100644 --- a/testing/gnome-settings-daemon/PKGBUILD +++ b/testing/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $ +# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117') +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD new file mode 100644 index 000000000..0c005f56e --- /dev/null +++ b/testing/gnome-shell/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Flamelab <panosfilip@gmail.com + +pkgname=gnome-shell +pkgver=3.0.2 +pkgrel=1 +pkgdesc="The next generation GNOME Shell" +arch=('i686' 'x86_64') +url="http://live.gnome.org/GnomeShell" +license=('GPL2') +depends=('mutter' 'gconf' 'dconf' 'gjs' 'gnome-menus' 'gnome-desktop' 'libcroco' 'libcanberra' 'libpulse' 'telepathy-glib' 'polkit-gnome' + 'gobject-introspection' 'evolution-data-server' 'gnome-bluetooth' 'gstreamer0.10' 'telepathy-logger') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('network-manager-applet: shell integration for networkmanager' + 'gnome-power-manager: shell integration for power management') +options=('!libtool' '!emptydirs') +install=gnome-shell.install +groups=(gnome) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + arch.patch + bluetoothstatus-always-update-devices.patch + shell-recorder-missing-XFree.patch) +sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95' + 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db' + 'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae' + '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/arch.patch" + patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch" + patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-shell ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-shell/arch.patch b/testing/gnome-shell/arch.patch new file mode 100644 index 000000000..67baefdcb --- /dev/null +++ b/testing/gnome-shell/arch.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-shell.orig/data/org.gnome.shell.gschema.xml.in gnome-shell/data/org.gnome.shell.gschema.xml.in +--- gnome-shell.orig/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:47:58.638600793 -0700 ++++ gnome-shell/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:49:17.035274675 -0700 +@@ -30,7 +30,7 @@ + </_description> + </key> + <key name="favorite-apps" type="as"> +- <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default> ++ <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]</default> + <_summary>List of desktop file IDs for favorite applications</_summary> + <_description> + The applications corresponding to these identifiers diff --git a/testing/gnome-shell/bluetoothstatus-always-update-devices.patch b/testing/gnome-shell/bluetoothstatus-always-update-devices.patch new file mode 100644 index 000000000..0272169f5 --- /dev/null +++ b/testing/gnome-shell/bluetoothstatus-always-update-devices.patch @@ -0,0 +1,132 @@ +From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Wed, 13 Apr 2011 17:08:45 +0000 +Subject: BluetoothStatus: always update devices + +Previously, we skipped rebuilding device items in case the device +had already been seen, but this caused the connected switch not to +be updated. Now it has been refactored to update in case the device +changes, and to create only when the device is completely new. + +https://bugzilla.gnome.org/show_bug.cgi?id=647565 +--- +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js +index 070016a..cee2f90 100644 +--- a/js/ui/status/bluetooth.js ++++ b/js/ui/status/bluetooth.js +@@ -127,13 +127,6 @@ Indicator.prototype = { + } + }, + +- _deviceCompare: function(d1, d2) { +- return d1.device_path == d2.device_path && +- d1.bdaddr == d2.bdaddr && +- d1.can_connect == d2.can_connect && +- d1.capabilities == d2.capabilities; +- }, +- + _updateDevices: function() { + let devices = this._applet.get_devices(); + +@@ -142,12 +135,8 @@ Indicator.prototype = { + let item = this._deviceItems[i]; + let destroy = true; + for (let j = 0; j < devices.length; j++) { +- // we need to deep compare because BluetoothSimpleDevice is a boxed type +- // (but we take advantage of that, because _skip will disappear the next +- // time get_devices() is called) +- if (this._deviceCompare(item._device, devices[j])) { +- item.label.text = devices[j].alias; +- devices[j]._skip = true; ++ if (item._device.device_path == devices[j].device_path) { ++ this._updateDeviceItem(item, devices[j]); + destroy = false; + break; + } +@@ -162,7 +151,7 @@ Indicator.prototype = { + this._hasDevices = newlist.length > 0; + for (let i = 0; i < devices.length; i++) { + let d = devices[i]; +- if (d._skip) ++ if (d._item) + continue; + let item = this._createDeviceItem(d); + if (item) { +@@ -177,17 +166,55 @@ Indicator.prototype = { + this._deviceSep.actor.hide(); + }, + ++ _updateDeviceItem: function(item, device) { ++ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) { ++ item.destroy(); ++ return; ++ } ++ ++ let prevDevice = item._device; ++ let prevCapabilities = prevDevice.capabilities; ++ let prevCanConnect = prevDevice.can_connect; ++ ++ // adopt the new device object ++ item._device = device; ++ device._item = item; ++ ++ // update properties ++ item.label.text = device.alias; ++ ++ if (prevCapabilities != device.capabilities || ++ prevCanConnect != device.can_connect) { ++ // need to rebuild the submenu ++ item.menu.removeAll(); ++ this._buildDeviceSubMenu(item, device); ++ } ++ ++ // update connected property ++ if (device.can_connect) ++ item._connectedMenuitem.setToggleState(device.connected); ++ }, ++ + _createDeviceItem: function(device) { + if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) + return null; + let item = new PopupMenu.PopupSubMenuMenuItem(device.alias); ++ ++ // adopt the device object, and add a back link + item._device = device; ++ device._item = item; + ++ this._buildDeviceSubMenu(item, device); ++ ++ return item; ++ }, ++ ++ _buildDeviceSubMenu: function(item, device) { + if (device.can_connect) { + item._connected = device.connected; +- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); ++ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); + +- menuitem.connect('toggled', Lang.bind(this, function() { ++ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() { + if (item._connected > ConnectionState.CONNECTED) { + // operation already in progress, revert + menuitem.setToggleState(menuitem.state); +@@ -217,7 +244,7 @@ Indicator.prototype = { + } + })); + +- item.menu.addMenuItem(menuitem); ++ item.menu.addMenuItem(item._connectedMenuitem); + } + + if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) { +@@ -263,8 +290,6 @@ Indicator.prototype = { + default: + break; + } +- +- return item; + }, + + _updateFullMenu: function() { +-- +cgit v0.9 diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install new file mode 100644 index 000000000..a07105c24 --- /dev/null +++ b/testing/gnome-shell/gnome-shell.install @@ -0,0 +1,22 @@ +pkgname=gnome-shell + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/testing/gnome-shell/shell-recorder-missing-XFree.patch b/testing/gnome-shell/shell-recorder-missing-XFree.patch new file mode 100644 index 000000000..a7329166f --- /dev/null +++ b/testing/gnome-shell/shell-recorder-missing-XFree.patch @@ -0,0 +1,22 @@ +From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001 +From: Maxim Ermilov <zaspire@rambler.ru> +Date: Tue, 24 May 2011 22:46:47 +0000 +Subject: shell-recorder: missing XFree + +https://bugzilla.gnome.org/show_bug.cgi?id=650934 +--- +diff --git a/src/shell-recorder.c b/src/shell-recorder.c +index 6555187..d297923 100644 +--- a/src/shell-recorder.c ++++ b/src/shell-recorder.c +@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder) + *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j]; + + cairo_surface_mark_dirty (recorder->cursor_image); ++ ++ XFree (cursor_image); + } + + /* Overlay the cursor image on the frame. We draw the cursor image +-- +cgit v0.9 diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD new file mode 100644 index 000000000..c25d0b22b --- /dev/null +++ b/testing/gnome-system-monitor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-system-monitor +pkgver=3.0.1 +pkgrel=1 +pkgdesc="A system monitor for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme') +makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool') +options=(!emptydirs) +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-system-monitor.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install new file mode 100644 index 000000000..e2957a570 --- /dev/null +++ b/testing/gnome-system-monitor/gnome-system-monitor.install @@ -0,0 +1,19 @@ +pkgname=gnome-system-monitor + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD new file mode 100644 index 000000000..12b8c7d90 --- /dev/null +++ b/testing/gnome-themes-standard/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=gnome-themes-standard +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Default themes for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://abattis.org/cantarell/" +license=('GPL2') +depends=('cantarell-fonts' 'gtk3' 'gtk-engines') +makedepends=('intltool') +groups=('gnome') +replaces=('gnome-themes') +conflicts=('gnome-themes') +source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2) +sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-vfs/PKGBUILD b/testing/gnome-vfs/PKGBUILD deleted file mode 100644 index 3474b4c22..000000000 --- a/testing/gnome-vfs/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-vfs -pkgver=2.24.4 -pkgrel=3 -pkgdesc="The GNOME Virtual File System" -arch=(i686 x86_64) -license=('LGPL') -depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls') -makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gnome-vfs.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 - gnutls-config.patch) -sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' - '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #Fix build with new gnutls - patch -Np1 -i "${srcdir}/gnutls-config.patch" - libtoolize --force - gtkdocize - aclocal - autoconf - automake - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --disable-hal \ - --enable-avahi --disable-howl \ - --disable-openssl --enable-gnutls - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-vfs/gnutls-config.patch b/testing/gnome-vfs/gnutls-config.patch deleted file mode 100644 index f6fa18b17..000000000 --- a/testing/gnome-vfs/gnutls-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 -# Use pkg-config in place of gnutls own macro since it's not present anymore. ---- a/configure.in 2009-03-07 19:59:53.805507753 +0100 -+++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 -@@ -686,14 +686,14 @@ - AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) - else - AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) -- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- have_ssl=true]) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ have_ssl=true]) - - if test "x${LIBGNUTLS_LIBS}" = "x"; then -- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -- have_ssl=true], -- AC_MSG_ERROR([Unable to find GNUTLS])) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -+ have_ssl=true], -+ AC_MSG_ERROR([Unable to find GNUTLS])) - fi - fi - fi diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD new file mode 100644 index 000000000..d2b07cf23 --- /dev/null +++ b/testing/grep/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=grep +pkgver=2.8 +pkgrel=1 +pkgdesc="A string search utility" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/grep/grep.html" +groups=('base') +depends=('glibc' 'pcre' 'sh') +makedepends=('texinfo') +install=${pkgname}.install +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('b59003c42b330bdabd417e00d07102da') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --bindir=/bin --without-included-regex + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/multilib-testing/binutils-multilib/binutils.install b/testing/grep/grep.install index 8bf9f3a47..7cd31301f 100644 --- a/multilib-testing/binutils-multilib/binutils.install +++ b/testing/grep/grep.install @@ -1,13 +1,17 @@ infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) +filelist=(grep.info) -post_upgrade() { +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 diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD deleted file mode 100644 index e67d63520..000000000 --- a/testing/gtk2/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gtk2 -pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.4 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' - 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') -options=('!libtool' '!docs') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2 - xid-collision-debug.patch) -sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xinput=yes - make -} -package_gtk2() { - pkgdesc="The GTK+ Toolkit (v2)" - install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') - backup=(etc/gtk-2.0/gtkrc) - - cd "${srcdir}/gtk+-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" - #split this out to use with gtk3 too - rm ${pkgdir}/usr/bin/gtk-update-icon-cache -} -package_gtk-update-icon-cache() { - pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2') - - cd "${srcdir}/gtk+-${pkgver}/gtk" - - install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache -} diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install deleted file mode 100644 index 4e2b72f1b..000000000 --- a/testing/gtk2/gtk2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null -} diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c3b..000000000 --- a/testing/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/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD index 5550647fc..0daea5d15 100644 --- a/testing/gtk3/PKGBUILD +++ b/testing/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ +# $Id: PKGBUILD 124599 2011-05-23 09:25:48Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.9 -pkgrel=2 +pkgver=3.0.10 +pkgrel=1 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 settings.ini) -sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' +sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD new file mode 100644 index 000000000..23b576238 --- /dev/null +++ b/testing/gtksourceview3/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 124948 2011-05-25 12:12:09Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gtksourceview3 +_pkgbasename=gtksourceview +pkgver=3.0.2 +pkgrel=1 +pkgdesc="A text widget adding syntax highlighting and more to GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libxml2') +makedepends=('intltool' 'pkgconfig' 'gobject-introspection') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2) +sha256sums=('2cda7851594778c903a3f2a6e303edbe665d18d4ffd0c143ab2d3cfe54ccf8ab') + +build() { + cd "${srcdir}/$_pkgbasename-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/$_pkgbasename-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gutenprint/PKGBUILD b/testing/gutenprint/PKGBUILD deleted file mode 100644 index 602d12bb4..000000000 --- a/testing/gutenprint/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 123069 2011-05-07 23:28:40Z stephane $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=gutenprint -pkgver=5.2.7 -pkgrel=2 -pkgdesc="Top quality printer drivers for POSIX systems" -arch=('i686' 'x86_64') -license=('GPL') -install=gutenprint.install -depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it -makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02') -optdepends=('cups: to use cups printer spooler(recommended)' - 'foomatic-db-engine: to use foomatic spooler' - 'ghostscript: adds postscript support for ijsgutenprint' - 'gimp: adds gutenprint plugin to gimp') -source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2) -url="http://gimp-print.sourceforge.net/" -replaces=('gimp-print') -options=('!libtool' '!emptydirs') -md5sums=('b19029972bf28f6efd693270daf8f5de') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-samples --with-cups --with-gimp2 \ - --disable-translated-cups-ppds --with-gimp2-as-gutenprint \ - --disable-libgutenprintui --enable-libgutenprintui2 --disable-gtktest \ - --enable-cups-ppds --enable-cups-ppds-at-top-level \ - --with-foomatic --with-foomatic3 --with-ghostscript \ - --disable-static --disable-static-genppd --with-ijs \ - --disable-globalized-cups-ppds - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - diff --git a/testing/gutenprint/gutenprint.install b/testing/gutenprint/gutenprint.install deleted file mode 100644 index 05e8bec38..000000000 --- a/testing/gutenprint/gutenprint.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo ">>please run /usr/sbin/cups-genppdupdate" - echo ">>and restart cups deamon" -} - -post_upgrade() { - post_install -} - diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD new file mode 100644 index 000000000..7169a5364 --- /dev/null +++ b/testing/gvfs/PKGBUILD @@ -0,0 +1,101 @@ +# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.8.2 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' + 'libarchive' 'gnome-disk-utility' 'pkgconfig' 'intltool' + 'libimobiledevice') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/etc/bash_completion.d + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('libsoup-gnome' 'gnome-disk-utility' 'libcdio' 'fuse' 'libarchive') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support') + install=gvfs.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^am__append_3/#am__append_3/' \ + -e 's/^am__append_4/#am__append_4/' \ + -i monitor/Makefile + make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') + install=gvfs-smb.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -m755 -d "${pkgdir}/usr/lib/gvfs" + install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=${pkgver}" 'libimobiledevice') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" + + cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" + make DESTDIR="${pkgdir}" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" + + cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" + make DESTDIR="${pkgdir}" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" +} diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/testing/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install new file mode 100644 index 000000000..0b8783c7b --- /dev/null +++ b/testing/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install new file mode 100644 index 000000000..9458b1513 --- /dev/null +++ b/testing/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD deleted file mode 100644 index 015044fe8..000000000 --- a/testing/kismet/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 123234 2011-05-09 12:19:16Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Juergen Hoetzel <jason@archlinux.org> - -pkgname=kismet -pkgver=2011_03_R2 -_realver="${pkgver//_/-}" -pkgrel=2 -pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -arch=('i686' 'x86_64') -url="http://www.kismetwireless.net/" -license=('GPL') -depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') -makedepends=() # already in core: ('grep' 'gcc-libs') -optdepends=('gpsd: log coordinates of detected networks' - 'wireshark: provide OUI files used to determine device manufacturer' - 'wireshark: mergecap, to merge multiple capture files' - 'sox: provide the default kismet sound playback binary' - 'festival: text-to-speech support' - 'flite: alternative/lightweight text-to-speech support' - 'mac80211-driver: full rfmon support' - 'ruby: ruby interface') -backup=('etc/kismet.conf' 'etc/kismet_drone.conf') -options=() -install=kismet.install -changelog=kismet.changelog -source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') - -build() { - cd "${srcdir}/${pkgname}-${_realver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make dep - make - - # Include plugins bundled with kismet - make plugins -} - -package() { - cd "${srcdir}/${pkgname}-${_realver}" - - # Install kismet - make DESTDIR="$pkgdir" install - - # Install plugins - make plugins-install DESTDIR="$pkgdir" - - # the README is very comprehensive, a good idea to include it - install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README" - - # Our own suid-install, first half (see kismet.install) - install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/" -} - diff --git a/testing/kismet/kismet.changelog b/testing/kismet/kismet.changelog deleted file mode 100644 index e66dcfda0..000000000 --- a/testing/kismet/kismet.changelog +++ /dev/null @@ -1,26 +0,0 @@ -2010-05-07 Angel Velasquez <angvp@archlinux.org> - * ChangeLog added - - * Removed old patches from SVN - - * Applied changes from FS#15746 thanks to people who worked on it. - - * Files that are no longer shipped and so should not be backed up: - backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf') - - * No longer needed; gpsmap is deprecated and being replaced with a tile-based - mapper, as of yet incomplete - optdepends=('perl-libwww: fetch maps for gpsmap') - - * Configuration has completely changed, no longer containing - references to either prism2 or wlanng - sed -i 's/prism2/wlanng/g' conf/kismet.conf - - * Ownership of man pages now defaults to "root" if the group "man" does not exist - chown root:root "$pkgdir"/usr/share/man/man{1,5}/* - - * Dependencies no longer needed - depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7') - - * Options no longer needed - options=('!makeflags') diff --git a/testing/kismet/kismet.install b/testing/kismet/kismet.install deleted file mode 100644 index 0bc806034..000000000 --- a/testing/kismet/kismet.install +++ /dev/null @@ -1,34 +0,0 @@ -## arg 1: the new package version -post_install() { - post_upgrade - - cat << EOP - If you have not done so already, read the README file and the FAQ file. - You MUST edit /etc/kismet.conf and configure Kismet for your system, or - it will NOT run properly!" - - Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by - users in the group ' kismet '. This WILL ALLOW USERS IN THIS GROUP - TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running - all of Kismet as root. ONLY users in this group will be able to - run Kismet and capture from physical network devices. -EOP -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # Add the group needed to use the limited-functionality binary "kismet_capture" - # Change group ownership of "kismet_capture" to this new group - # Preserve the file mode bits of "kismet_capture" - getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null - chown root:kismet "/usr/bin/kismet_capture" - chmod 4550 "/usr/bin/kismet_capture" -} - -## arg 1: the old package version -post_remove() { - getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD deleted file mode 100644 index 4e3dd2c4f..000000000 --- a/testing/krb5/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=krb5 -pkgver=1.9.1 -pkgrel=1 -pkgdesc="The Kerberos network authentication system" -arch=('i686' 'x86_64') -url="http://web.mit.edu/kerberos/" -license=('custom') -depends=('e2fsprogs' 'libldap' 'keyutils') -makedepends=('perl') -provides=('heimdal') -replaces=('heimdal') -conflicts=('heimdal') -backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar - kadmind.rc - krb5-kdc.rc) -sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' - '640e3046c6558313d2be81cf2252afc8622892b0' - '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393') -options=('!emptydirs') - -build() { - tar zxvf ${pkgname}-${pkgver}.tar.gz - cd "${srcdir}/${pkgname}-${pkgver}/src" - - export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" - export CPPFLAGS+=" -I/usr/include/et" - ./configure --prefix=/usr \ - --sysconfdir=/etc/krb5 \ - --mandir=/usr/share/man \ - --localstatedir=/var/lib \ - --enable-shared \ - --with-system-et \ - --with-system-ss \ - --disable-rpath \ - --without-tcl \ - --enable-dns-for-realm \ - --with-ldap - - make -} - -check() { - # We can't do this in the build directory. - cd "${srcdir}/${pkgname}-${pkgver}" - make -C src check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install - - install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf - install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf - - install -d -m 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d - install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d - - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/krb5/kadmind.rc b/testing/krb5/kadmind.rc deleted file mode 100644 index 45835e35b..000000000 --- a/testing/krb5/kadmind.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting Kerberos Admin Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kadmind - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Admin Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/testing/krb5/krb5-kdc.rc b/testing/krb5/krb5-kdc.rc deleted file mode 100644 index 05a03411e..000000000 --- a/testing/krb5/krb5-kdc.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/krb5kdc` -case "$1" in - start) - stat_busy "Starting Kerberos Authentication" - if [ -z "$PID" ]; then - /usr/sbin/krb5kdc - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Authentication" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD new file mode 100644 index 000000000..c26ddfb00 --- /dev/null +++ b/testing/less/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 125524 2011-05-26 14:15:10Z stephane $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=less +pkgver=443 +pkgrel=2 +pkgdesc="A terminal based program for viewing text files" +license=('GPL3') +arch=('i686' 'x86_64') +url="http://www.greenwoodsoftware.com/less" +groups=('base') +depends=('ncurses' 'pcre') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('47db098fb3cdaf847b3c4be05ee954fc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}"/usr install + install -dm755 "${pkgdir}"/bin + mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin +} diff --git a/testing/less/zless b/testing/less/zless new file mode 100644 index 000000000..93d560bc5 --- /dev/null +++ b/testing/less/zless @@ -0,0 +1,9 @@ +#!/bin/sh + +: ${PAGER=less} +export PAGER + +PATH="/usr/bin:$PATH" +export PATH + +exec zmore ${1+"$@"} diff --git a/testing/libgnomecups/PKGBUILD b/testing/libgnomecups/PKGBUILD deleted file mode 100644 index 157e18f50..000000000 --- a/testing/libgnomecups/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Paulius Palevicius <paulius@birzai.com> - -pkgname=libgnomecups -pkgver=0.2.3 -pkgrel=8 -pkgdesc="GNOME cups library" -arch=(i686 x86_64) -license=('LGPL' 'GPL') -url="http://www.gnome.org" -depends=('libcups' 'glib2' 'krb5' 'gnutls') -makedepends=('perlxml') -options=(!libtool) -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 - libgnomecups_0.2.3-ignore-ipp-not-found.patch) -md5sums=('dc4920c15c9f886f73ea74fbff0ae48b' - '973a1b9d93013ce431400a14b78f5d94') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # This avoids generating huge 'IPP request failed with status 1030' lines - patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch deleted file mode 100644 index 797367bf9..000000000 --- a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libgnomecups/gnome-cups-request.c 2007-01-31 10:49:17.000000000 -0800 -+++ b/libgnomecups/gnome-cups-request.c 2009-11-24 12:49:30.000000000 -0800 -@@ -349,7 +349,7 @@ - if (request->response == NULL) - status = IPP_INTERNAL_ERROR; - -- if (status > IPP_OK_CONFLICT) { -+ if (status > IPP_OK_CONFLICT && status != IPP_NOT_FOUND) { - g_warning ("IPP request failed with status %d", status); - if (request->error != NULL) - *(request->error) = g_error_new (GNOME_CUPS_ERROR, diff --git a/testing/libgnomeprint/PKGBUILD b/testing/libgnomeprint/PKGBUILD deleted file mode 100644 index db2bfedcd..000000000 --- a/testing/libgnomeprint/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgnomeprint -pkgver=2.18.8 -pkgrel=2 -pkgdesc="Printing routines for GNOME" -arch=(i686 x86_64) -license=('LGPL' 'GPL') -depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls') -makedepends=('intltool' 'pkgconfig') -replaces=('libgnomeprint-cups') -conflicts=('libgnomeprint-cups') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libgssglue/PKGBUILD b/testing/libgssglue/PKGBUILD deleted file mode 100644 index 493598561..000000000 --- a/testing/libgssglue/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 123644 2011-05-12 06:23:26Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=libgssglue -pkgver=0.1 -pkgrel=4 -pkgdesc="Exports a gssapi interface which calls other random gssapi libraries" -arch=('i686' 'x86_64') -url="http://www.citi.umich.edu/projects/nfsv4/linux/" -license=('BSD') -depends=('glibc') -makedepends=('pkgconfig' 'autoconf') -backup=(etc/gssapi_mech.conf) -options=('!libtool') -source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz - gssapi_mech.conf) -md5sums=('ce1b4c758e6de01b712d154c5c97e540' - '080be866717e4e06fa6f7d6f43cb395a') - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir/" install - - # Configuration - install -Dm644 "$srcdir"/gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf - # install license - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/libgssglue/COPYING -} diff --git a/testing/libgssglue/gssapi_mech.conf b/testing/libgssglue/gssapi_mech.conf deleted file mode 100644 index 9a832ee1b..000000000 --- a/testing/libgssglue/gssapi_mech.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Example /etc/gssapi_mech.conf file -# -# GSSAPI Mechanism Definitions -# -# This configuration file determines which GSS-API mechanisms -# the gssd code should use -# -# NOTE: -# The initiaiization function "mechglue_internal_krb5_init" -# is used for the MIT krb5 gssapi mechanism. This special -# function name indicates that an internal function should -# be used to determine the entry points for the MIT gssapi -# mechanism funtions. -# -# library initialization function -# ================================ ========================== -# The MIT K5 gssapi library, use special function for initialization. -/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init -#/usr/lib/libgssapi.so mechglue_internal_krb5_init -# -# The SPKM3 gssapi library function. Use the function spkm3_gss_initialize. -# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize diff --git a/testing/libgweather/01_gettext_not_xml.patch b/testing/libgweather/01_gettext_not_xml.patch new file mode 100644 index 000000000..d5f57305e --- /dev/null +++ b/testing/libgweather/01_gettext_not_xml.patch @@ -0,0 +1,527 @@ +only in patch2: +unchanged: +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/configure.in libgweather-2.27.91.new/configure.in +--- libgweather-2.27.91/configure.in 2009-08-25 23:56:58.000000000 +1000 ++++ libgweather-2.27.91.new/configure.in 2009-08-26 11:54:52.000000000 +1000 +@@ -40,6 +40,10 @@ + AM_MAINTAINER_MODE + GNOME_MAINTAINER_MODE_DEFINES + ++dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations ++AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) ++IT_PO_SUBDIR([po-locations]) ++ + IT_PROG_INTLTOOL([0.40.3]) + PKG_PROG_PKG_CONFIG([0.19]) + +@@ -50,13 +54,6 @@ + AM_PROG_LIBTOOL + AC_PATH_PROG(GCONFTOOL, gconftool-2) + +-AC_ARG_ENABLE(all-translations-in-one-xml, +- [AC_HELP_STRING([--enable-all-translations-in-one-xml], +- [Put all translations in a big Locations.xml file (slow to parse)])], +- [enable_big_xml=yes], +- [enable_big_xml=no]) +-AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") +- + AC_ARG_ENABLE(locations-compression, + [AC_HELP_STRING([--enable-locations-compression], + [Compress Locations.xml files])], +@@ -253,7 +250,7 @@ + Makefile + doc/Makefile + po/Makefile.in +-po-locations/Makefile ++po-locations/Makefile.in + libgweather/Makefile + libgweather/gweather.pc + libgweather/gweather-uninstalled.pc +@@ -261,12 +258,6 @@ + python/Makefile + ]) + +-if test "x$enable_big_xml" = "xyes"; then +- LOCATIONS_XML_TRANSLATIONS="one big file" +-else +- LOCATIONS_XML_TRANSLATIONS="one file per translation" +-fi +- + dnl *************************************************************************** + dnl *** Display Summary *** + dnl *************************************************************************** +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/data/Makefile.am libgweather-2.27.91.new/data/Makefile.am +--- libgweather-2.27.91/data/Makefile.am 2009-07-22 03:01:11.000000000 +1000 ++++ libgweather-2.27.91.new/data/Makefile.am 2009-08-26 11:57:46.000000000 +1000 +@@ -4,55 +4,23 @@ + libgweatherlocationsdir = $(pkgdatadir) + libgweatherlocations_in_files = Locations.xml.in + +-if USE_ONE_BIG_XML +- +-LOCATIONS_STAMP = +- +-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) +- +-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) +- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ +- fi +- +-else # USE_ONE_BIG_XML +- + LOCATIONS_STAMP = stamp-Locations.xml + +-PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) +- + # Helper variable +-libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) +- +-libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) ++libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) + + # We need this step so that we merge all the make Locations.xy.xml destinations + # into one unique destination. This makes -j2 work. (Else, we end up with + # multiple and conflicting calls to intltool-merge) + $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) + +-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile +- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ +- for pofile in $(PO_LOCATIONS); do \ +- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ +- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ +- rm -f $$locale/$(libgweatherlocations_data); \ +- test -d $$locale && rmdir $$locale; \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.$$locale.xml; \ +- fi; \ +- done && \ +- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ +- rm -f C/$(libgweatherlocations_data) && \ ++$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile ++ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \ ++ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \ ++ rm -f C/$(libgweatherlocations_DATA) && \ + test -d C && rmdir C && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.xml; \ +- fi && \ + touch $@ + +-endif # USE_ONE_BIG_XML +- + check: + xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in + $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-location.c libgweather-2.27.91.new/libgweather/gweather-location.c +--- libgweather-2.27.91/libgweather/gweather-location.c 2009-04-20 03:41:11.000000000 +1000 ++++ libgweather-2.27.91.new/libgweather/gweather-location.c 2009-08-26 11:54:52.000000000 +1000 +@@ -22,11 +22,14 @@ + #include <config.h> + #endif + ++#include "config.h" ++ + #include <string.h> + #include <math.h> + #include <locale.h> + #include <gtk/gtk.h> + #include <libxml/xmlreader.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-location.h" +@@ -184,10 +187,20 @@ + + tagname = (const char *) xmlTextReaderConstName (parser->xml); + if (!strcmp (tagname, "name") && !loc->name) { +- value = gweather_parser_get_localized_value (parser); ++ char *context = NULL; ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ ++ value = gweather_parser_get_value (parser); + if (!value) + goto error_out; +- loc->name = g_strdup (value); ++ ++ if (context != NULL) { ++ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); ++ xmlFree (context); ++ } ++ else ++ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); ++ + xmlFree (value); + normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); + loc->sort_name = g_utf8_casefold (normalized, -1); +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-timezone.c libgweather-2.27.91.new/libgweather/gweather-timezone.c +--- libgweather-2.27.91/libgweather/gweather-timezone.c 2009-08-12 19:00:52.000000000 +1000 ++++ libgweather-2.27.91.new/libgweather/gweather-timezone.c 2009-08-26 11:54:52.000000000 +1000 +@@ -23,6 +23,7 @@ + #endif + + #include <string.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-timezone.h" +@@ -152,7 +153,7 @@ + parse_timezone (GWeatherParser *parser) + { + GWeatherTimezone *zone = NULL; +- char *id = NULL, *name = NULL; ++ char *id = NULL, *name = NULL, *context = NULL; + int offset = 0, dst_offset = 0; + gboolean has_dst = FALSE; + +@@ -175,27 +176,34 @@ + continue; + } + +- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) +- name = gweather_parser_get_localized_value (parser); ++ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ name = gweather_parser_get_value (parser); ++ } + else { + if (xmlTextReaderNext (parser->xml) != 1) + break; + } + } + } +- ++ + if (parse_tzdata (id, parser->year_start, parser->year_end, + &offset, &has_dst, &dst_offset)) { + zone = g_slice_new0 (GWeatherTimezone); + zone->ref_count = 1; + zone->id = g_strdup (id); +- zone->name = g_strdup (name); ++ if (context != NULL) ++ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); ++ else ++ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); + zone->offset = offset; + zone->has_dst = has_dst; + zone->dst_offset = dst_offset; + } + + xmlFree (id); ++ if (context) ++ xmlFree (context); + if (name) + xmlFree (name); + +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/LINGUAS libgweather-2.27.91.new/po-locations/LINGUAS +--- libgweather-2.27.91/po-locations/LINGUAS 1970-01-01 10:00:00.000000000 +1000 ++++ libgweather-2.27.91.new/po-locations/LINGUAS 2009-08-26 11:54:52.000000000 +1000 +@@ -0,0 +1,78 @@ ++ang ++ar ++as ++az ++be ++be@latin ++bg ++bn_IN ++bn ++bs ++ca ++cs ++cy ++da ++de ++dz ++el ++en_CA ++en_GB ++es ++et ++eu ++fa ++fi ++fr ++ga ++gl ++gu ++he ++hi ++hr ++hu ++id ++it ++ja ++ka ++kn ++ko ++ku ++ky ++lt ++lv ++mai ++mg ++mk ++ml ++mn ++mr ++ms ++nb ++ne ++nl ++nn ++oc ++or ++pa ++pl ++pt_BR ++pt ++ro ++ru ++rw ++si ++sk ++sl ++sq ++sr@latin ++sr ++sv ++ta ++te ++th ++tr ++uk ++vi ++zh_CN ++zh_HK ++zh_TW +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/Makefile.in.in libgweather-2.27.91.new/po-locations/Makefile.in.in +--- libgweather-2.27.91/po-locations/Makefile.in.in 1970-01-01 10:00:00.000000000 +1000 ++++ libgweather-2.27.91.new/po-locations/Makefile.in.in 2009-08-26 11:54:52.000000000 +1000 +@@ -0,0 +1,217 @@ ++# Makefile for program source directory in GNU NLS utilities package. ++# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> ++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> ++# ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, ++# but which still want to provide support for the GNU gettext functionality. ++# ++# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman <jacob@ximian.com> to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++# ++# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool ++# ++# We have the following line for use by intltoolize: ++# INTLTOOL_MAKEFILE ++ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations ++PACKAGE = @PACKAGE@ ++VERSION = @VERSION@ ++ ++SHELL = /bin/sh ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ ++VPATH = @srcdir@ ++ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++libdir = @libdir@ ++DATADIRNAME = @DATADIRNAME@ ++itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++subdir = po-locations ++install_sh = @install_sh@ ++# Automake >= 1.8 provides @mkdir_p@. ++# Until it can be supposed, use the safe fallback: ++mkdir_p = $(install_sh) -d ++ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++ ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ++ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ ++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) ++ ++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) ++ ++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) ++ ++DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) ++EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS ++ ++POTFILES = \ ++# This comment gets stripped out ++ ++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) ++ ++.SUFFIXES: ++.SUFFIXES: .po .pox .gmo .mo .msg .cat ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox ++ ++.po.mo: ++ $(MSGFMT) -o $@ $< ++ ++.po.gmo: ++ file=`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && gencat $@ $*.msg ++ ++ ++all: all-@USE_NLS@ ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(GENPOT) ++ ++install: install-data ++install-data: install-data-@USE_NLS@ ++install-data-no: all ++install-data-yes: all ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ $(mkdir_p) $$dir; \ ++ if test -r $$lang.gmo; then \ ++ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $(srcdir)/$$lang.gmo as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo"; \ ++ fi; \ ++ if test -r $$lang.gmo.m; then \ ++ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ if test -r $(srcdir)/$$lang.gmo.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ ++ $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $(srcdir)/$$lang.gmo.m as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ true; \ ++ fi; \ ++ fi; \ ++ done ++ ++# Empty stubs to satisfy archaic automake needs ++dvi info tags TAGS ID: ++ ++# Define this as empty until I found a useful application. ++install-exec installcheck: ++ ++uninstall: ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ ++ done ++ ++check: all $(GETTEXT_PACKAGE).pot ++ rm -f missing notexist ++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m ++ if [ -r missing -o -r notexist ]; then \ ++ exit 1; \ ++ fi ++ ++mostlyclean: ++ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp ++ rm -f .intltool-merge-cache ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES stamp-it ++ rm -f *.mo *.msg *.cat *.cat.m *.gmo ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f Makefile.in.in ++ ++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ extra_dists="$(EXTRA_DISTFILES)"; \ ++ for file in $$extra_dists; do \ ++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ ++ done; \ ++ for file in $$dists; do \ ++ test -f $$file || file="$(srcdir)/$$file"; \ ++ ln $$file $(distdir) 2> /dev/null \ ++ || cp -p $$file $(distdir); \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ tmpdir=`pwd`; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ echo "$$lang:"; \ ++ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ ++ if $$result; then \ ++ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$lang.gmo failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi; \ ++ done ++ ++Makefile POTFILES: stamp-it ++ @if test ! -f $@; then \ ++ rm -f stamp-it; \ ++ $(MAKE) stamp-it; \ ++ fi ++ ++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ ++ $(SHELL) ./config.status ++ ++# Tell versions [3.59,3.63) of GNU make not to export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/POTFILES.in libgweather-2.27.91.new/po-locations/POTFILES.in +--- libgweather-2.27.91/po-locations/POTFILES.in 1970-01-01 10:00:00.000000000 +1000 ++++ libgweather-2.27.91.new/po-locations/POTFILES.in 2009-08-26 11:54:52.000000000 +1000 +@@ -0,0 +1,4 @@ ++# This list should contain *only* data/Locations.xml.in. ++# Everything else should be in POTFILES.skip. ++[encoding:UTF-8] ++data/Locations.xml.in diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD new file mode 100644 index 000000000..f8c1e71c4 --- /dev/null +++ b/testing/libgweather/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgweather +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Provides access to weather information from the net" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org/" +install=libgweather.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + gettext-not-xml.patch) +sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c' + 'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/gettext-not-xml.patch" + gtkdocize + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-locations-compression + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch new file mode 100644 index 000000000..4fd2e3aa6 --- /dev/null +++ b/testing/libgweather/gettext-not-xml.patch @@ -0,0 +1,533 @@ +diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac +--- libgweather-2.91.0/configure.ac.gettext 2010-10-04 18:08:07.000000000 -0400 ++++ libgweather-2.91.0/configure.ac 2011-01-30 13:51:19.615635059 -0500 +@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0 + AM_MAINTAINER_MODE + GNOME_MAINTAINER_MODE_DEFINES + ++dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations ++AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) ++IT_PO_SUBDIR([po-locations]) ++ + IT_PROG_INTLTOOL([0.40.3]) + PKG_PROG_PKG_CONFIG([0.19]) + +@@ -50,13 +54,6 @@ AC_STDC_HEADERS + AM_PROG_LIBTOOL + AC_PATH_PROG(GCONFTOOL, gconftool-2) + +-AC_ARG_ENABLE(all-translations-in-one-xml, +- [AC_HELP_STRING([--enable-all-translations-in-one-xml], +- [Put all translations in a big Locations.xml file (slow to parse)])], +- [enable_big_xml=yes], +- [enable_big_xml=no]) +-AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") +- + AC_ARG_ENABLE(locations-compression, + [AC_HELP_STRING([--enable-locations-compression], + [Compress Locations.xml files])], +@@ -236,7 +233,7 @@ AC_OUTPUT([ + Makefile + doc/Makefile + po/Makefile.in +-po-locations/Makefile ++po-locations/Makefile.in + libgweather/Makefile + libgweather/gweather-3.0.pc + libgweather/gweather-3.0-uninstalled.pc +@@ -244,12 +241,6 @@ data/Makefile + icons/Makefile + ]) + +-if test "x$enable_big_xml" = "xyes"; then +- LOCATIONS_XML_TRANSLATIONS="one big file" +-else +- LOCATIONS_XML_TRANSLATIONS="one file per translation" +-fi +- + dnl *************************************************************************** + dnl *** Display Summary *** + dnl *************************************************************************** +@@ -260,6 +251,4 @@ libgweather-$VERSION configure summary: + Source code location: ${srcdir} + Compiler: ${CC} + Introspection support: ${found_introspection} +- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} +- Locations.xml compression: ${enable_locations_compression} + " >&2 +diff -up libgweather-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Makefile.am +--- libgweather-2.91.0/data/Makefile.am.gettext 2010-10-04 18:07:31.000000000 -0400 ++++ libgweather-2.91.0/data/Makefile.am 2011-01-30 13:53:12.581466339 -0500 +@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd + libgweatherlocationsdir = $(pkgdatadir) + libgweatherlocations_in_files = Locations.xml.in + +-if USE_ONE_BIG_XML +- +-LOCATIONS_STAMP = +- +-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) +- +-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) +- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ +- fi +- +-else # USE_ONE_BIG_XML +- + LOCATIONS_STAMP = stamp-Locations.xml + +-PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) +- + # Helper variable +-libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) +- +-libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) ++libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) + + # We need this step so that we merge all the make Locations.xy.xml destinations + # into one unique destination. This makes -j2 work. (Else, we end up with + # multiple and conflicting calls to intltool-merge) + $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) + +-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile +- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ +- for pofile in $(PO_LOCATIONS); do \ +- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ +- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ +- rm -f $$locale/$(libgweatherlocations_data); \ +- test -d $$locale && rmdir $$locale; \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.$$locale.xml; \ +- fi; \ +- done && \ +- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ +- rm -f C/$(libgweatherlocations_data) && \ +- test -d C && rmdir C && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.xml; \ +- fi && \ ++$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile ++ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) ++ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) ++ rm -f C/$(libgweatherlocations_DATA) ++ test -d C && rmdir C + touch $@ + +-endif # USE_ONE_BIG_XML +- + ### Locations.xml.in rebuild + rebuild-locations: locationdb.sqlite update-locations.py + $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new +diff -up libgweather-2.91.0/libgweather/gweather-location.c.gettext libgweather-2.91.0/libgweather/gweather-location.c +--- libgweather-2.91.0/libgweather/gweather-location.c.gettext 2010-02-09 07:28:03.000000000 -0500 ++++ libgweather-2.91.0/libgweather/gweather-location.c 2011-01-30 13:51:19.616635049 -0500 +@@ -22,11 +22,14 @@ + #include <config.h> + #endif + ++#include "config.h" ++ + #include <string.h> + #include <math.h> + #include <locale.h> + #include <gtk/gtk.h> + #include <libxml/xmlreader.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-location.h" +@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p + + tagname = (const char *) xmlTextReaderConstName (parser->xml); + if (!strcmp (tagname, "name") && !loc->name) { +- value = gweather_parser_get_localized_value (parser); ++ char *context = NULL; ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ ++ value = gweather_parser_get_value (parser); + if (!value) + goto error_out; +- loc->name = g_strdup (value); ++ ++ if (context != NULL) { ++ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); ++ xmlFree (context); ++ } ++ else ++ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); ++ + xmlFree (value); + normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); + loc->sort_name = g_utf8_casefold (normalized, -1); +diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-2.91.0/libgweather/gweather-timezone.c +--- libgweather-2.91.0/libgweather/gweather-timezone.c.gettext 2010-02-09 07:28:03.000000000 -0500 ++++ libgweather-2.91.0/libgweather/gweather-timezone.c 2011-01-30 13:51:19.617635039 -0500 +@@ -23,6 +23,7 @@ + #endif + + #include <string.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-timezone.h" +@@ -152,7 +153,7 @@ static GWeatherTimezone * + parse_timezone (GWeatherParser *parser) + { + GWeatherTimezone *zone = NULL; +- char *id = NULL, *name = NULL; ++ char *id = NULL, *name = NULL, *context = NULL; + int offset = 0, dst_offset = 0; + gboolean has_dst = FALSE; + +@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser) + continue; + } + +- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) +- name = gweather_parser_get_localized_value (parser); ++ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ name = gweather_parser_get_value (parser); ++ } + else { + if (xmlTextReaderNext (parser->xml) != 1) + break; + } + } + } +- ++ + if (parse_tzdata (id, parser->year_start, parser->year_end, + &offset, &has_dst, &dst_offset)) { + zone = g_slice_new0 (GWeatherTimezone); + zone->ref_count = 1; + zone->id = g_strdup (id); +- zone->name = g_strdup (name); ++ if (context != NULL) ++ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); ++ else ++ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); + zone->offset = offset; + zone->has_dst = has_dst; + zone->dst_offset = dst_offset; + } + + xmlFree (id); ++ if (context) ++ xmlFree (context); + if (name) + xmlFree (name); + +diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-locations/LINGUAS +--- libgweather-2.91.0/po-locations/LINGUAS.gettext 2011-01-30 13:51:19.617635039 -0500 ++++ libgweather-2.91.0/po-locations/LINGUAS 2011-01-30 13:51:19.617635039 -0500 +@@ -0,0 +1,78 @@ ++ang ++ar ++as ++az ++be ++be@latin ++bg ++bn_IN ++bn ++bs ++ca ++cs ++cy ++da ++de ++dz ++el ++en_CA ++en_GB ++es ++et ++eu ++fa ++fi ++fr ++ga ++gl ++gu ++he ++hi ++hr ++hu ++id ++it ++ja ++ka ++kn ++ko ++ku ++ky ++lt ++lv ++mai ++mg ++mk ++ml ++mn ++mr ++ms ++nb ++ne ++nl ++nn ++oc ++or ++pa ++pl ++pt_BR ++pt ++ro ++ru ++rw ++si ++sk ++sl ++sq ++sr@latin ++sr ++sv ++ta ++te ++th ++tr ++uk ++vi ++zh_CN ++zh_HK ++zh_TW +diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91.0/po-locations/Makefile.in.in +--- libgweather-2.91.0/po-locations/Makefile.in.in.gettext 2011-01-30 13:51:19.618635028 -0500 ++++ libgweather-2.91.0/po-locations/Makefile.in.in 2011-01-30 13:51:19.618635028 -0500 +@@ -0,0 +1,217 @@ ++# Makefile for program source directory in GNU NLS utilities package. ++# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> ++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> ++# ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, ++# but which still want to provide support for the GNU gettext functionality. ++# ++# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman <jacob@ximian.com> to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++# ++# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool ++# ++# We have the following line for use by intltoolize: ++# INTLTOOL_MAKEFILE ++ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations ++PACKAGE = @PACKAGE@ ++VERSION = @VERSION@ ++ ++SHELL = /bin/sh ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ ++VPATH = @srcdir@ ++ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++libdir = @libdir@ ++DATADIRNAME = @DATADIRNAME@ ++itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++subdir = po-locations ++install_sh = @install_sh@ ++# Automake >= 1.8 provides @mkdir_p@. ++# Until it can be supposed, use the safe fallback: ++mkdir_p = $(install_sh) -d ++ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++ ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ++ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ ++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) ++ ++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) ++ ++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) ++ ++DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) ++EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS ++ ++POTFILES = \ ++# This comment gets stripped out ++ ++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) ++ ++.SUFFIXES: ++.SUFFIXES: .po .pox .gmo .mo .msg .cat ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox ++ ++.po.mo: ++ $(MSGFMT) -o $@ $< ++ ++.po.gmo: ++ file=`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && gencat $@ $*.msg ++ ++ ++all: all-@USE_NLS@ ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(GENPOT) ++ ++install: install-data ++install-data: install-data-@USE_NLS@ ++install-data-no: all ++install-data-yes: all ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ $(mkdir_p) $$dir; \ ++ if test -r $$lang.gmo; then \ ++ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $(srcdir)/$$lang.gmo as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo"; \ ++ fi; \ ++ if test -r $$lang.gmo.m; then \ ++ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ if test -r $(srcdir)/$$lang.gmo.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ ++ $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $(srcdir)/$$lang.gmo.m as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ true; \ ++ fi; \ ++ fi; \ ++ done ++ ++# Empty stubs to satisfy archaic automake needs ++dvi info tags TAGS ID: ++ ++# Define this as empty until I found a useful application. ++install-exec installcheck: ++ ++uninstall: ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ ++ done ++ ++check: all $(GETTEXT_PACKAGE).pot ++ rm -f missing notexist ++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m ++ if [ -r missing -o -r notexist ]; then \ ++ exit 1; \ ++ fi ++ ++mostlyclean: ++ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp ++ rm -f .intltool-merge-cache ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES stamp-it ++ rm -f *.mo *.msg *.cat *.cat.m *.gmo ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f Makefile.in.in ++ ++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ extra_dists="$(EXTRA_DISTFILES)"; \ ++ for file in $$extra_dists; do \ ++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ ++ done; \ ++ for file in $$dists; do \ ++ test -f $$file || file="$(srcdir)/$$file"; \ ++ ln $$file $(distdir) 2> /dev/null \ ++ || cp -p $$file $(distdir); \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ tmpdir=`pwd`; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ echo "$$lang:"; \ ++ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ ++ if $$result; then \ ++ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$lang.gmo failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi; \ ++ done ++ ++Makefile POTFILES: stamp-it ++ @if test ! -f $@; then \ ++ rm -f stamp-it; \ ++ $(MAKE) stamp-it; \ ++ fi ++ ++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ ++ $(SHELL) ./config.status ++ ++# Tell versions [3.59,3.63) of GNU make not to export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -up libgweather-2.91.0/po-locations/POTFILES.in.gettext libgweather-2.91.0/po-locations/POTFILES.in +--- libgweather-2.91.0/po-locations/POTFILES.in.gettext 2011-01-30 13:51:19.618635028 -0500 ++++ libgweather-2.91.0/po-locations/POTFILES.in 2011-01-30 13:51:19.618635028 -0500 +@@ -0,0 +1,4 @@ ++# This list should contain *only* data/Locations.xml.in. ++# Everything else should be in POTFILES.skip. ++[encoding:UTF-8] ++data/Locations.xml.in diff --git a/testing/librpcsecgss/PKGBUILD b/testing/librpcsecgss/PKGBUILD deleted file mode 100644 index c16ea175b..000000000 --- a/testing/librpcsecgss/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 121187 2011-04-29 07:12:44Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> - -pkgname=librpcsecgss -pkgver=0.19 -pkgrel=5 -pkgdesc="Library for RPCSECGSS support" -arch=('i686' 'x86_64') -url="http://www.citi.umich.edu/projects/nfsv4/linux/" -license=('GPL') -depends=('glibc' 'krb5' 'libgssglue') -makedepends=('pkg-config' 'autoconf') -options=('!libtool') -source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('b45ed565bdc3099023aa35830ec92997') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir/" install -} diff --git a/testing/librpcsecgss/librpcsecgss-0.18-heimdal.patch b/testing/librpcsecgss/librpcsecgss-0.18-heimdal.patch deleted file mode 100644 index deb039123..000000000 --- a/testing/librpcsecgss/librpcsecgss-0.18-heimdal.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -NaurwB librpcsecgss-0.18.orig/configure.in librpcsecgss-0.18/configure.in ---- librpcsecgss-0.18.orig/configure.in 2008-04-09 00:05:40.000000000 +0200 -+++ librpcsecgss-0.18/configure.in 2008-06-12 19:05:51.000000000 +0200 -@@ -12,10 +12,15 @@ - AC_PROG_RANLIB - - # Checks for libraries. --PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], [], -+PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], -+ [echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue], -+ [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi], -+ [echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi], - [AC_MSG_ERROR([Unable to locate information required to use libgssglue. - If you have pkgconfig installed, you might try setting environment -- variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])]) -+ variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])]) -+ -+AC_SUBST([GSSAPI_IMPLEMENTATION]) - - # Checks for header files. - AC_HEADER_STDC -diff -NaurwB librpcsecgss-0.18.orig/librpcsecgss.pc.in librpcsecgss-0.18/librpcsecgss.pc.in ---- librpcsecgss-0.18.orig/librpcsecgss.pc.in 2007-09-06 17:39:04.000000000 +0200 -+++ librpcsecgss-0.18/librpcsecgss.pc.in 2008-06-12 19:06:40.000000000 +0200 -@@ -5,7 +5,7 @@ - - Name: librpcsecgss - Description: Library that implements rpcsec_gss interface. --Requires: libgssglue -+Requires: @GSSAPI_IMPLEMENTATION@ - Version: @PACKAGE_VERSION@ - Libs: -L@libdir@ -lrpcsecgss - Cflags: -I@includedir@/rpcsecgss diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD new file mode 100644 index 000000000..7c2aa02ae --- /dev/null +++ b/testing/libsoup/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=libsoup +pkgname=('libsoup' 'libsoup-gnome') +pkgver=2.34.2 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package_libsoup() { + pkgdesc="GNOME HTTP Library - base library" + depends=('glib2' 'libxml2' 'glib-networking') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.* + rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" + rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4" + rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" +} + +package_libsoup-gnome() { + pkgdesc="GNOME HTTP Library - GNOME libraries" + depends=("libsoup=${pkgver}" 'libgnome-keyring') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/libsoup-2.4.* + rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc" + rm -rf "${pkgdir}/usr/include/libsoup-2.4" + rm -rf "${pkgdir}/usr/share" + rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib" +} diff --git a/testing/libtirpc/PKGBUILD b/testing/libtirpc/PKGBUILD deleted file mode 100644 index b222249ff..000000000 --- a/testing/libtirpc/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 121179 2011-04-29 06:50:46Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=libtirpc -pkgver=0.2.1 -pkgrel=3 -pkgdesc="Transport Independent RPC library (SunRPC replacement)" -arch=(i686 x86_64) -depends=('glibc' 'libgssglue' 'krb5') -url="http://libtirpc.sourceforge.net/" -license=('GPL2') -source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 - libtirpc-0.2.1-fortify.patch) -backup=('etc/netconfig') -options=(!libtool) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # fix http://bugs.gentoo.org/293593 - # https://bugs.archlinux.org/task/20082 - patch -Np1 -i ../libtirpc-0.2.1-fortify.patch - ./configure --prefix=/usr --enable-gss - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # install netconfig - install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig -} -md5sums=('d77eb15f464bf9d6e66259eaf78b2a4e' - '2e5c067f1651469dfbbdc91d3c9c60e8') diff --git a/testing/libtirpc/libtirpc-0.2.1-fortify.patch b/testing/libtirpc/libtirpc-0.2.1-fortify.patch deleted file mode 100644 index 7375bf83e..000000000 --- a/testing/libtirpc/libtirpc-0.2.1-fortify.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libtirpc-0.2.1/src/getrpcport.c -=================================================================== ---- libtirpc-0.2.1.orig/src/getrpcport.c -+++ libtirpc-0.2.1/src/getrpcport.c -@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto - - if ((hp = gethostbyname(host)) == NULL) - return (0); -+ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) -+ return (0); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; -- if (hp->h_length > sizeof(addr)) -- hp->h_length = sizeof(addr); - memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); - /* Inconsistent interfaces need casts! :-( */ - return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD new file mode 100644 index 000000000..d37c740ec --- /dev/null +++ b/testing/libwnck3/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=libwnck3 +_pkgbasename=libwnck +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Window Navigator Construction Kit (GTK+3)" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3' 'startup-notification' 'libxres') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +url="http://www.gnome.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) +sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD deleted file mode 100644 index e7129b765..000000000 --- a/testing/lvm2/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 123786 2011-05-13 00:53:49Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.85 -_pkgverlvm=${pkgver} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -conflicts=('mkinitcpio<0.5.99') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz - lvm2_install - lvm2_hook - Be-quiet-on-removing-cache-on-read-only-fs.diff) -md5sums=('91785ca438e5ce679dd3a386b183d552' - 'e29bc80d636ed17b617d9b384a5f3aa0' - 'cf05f2c7281e24269ea9dcc6b4e106ba' - '6db89da27928d2415a8e26cd0a842712') -sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' - '662fc54ce291fd79bd09701e4c3e10854f325282' - '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' - '6d7dd04be291d7537235704c816a701fd5beacc0') - -build() { - cd "${srcdir}/LVM2.${_pkgverlvm}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff - unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_device-mapper -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - cd liblvm - make DESTDIR="${pkgdir}" install - cd .. - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" -} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook deleted file mode 100644 index 86d2ea582..000000000 --- a/testing/lvm2/lvm2_hook +++ /dev/null @@ -1,24 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi - - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET - fi -} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install deleted file mode 100644 index 0c01ce69c..000000000 --- a/testing/lvm2/lvm2_install +++ /dev/null @@ -1,29 +0,0 @@ -# vim: set ft=sh: - -install () -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" - - add_dir "/dev/mapper" - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" -} - -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for an LVM2 root device. - - The optional lvmwait= parameter followed by a comma-separated - list of device names can be given on the command line. - It will cause the hook to wait until all given devices exist - before trying to scan and activate any volume groups. -HELPEOF -} diff --git a/testing/lzo2/PKGBUILD b/testing/lzo2/PKGBUILD deleted file mode 100644 index b9aa75ad5..000000000 --- a/testing/lzo2/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $ -# Contributor: Low Kian Seong <fastmail_low@speedymail.org> -# Maintainer: dorphell <dorphell@archlinux.org> -pkgname=lzo2 -pkgver=2.05 -pkgrel=1 -pkgdesc="Portable lossless data compression library" -arch=('i686' 'x86_64') -url="http://www.oberhumer.com/opensource/lzo" -license=('GPL') -depends=('glibc') -source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) -options=(!libtool) -md5sums=('c67cda5fa191bab761c7cb06fe091e36') - -build() { - cd "${srcdir}/lzo-${pkgver}" - - ./configure --prefix=/usr --enable-shared - make - - # build minilzo - gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c - gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o -} - -package() { - cd "${srcdir}/lzo-${pkgver}" - make DESTDIR=${pkgdir} install - - # install minilzo - install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib - install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo - cd ${pkgdir}/usr/lib - ln -s libminilzo.so.0 libminilzo.so -} diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index b2c0db5bd..02506cbe2 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121126 2011-04-29 05:00:59Z andyrtr $ +# $Id: PKGBUILD 125601 2011-05-26 20:48:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -9,7 +9,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110429 + pkgver=7.10.99.git20110526 else pkgver=7.10.2 fi @@ -21,12 +21,16 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch) if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b3f40b70dc7dd602897d364011089047583c5d + source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f7b3f40b70dc7dd602897d364011089047583c5d.tar.bz2') else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" ) fi +md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + '3ec78f340f9387abd7a37b195e764cbf' + '67c87b77cc2236b52a3b47dad3fbb5d4' + 'ca2b343a0b8077fda38077c547b80fc3') build() { if [ "${_git}" = "true" ]; then diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD new file mode 100644 index 000000000..e58f87add --- /dev/null +++ b/testing/mkinitcpio-busybox/PKGBUILD @@ -0,0 +1,31 @@ +# $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 new file mode 100644 index 000000000..1aa333faf --- /dev/null +++ b/testing/mkinitcpio-busybox/config @@ -0,0 +1,986 @@ +# +# 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/mutt/PKGBUILD b/testing/mutt/PKGBUILD deleted file mode 100644 index 9a940857c..000000000 --- a/testing/mutt/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 121107 2011-04-29 00:34:05Z stephane $ -# Contributor: tobias [tobias [at] archlinux.org] -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=mutt -pkgver=1.5.21 -pkgrel=5 -pkgdesc='Small but very powerful text-based mail client' -url='http://www.mutt.org/' -license=('GPL') -backup=('etc/Muttrc') -arch=('i686' 'x86_64') -depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') -source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-gpgme \ - --enable-pop \ - --enable-imap \ - --enable-smtp \ - --enable-hcache \ - --with-curses=/usr \ - --with-regex \ - --with-gss=/usr \ - --with-ssl=/usr \ - --with-sasl \ - --with-idn \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/bin/{flea,muttbug} - rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1 - rm "${pkgdir}"/etc/mime.types{,.dist} - install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist -} diff --git a/testing/mutt/install b/testing/mutt/install deleted file mode 100644 index d65675c06..000000000 --- a/testing/mutt/install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - cat <<EOF - -==> For GPG support, add the following to your muttrc: -==> source /etc/Muttrc.gpg.dist - -EOF -} diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD new file mode 100644 index 000000000..7f1a0f89a --- /dev/null +++ b/testing/mutter/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Michael Kanis <mkanis_at_gmx_dot_de> + +pkgname=mutter +pkgver=3.0.2.1 +pkgrel=1 +pkgdesc="A window manager for GNOME3" +arch=(i686 x86_64) +license=('GPL') +depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') +makedepends=('intltool' 'gnome-doc-utils') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=mutter.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/mutter \ + --localstatedir=/var --disable-static + 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 mutter ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-vfs/gnome-vfs.install b/testing/mutter/mutter.install index 793a3e7ab..199f12584 100644 --- a/testing/gnome-vfs/gnome-vfs.install +++ b/testing/mutter/mutter.install @@ -1,4 +1,4 @@ -pkgname=gnome-vfs +pkgname=mutter post_install() { usr/sbin/gconfpkg --install ${pkgname} diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD new file mode 100644 index 000000000..3f1c44be4 --- /dev/null +++ b/testing/nautilus/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=nautilus +pkgver=3.0.2 +pkgrel=1 +pkgdesc="The GNOME shell and file manager" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 'gnome-icon-theme') +makedepends=('intltool' 'gobject-introspection') +replaces=('gnome-volume-manager') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=nautilus.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/nautilus \ + --disable-nst-extension \ + --disable-update-mimedb \ + --disable-packagekit \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install new file mode 100644 index 000000000..631e38649 --- /dev/null +++ b/testing/nautilus/nautilus.install @@ -0,0 +1,20 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime > /dev/null +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall nautilus + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/neon/PKGBUILD b/testing/neon/PKGBUILD deleted file mode 100644 index c0fe650cf..000000000 --- a/testing/neon/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> - -# KEEP LIBTOOL FILES! -pkgname=neon -pkgver=0.29.3 -pkgrel=3 -pkgdesc="HTTP and WebDAV client library with a C interface" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('krb5' 'expat' 'ca-certificates') -url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba1015b59c112d44d7797b62fe7bee51') -options=('libtool') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-expat --enable-shared --disable-static \ - --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD deleted file mode 100644 index e732cfa27..000000000 --- a/testing/nfs-utils/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 123110 2011-05-08 13:46:17Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> -# Contributor: abelstr <abel@pinklf.eu> -# Contributor: Marco Lima <cipparello gmail com> - -pkgname=nfs-utils -pkgver=1.2.3 -pkgrel=2 -pkgdesc="Support programs for Network File Systems" -arch=('i686' 'x86_64') -url='http://nfs.sourceforge.net' -license=('GPL') -backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') -makedepends=('pkgconfig' 'autoconf' 'automake') -source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common - nfs-common.conf - nfs-server - nfs-server.conf - exports - idmapd.conf - start-statd.patch - nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch) -install=nfs-utils.install -md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d' - 'fc508e10cdf5e8ddd80373b1b2bc99a1' - 'f73f197a16b02c3e248488ec35c4cf43' - '5ae080f6117cef3140f02bc162bdc755' - '2bf71def3263325643a09458635520f0' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e24f81a8c8657672e262c61235d34b4a' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2') - -build() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch - - ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc - - make -} - -package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install - - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server - # Configuration - install -D -m 644 ../exports "$pkgdir/"etc/exports - install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - # directories - mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery -} diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports deleted file mode 100644 index 8f4aac598..000000000 --- a/testing/nfs-utils/exports +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. -# -# Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# -# Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) -# /srv/nfs4/home hostname1(rw,sync,nohide) -# Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) -# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf deleted file mode 100644 index b1b23afe9..000000000 --- a/testing/nfs-utils/idmapd.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] - -Verbosity = 0 -Pipefs-Directory = /var/lib/nfs/rpc_pipefs -Domain = localdomain - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nobody - -[Translation] - -Method = nsswitch diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common deleted file mode 100644 index 13742bde3..000000000 --- a/testing/nfs-utils/nfs-common +++ /dev/null @@ -1,319 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -# daemon dependencies -DAEMON_DEPENDS=('rpcbind') - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 </etc/fstab - - while read DEV MTPT FSTYPE OPTS REST; do - if [ "$FSTYPE" = "nfs4" ]; then - AUTO_NEED_IDMAPD=yes - fi - case "$OPTS" in - sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*) - AUTO_NEED_GSSD=yes - ;; - esac - done - - exec 0<&9 9<&- -fi - -# We also need idmapd if we run an NFSv4 server. It's fairly difficult -# to autodetect whether there are NFSv4 exports or not, and idmapd is not a -# particularily heavy daemon, so we auto-enable it if we find an /etc/exports -# file. This does not mean that there are NFSv4 or other mounts active (or -# even that nfs-kernel-server is installed), but it matches what the "start" -# condition in nfs-kernel-server's init script does, which has a value in -# itself. -if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then - AUTO_NEED_IDMAPD=yes -fi - -case "$NEED_STATD" in - yes|no) - ;; - *) - NEED_STATD=yes - ;; -esac - -case "$NEED_IDMAPD" in - yes|no) - ;; - *) - NEED_IDMAPD=$AUTO_NEED_IDMAPD - ;; -esac - -case "$NEED_GSSD" in - yes|no) - ;; - *) - NEED_GSSD=$AUTO_NEED_GSSD - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_depends ${DAEMON_DEPENDS[@]} - - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf deleted file mode 100644 index 12466b3e5..000000000 --- a/testing/nfs-utils/nfs-common.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Parameters to be passed to nfs-common (nfs clients & server) init script. -# - -# If you do not set values for the NEED_ options, they will be attempted -# autodetected; this should be sufficient for most people. Valid alternatives -# for the NEED_ options are "yes" and "no". - -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD="" - -# Options to pass to rpc.statd. -# See rpc.statd(8) for more details. -# N.B. statd normally runs on both client and server, and run-time -# options should be specified accordingly. -# STATD_OPTS="-p 32765 -o 32766" -STATD_OPTS="" - -# Options to pass to sm-notify -# e.g. SMNOTIFY_OPTS="-p 32764" -SMNOTIFY_OPTS="" - -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD="" - -# Options to pass to rpc.idmapd. -# See rpc.idmapd(8) for more details. -IDMAPD_OPTS="" - -# Do you want to start the gssd daemon? It is required for Kerberos mounts. -NEED_GSSD="" - -# Options to pass to rpc.gssd. -# See rpc.gssd(8) for more details. -GSSD_OPTS="" - -# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". -PIPEFS_MOUNTPOINT="" - -# Options used to mount rpc_pipefs filesystem; the default is "defaults". -PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server deleted file mode 100644 index 9574cbc12..000000000 --- a/testing/nfs-utils/nfs-server +++ /dev/null @@ -1,303 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -# daemon dependencies -DAEMON_DEPENDS=('nfs-common') - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_depends ${DAEMON_DEPENDS[@]} - - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf deleted file mode 100644 index 4054d6b88..000000000 --- a/testing/nfs-utils/nfs-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Parameters to be passed to nfs-server init script. -# - -# Options to pass to rpc.nfsd. -# See rpc.nfsd(8) for more details. -NFSD_OPTS="" - -# Number of servers to start up; the default is 8 servers. -NFSD_COUNT="" - -# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". -PROCNFSD_MOUNTPOINT="" - -# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". -PROCNFSD_MOUNTOPTS="" - -# Options for rpc.mountd. -# If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. -# See rpc.mountd(8) for more details. -MOUNTD_OPTS="--no-nfs-version 2" - -# Do you want to start the svcgssd daemon? It is only required for Kerberos -# exports. Valid alternatives are "yes" and "no"; the default is "no". -NEED_SVCGSSD="" - -# Options to pass to rpc.svcgssd. -# See rpc.svcgssd(8) for more details. -SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch deleted file mode 100644 index 4a5a138e7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4 ---- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.000000000 +0100 -+++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.000000000 +0200 -@@ -1,112 +1,48 @@ --dnl Checks for Kerberos --dnl NOTE: while we intend to do generic gss-api, currently we --dnl have a requirement to get an initial Kerberos machine --dnl credential. Thus, the requirement for Kerberos. --dnl The Kerberos gssapi library will be dynamically loaded? - AC_DEFUN([AC_KERBEROS_V5],[ -+ K5CONFIG="krb5-config" - AC_MSG_CHECKING(for Kerberos v5) -- AC_ARG_WITH(krb5, -- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], -+ AC_ARG_WITH(krb5-config, -+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], - [ case "$withval" in - yes|no) -- krb5_with="" -+ K5CONFIG="krb5-config" - ;; - *) -- krb5_with="$withval" -+ K5CONFIG="$withval" - ;; - esac ] - ) - -- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ -- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do -- dnl This ugly hack brought on by the split installation of -- dnl MIT Kerberos on Fedora Core 1 -- K5CONFIG="" -- if test -f $dir/bin/krb5-config; then -- K5CONFIG=$dir/bin/krb5-config -- elif test -f "/usr/kerberos/bin/krb5-config"; then -- K5CONFIG="/usr/kerberos/bin/krb5-config" -- elif test -f "/usr/lib/mit/bin/krb5-config"; then -- K5CONFIG="/usr/lib/mit/bin/krb5-config" -- fi - if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs gssapi` -- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` -- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) -- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ -- \( -f $dir/lib/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.so -o \ -- -f $dir/lib/libgssapi_krb5.so \) ; then -+ if $K5CONFIG --version | grep -q -e heimdal; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` -+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -+ gssapi_lib=gssapi -+ KRBIMPL="heimdal" -+ elif $K5CONFIG --version | grep -q -e mit; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` - AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) -- KRBDIR="$dir" -- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the -- dnl private function (gss_krb5_ccache_name) to get correct -- dnl behavior of changing the ccache used by gssapi. -- dnl Starting in 1.3.2, we *DO NOT* want to use -- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME -- dnl to get gssapi to use a different ccache - if test $K5VERS -le 131; then - AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) - fi - gssapi_lib=gssapi_krb5 -- break -- dnl The following ugly hack brought on by the split installation -- dnl of Heimdal Kerberos on SuSe -- elif test \( -f $dir/include/heim_err.h -o\ -- -f $dir/include/heimdal/heim_err.h \) -a \ -- -f $dir/lib/libroken.a; then -- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -- KRBDIR="$dir" -- gssapi_lib=gssapi -- break -- fi -- fi -- done -- dnl We didn't find a usable Kerberos environment -- if test "x$KRBDIR" = "x"; then -- if test "x$krb5_with" = "x"; then -- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) -+ KRBIMPL="mit-krb5" - else -- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) -- fi -+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) -+ KRBIMPL="unknown" - fi -- AC_MSG_RESULT($KRBDIR) -- -- dnl Check if -rpath=$(KRBDIR)/lib is needed -- echo "The current KRBDIR is $KRBDIR" -- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ -- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then -- KRBLDFLAGS=""; -- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then -- KRBLDFLAGS=""; -- else -- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" -+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) - fi -+ AC_MSG_RESULT($KRBIMPL) - -- dnl Now check for functions within gssapi library -- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, -- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, -- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, -- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -- -- dnl Check for newer error message facility -- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, -- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) - -- dnl Check for function to specify addressless tickets -- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, -- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) -- -- dnl If they specified a directory and it didn't work, give them a warning -- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then -- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) -- fi -- -- AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIBS]) - AC_SUBST([KRBCFLAGS]) - AC_SUBST([KRBLDFLAGS]) diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch deleted file mode 100644 index ea50a21d8..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch +++ /dev/null @@ -1,15 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.2/utils/mount/mount.c -+++ nfs-utils-1.1.2/utils/mount/mount.c -@@ -381,10 +381,6 @@ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } -- if (access(mount_point, X_OK) < 0) { -- mount_error(NULL, mount_point, errno); -- return 1; -- } - - return 0; - } diff --git a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch deleted file mode 100644 index 7f6c7a751..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c ---- utils/gssd/krb5_util.c 2009-04-20 19:32:50.000000000 +0200 -+++ utils/gssd/krb5_util.c 2009-04-20 20:57:31.000000000 +0200 -@@ -940,9 +940,37 @@ - { - krb5_error_code ret; - krb5_creds creds; -- krb5_cc_cursor cur; - int found = 0; - -+#ifdef HAVE_HEIMDAL -+ krb5_creds pattern; -+ krb5_realm *client_realm; -+ -+ krb5_cc_clear_mcred(&pattern); -+ -+ client_realm = krb5_princ_realm (context, principal); -+ -+ ret = krb5_make_principal (context, &pattern.server, -+ *client_realm, KRB5_TGS_NAME, *client_realm, -+ NULL); -+ if (ret) -+ krb5_err (context, 1, ret, "krb5_make_principal"); -+ pattern.client = principal; -+ -+ ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds); -+ krb5_free_principal (context, pattern.server); -+ if (ret) { -+ if (ret == KRB5_CC_END) -+ return 1; -+ krb5_err (context, 1, ret, "krb5_cc_retrieve_cred"); -+ } -+ -+ found = creds.times.endtime > time(NULL); -+ -+ krb5_free_cred_contents (context, &creds); -+#else -+ krb5_cc_cursor cur; -+ - ret = krb5_cc_start_seq_get(context, ccache, &cur); - if (ret) - return 0; -@@ -962,6 +990,7 @@ - krb5_free_cred_contents(context, &creds); - } - krb5_cc_end_seq_get(context, ccache, &cur); -+#endif - - return found; - } -@@ -1008,6 +1037,9 @@ - } - krb5_free_principal(context, principal); - err_princ: -+#ifdef HAVE_HEIMDAL -+#define KRB5_TC_OPENCLOSE 0x00000001 -+#endif - krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE); - krb5_cc_close(context, ccache); - err_cache: -@@ -1262,7 +1294,7 @@ - if (context != NULL) { - origmsg = krb5_get_error_message(context, code); - msg = strdup(origmsg); -- krb5_free_error_message(context, origmsg); -+ krb5_free_error_string(context, origmsg); - } - #endif - if (msg != NULL) diff --git a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch deleted file mode 100644 index 917136a8c..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c -+++ nfs-utils-1.1.6/utils/gssd/context_lucid.c -@@ -51,8 +51,10 @@ - #include "context.h" - - #ifndef OM_uint64 -+#ifndef GSSAPI_GSSAPI_H_ - typedef uint64_t OM_uint64; - #endif -+#endif - - static int - write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key) -@@ -177,10 +179,10 @@ - int retcode = 0; - - printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n"); -- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx, -+ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx, - 1, &return_ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - goto out_err; - } -@@ -204,9 +206,9 @@ - else - retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime); - -- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx); -+ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - printerr(0, "WARN: failed to free lucid sec context\n"); - } -Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c -+++ nfs-utils-1.1.6/utils/gssd/krb5_util.c -@@ -332,10 +332,10 @@ - return -1; - } - -- maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid, -+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, - num_enctypes, &enctypes); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_set_allowable_enctypes", -+ pgsserr("gss_krb5_set_allowable_enctypes", - maj_stat, min_stat, &krb5oid); - gss_release_cred(&min_stat, &credh); - return -1; diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install deleted file mode 100644 index 7dcdf9575..000000000 --- a/testing/nfs-utils/nfs-utils.install +++ /dev/null @@ -1,32 +0,0 @@ -## arg 1: the new package version -post_install() { -cat << 'EOM' - ==> PLEASE NOTE: - ==> Extended configuration options for NFS (clients & server) are available in - ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf - ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 -EOM -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then -cat << 'EOM' - ==> IMPORTANT NFS UTILS CHANGES: - ==> This is a rather important upgrade, you are going to have to change config files. - ==> /etc/rc.conf daemons changes: - ==> Change portmap to rpcbind - ==> Change nfslock to nfs-common - ==> Change nfsd to nfs-server - ==> - ==> Extended configuration options for NFS (clients & server) are available in: - ==> /etc/conf.d/nfs-common - ==> /etc/conf.d/nfs-server - ==> Please change them to your needs. -EOM - fi -} diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch deleted file mode 100644 index 38c60a784..000000000 --- a/testing/nfs-utils/start-statd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/sh -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on - # /var/run/rpc.statd.pid). - # It should run run statd with whatever flags are apropriate for this - # site. --PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS - diff --git a/testing/nss_ldap/PKGBUILD b/testing/nss_ldap/PKGBUILD deleted file mode 100644 index 0a1f93d38..000000000 --- a/testing/nss_ldap/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 121171 2011-04-29 06:45:19Z stephane $ -# Maintainer: Paul Mattal <paul@archlinux.org> -# Contributor: Comete <la_comete@tiscali.fr> - -pkgname=nss_ldap -pkgver=265 -pkgrel=2 -pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories." -arch=(i686 x86_64) -url="http://www.padl.com/OSS/nss_ldap.html" -license=('LGPL') -depends=('libldap>=2.4.18' 'krb5') -backup=("etc/nss_ldap.conf") -source=(http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('c1cb02d1a85538cf16bca6f6a562abe4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --with-ldap-conf-file=/etc/nss_ldap.conf \ - --with-ldap=openldap \ - --libdir=/lib \ - --mandir=/usr/share/man \ - --enable-schema-mapping \ - --enable-rfc2307bis \ - --enable-configurable-krb5-ccname-gssapi - env PATH=`pwd`:"$PATH" make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD deleted file mode 100644 index e0f866502..000000000 --- a/testing/openssh/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 123290 2011-05-09 17:45:14Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=openssh -pkgver=5.8p2 -pkgrel=6 -pkgdesc='Free version of the SSH connectivity tools' -arch=('i686' 'x86_64') -license=('custom:BSD') -url='http://www.openssh.org/portable.html' -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '660092c57bde28bed82078f74011f95fc51c2293' - '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \ - --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \ - --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \ - --with-libedit=/usr/lib --disable-strip # stripping is done by makepkg - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - # additional contrib scripts that we like - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - # PAM is a common, standard feature to have - sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - "$pkgdir"/etc/ssh/sshd_config -} diff --git a/testing/openssh/sshd b/testing/openssh/sshd deleted file mode 100755 index 2ee1091f0..000000000 --- a/testing/openssh/sshd +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/var/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy "Starting Secure Shell Daemon" - [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } - [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } - [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } - [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; } - [ -d /var/empty ] || mkdir -p /var/empty - [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy "Stopping Secure Shell Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/testing/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam deleted file mode 100644 index ae028ceb5..000000000 --- a/testing/openssh/sshd.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD new file mode 100644 index 000000000..d0d7111b6 --- /dev/null +++ b/testing/openvpn/PKGBUILD @@ -0,0 +1,61 @@ +# $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 new file mode 100644 index 000000000..afa5586dd --- /dev/null +++ b/testing/openvpn/openvpn-tapdev.conf @@ -0,0 +1,12 @@ +# +# /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 new file mode 100755 index 000000000..2c51f8248 --- /dev/null +++ b/testing/openvpn/openvpn-tapdev.rc @@ -0,0 +1,40 @@ +#!/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 new file mode 100755 index 000000000..96c28b641 --- /dev/null +++ b/testing/openvpn/openvpn.rc @@ -0,0 +1,43 @@ +#!/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 new file mode 100644 index 000000000..bbc0360f6 --- /dev/null +++ b/testing/pixman/PKGBUILD @@ -0,0 +1,33 @@ +# $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 new file mode 100644 index 000000000..95ed134c6 --- /dev/null +++ b/testing/pkg-config/PKGBUILD @@ -0,0 +1,36 @@ +# $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 new file mode 100644 index 000000000..14cabdf9f --- /dev/null +++ b/testing/pkg-config/autoconf-2.66.patch @@ -0,0 +1,12 @@ +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/postfix/PKGBUILD b/testing/postfix/PKGBUILD deleted file mode 100644 index 6843a2881..000000000 --- a/testing/postfix/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 123813 2011-05-13 12:45:42Z bisson $ -# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Paul Mattal <paul@archlinux.org> - -pkgname=postfix -pkgver=2.8.3 -pkgrel=2 -pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' -url='http://www.postfix.org/' -arch=('i686' 'x86_64') -license=('custom') -depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db') -backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ - 'aliases.patch' \ - 'rc.d') -sha1sums=('2604066f158f5327449960afd6334b996dc01799' - '5fc3de6c7df1e5851a0a379e825148868808318b' - '050e6afc5886049682c945ce147b3c47fe113939') - -provides=('smtp-server' 'smtp-forwarder') -replaces=('postfix-mysql' 'postfix-pgsql') -conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make makefiles DEBUG='' CCARGS=' \ - -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ - -DHAS_LDAP \ - -DUSE_TLS \ - -DHAS_MYSQL -I/usr/include/mysql \ - -DHAS_PGSQL -I/usr/include/postgresql \ - -DHAS_SQLITE \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sh postfix-install -non-interactive \ - install_root="${pkgdir}" \ - daemon_directory="/usr/lib/${pkgname}" \ - sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" - - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd "${pkgdir}" - patch -p0 < "${srcdir}"/aliases.patch -} diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch deleted file mode 100644 index 6767870b7..000000000 --- a/testing/postfix/aliases.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 -+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 -@@ -382,6 +382,7 @@ - #alias_maps = hash:/etc/aliases - #alias_maps = hash:/etc/aliases, nis:mail.aliases - #alias_maps = netinfo:/aliases -+alias_maps = hash:/etc/postfix/aliases - - # The alias_database parameter specifies the alias database(s) that - # are built with "newaliases" or "sendmail -bi". This is a separate -@@ -392,6 +393,7 @@ - #alias_database = dbm:/etc/mail/aliases - #alias_database = hash:/etc/aliases - #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases -+alias_database = $alias_maps - - # ADDRESS EXTENSIONS (e.g., user+foo) - # diff --git a/testing/postfix/install b/testing/postfix/install deleted file mode 100644 index f5d81a565..000000000 --- a/testing/postfix/install +++ /dev/null @@ -1,35 +0,0 @@ -post_install() { - getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null - getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null - getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null - - cd var/spool/postfix - chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved - chgrp postdrop public maildrop - cd ../../../usr/sbin - chgrp postdrop postqueue postdrop - chmod g+s postqueue postdrop - cd ../.. - chown postfix var/lib/postfix - - newaliases -} - -post_upgrade() { - post_install - - if [ `vercmp $2 2.8` = -1 ]; then cat <<EOF - -==> You must now execute "/etc/rc.d/postfix reload" (or restart). -==> This is needed because the queue manager to delivery agent -==> protocol has changed. - -EOF - fi -} - -pre_remove() { - getent passwd postfix &>/dev/null && userdel postfix >/dev/null - getent group postfix &>/dev/null && groupdel postfix >/dev/null - getent group postdrop &>/dev/null && groupdel postdrop >/dev/null -} diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD deleted file mode 100644 index 6bd883503..000000000 --- a/testing/samba/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -pkgbase=samba -pkgname=('smbclient' 'samba') -pkgver=3.5.8 -# We use the 'A' to fake out pacman's version comparators. Samba chooses -# to append 'a','b',etc to their subsequent releases, which pamcan -# misconstrues as alpha, beta, etc. Bad samba! -_realver=3.5.8 -pkgrel=3 -arch=(i686 x86_64) -url="http://www.samba.org" -license=('GPL3') -makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb') -options=(!makeflags) -source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz - samba samba.logrotate - swat.xinetd - samba.pam - samba.conf.d - fix-ipv6-mount.patch) -### UNINSTALL dmapi package before building!!! - -build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ - --libdir=/usr/lib/ \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-lockdir=/var/cache/samba \ - --with-piddir=/var/run/samba \ - --with-fhs \ - --with-pam \ - --with-pam_smbpass \ - --with-pammodulesdir=/lib/security \ - --with-ads \ - --with-acl-support \ - --with-cifsmount \ - --with-libsmbclient \ - --with-syslog \ - --enable-external-libtalloc \ - --disable-dnssd \ - --disable-avahi \ - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \ - --enable-external-libtdb - make -} - -package_smbclient () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib - install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ - for i in libnetapi* libwbclient* libsmbclient*;do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ - done - install -m755 script/smbtar ${pkgdir}/usr/bin/ - mkdir -p ${pkgdir}/usr/lib/cups/backend - ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb - mkdir -p ${pkgdir}/usr/include - install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ - install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ - mkdir -p ${pkgdir}/usr/share/man/man{1,7} - for man in rpcclient smbcacls smbclient smbcquotas smbget \ - smbtree smbtar nmblookup; do - install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ - done - install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ -} - -package_samba () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -backup=(etc/logrotate.d/samba - etc/pam.d/samba - etc/samba/smb.conf - etc/xinetd.d/swat - etc/conf.d/samba) -depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') - cd ${srcdir}/samba-${_realver}/source3 - mkdir -p ${pkgdir}/var/log/samba - mkdir -p ${pkgdir}/etc/samba/private - chmod 700 ${pkgdir}/etc/samba/private - make DESTDIR=${pkgdir} install - chmod 644 ${pkgdir}/usr/include/*.h - rm -rf ${pkgdir}/usr/var - (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) - install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba - install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba - mkdir -p ${pkgdir}/etc/samba - cat ../examples/smb.conf.default | \ - sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default - install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat - install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba - # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba - sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default - # fix logrotate - sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default - # nsswitch libraries - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so - # remove conflict files of smbclient - for man in libsmbclient smbspool \ - mount.cifs net cifs.upcall; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - for i in libnetapi* libwbclient* libsmbclient*;do - rm -f ${pkgdir}/usr/lib/$i - done - for bin in net \ - nmblookup rpcclient smbcacls smbclient \ - smbcquotas smbget smbspool smbtar smbtree; do - rm -f ${pkgdir}/usr/bin/$bin - done - rm -f ${pkgdir}/usr/sbin/cifs.upcall - rm -f ${pkgdir}/usr/include/netapi.h - for man in rpcclient smbcacls smbclient smbcquotas \ - smbtree smbtar nmblookup smbget; do - rm -f ${pkgdir}/usr/share/man/man1/${man}.1 - done - for man in tdbbackup tdbdump tdbtool; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 - rm -f ${pkgdir}/usr/include/libsmbclient.h - # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema -} -md5sums=('355b4530c20997e94aebc74cd6ea5307' - '891b9be03e7adf65c9a00319c76d33e5' - '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' - '96f82c38f3f540b53f3e5144900acf17' - 'f2f2e348acd1ccb566e95fa8a561b828' - 'c6a38a8c8fa24979e6217aed533358ea') diff --git a/testing/samba/fix-ipv6-mount.patch b/testing/samba/fix-ipv6-mount.patch deleted file mode 100644 index 89bef6533..000000000 --- a/testing/samba/fix-ipv6-mount.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000 -+++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000 -@@ -1563,7 +1563,7 @@ - } - } - -- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { -+ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { - strlcat(options, "%", options_size); - current_len = strnlen(options, options_size); - optionstail = options + current_len; diff --git a/testing/samba/samba b/testing/samba/samba deleted file mode 100755 index 1b222d6cc..000000000 --- a/testing/samba/samba +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/run/samba ] ; then - install -m755 -g 81 -o 81 -d /var/run/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /var/run/samba/smbd.pid &>/dev/null - rm /var/run/samba/nmbd.pid &>/dev/null - rm /var/run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d deleted file mode 100644 index 8721f956a..000000000 --- a/testing/samba/samba.conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# -# Configuration for the samba init script -# - -# space separated list of daemons to launch -SAMBA_DAEMONS=(smbd nmbd) -#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate deleted file mode 100644 index 581f4c33b..000000000 --- a/testing/samba/samba.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { - notifempty - missingok - sharedscripts - copytruncate - postrotate - /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/samba/samba.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd deleted file mode 100644 index 2e62a82b2..000000000 --- a/testing/samba/swat.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service swat -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/swat - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD new file mode 100644 index 000000000..63be526f7 --- /dev/null +++ b/testing/sqlite3/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3070603 +_amalgamationver2=${_amalgamationver/00/} +_docver=3070600 +pkgver=${_amalgamationver2//0/.} +pkgrel=1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip + http://www.sqlite.org/sqlite-doc-${_docver}.zip + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('7eb41eea5ffa5cbe359a48629084c425' + '1c9b9da6f98f1da2d8958254662c393c' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite') + replaces=('sqlite') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} + +package_sqlite3-doc() { + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + #arch=('any') - not yet supported + + #cd ${srcdir}/sqlite-doc-${_amalgamationver} + cd ${srcdir}/sqlite-doc-${_docver} + mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} + cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ +} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/testing/sqlite3/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD deleted file mode 100644 index 0f9c0a70a..000000000 --- a/testing/subversion/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# $Id: PKGBUILD 121110 2011-04-29 01:29:30Z stephane $ -# Maintainer: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.6.15 -pkgrel=2 -pkgdesc="Replacement for CVS, another versioning system (SVN)" -arch=('i686' 'x86_64') -license=('apache' 'bsd') -depends=('neon' 'apr-util') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' - 'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 - svnserve svn svnserve.conf svnmerge.py - subversion.rpath.fix.patch - subversion.suppress.deprecation.warnings.patch) - -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - export PYTHON=/usr/bin/python2 - - # apply patches - patch -p0 < $srcdir/subversion.rpath.fix.patch - patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch - - # configure - autoreconf - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.1 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - # build - (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - # install - export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH - make DESTDIR=${pkgdir} install - - make DESTDIR=${pkgdir} swig-py - make install-swig-py DESTDIR=${pkgdir} - - install -d ${pkgdir}/usr/lib/python2.7 - mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages - - install -d ${pkgdir}/usr/share/subversion - install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ - rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in - - make DESTDIR=${pkgdir} swig-pl - make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor - rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -rf ${pkgdir}/usr/lib/perl5/core_perl - - make DESTDIR=${pkgdir} swig-rb - make install-swig-rb DESTDIR=${pkgdir} - - make DESTDIR=${pkgdir} javahl - make DESTDIR=${pkgdir} install-javahl - - install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} - - install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d - install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d - install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve - install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge - install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - - # bash completion - install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ - ${pkgdir}/etc/bash_completion.d/subversion -} -md5sums=('113fca1d9e4aa389d7dc2b210010fa69' - 'a2b029e8385007ffb99b437b30521c90' - 'a0db6dd43af33952739b6ec089852630' - 'c459e299192552f61578f3438abf0664' - 'a6371baeda7e224504629ecdda2749b4' - '6b4340ba9d8845cd8497e013ae01be3f' - '1166f3b7413d7e7450299b3525680bbe') diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/testing/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/subversion.suppress.deprecation.warnings.patch b/testing/subversion/subversion.suppress.deprecation.warnings.patch deleted file mode 100644 index 94ce89b18..000000000 --- a/testing/subversion/subversion.suppress.deprecation.warnings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py ---- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 -+++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 -@@ -19,6 +19,7 @@ - from libsvn.core import * - import libsvn.core as _libsvncore - import atexit as _atexit -+import warnings - - class SubversionException(Exception): - def __init__(self, message=None, apr_err=None, child=None, -@@ -44,7 +45,9 @@ - Exception.__init__(self, *args) - - self.apr_err = apr_err -- self.message = message -+ with warnings.catch_warnings(): -+ warnings.simplefilter("ignore", DeprecationWarning) -+ self.message = message - self.child = child - self.file = file - self.line = line diff --git a/testing/subversion/svn b/testing/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/testing/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} diff --git a/testing/subversion/svnmerge.py b/testing/subversion/svnmerge.py deleted file mode 100644 index d8931648f..000000000 --- a/testing/subversion/svnmerge.py +++ /dev/null @@ -1,2370 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- -# Copyright (c) 2005, Giovanni Bajo -# Copyright (c) 2004-2005, Awarix, Inc. -# All rights reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -# -# Author: Archie Cobbs <archie at awarix dot com> -# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> -# -# Acknowledgments: -# John Belmonte <john at neggie dot net> - metadata and usability -# improvements -# Blair Zajac <blair at orcaware dot com> - random improvements -# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive -# merging support -# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple -# location identifier formats -# -# $HeadURL$ -# $LastChangedDate$ -# $LastChangedBy$ -# $LastChangedRevision$ -# -# Requisites: -# svnmerge.py has been tested with all SVN major versions since 1.1 (both -# client and server). It is unknown if it works with previous versions. -# -# Differences from svnmerge.sh: -# - More portable: tested as working in FreeBSD and OS/2. -# - Add double-verbose mode, which shows every svn command executed (-v -v). -# - "svnmerge avail" now only shows commits in source, not also commits in -# other parts of the repository. -# - Add "svnmerge block" to flag some revisions as blocked, so that -# they will not show up anymore in the available list. Added also -# the complementary "svnmerge unblock". -# - "svnmerge avail" has grown two new options: -# -B to display a list of the blocked revisions -# -A to display both the blocked and the available revisions. -# - Improved generated commit message to make it machine parsable even when -# merging commits which are themselves merges. -# - Add --force option to skip working copy check -# - Add --record-only option to "svnmerge merge" to avoid performing -# an actual merge, yet record that a merge happened. -# - Can use a variety of location-identifier formats -# -# TODO: -# - Add "svnmerge avail -R": show logs in reverse order -# -# Information for Hackers: -# -# Identifiers for branches: -# A branch is identified in three ways within this source: -# - as a working copy (variable name usually includes 'dir') -# - as a fully qualified URL -# - as a path identifier (an opaque string indicating a particular path -# in a particular repository; variable name includes 'pathid') -# A "target" is generally user-specified, and may be a working copy or -# a URL. - -import sys, os, getopt, re, types, tempfile, time, locale -from bisect import bisect -from xml.dom import pulldom - -NAME = "svnmerge" -if not hasattr(sys, "version_info") or sys.version_info < (2, 0): - error("requires Python 2.0 or newer") - -# Set up the separator used to separate individual log messages from -# each revision merged into the target location. Also, create a -# regular expression that will find this same separator in already -# committed log messages, so that the separator used for this run of -# svnmerge.py will have one more LOG_SEPARATOR appended to the longest -# separator found in all the commits. -LOG_SEPARATOR = 8 * '.' -LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), - re.MULTILINE) - -# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. -LOG_LINE_PREFIX = 2 * ' ' - -# Set python to the default locale as per environment settings, same as svn -# TODO we should really parse config and if log-encoding is specified, set -# the locale to match that encoding -locale.setlocale(locale.LC_ALL, '') - -# We want the svn output (such as svn info) to be non-localized -# Using LC_MESSAGES should not affect localized output of svn log, for example -if os.environ.has_key("LC_ALL"): - del os.environ["LC_ALL"] -os.environ["LC_MESSAGES"] = "C" - -############################################################################### -# Support for older Python versions -############################################################################### - -# True/False constants are Python 2.2+ -try: - True, False -except NameError: - True, False = 1, 0 - -def lstrip(s, ch): - """Replacement for str.lstrip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - i = 0 - try: - while s[i] == ch: - i = i+1 - return s[i:] - except IndexError: - return "" - -def rstrip(s, ch): - """Replacement for str.rstrip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - try: - if s[-1] != ch: - return s - i = -2 - while s[i] == ch: - i = i-1 - return s[:i+1] - except IndexError: - return "" - -def strip(s, ch): - """Replacement for str.strip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - return lstrip(rstrip(s, ch), ch) - -def rsplit(s, sep, maxsplits=0): - """Like str.rsplit, which is Python 2.4+ only.""" - L = s.split(sep) - if not 0 < maxsplits <= len(L): - return L - return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] - -############################################################################### - -def kwextract(s): - """Extract info from a svn keyword string.""" - try: - return strip(s, "$").strip().split(": ")[1] - except IndexError: - return "<unknown>" - -__revision__ = kwextract('$Rev$') -__date__ = kwextract('$Date$') - -# Additional options, not (yet?) mapped to command line flags -default_opts = { - "svn": "svn", - "prop": NAME + "-integrated", - "block-prop": NAME + "-blocked", - "commit-verbose": True, - "verbose": 0, -} -logs = {} - -def console_width(): - """Get the width of the console screen (if any).""" - try: - return int(os.environ["COLUMNS"]) - except (KeyError, ValueError): - pass - - try: - # Call the Windows API (requires ctypes library) - from ctypes import windll, create_string_buffer - h = windll.kernel32.GetStdHandle(-11) - csbi = create_string_buffer(22) - res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) - if res: - import struct - (bufx, bufy, - curx, cury, wattr, - left, top, right, bottom, - maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) - return right - left + 1 - except ImportError: - pass - - # Parse the output of stty -a - if os.isatty(1): - out = os.popen("stty -a").read() - m = re.search(r"columns (\d+);", out) - if m: - return int(m.group(1)) - - # sensible default - return 80 - -def error(s): - """Subroutine to output an error and bail.""" - print >> sys.stderr, "%s: %s" % (NAME, s) - sys.exit(1) - -def report(s): - """Subroutine to output progress message, unless in quiet mode.""" - if opts["verbose"]: - print "%s: %s" % (NAME, s) - -def prefix_lines(prefix, lines): - """Given a string representing one or more lines of text, insert the - specified prefix at the beginning of each line, and return the result. - The input must be terminated by a newline.""" - assert lines[-1] == "\n" - return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" - -def recode_stdout_to_file(s): - if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ - or sys.stdout.encoding is None: - return s - u = s.decode(sys.stdout.encoding) - return u.encode(locale.getdefaultlocale()[1]) - -class LaunchError(Exception): - """Signal a failure in execution of an external command. Parameters are the - exit code of the process, the original command line, and the output of the - command.""" - -try: - """Launch a sub-process. Return its output (both stdout and stderr), - optionally split by lines (if split_lines is True). Raise a LaunchError - exception if the exit code of the process is non-zero (failure). - - This function has two implementations, one based on subprocess (preferred), - and one based on popen (for compatibility). - """ - import subprocess - import shlex - - def launch(cmd, split_lines=True): - # Requiring python 2.4 or higher, on some platforms we get - # much faster performance from the subprocess module (where python - # doesn't try to close an exhorbitant number of file descriptors) - stdout = "" - stderr = "" - try: - if os.name == 'nt': - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ - close_fds=False, stderr=subprocess.PIPE) - else: - # Use shlex to break up the parameters intelligently, - # respecting quotes. shlex can't handle unicode. - args = shlex.split(cmd.encode('ascii')) - p = subprocess.Popen(args, stdout=subprocess.PIPE, \ - close_fds=False, stderr=subprocess.PIPE) - stdoutAndErr = p.communicate() - stdout = stdoutAndErr[0] - stderr = stdoutAndErr[1] - except OSError, inst: - # Using 1 as failure code; should get actual number somehow? For - # examples see svnmerge_test.py's TestCase_launch.test_failure and - # TestCase_launch.test_failurecode. - raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) - - if p.returncode == 0: - if split_lines: - # Setting keepends=True for compatibility with previous logic - # (where file.readlines() preserves newlines) - return stdout.splitlines(True) - else: - return stdout - else: - raise LaunchError(p.returncode, cmd, stdout + stderr) -except ImportError: - # support versions of python before 2.4 (slower on some systems) - def launch(cmd, split_lines=True): - if os.name not in ['nt', 'os2']: - import popen2 - p = popen2.Popen4(cmd) - p.tochild.close() - if split_lines: - out = p.fromchild.readlines() - else: - out = p.fromchild.read() - ret = p.wait() - if ret == 0: - ret = None - else: - ret >>= 8 - else: - i,k = os.popen4(cmd) - i.close() - if split_lines: - out = k.readlines() - else: - out = k.read() - ret = k.close() - - if ret is None: - return out - raise LaunchError(ret, cmd, out) - -def launchsvn(s, show=False, pretend=False, **kwargs): - """Launch SVN and grab its output.""" - username = password = configdir = "" - if opts.get("username", None): - username = "--username=" + opts["username"] - if opts.get("password", None): - password = "--password=" + opts["password"] - if opts.get("config-dir", None): - configdir = "--config-dir=" + opts["config-dir"] - cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", - username, password, configdir, s])) - if show or opts["verbose"] >= 2: - print cmd - if pretend: - return None - return launch(cmd, **kwargs) - -def svn_command(s): - """Do (or pretend to do) an SVN command.""" - out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], - pretend=opts["dry-run"], - split_lines=False) - if not opts["dry-run"]: - print out - -def check_dir_clean(dir): - """Check the current status of dir for local mods.""" - if opts["force"]: - report('skipping status check because of --force') - return - report('checking status of "%s"' % dir) - - # Checking with -q does not show unversioned files or external - # directories. Though it displays a debug message for external - # directories, after a blank line. So, practically, the first line - # matters: if it's non-empty there is a modification. - out = launchsvn("status -q %s" % dir) - if out and out[0].strip(): - error('"%s" has local modifications; it must be clean' % dir) - -class PathIdentifier: - """Abstraction for a path identifier, so that we can start talking - about it before we know the form that it takes in the properties (its - external_form). Objects are referenced in the class variable 'locobjs', - keyed by all known forms.""" - - # a map of UUID (or None) to repository root URL. - repo_hints = {} - - # a map from any known string form to the corresponding PathIdentifier - locobjs = {} - - def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): - self.repo_relative_path = repo_relative_path - self.uuid = uuid - self.url = url - self.external_form = external_form - - def __repr__(self): - return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' - - def __str__(self): - """Return a printable string representation""" - if self.external_form: - return self.external_form - if self.url: - return self.format('url') - if self.uuid: - return self.format('uuid') - return self.format('path') - - def from_pathid(pathid_str): - """convert pathid_str to a PathIdentifier""" - if not PathIdentifier.locobjs.has_key(pathid_str): - if is_url(pathid_str): - # we can determine every form; PathIdentifier.hint knows how to do that - PathIdentifier.hint(pathid_str) - elif pathid_str[:7] == 'uuid://': - mo = re.match('uuid://([^/]*)(.*)', pathid_str) - if not mo: - error("Invalid path identifier '%s'" % pathid_str) - uuid, repo_relative_path = mo.groups() - pathid = PathIdentifier(repo_relative_path, uuid=uuid) - # we can cache this by uuid:// pathid and by repo-relative path - PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid - elif pathid_str and pathid_str[0] == '/': - # strip any trailing slashes - pathid_str = pathid_str.rstrip('/') - pathid = PathIdentifier(repo_relative_path=pathid_str) - # we can only cache this by repo-relative path - PathIdentifier.locobjs[pathid_str] = pathid - else: - error("Invalid path identifier '%s'" % pathid_str) - return PathIdentifier.locobjs[pathid_str] - from_pathid = staticmethod(from_pathid) - - def from_target(target): - """Convert a target (either a working copy path or an URL) into a - path identifier.""" - # prime the cache first if we don't know about this target yet - if not PathIdentifier.locobjs.has_key(target): - PathIdentifier.hint(target) - - try: - return PathIdentifier.locobjs[target] - except KeyError: - error("Could not recognize path identifier '%s'" % target) - from_target = staticmethod(from_target) - - def hint(target): - """Cache some information about target, as it may be referenced by - repo-relative path in subversion properties; the cache can help to - expand such a relative path to a full path identifier.""" - if PathIdentifier.locobjs.has_key(target): return - if not is_url(target) and not is_wc(target): return - - url = target_to_url(target) - - root = get_repo_root(url) - assert root[-1] != "/" - assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) - repo_relative_path = url[len(root):] - - try: - uuid = get_svninfo(target)['Repository UUID'] - uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) - except KeyError: - uuid = None - uuid_pathid = None - - locobj = PathIdentifier.locobjs.get(url) or \ - (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) - if not locobj: - locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) - - PathIdentifier.repo_hints[uuid] = root # (uuid may be None) - - PathIdentifier.locobjs[target] = locobj - PathIdentifier.locobjs[url] = locobj - if uuid_pathid: - PathIdentifier.locobjs[uuid_pathid] = locobj - if not PathIdentifier.locobjs.has_key(repo_relative_path): - PathIdentifier.locobjs[repo_relative_path] = locobj - hint = staticmethod(hint) - - def format(self, fmt): - if fmt == 'path': - return self.repo_relative_path - elif fmt == 'uuid': - return "uuid://%s%s" % (self.uuid, self.repo_relative_path) - elif fmt == 'url': - return self.url - else: - error("Unkonwn path type '%s'" % fmt) - - def match_substring(self, str): - """Test whether str is a substring of any representation of this - PathIdentifier.""" - if self.repo_relative_path.find(str) >= 0: - return True - - if self.uuid: - if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: - return True - - if self.url: - if (self.url + self.repo_relative_path).find(str) >= 0: - return True - - return False - - def get_url(self): - """Convert a pathid into a URL. If this is not possible, error out.""" - if self.url: - return self.url - # if we have a uuid and happen to know the URL for it, use that - elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): - self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path - PathIdentifier.locobjs[self.url] = self - return self.url - # if we've only seen one rep, use that (a guess, but an educated one) - elif not self.uuid and len(PathIdentifier.repo_hints) == 1: - uuid, root = PathIdentifier.repo_hints.items()[0] - if uuid: - self.uuid = uuid - PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self - self.url = root + self.repo_relative_path - PathIdentifier.locobjs[self.url] = self - report("Guessing that '%s' refers to '%s'" % (self, self.url)) - return self.url - else: - error("Cannot determine URL for '%s'; " % self + - "Explicit source argument (-S/--source) required.\n") - -class RevisionLog: - """ - A log of the revisions which affected a given URL between two - revisions. - """ - - def __init__(self, url, begin, end, find_propchanges=False): - """ - Create a new RevisionLog object, which stores, in self.revs, a list - of the revisions which affected the specified URL between begin and - end. If find_propchanges is True, self.propchange_revs will contain a - list of the revisions which changed properties directly on the - specified URL. URL must be the URL for a directory in the repository. - """ - self.url = url - - # Setup the log options (--quiet, so we don't show log messages) - log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) - if find_propchanges: - # The --verbose flag lets us grab merge tracking information - # by looking at propchanges - log_opts = "--verbose " + log_opts - - # Read the log to look for revision numbers and merge-tracking info - self.revs = [] - self.propchange_revs = [] - repos_pathid = PathIdentifier.from_target(url) - for chg in SvnLogParser(launchsvn("log %s" % log_opts, - split_lines=False)): - self.revs.append(chg.revision()) - for p in chg.paths(): - if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: - self.propchange_revs.append(chg.revision()) - - # Save the range of the log - self.begin = int(begin) - if end == "HEAD": - # If end is not provided, we do not know which is the latest - # revision in the repository. So we set 'end' to the latest - # known revision. - self.end = self.revs[-1] - else: - self.end = int(end) - - self._merges = None - self._blocks = None - - def merge_metadata(self): - """ - Return a VersionedProperty object, with a cached view of the merge - metadata in the range of this log. - """ - - # Load merge metadata if necessary - if not self._merges: - self._merges = VersionedProperty(self.url, opts["prop"]) - self._merges.load(self) - - return self._merges - - def block_metadata(self): - if not self._blocks: - self._blocks = VersionedProperty(self.url, opts["block-prop"]) - self._blocks.load(self) - - return self._blocks - - -class VersionedProperty: - """ - A read-only, cached view of a versioned property. - - self.revs contains a list of the revisions in which the property changes. - self.values stores the new values at each corresponding revision. If the - value of the property is unknown, it is set to None. - - Initially, we set self.revs to [0] and self.values to [None]. This - indicates that, as of revision zero, we know nothing about the value of - the property. - - Later, if you run self.load(log), we cache the value of this property over - the entire range of the log by noting each revision in which the property - was changed. At the end of the range of the log, we invalidate our cache - by adding the value "None" to our cache for any revisions which fall out - of the range of our log. - - Once self.revs and self.values are filled, we can find the value of the - property at any arbitrary revision using a binary search on self.revs. - Once we find the last revision during which the property was changed, - we can lookup the associated value in self.values. (If the associated - value is None, the associated value was not cached and we have to do - a full propget.) - - An example: We know that the 'svnmerge' property was added in r10, and - changed in r21. We gathered log info up until r40. - - revs = [0, 10, 21, 40] - values = [None, "val1", "val2", None] - - What these values say: - - From r0 to r9, we know nothing about the property. - - In r10, the property was set to "val1". This property stayed the same - until r21, when it was changed to "val2". - - We don't know what happened after r40. - """ - - def __init__(self, url, name): - """View the history of a versioned property at URL with name""" - self.url = url - self.name = name - - # We know nothing about the value of the property. Setup revs - # and values to indicate as such. - self.revs = [0] - self.values = [None] - - # We don't have any revisions cached - self._initial_value = None - self._changed_revs = [] - self._changed_values = [] - - def load(self, log): - """ - Load the history of property changes from the specified - RevisionLog object. - """ - - # Get the property value before the range of the log - if log.begin > 1: - self.revs.append(log.begin-1) - try: - self._initial_value = self.raw_get(log.begin-1) - except LaunchError: - # The specified URL might not exist before the - # range of the log. If so, we can safely assume - # that the property was empty at that time. - self._initial_value = { } - self.values.append(self._initial_value) - else: - self._initial_value = { } - self.values[0] = self._initial_value - - # Cache the property values in the log range - old_value = self._initial_value - for rev in log.propchange_revs: - new_value = self.raw_get(rev) - if new_value != old_value: - self._changed_revs.append(rev) - self._changed_values.append(new_value) - self.revs.append(rev) - self.values.append(new_value) - old_value = new_value - - # Indicate that we know nothing about the value of the property - # after the range of the log. - if log.revs: - self.revs.append(log.end+1) - self.values.append(None) - - def raw_get(self, rev=None): - """ - Get the property at revision REV. If rev is not specified, get - the property at revision HEAD. - """ - return get_revlist_prop(self.url, self.name, rev) - - def get(self, rev=None): - """ - Get the property at revision REV. If rev is not specified, get - the property at revision HEAD. - """ - - if rev is not None: - - # Find the index using a binary search - i = bisect(self.revs, rev) - 1 - - # Return the value of the property, if it was cached - if self.values[i] is not None: - return self.values[i] - - # Get the current value of the property - return self.raw_get(rev) - - def changed_revs(self, key=None): - """ - Get a list of the revisions in which the specified dictionary - key was changed in this property. If key is not specified, - return a list of revisions in which any key was changed. - """ - if key is None: - return self._changed_revs - else: - changed_revs = [] - old_val = self._initial_value - for rev, val in zip(self._changed_revs, self._changed_values): - if val.get(key) != old_val.get(key): - changed_revs.append(rev) - old_val = val - return changed_revs - - def initialized_revs(self): - """ - Get a list of the revisions in which keys were added or - removed in this property. - """ - initialized_revs = [] - old_len = len(self._initial_value) - for rev, val in zip(self._changed_revs, self._changed_values): - if len(val) != old_len: - initialized_revs.append(rev) - old_len = len(val) - return initialized_revs - -class RevisionSet: - """ - A set of revisions, held in dictionary form for easy manipulation. If we - were to rewrite this script for Python 2.3+, we would subclass this from - set (or UserSet). As this class does not include branch - information, it's assumed that one instance will be used per - branch. - """ - def __init__(self, parm): - """Constructs a RevisionSet from a string in property form, or from - a dictionary whose keys are the revisions. Raises ValueError if the - input string is invalid.""" - - self._revs = {} - - revision_range_split_re = re.compile('[-:]') - - if isinstance(parm, types.DictType): - self._revs = parm.copy() - elif isinstance(parm, types.ListType): - for R in parm: - self._revs[int(R)] = 1 - else: - parm = parm.strip() - if parm: - for R in parm.split(","): - rev_or_revs = re.split(revision_range_split_re, R) - if len(rev_or_revs) == 1: - self._revs[int(rev_or_revs[0])] = 1 - elif len(rev_or_revs) == 2: - for rev in range(int(rev_or_revs[0]), - int(rev_or_revs[1])+1): - self._revs[rev] = 1 - else: - raise ValueError, 'Ill formatted revision range: ' + R - - def sorted(self): - revnums = self._revs.keys() - revnums.sort() - return revnums - - def normalized(self): - """Returns a normalized version of the revision set, which is an - ordered list of couples (start,end), with the minimum number of - intervals.""" - revnums = self.sorted() - revnums.reverse() - ret = [] - while revnums: - s = e = revnums.pop() - while revnums and revnums[-1] in (e, e+1): - e = revnums.pop() - ret.append((s, e)) - return ret - - def __str__(self): - """Convert the revision set to a string, using its normalized form.""" - L = [] - for s,e in self.normalized(): - if s == e: - L.append(str(s)) - else: - L.append(str(s) + "-" + str(e)) - return ",".join(L) - - def __contains__(self, rev): - return self._revs.has_key(rev) - - def __sub__(self, rs): - """Compute subtraction as in sets.""" - revs = {} - for r in self._revs.keys(): - if r not in rs: - revs[r] = 1 - return RevisionSet(revs) - - def __and__(self, rs): - """Compute intersections as in sets.""" - revs = {} - for r in self._revs.keys(): - if r in rs: - revs[r] = 1 - return RevisionSet(revs) - - def __nonzero__(self): - return len(self._revs) != 0 - - def __len__(self): - """Return the number of revisions in the set.""" - return len(self._revs) - - def __iter__(self): - return iter(self.sorted()) - - def __or__(self, rs): - """Compute set union.""" - revs = self._revs.copy() - revs.update(rs._revs) - return RevisionSet(revs) - -def merge_props_to_revision_set(merge_props, pathid): - """A converter which returns a RevisionSet instance containing the - revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a - dictionary of pathid -> revision set branch integration information - (as returned by get_merge_props()).""" - if not merge_props.has_key(pathid): - error('no integration info available for path "%s"' % pathid) - return RevisionSet(merge_props[pathid]) - -def dict_from_revlist_prop(propvalue): - """Given a property value as a string containing per-source revision - lists, return a dictionary whose key is a source path identifier - and whose value is the revisions for that source.""" - prop = {} - - # Multiple sources are separated by any whitespace. - for L in propvalue.split(): - # We use rsplit to play safe and allow colons in pathids. - pathid_str, revs = rsplit(L.strip(), ":", 1) - - pathid = PathIdentifier.from_pathid(pathid_str) - - # cache the "external" form we saw - pathid.external_form = pathid_str - - prop[pathid] = revs - return prop - -def get_revlist_prop(url_or_dir, propname, rev=None): - """Given a repository URL or working copy path and a property - name, extract the values of the property which store per-source - revision lists and return a dictionary whose key is a source path - identifier, and whose value is the revisions for that source.""" - - # Note that propget does not return an error if the property does - # not exist, it simply does not output anything. So we do not need - # to check for LaunchError here. - args = '--strict "%s" "%s"' % (propname, url_or_dir) - if rev: - args = '-r %s %s' % (rev, args) - out = launchsvn('propget %s' % args, split_lines=False) - - return dict_from_revlist_prop(out) - -def get_merge_props(dir): - """Extract the merged revisions.""" - return get_revlist_prop(dir, opts["prop"]) - -def get_block_props(dir): - """Extract the blocked revisions.""" - return get_revlist_prop(dir, opts["block-prop"]) - -def get_blocked_revs(dir, source_pathid): - p = get_block_props(dir) - if p.has_key(source_pathid): - return RevisionSet(p[source_pathid]) - return RevisionSet("") - -def format_merge_props(props, sep=" "): - """Formats the hash PROPS as a string suitable for use as a - Subversion property value.""" - assert sep in ["\t", "\n", " "] # must be a whitespace - props = props.items() - props.sort() - L = [] - for h, r in props: - L.append("%s:%s" % (h, r)) - return sep.join(L) - -def _run_propset(dir, prop, value): - """Set the property 'prop' of directory 'dir' to value 'value'. We go - through a temporary file to not run into command line length limits.""" - try: - fd, fname = tempfile.mkstemp() - f = os.fdopen(fd, "wb") - except AttributeError: - # Fallback for Python <= 2.3 which does not have mkstemp (mktemp - # suffers from race conditions. Not that we care...) - fname = tempfile.mktemp() - f = open(fname, "wb") - - try: - f.write(value) - f.close() - report("property data written to temp file: %s" % value) - svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) - finally: - os.remove(fname) - -def set_props(dir, name, props): - props = format_merge_props(props) - if props: - _run_propset(dir, name, props) - else: - # Check if NAME exists on DIR before trying to delete it. - # As of 1.6 propdel no longer supports deleting a - # non-existent property. - out = launchsvn('propget "%s" "%s"' % (name, dir)) - if out: - svn_command('propdel "%s" "%s"' % (name, dir)) - -def set_merge_props(dir, props): - set_props(dir, opts["prop"], props) - -def set_block_props(dir, props): - set_props(dir, opts["block-prop"], props) - -def set_blocked_revs(dir, source_pathid, revs): - props = get_block_props(dir) - if revs: - props[source_pathid] = str(revs) - elif props.has_key(source_pathid): - del props[source_pathid] - set_block_props(dir, props) - -def is_url(url): - """Check if url looks like a valid url.""" - return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' - -def check_url(url): - """Similar to is_url, but actually invoke get_svninfo to find out""" - return get_svninfo(url) != {} - -def is_pathid(pathid): - return isinstance(pathid, PathIdentifier) - -def is_wc(dir): - """Check if a directory is a working copy.""" - return os.path.isdir(os.path.join(dir, ".svn")) or \ - os.path.isdir(os.path.join(dir, "_svn")) - -_cache_svninfo = {} -def get_svninfo(target): - """Extract the subversion information for a target (through 'svn info'). - This function uses an internal cache to let clients query information - many times.""" - if _cache_svninfo.has_key(target): - return _cache_svninfo[target] - info = {} - for L in launchsvn('info "%s"' % target): - L = L.strip() - if not L: - continue - key, value = L.split(": ", 1) - info[key] = value.strip() - _cache_svninfo[target] = info - return info - -def target_to_url(target): - """Convert working copy path or repos URL to a repos URL.""" - if is_wc(target): - info = get_svninfo(target) - return info["URL"] - return target - -_cache_reporoot = {} -def get_repo_root(target): - """Compute the root repos URL given a working-copy path, or a URL.""" - # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 - if not is_url(target): - try: - info = get_svninfo(target) - root = info["Repository Root"] - _cache_reporoot[root] = None - return root - except KeyError: - pass - url = target_to_url(target) - assert url[-1] != '/' - else: - url = target - - # Go through the cache of the repository roots. This avoids extra - # server round-trips if we are asking the root of different URLs - # in the same repository (the cache in get_svninfo() cannot detect - # that of course and would issue a remote command). - assert is_url(url) - for r in _cache_reporoot: - if url.startswith(r): - return r - - # Try using "svn info URL". This works only on SVN clients >= 1.2 - try: - info = get_svninfo(url) - # info may be {}, in which case we'll see KeyError here - root = info["Repository Root"] - _cache_reporoot[root] = None - return root - except (KeyError, LaunchError): - pass - - # Constrained to older svn clients, we are stuck with this ugly - # trial-and-error implementation. It could be made faster with a - # binary search. - while url: - temp = os.path.dirname(url) - try: - launchsvn('proplist "%s"' % temp) - except LaunchError: - _cache_reporoot[url] = None - return rstrip(url, "/") - url = temp - - error("svn repos root of %s not found" % target) - -class SvnLogParser: - """ - Parse the "svn log", going through the XML output and using pulldom (which - would even allow streaming the command output). - """ - def __init__(self, xml): - self._events = pulldom.parseString(xml) - def __getitem__(self, idx): - for event, node in self._events: - if event == pulldom.START_ELEMENT and node.tagName == "logentry": - self._events.expandNode(node) - return self.SvnLogRevision(node) - raise IndexError, "Could not find 'logentry' tag in xml" - - class SvnLogRevision: - def __init__(self, xmlnode): - self.n = xmlnode - def revision(self): - return int(self.n.getAttribute("revision")) - def author(self): - return self.n.getElementsByTagName("author")[0].firstChild.data - def paths(self): - return [self.SvnLogPath(n) - for n in self.n.getElementsByTagName("path")] - - class SvnLogPath: - def __init__(self, xmlnode): - self.n = xmlnode - def action(self): - return self.n.getAttribute("action") - def pathid(self): - return self.n.firstChild.data - def copyfrom_rev(self): - try: return self.n.getAttribute("copyfrom-rev") - except KeyError: return None - def copyfrom_pathid(self): - try: return self.n.getAttribute("copyfrom-path") - except KeyError: return None - -def get_copyfrom(target): - """Get copyfrom info for a given target (it represents the - repository-relative path from where it was branched). NOTE: - repos root has no copyfrom info. In this case None is returned. - - Returns the: - - source file or directory from which the copy was made - - revision from which that source was copied - - revision in which the copy was committed - """ - repos_path = PathIdentifier.from_target(target).repo_relative_path - for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' - % target, split_lines=False)): - for p in chg.paths(): - if p.action() == 'A' and p.pathid() == repos_path: - # These values will be None if the corresponding elements are - # not found in the log. - return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() - return None,None,None - -def get_latest_rev(url): - """Get the latest revision of the repository of which URL is part.""" - try: - info = get_svninfo(url) - if not info.has_key("Revision"): - error("Not a valid URL: %s" % url) - return info["Revision"] - except LaunchError: - # Alternative method for latest revision checking (for svn < 1.2) - report('checking latest revision of "%s"' % url) - L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] - rev = re.search("revision (\d+)", L).group(1) - report('latest revision of "%s" is %s' % (url, rev)) - return rev - -def get_created_rev(url): - """Lookup the revision at which the path identified by the - provided URL was first created.""" - oldest_rev = -1 - report('determining oldest revision for URL "%s"' % url) - ### TODO: Refactor this to use a modified RevisionLog class. - lines = None - cmd = "log -r1:HEAD --stop-on-copy -q " + url - try: - lines = launchsvn(cmd + " --limit=1") - except LaunchError: - # Assume that --limit isn't supported by the installed 'svn'. - lines = launchsvn(cmd) - if lines and len(lines) > 1: - i = lines[1].find(" ") - if i != -1: - oldest_rev = int(lines[1][1:i]) - if oldest_rev == -1: - error('unable to determine oldest revision for URL "%s"' % url) - return oldest_rev - -def get_commit_log(url, revnum): - """Return the log message for a specific integer revision - number.""" - out = launchsvn("log --incremental -r%d %s" % (revnum, url)) - return recode_stdout_to_file("".join(out[1:])) - -def construct_merged_log_message(url, revnums): - """Return a commit log message containing all the commit messages - in the specified revisions at the given URL. The separator used - in this log message is determined by searching for the longest - svnmerge separator existing in the commit log messages and - extending it by one more separator. This results in a new commit - log message that is clearer in describing merges that contain - other merges. Trailing newlines are removed from the embedded - log messages.""" - messages = [''] - longest_sep = '' - for r in revnums.sorted(): - message = get_commit_log(url, r) - if message: - message = re.sub(r'(\r\n|\r|\n)', "\n", message) - message = rstrip(message, "\n") + "\n" - messages.append(prefix_lines(LOG_LINE_PREFIX, message)) - for match in LOG_SEPARATOR_RE.findall(message): - sep = match[1] - if len(sep) > len(longest_sep): - longest_sep = sep - - longest_sep += LOG_SEPARATOR + "\n" - messages.append('') - return longest_sep.join(messages) - -def get_default_source(branch_target, branch_props): - """Return the default source for branch_target (given its branch_props). - Error out if there is ambiguity.""" - if not branch_props: - error("no integration info available") - - props = branch_props.copy() - pathid = PathIdentifier.from_target(branch_target) - - # To make bidirectional merges easier, find the target's - # repository local path so it can be removed from the list of - # possible integration sources. - if props.has_key(pathid): - del props[pathid] - - if len(props) > 1: - err_msg = "multiple sources found. " - err_msg += "Explicit source argument (-S/--source) required.\n" - err_msg += "The merge sources available are:" - for prop in props: - err_msg += "\n " + str(prop) - error(err_msg) - - return props.keys()[0] - -def should_find_reflected(branch_dir): - should_find_reflected = opts["bidirectional"] - - # If the source has integration info for the target, set find_reflected - # even if --bidirectional wasn't specified - if not should_find_reflected: - source_props = get_merge_props(opts["source-url"]) - should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) - - return should_find_reflected - -def analyze_revs(target_pathid, url, begin=1, end=None, - find_reflected=False): - """For the source of the merges in the source URL being merged into - target_pathid, analyze the revisions in the interval begin-end (which - defaults to 1-HEAD), to find out which revisions are changes in - the url, which are changes elsewhere (so-called 'phantom' - revisions), optionally which are reflected changes (to avoid - conflicts that can occur when doing bidirectional merging between - branches), and which revisions initialize merge tracking against other - branches. Return a tuple of four RevisionSet's: - (real_revs, phantom_revs, reflected_revs, initialized_revs). - - NOTE: To maximize speed, if "end" is not provided, the function is - not able to find phantom revisions following the last real - revision in the URL. - """ - - begin = str(begin) - if end is None: - end = "HEAD" - else: - end = str(end) - if long(begin) > long(end): - return RevisionSet(""), RevisionSet(""), \ - RevisionSet(""), RevisionSet("") - - logs[url] = RevisionLog(url, begin, end, find_reflected) - revs = RevisionSet(logs[url].revs) - - if end == "HEAD": - # If end is not provided, we do not know which is the latest revision - # in the repository. So return the phantom revision set only up to - # the latest known revision. - end = str(list(revs)[-1]) - - phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs - - if find_reflected: - reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) - reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) - else: - reflected_revs = [] - - initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) - reflected_revs = RevisionSet(reflected_revs) - - return revs, phantom_revs, reflected_revs, initialized_revs - -def analyze_source_revs(branch_target, source_url, **kwargs): - """For the given branch and source, extract the real and phantom - source revisions.""" - branch_url = target_to_url(branch_target) - branch_pathid = PathIdentifier.from_target(branch_target) - - # Extract the latest repository revision from the URL of the branch - # directory (which is already cached at this point). - end_rev = get_latest_rev(source_url) - - # Calculate the base of analysis. If there is a "1-XX" interval in the - # merged_revs, we do not need to check those. - base = 1 - r = opts["merged-revs"].normalized() - if r and r[0][0] == 1: - base = r[0][1] + 1 - - # See if the user filtered the revision set. If so, we are not - # interested in something outside that range. - if opts["revision"]: - revs = RevisionSet(opts["revision"]).sorted() - if base < revs[0]: - base = revs[0] - if end_rev > revs[-1]: - end_rev = revs[-1] - - return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) - -def minimal_merge_intervals(revs, phantom_revs): - """Produce the smallest number of intervals suitable for merging. revs - is the RevisionSet which we want to merge, and phantom_revs are phantom - revisions which can be used to concatenate intervals, thus minimizing the - number of operations.""" - revnums = revs.normalized() - ret = [] - - cur = revnums.pop() - while revnums: - next = revnums.pop() - assert next[1] < cur[0] # otherwise it is not ordered - assert cur[0] - next[1] > 1 # otherwise it is not normalized - for i in range(next[1]+1, cur[0]): - if i not in phantom_revs: - ret.append(cur) - cur = next - break - else: - cur = (next[0], cur[1]) - - ret.append(cur) - ret.reverse() - return ret - -def display_revisions(revs, display_style, revisions_msg, source_url): - """Show REVS as dictated by DISPLAY_STYLE, either numerically, in - log format, or as diffs. When displaying revisions numerically, - prefix output with REVISIONS_MSG when in verbose mode. Otherwise, - request logs or diffs using SOURCE_URL.""" - if display_style == "revisions": - if revs: - report(revisions_msg) - print revs - elif display_style == "logs": - for start,end in revs.normalized(): - svn_command('log --incremental -v -r %d:%d %s' % \ - (start, end, source_url)) - elif display_style in ("diffs", "summarize"): - if display_style == 'summarize': - summarize = '--summarize ' - else: - summarize = '' - - for start, end in revs.normalized(): - print - if start == end: - print "%s: changes in revision %d follow" % (NAME, start) - else: - print "%s: changes in revisions %d-%d follow" % (NAME, - start, end) - print - - # Note: the starting revision number to 'svn diff' is - # NOT inclusive so we have to subtract one from ${START}. - svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, - source_url)) - else: - assert False, "unhandled display style: %s" % display_style - -def action_init(target_dir, target_props): - """Initialize for merges.""" - # Check that directory is ready for being modified - check_dir_clean(target_dir) - - target_pathid = PathIdentifier.from_target(target_dir) - source_pathid = opts['source-pathid'] - if source_pathid == target_pathid: - error("cannot init integration source path '%s'\nIts path identifier does not " - "differ from the path identifier of the current directory, '%s'." - % (source_pathid, target_pathid)) - - source_url = opts['source-url'] - - # If the user hasn't specified the revisions to use, see if the - # "source" is a copy from the current tree and if so, we can use - # the version data obtained from it. - revision_range = opts["revision"] - if not revision_range: - # If source was originally copied from target, and we are merging - # changes from source to target (the copy target is the merge source, - # and the copy source is the merge target), then we want to mark as - # integrated up to the rev in which the copy was committed which - # created the merge source: - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) - - cf_pathid = None - if cf_source: - cf_url = get_repo_root(source_url) + cf_source - if is_url(cf_url) and check_url(cf_url): - cf_pathid = PathIdentifier.from_target(cf_url) - - if target_pathid == cf_pathid: - report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % - (source_url, target_dir, cf_rev, copy_committed_in_rev)) - revision_range = "1-" + str(copy_committed_in_rev) - - if not revision_range: - # If the reverse is true: copy source is the merge source, and - # the copy target is the merge target, then we want to mark as - # integrated up to the specific rev of the merge target from - # which the merge source was copied. (Longer discussion at: - # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) - - cf_pathid = None - if cf_source: - cf_url = get_repo_root(target_dir) + cf_source - if is_url(cf_url) and check_url(cf_url): - cf_pathid = PathIdentifier.from_target(cf_url) - - source_pathid = PathIdentifier.from_target(source_url) - if source_pathid == cf_pathid: - report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % - (target_dir, source_url, cf_rev, copy_committed_in_rev)) - revision_range = "1-" + cf_rev - - # When neither the merge source nor target is a copy of the other, and - # the user did not specify a revision range, then choose a default which is - # the current revision; saying, in effect, "everything has been merged, so - # mark as integrated up to the latest rev on source url). - if not revision_range: - revision_range = "1-" + get_latest_rev(source_url) - - revs = RevisionSet(revision_range) - - report('marking "%s" as already containing revisions "%s" of "%s"' % - (target_dir, revs, source_url)) - - revs = str(revs) - # If the local svnmerge-integrated property already has an entry - # for the source-pathid, simply error out. - if not opts["force"] and target_props.has_key(source_pathid): - error('Repository-relative path %s has already been initialized at %s\n' - 'Use --force to re-initialize' % (source_pathid, target_dir)) - # set the pathid's external_form based on the user's options - source_pathid.external_form = source_pathid.format(opts['location-type']) - - revs = str(revs) - target_props[source_pathid] = revs - - # Set property - set_merge_props(target_dir, target_props) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ - % (NAME, revs) - print >>f, '%s' % source_url - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_avail(branch_dir, branch_props): - """Show commits available for merges.""" - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"], - find_reflected= - should_find_reflected(branch_dir)) - report('skipping phantom revisions: %s' % phantom_revs) - if reflected_revs: - report('skipping reflected revisions: %s' % reflected_revs) - report('skipping initialized revisions: %s' % initialized_revs) - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ - reflected_revs - initialized_revs - - # Compose the set of revisions to show - revs = RevisionSet("") - report_msg = "revisions available to be merged are:" - if "avail" in opts["avail-showwhat"]: - revs |= avail_revs - if "blocked" in opts["avail-showwhat"]: - revs |= blocked_revs - report_msg = "revisions blocked are:" - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs = revs & RevisionSet(opts["revision"]) - - display_revisions(revs, opts["avail-display"], - report_msg, - opts["source-url"]) - -def action_integrated(branch_dir, branch_props): - """Show change sets already merged. This set of revisions is - calculated from taking svnmerge-integrated property from the - branch, and subtracting any revision older than the branch - creation revision.""" - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) - - # Lookup the oldest revision on the branch path. - oldest_src_rev = get_created_rev(opts["source-url"]) - - # Subtract any revisions which pre-date the branch. - report("subtracting revisions which pre-date the source URL (%d)" % - oldest_src_rev) - revs = revs - RevisionSet(range(1, oldest_src_rev)) - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs = revs & RevisionSet(opts["revision"]) - - display_revisions(revs, opts["integrated-display"], - "revisions already integrated are:", opts["source-url"]) - -def action_merge(branch_dir, branch_props): - """Record merge meta data, and do the actual merge (if not - requested otherwise via --record-only).""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"], - find_reflected= - should_find_reflected(branch_dir)) - - if opts["revision"]: - revs = RevisionSet(opts["revision"]) - else: - revs = source_revs - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - merged_revs = opts["merged-revs"] - - # Show what we're doing - if opts["verbose"]: # just to avoid useless calculations - if merged_revs & revs: - report('"%s" already contains revisions %s' % (branch_dir, - merged_revs & revs)) - if phantom_revs: - report('memorizing phantom revision(s): %s' % phantom_revs) - if reflected_revs: - report('memorizing reflected revision(s): %s' % reflected_revs) - if blocked_revs & revs: - report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) - if initialized_revs: - report('skipping initialized revision(s): %s' % initialized_revs) - - # Compute final merge set. - revs = revs - merged_revs - blocked_revs - reflected_revs - \ - phantom_revs - initialized_revs - if not revs: - report('no revisions to merge, exiting') - return - - # When manually marking revisions as merged, we only update the - # integration meta data, and don't perform an actual merge. - record_only = opts["record-only"] - - if record_only: - report('recording merge of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - else: - report('merging in revision(s) %s from "%s"' % - (revs, opts["source-url"])) - - # Do the merge(s). Note: the starting revision number to 'svn merge' - # is NOT inclusive so we have to subtract one from start. - # We try to keep the number of merge operations as low as possible, - # because it is faster and reduces the number of conflicts. - old_block_props = get_block_props(branch_dir) - merge_metadata = logs[opts["source-url"]].merge_metadata() - block_metadata = logs[opts["source-url"]].block_metadata() - for start,end in minimal_merge_intervals(revs, phantom_revs): - if not record_only: - # Preset merge/blocked properties to the source value at - # the start rev to avoid spurious property conflicts - set_merge_props(branch_dir, merge_metadata.get(start - 1)) - set_block_props(branch_dir, block_metadata.get(start - 1)) - # Do the merge - svn_command("merge --force -r %d:%d %s %s" % \ - (start - 1, end, opts["source-url"], branch_dir)) - # TODO: to support graph merging, add logic to merge the property - # meta-data manually - - # Update the set of merged revisions. - merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs - branch_props[opts["source-pathid"]] = str(merged_revs) - set_merge_props(branch_dir, branch_props) - # Reset the blocked revs - set_block_props(branch_dir, old_block_props) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - if record_only: - print >>f, 'Recorded merge of revisions %s via %s from ' % \ - (revs, NAME) - else: - print >>f, 'Merged revisions %s via %s from ' % \ - (revs, NAME) - print >>f, '%s' % opts["source-url"] - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], revs), - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_block(branch_dir, branch_props): - """Block revisions.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"]) - revs_to_block = source_revs - opts["merged-revs"] - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs_to_block = RevisionSet(opts["revision"]) & revs_to_block - - if not revs_to_block: - error('no available revisions to block') - - # Change blocked information - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - blocked_revs = blocked_revs | revs_to_block - set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], - revs_to_block), - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_unblock(branch_dir, branch_props): - """Unblock revisions.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - revs_to_unblock = blocked_revs - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) - - if not revs_to_unblock: - error('no available revisions to unblock') - - # Change blocked information - blocked_revs = blocked_revs - revs_to_unblock - set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], - revs_to_unblock), - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_rollback(branch_dir, branch_props): - """Rollback previously integrated revisions.""" - - # Make sure the revision arguments are present - if not opts["revision"]: - error("The '-r' option is mandatory for rollback") - - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - # Get the list of all revisions already merged into this source-pathid. - merged_revs = merge_props_to_revision_set(branch_props, - opts["source-pathid"]) - - # At which revision was the src created? - oldest_src_rev = get_created_rev(opts["source-url"]) - src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) - - # Limit to revisions specified by -r (if any) - revs = merged_revs & RevisionSet(opts["revision"]) - - # make sure there's some revision to rollback - if not revs: - report("Nothing to rollback in revision range r%s" % opts["revision"]) - return - - # If even one specified revision lies outside the lifetime of the - # merge source, error out. - if revs & src_pre_exist_range: - err_str = "Specified revision range falls out of the rollback range.\n" - err_str += "%s was created at r%d" % (opts["source-pathid"], - oldest_src_rev) - error(err_str) - - record_only = opts["record-only"] - - if record_only: - report('recording rollback of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - else: - report('rollback of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - - # Do the reverse merge(s). Note: the starting revision number - # to 'svn merge' is NOT inclusive so we have to subtract one from start. - # We try to keep the number of merge operations as low as possible, - # because it is faster and reduces the number of conflicts. - rollback_intervals = minimal_merge_intervals(revs, []) - # rollback in the reverse order of merge - rollback_intervals.reverse() - for start, end in rollback_intervals: - if not record_only: - # Do the merge - svn_command("merge --force -r %d:%d %s %s" % \ - (end, start - 1, opts["source-url"], branch_dir)) - - # Write out commit message if desired - # calculate the phantom revs first - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - if record_only: - print >>f, 'Recorded rollback of revisions %s via %s from ' % \ - (revs , NAME) - else: - print >>f, 'Rolled back revisions %s via %s from ' % \ - (revs , NAME) - print >>f, '%s' % opts["source-url"] - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - - # Update the set of merged revisions. - merged_revs = merged_revs - revs - branch_props[opts["source-pathid"]] = str(merged_revs) - set_merge_props(branch_dir, branch_props) - -def action_uninit(branch_dir, branch_props): - """Uninit SOURCE URL.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - # If the source-pathid does not have an entry in the svnmerge-integrated - # property, simply error out. - if not branch_props.has_key(opts["source-pathid"]): - error('Repository-relative path "%s" does not contain merge ' - 'tracking information for "%s"' \ - % (opts["source-pathid"], branch_dir)) - - del branch_props[opts["source-pathid"]] - - # Set merge property with the selected source deleted - set_merge_props(branch_dir, branch_props) - - # Set blocked revisions for the selected source to None - set_blocked_revs(branch_dir, opts["source-pathid"], None) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Removed merge tracking for "%s" for ' % NAME - print >>f, '%s' % opts["source-url"] - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -############################################################################### -# Command line parsing -- options and commands management -############################################################################### - -class OptBase: - def __init__(self, *args, **kwargs): - self.help = kwargs["help"] - del kwargs["help"] - self.lflags = [] - self.sflags = [] - for a in args: - if a.startswith("--"): self.lflags.append(a) - elif a.startswith("-"): self.sflags.append(a) - else: - raise TypeError, "invalid flag name: %s" % a - if kwargs.has_key("dest"): - self.dest = kwargs["dest"] - del kwargs["dest"] - else: - if not self.lflags: - raise TypeError, "cannot deduce dest name without long options" - self.dest = self.lflags[0][2:] - if kwargs: - raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() - def repr_flags(self): - f = self.sflags + self.lflags - r = f[0] - for fl in f[1:]: - r += " [%s]" % fl - return r - -class Option(OptBase): - def __init__(self, *args, **kwargs): - self.default = kwargs.setdefault("default", 0) - del kwargs["default"] - self.value = kwargs.setdefault("value", None) - del kwargs["value"] - OptBase.__init__(self, *args, **kwargs) - def apply(self, state, value): - assert value == "" - if self.value is not None: - state[self.dest] = self.value - else: - state[self.dest] += 1 - -class OptionArg(OptBase): - def __init__(self, *args, **kwargs): - self.default = kwargs["default"] - del kwargs["default"] - self.metavar = kwargs.setdefault("metavar", None) - del kwargs["metavar"] - OptBase.__init__(self, *args, **kwargs) - - if self.metavar is None: - if self.dest is not None: - self.metavar = self.dest.upper() - else: - self.metavar = "arg" - if self.default: - self.help += " (default: %s)" % self.default - def apply(self, state, value): - assert value is not None - state[self.dest] = value - def repr_flags(self): - r = OptBase.repr_flags(self) - return r + " " + self.metavar - -class CommandOpts: - class Cmd: - def __init__(self, *args): - self.name, self.func, self.usage, self.help, self.opts = args - def short_help(self): - return self.help.split(".")[0] - def __str__(self): - return self.name - def __call__(self, *args, **kwargs): - return self.func(*args, **kwargs) - - def __init__(self, global_opts, common_opts, command_table, version=None): - self.progname = NAME - self.version = version.replace("%prog", self.progname) - self.cwidth = console_width() - 2 - self.ctable = command_table.copy() - self.gopts = global_opts[:] - self.copts = common_opts[:] - self._add_builtins() - for k in self.ctable.keys(): - cmd = self.Cmd(k, *self.ctable[k]) - opts = [] - for o in cmd.opts: - if isinstance(o, types.StringType) or \ - isinstance(o, types.UnicodeType): - o = self._find_common(o) - opts.append(o) - cmd.opts = opts - self.ctable[k] = cmd - - def _add_builtins(self): - self.gopts.append( - Option("-h", "--help", help="show help for this command and exit")) - if self.version is not None: - self.gopts.append( - Option("-V", "--version", help="show version info and exit")) - self.ctable["help"] = (self._cmd_help, - "help [COMMAND]", - "Display help for a specific command. If COMMAND is omitted, " - "display brief command description.", - []) - - def _cmd_help(self, cmd=None, *args): - if args: - self.error("wrong number of arguments", "help") - if cmd is not None: - cmd = self._command(cmd) - self.print_command_help(cmd) - else: - self.print_command_list() - - def _paragraph(self, text, width=78): - chunks = re.split("\s+", text.strip()) - chunks.reverse() - lines = [] - while chunks: - L = chunks.pop() - while chunks and len(L) + len(chunks[-1]) + 1 <= width: - L += " " + chunks.pop() - lines.append(L) - return lines - - def _paragraphs(self, text, *args, **kwargs): - pars = text.split("\n\n") - lines = self._paragraph(pars[0], *args, **kwargs) - for p in pars[1:]: - lines.append("") - lines.extend(self._paragraph(p, *args, **kwargs)) - return lines - - def _print_wrapped(self, text, indent=0): - text = self._paragraphs(text, self.cwidth - indent) - print text.pop(0) - for t in text: - print " " * indent + t - - def _find_common(self, fl): - for o in self.copts: - if fl in o.lflags+o.sflags: - return o - assert False, fl - - def _compute_flags(self, opts, check_conflicts=True): - back = {} - sfl = "" - lfl = [] - for o in opts: - sapp = lapp = "" - if isinstance(o, OptionArg): - sapp, lapp = ":", "=" - for s in o.sflags: - if check_conflicts and back.has_key(s): - raise RuntimeError, "option conflict: %s" % s - back[s] = o - sfl += s[1:] + sapp - for l in o.lflags: - if check_conflicts and back.has_key(l): - raise RuntimeError, "option conflict: %s" % l - back[l] = o - lfl.append(l[2:] + lapp) - return sfl, lfl, back - - def _extract_command(self, args): - """ - Try to extract the command name from the argument list. This is - non-trivial because we want to allow command-specific options even - before the command itself. - """ - opts = self.gopts[:] - for cmd in self.ctable.values(): - opts.extend(cmd.opts) - sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) - - lopts,largs = getopt.getopt(args, sfl, lfl) - if not largs: - return None - return self._command(largs[0]) - - def _fancy_getopt(self, args, opts, state=None): - if state is None: - state= {} - for o in opts: - if not state.has_key(o.dest): - state[o.dest] = o.default - - sfl, lfl, back = self._compute_flags(opts) - try: - lopts,args = getopt.gnu_getopt(args, sfl, lfl) - except AttributeError: - # Before Python 2.3, there was no gnu_getopt support. - # So we can't parse intermixed positional arguments - # and options. - lopts,args = getopt.getopt(args, sfl, lfl) - - for o,v in lopts: - back[o].apply(state, v) - return state, args - - def _command(self, cmd): - if not self.ctable.has_key(cmd): - self.error("unknown command: '%s'" % cmd) - return self.ctable[cmd] - - def parse(self, args): - if not args: - self.print_small_help() - sys.exit(0) - - cmd = None - try: - cmd = self._extract_command(args) - opts = self.gopts[:] - if cmd: - opts.extend(cmd.opts) - args.remove(cmd.name) - state, args = self._fancy_getopt(args, opts) - except getopt.GetoptError, e: - self.error(e, cmd) - - # Handle builtins - if self.version is not None and state["version"]: - self.print_version() - sys.exit(0) - if state["help"]: # special case for --help - if cmd: - self.print_command_help(cmd) - sys.exit(0) - cmd = self.ctable["help"] - else: - if cmd is None: - self.error("command argument required") - if str(cmd) == "help": - cmd(*args) - sys.exit(0) - return cmd, args, state - - def error(self, s, cmd=None): - print >>sys.stderr, "%s: %s" % (self.progname, s) - if cmd is not None: - self.print_command_help(cmd) - else: - self.print_small_help() - sys.exit(1) - def print_small_help(self): - print "Type '%s help' for usage" % self.progname - def print_usage_line(self): - print "usage: %s <subcommand> [options...] [args...]\n" % self.progname - def print_command_list(self): - print "Available commands (use '%s help COMMAND' for more details):\n" \ - % self.progname - cmds = self.ctable.keys() - cmds.sort() - indent = max(map(len, cmds)) - for c in cmds: - h = self.ctable[c].short_help() - print " %-*s " % (indent, c), - self._print_wrapped(h, indent+6) - def print_command_help(self, cmd): - cmd = self.ctable[str(cmd)] - print 'usage: %s %s\n' % (self.progname, cmd.usage) - self._print_wrapped(cmd.help) - def print_opts(opts, self=self): - if not opts: return - flags = [o.repr_flags() for o in opts] - indent = max(map(len, flags)) - for f,o in zip(flags, opts): - print " %-*s :" % (indent, f), - self._print_wrapped(o.help, indent+5) - print '\nCommand options:' - print_opts(cmd.opts) - print '\nGlobal options:' - print_opts(self.gopts) - - def print_version(self): - print self.version - -############################################################################### -# Options and Commands description -############################################################################### - -global_opts = [ - Option("-F", "--force", - help="force operation even if the working copy is not clean, or " - "there are pending updates"), - Option("-n", "--dry-run", - help="don't actually change anything, just pretend; " - "implies --show-changes"), - Option("-s", "--show-changes", - help="show subversion commands that make changes"), - Option("-v", "--verbose", - help="verbose mode: output more information about progress"), - OptionArg("-u", "--username", - default=None, - help="invoke subversion commands with the supplied username"), - OptionArg("-p", "--password", - default=None, - help="invoke subversion commands with the supplied password"), - OptionArg("-c", "--config-dir", metavar="DIR", - default=None, - help="cause subversion commands to consult runtime config directory DIR"), -] - -common_opts = [ - Option("-b", "--bidirectional", - value=True, - default=False, - help="remove reflected and initialized revisions from merge candidates. " - "Not required but may be specified to speed things up slightly"), - OptionArg("-f", "--commit-file", metavar="FILE", - default="svnmerge-commit-message.txt", - help="set the name of the file where the suggested log message " - "is written to"), - Option("-M", "--record-only", - value=True, - default=False, - help="do not perform an actual merge of the changes, yet record " - "that a merge happened"), - OptionArg("-r", "--revision", - metavar="REVLIST", - default="", - help="specify a revision list, consisting of revision numbers " - 'and ranges separated by commas, e.g., "534,537-539,540"'), - OptionArg("-S", "--source", "--head", - default=None, - help="specify a merge source for this branch. It can be either " - "a working directory path, a full URL, or an unambiguous " - "substring of one of the locations for which merge tracking was " - "already initialized. Needed only to disambiguate in case of " - "multiple merge sources"), -] - -command_table = { - "init": (action_init, - "init [OPTION...] [SOURCE]", - """Initialize merge tracking from SOURCE on the current working - directory. - - If SOURCE is specified, all the revisions in SOURCE are marked as already - merged; if this is not correct, you can use --revision to specify the - exact list of already-merged revisions. - - If SOURCE is omitted, then it is computed from the "svn cp" history of the - current working directory (searching back for the branch point); in this - case, %s assumes that no revision has been integrated yet since - the branch point (unless you teach it with --revision).""" % NAME, - [ - "-f", "-r", # import common opts - OptionArg("-L", "--location-type", - dest="location-type", - default="path", - help="Use this type of location identifier in the new " + - "Subversion properties; 'uuid', 'url', or 'path' " + - "(default)"), - ]), - - "avail": (action_avail, - "avail [OPTION...] [PATH]", - """Show unmerged revisions available for PATH as a revision list. - If --revision is given, the revisions shown will be limited to those - also specified in the option. - - When svnmerge is used to bidirectionally merge changes between a - branch and its source, it is necessary to not merge the same changes - forth and back: e.g., if you committed a merge of a certain - revision of the branch into the source, you do not want that commit - to appear as available to merged into the branch (as the code - originated in the branch itself!). svnmerge will automatically - exclude these so-called "reflected" revisions.""", - [ - Option("-A", "--all", - dest="avail-showwhat", - value=["blocked", "avail"], - default=["avail"], - help="show both available and blocked revisions (aka ignore " - "blocked revisions)"), - "-b", - Option("-B", "--blocked", - dest="avail-showwhat", - value=["blocked"], - help="show the blocked revision list (see '%s block')" % NAME), - Option("-d", "--diff", - dest="avail-display", - value="diffs", - default="revisions", - help="show corresponding diff instead of revision list"), - Option("--summarize", - dest="avail-display", - value="summarize", - help="show summarized diff instead of revision list"), - Option("-l", "--log", - dest="avail-display", - value="logs", - help="show corresponding log history instead of revision list"), - "-r", - "-S", - ]), - - "integrated": (action_integrated, - "integrated [OPTION...] [PATH]", - """Show merged revisions available for PATH as a revision list. - If --revision is given, the revisions shown will be limited to - those also specified in the option.""", - [ - Option("-d", "--diff", - dest="integrated-display", - value="diffs", - default="revisions", - help="show corresponding diff instead of revision list"), - Option("-l", "--log", - dest="integrated-display", - value="logs", - help="show corresponding log history instead of revision list"), - "-r", - "-S", - ]), - - "rollback": (action_rollback, - "rollback [OPTION...] [PATH]", - """Rollback previously merged in revisions from PATH. The - --revision option is mandatory, and specifies which revisions - will be rolled back. Only the previously integrated merges - will be rolled back. - - When manually rolling back changes, --record-only can be used to - instruct %s that a manual rollback of a certain revision - already happened, so that it can record it and offer that - revision for merge henceforth.""" % (NAME), - [ - "-f", "-r", "-S", "-M", # import common opts - ]), - - "merge": (action_merge, - "merge [OPTION...] [PATH]", - """Merge in revisions into PATH from its source. If --revision is omitted, - all the available revisions will be merged. In any case, already merged-in - revisions will NOT be merged again. - - When svnmerge is used to bidirectionally merge changes between a - branch and its source, it is necessary to not merge the same changes - forth and back: e.g., if you committed a merge of a certain - revision of the branch into the source, you do not want that commit - to appear as available to merged into the branch (as the code - originated in the branch itself!). svnmerge will automatically - exclude these so-called "reflected" revisions. - - When manually merging changes across branches, --record-only can - be used to instruct %s that a manual merge of a certain revision - already happened, so that it can record it and not offer that - revision for merge anymore. Conversely, when there are revisions - which should not be merged, use '%s block'.""" % (NAME, NAME), - [ - "-b", "-f", "-r", "-S", "-M", # import common opts - ]), - - "block": (action_block, - "block [OPTION...] [PATH]", - """Block revisions within PATH so that they disappear from the available - list. This is useful to hide revisions which will not be integrated. - If --revision is omitted, it defaults to all the available revisions. - - Do not use this option to hide revisions that were manually merged - into the branch. Instead, use '%s merge --record-only', which - records that a merge happened (as opposed to a merge which should - not happen).""" % NAME, - [ - "-f", "-r", "-S", # import common opts - ]), - - "unblock": (action_unblock, - "unblock [OPTION...] [PATH]", - """Revert the effect of '%s block'. If --revision is omitted, all the - blocked revisions are unblocked""" % NAME, - [ - "-f", "-r", "-S", # import common opts - ]), - - "uninit": (action_uninit, - "uninit [OPTION...] [PATH]", - """Remove merge tracking information from PATH. It cleans any kind of merge - tracking information (including the list of blocked revisions). If there - are multiple sources, use --source to indicate which source you want to - forget about.""", - [ - "-f", "-S", # import common opts - ]), -} - - -def main(args): - global opts - - # Initialize default options - opts = default_opts.copy() - logs.clear() - - optsparser = CommandOpts(global_opts, common_opts, command_table, - version="%%prog r%s\n modified: %s\n\n" - "Copyright (C) 2004,2005 Awarix Inc.\n" - "Copyright (C) 2005, Giovanni Bajo" - % (__revision__, __date__)) - - cmd, args, state = optsparser.parse(args) - opts.update(state) - - source = opts.get("source", None) - branch_dir = "." - - if str(cmd) == "init": - if len(args) == 1: - source = args[0] - elif len(args) > 1: - optsparser.error("wrong number of parameters", cmd) - elif str(cmd) in command_table.keys(): - if len(args) == 1: - branch_dir = args[0] - elif len(args) > 1: - optsparser.error("wrong number of parameters", cmd) - else: - assert False, "command not handled: %s" % cmd - - # Validate branch_dir - if not is_wc(branch_dir): - if str(cmd) == "avail": - info = None - # it should be noted here that svn info does not error exit - # if an invalid target is specified to it (as is - # intuitive). so the try, except code is not absolutely - # necessary. but, I retain it to indicate the intuitive - # handling. - try: - info = get_svninfo(branch_dir) - except LaunchError: - pass - # test that we definitely targeted a subversion directory, - # mirroring the purpose of the earlier is_wc() call - if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": - error('"%s" is neither a valid URL, nor a working directory' % branch_dir) - else: - error('"%s" is not a subversion working directory' % branch_dir) - - # give out some hints as to potential pathids - PathIdentifier.hint(branch_dir) - if source: PathIdentifier.hint(source) - - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - - # Calculate source_url and source_path - report("calculate source path for the branch") - if not source: - if str(cmd) == "init": - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) - if not cf_source: - error('no copyfrom info available. ' - 'Explicit source argument (-S/--source) required.') - opts["source-url"] = get_repo_root(branch_dir) + cf_source - opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) - - if not opts["revision"]: - opts["revision"] = "1-" + cf_rev - else: - opts["source-pathid"] = get_default_source(branch_dir, branch_props) - opts["source-url"] = opts["source-pathid"].get_url() - - assert is_pathid(opts["source-pathid"]) - assert is_url(opts["source-url"]) - else: - # The source was given as a command line argument and is stored in - # SOURCE. Ensure that the specified source does not end in a /, - # otherwise it's easy to have the same source path listed more - # than once in the integrated version properties, with and without - # trailing /'s. - source = rstrip(source, "/") - if not is_wc(source) and not is_url(source): - # Check if it is a substring of a pathid recorded - # within the branch properties. - found = [] - for pathid in branch_props.keys(): - if pathid.match_substring(source): - found.append(pathid) - if len(found) == 1: - # (assumes pathid is a repository-relative-path) - source_pathid = found[0] - source = source_pathid.get_url() - else: - error('"%s" is neither a valid URL, nor an unambiguous ' - 'substring of a repository path, nor a working directory' - % source) - else: - source_pathid = PathIdentifier.from_target(source) - - source_pathid = PathIdentifier.from_target(source) - if str(cmd) == "init" and \ - source_pathid == PathIdentifier.from_target("."): - error("cannot init integration source path '%s'\n" - "Its repository-relative path must differ from the " - "repository-relative path of the current directory." - % source_pathid) - opts["source-pathid"] = source_pathid - opts["source-url"] = target_to_url(source) - - # Sanity check source_url - assert is_url(opts["source-url"]) - # SVN does not support non-normalized URL (and we should not - # have created them) - assert opts["source-url"].find("/..") < 0 - - report('source is "%s"' % opts["source-url"]) - - # Get previously merged revisions (except when command is init) - if str(cmd) != "init": - opts["merged-revs"] = merge_props_to_revision_set(branch_props, - opts["source-pathid"]) - - # Perform the action - cmd(branch_dir, branch_props) - - -if __name__ == "__main__": - try: - main(sys.argv[1:]) - except LaunchError, (ret, cmd, out): - err_msg = "command execution failed (exit code: %d)\n" % ret - err_msg += cmd + "\n" - err_msg += "".join(out) - error(err_msg) - except KeyboardInterrupt: - # Avoid traceback on CTRL+C - print "aborted by user" - sys.exit(1) diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/testing/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf deleted file mode 100644 index 37fb7ea10..000000000 --- a/testing/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD new file mode 100644 index 000000000..fee69d2c1 --- /dev/null +++ b/testing/sudo/PKGBUILD @@ -0,0 +1,37 @@ +# $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 new file mode 100644 index 000000000..4e586cd22 --- /dev/null +++ b/testing/sudo/sudo.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD deleted file mode 100644 index 3a25d87e4..000000000 --- a/testing/syslog-ng/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 123085 2011-05-08 03:28:44Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=syslog-ng -pkgver=3.2.4 -pkgrel=1 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -license=('GPL2') -groups=('base') -url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk') -makedepends=('flex' 'pkg-config') -optdepends=('logrotate: for rotating log files') -provides=('logger') -options=('!libtool') -backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ - 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz \ - syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch) -md5sums=('5995f7dad0053a478b60a63f6f754203' - '344dddfff946300f5576b13a7e8ea19f' - '735636090be4582885974542d2a75855' - '8b4441343d859c2f01c2cf799a7e6f98' - '46e5dcff71f820d497898331a3f608fe') -sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1' - 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f' - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' - '4481819762fd1b6f25903016a8878e63c0058fcb' - 'f093a09626a528d23f0f2aeece018cab15a735a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" -# fix #22555 for kernels >=2.6.38 - patch -p1 -i ../cap_syslog.patch - ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ - --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ - --enable-tcp-wrapper \ - --with-pidfile-dir=/var/run \ - --disable-spoof-source - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d" - install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf" - install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng" - install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng" -} diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch deleted file mode 100644 index b6e6db6e4..000000000 --- a/testing/syslog-ng/cap_syslog.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/lib/gprocess.h b/lib/gprocess.h -index cda35b0..5c449f7 100644 ---- a/lib/gprocess.h -+++ b/lib/gprocess.h -@@ -28,9 +28,14 @@ - #include "syslog-ng.h" - - #include <sys/types.h> -+#include <sys/utsname.h> - - #if ENABLE_LINUX_CAPS - # include <sys/capability.h> -+# -+# ifndef CAP_SYSLOG -+# define CAP_SYSLOG 34 -+# endif - #endif - - typedef enum -@@ -78,5 +83,8 @@ void g_process_finish(void); - - void g_process_add_option_group(GOptionContext *ctx); - -+extern int kernel_version; -+extern void get_kernel_version(void); -+#define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) - - #endif -diff --git a/modules/affile/affile.c b/modules/affile/affile.c -index e145324..886fa72 100644 ---- a/modules/affile/affile.c -+++ b/modules/affile/affile.c -@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags, - if (privileged) - { - g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE); -- g_process_cap_modify(CAP_SYS_ADMIN, TRUE); -+ if (!kernel_version) -+ get_kernel_version(); -+ if (kernel_version < LINUX_VERSION(2, 6, 38)) -+ g_process_cap_modify(CAP_SYS_ADMIN, TRUE); -+ else -+ g_process_cap_modify(CAP_SYSLOG, TRUE); - } - else - { -diff --git a/syslog-ng/main.c b/syslog-ng/main.c -index 9880c1f..ee5031b 100644 ---- a/syslog-ng/main.c -+++ b/syslog-ng/main.c -@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE; - static gboolean display_version = FALSE; - static gchar *ctlfilename = PATH_CONTROL_SOCKET; - static gchar *preprocess_into = NULL; -+int kernel_version; - - static volatile sig_atomic_t sig_hup_received = FALSE; - static volatile sig_atomic_t sig_term_received = FALSE; -@@ -363,6 +364,20 @@ version(void) - ON_OFF_STR(ENABLE_PACCT_MODULE)); - } - -+void -+get_kernel_version(void) { -+ static struct utsname uts; -+ int x = 0, y = 0, z = 0; -+ -+ if (uname(&uts) == -1) { -+ fprintf(stderr, "Unable to retrieve kernel version.\n"); -+ exit(1); -+ } -+ -+ sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ kernel_version = LINUX_VERSION(x, y, z); -+} -+ - int - main(int argc, char *argv[]) - { -@@ -379,9 +394,20 @@ main(int argc, char *argv[]) - * indicate readability. Enabling/disabling cap_sys_admin on every poll - * invocation seems to be too expensive. So I enable it for now. */ - -- g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ if (!kernel_version) -+ get_kernel_version(); -+ if (kernel_version < LINUX_VERSION(2, 6, 34)) -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," - "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p " - "cap_sys_admin=ep"); -+ else if (kernel_version < LINUX_VERSION(2, 6, 38)) -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," -+ "cap_sys_admin=p"); -+ else -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," -+ "cap_syslog=p"); - ctx = g_option_context_new("syslog-ng"); - g_process_add_option_group(ctx); - msg_add_option_group(ctx); diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf deleted file mode 100644 index 6e3362681..000000000 --- a/testing/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,92 +0,0 @@ -@version: 3.2 -# -# /etc/syslog-ng/syslog-ng.conf -# - -options { - stats_freq (0); - flush_lines (0); - time_reopen (10); - log_fifo_size (1000); - long_hostnames(off); - use_dns (no); - use_fqdn (no); - create_dirs (no); - keep_hostname (yes); - perm(0640); - group("log"); -}; - -source src { - unix-dgram("/dev/log"); - internal(); - file("/proc/kmsg"); -}; - -destination d_authlog { file("/var/log/auth.log"); }; -destination d_syslog { file("/var/log/syslog.log"); }; -destination d_cron { file("/var/log/crond.log"); }; -destination d_daemon { file("/var/log/daemon.log"); }; -destination d_kernel { file("/var/log/kernel.log"); }; -destination d_lpr { file("/var/log/lpr.log"); }; -destination d_user { file("/var/log/user.log"); }; -destination d_uucp { file("/var/log/uucp.log"); }; -destination d_mail { file("/var/log/mail.log"); }; -destination d_news { file("/var/log/news.log"); }; -destination d_ppp { file("/var/log/ppp.log"); }; -destination d_debug { file("/var/log/debug.log"); }; -destination d_messages { file("/var/log/messages.log"); }; -destination d_errors { file("/var/log/errors.log"); }; -destination d_everything { file("/var/log/everything.log"); }; -destination d_iptables { file("/var/log/iptables.log"); }; -destination d_acpid { file("/var/log/acpid.log"); }; -destination d_console { usertty("root"); }; - -# Log everything to tty12 -destination console_all { file("/dev/tty12"); }; - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { program(syslog-ng); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_kernel { facility(kern) and not filter(f_iptables); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -filter f_ppp { facility(local2); }; -filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; -filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; -filter f_emergency { level(emerg); }; -filter f_info { level(info); }; -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; -filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; -filter f_acpid { program("acpid"); }; - -log { source(src); filter(f_acpid); destination(d_acpid); }; -log { source(src); filter(f_authpriv); destination(d_authlog); }; -log { source(src); filter(f_syslog); destination(d_syslog); }; -log { source(src); filter(f_cron); destination(d_cron); }; -log { source(src); filter(f_daemon); destination(d_daemon); }; -log { source(src); filter(f_kernel); destination(d_kernel); }; -log { source(src); filter(f_lpr); destination(d_lpr); }; -log { source(src); filter(f_mail); destination(d_mail); }; -log { source(src); filter(f_news); destination(d_news); }; -log { source(src); filter(f_ppp); destination(d_ppp); }; -log { source(src); filter(f_user); destination(d_user); }; -log { source(src); filter(f_uucp); destination(d_uucp); }; -#log { source(src); filter(f_debug); destination(d_debug); }; -log { source(src); filter(f_messages); destination(d_messages); }; -log { source(src); filter(f_err); destination(d_errors); }; -log { source(src); filter(f_emergency); destination(d_console); }; -log { source(src); filter(f_everything); destination(d_everything); }; -log { source(src); filter(f_iptables); destination(d_iptables); }; - -# Log everything to tty12 -#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate deleted file mode 100644 index e0e6929f2..000000000 --- a/testing/syslog-ng/syslog-ng.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { - missingok - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc deleted file mode 100755 index bb5320b2c..000000000 --- a/testing/syslog-ng/syslog-ng.rc +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -checkconfig() { - syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf - if [ $? -gt 0 ]; then - stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)." - stat_fail - exit 0 - fi -} - -PID=`pidof -o %PPID /usr/sbin/syslog-ng` -case "$1" in - start) - stat_busy "Starting Syslog-NG" - checkconfig - [ -z "$PID" ] && /usr/sbin/syslog-ng - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon syslog-ng - stat_done - fi - ;; - stop) - stat_busy "Stopping Syslog-NG" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/syslog-ng.pid -# Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/ - rm -f /var/syslog-ng.persist - rm_daemon syslog-ng - stat_done - fi - ;; - reload) - stat_busy "Reloading Syslog-NG configuration and re-opening log files" - if [ -z "$PID" ]; then - stat_fail - else - checkconfig - kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules index 21127a729..3e71a9118 100644 --- a/testing/udev/81-arch.rules +++ b/testing/udev/81-arch.rules @@ -28,10 +28,6 @@ # check if the device has already been claimed by a driver ACTION!="add", GOTO="drivers_end" -# SOUND addon modules -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" - #PNP addon modules SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" @@ -50,26 +46,6 @@ LABEL="drivers_end" ##################################### ##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### - -##################################### # Additional Archlinux # Permissions and Symlinks - begin ##################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index 44c2cf9d7..acb78e0bf 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123587 2011-05-11 16:38:57Z tomegun $ +# $Id: PKGBUILD 124345 2011-05-20 06:14:46Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=168 +pkgver=170 pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -18,13 +18,13 @@ makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 80-drivers.rules 81-arch.rules - load-modules.sh - cdsymlinks.sh) + load-modules.sh) build() { cd $srcdir/$pkgbase-$pkgver ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ + --disable-rule-generator make } @@ -46,16 +46,6 @@ package_udev() { install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules # install our module loading subsystem install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh - # install cdsymlinks.sh - install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh - # disable error logging to prevent startup failures printed to vc on boot - sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf - # disable persistent cdromsymlinks and network by default - # and move it to /etc/udev/rules.d - mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ - $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional - mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \ - $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional # create framebuffer blacklist mkdir -p $pkgdir/etc/modprobe.d/ @@ -96,9 +86,6 @@ package_udev() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done - - # Provided by the bluez package, remove this line when updating to udev>=169 - rm ${pkgdir}/lib/udev/hid2hci } package_udev-compat() { @@ -109,8 +96,7 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -md5sums=('4a466078532ab5dd5c35acc3ea2ec9a1' +md5sums=('6e132d1a3b4dae24dafd2726c5cdd982' '4427855146513a4703ab5c7eb8a0156e' - 'f17c99779173ddc79f866cf3a5de5e68' - 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769') + 'd8725e64fd0ce6e784ae795fae424c0a' + 'f91fddc67609b45b244a624977c4247b') diff --git a/testing/udev/cdsymlinks.sh b/testing/udev/cdsymlinks.sh deleted file mode 100755 index 498abda4a..000000000 --- a/testing/udev/cdsymlinks.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -# Creates cdsymlinks in /dev -# for Archlinux by Tobias Powalowski <tpowa@archlinux.org> - -# check on cd/dvd drives and if persistant rules file is used -if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then - # remove existing device files - rm /dev/cdrom* - rm /dev/cdrw* - rm /dev/dvd* - rm /dev/dvdrw* - # start creating symlinks - for i in /dev/cd/cdrom-*; do - if [ -h $i ]; then - [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom - [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" - ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER - fi - done - - for i in /dev/cd/cdrw-*; do - if [ -h $i ]; then - [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw - [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" - ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER - fi - done - - for i in /dev/cd/dvd-*; do - if [ -h $i ]; then - [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd - [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" - ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER - fi - done - - for i in /dev/cd/dvdrw-*; do - if [ -h $i ]; then - [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw - [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" - ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER - fi - done -fi diff --git a/testing/udev/udev.install b/testing/udev/udev.install index e953ec743..b2ed69467 100644 --- a/testing/udev/udev.install +++ b/testing/udev/udev.install @@ -11,6 +11,17 @@ post_upgrade() { echo "They are located in /etc/udev/readme-udev-arch.txt" echo "----------" fi + if [ "$(vercmp $2 169)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "---------------" + echo "Kernel 2.6.32 or newer is now required." + echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo "Arch specific cd symlinks are now no longer created." + echo "cd and net persistent rules will no longer be autogenerated," + echo "see <https://wiki.archlinux.org/index.php/Udev> for details." + echo "Errors are now logged (possibly to the console) by default." + echo "---------------" + fi } post_install() { diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD new file mode 100644 index 000000000..4f45a4e78 --- /dev/null +++ b/testing/upower/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=upower +pkgver=0.9.11 +pkgrel=1 +pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" +arch=('i686' 'x86_64') +url="http://upower.freedesktop.org" +license=('GPL') +depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib') +makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') +replaces=('devicekit-power') +options=('!libtool') +source=($url/releases/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/upower --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD deleted file mode 100644 index 2edabc2f0..000000000 --- a/testing/usbutils/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 123172 2011-05-09 02:20:17Z allan $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> -pkgname=usbutils -pkgver=002 -pkgrel=3 -_usb_ids_date=2011.04.14 -pkgdesc="USB Device Utilities" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -makedepends=('wget') -depends=('glibc' 'libusb') -optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage') -url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz - fix-python2.patch - usb.ids-${_usb_ids_date}) # from http://linux-usb.sourceforge.net/usb.ids -md5sums=('05610d15c3c8c8ada3d691c320ca784a' - '45766196895b4cc50b53cd56e1bbf3d1' - 'd64f120c208ca742d3a1d05d84e3f531') - -build() { - cd $srcdir/$pkgname-$pkgver - rm usb.ids - cp $srcdir/usb.ids-${_usb_ids_date} usb.ids - # patch lsusb.py to use correct usb.ids file and python2 interpreter - patch -Np1 -i $srcdir/fix-python2.patch - ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # fix pkgconfig file - install -dm755 $pkgdir/usr/lib - mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/ -} diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch deleted file mode 100644 index 7e2875e99..000000000 --- a/testing/usbutils/fix-python2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # lsusb.py - # Displays your USB devices in reasonable form. - # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/testing/usbutils/usb.ids-2011.04.14 b/testing/usbutils/usb.ids-2011.04.14 deleted file mode 100644 index 02e03ba36..000000000 --- a/testing/usbutils/usb.ids-2011.04.14 +++ /dev/null @@ -1,16374 +0,0 @@ -# -# List of USB ID's -# -# Maintained by Stephen J. Gowdy <linux.usb.ids@gmail.com> -# If you have any new entries, please submit them via -# http://www.linux-usb.org/usb-ids.html -# or send entries as patches (diff -u old new) in the -# body of your email (a bot will attempt to deal with it). -# The latest version can be obtained from -# http://www.linux-usb.org/usb.ids -# -# Version: 2011.04.14 -# Date: 2011-04-14 20:34:04 -# - -# Vendors, devices and interfaces. Please keep sorted. - -# Syntax: -# vendor vendor_name -# device device_name <-- single tab -# interface interface_name <-- two tabs - -0001 Fry's Electronics - 142b Arbiter Systems, Inc. -0002 Ingram -0003 Club Mac -0004 Nebraska Furniture Mart -0053 Planex - 5301 GW-US54ZGL 802.11bg -0079 DragonRise Inc. - 0006 Generic USB Joystick - 0011 Gamepad -0105 Trust International B.V. - 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] -0145 Unknown - 0112 Card Reader -0204 Chipsbank Microelectronics Co., Ltd - 6025 CBM2080 Flash drive controller - 6026 CBM1180 Flash drive controller -0218 Hangzhou Worlde - 0301 MIDI Port -02ad HUMAX Co., Ltd. - 138c PVR Mass Storage -0300 MM300 eBook Reader -0324 OCZ Technology Inc - bc06 OCZ ATV USB 2.0 Flash Drive - bc08 OCZ Rally2/ATV USB 2.0 Flash Drive -0325 OCZ Technology Inc - ac02 ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive -0386 LTS - 0001 PSX for USB Converter -03da Bernd Walter Computer Technology - 0002 HD44780 LCD interface -03e8 EndPoints, Inc. - 0004 SE401 Webcam - 0008 101 Ethernet [klsi] - 0015 ATAPI Enclosure - 2123 SiPix StyleCam Deluxe - 8004 Aox 99001 -03e9 Thesys Microelectronics -03ea Data Broadcasting Corp. -03eb Atmel Corp. - 0902 4-Port Hub - 2002 Mass Storage Device - 2015 at90usbkey sample firmware (HID keyboard) - 2018 at90usbkey sample firmware (CDC ACM) - 2019 stk525 sample firmware (microphone) - 201c at90usbkey sample firmware (HID mouse) - 201d at90usbkey sample firmware (HID generic) - 2022 at90usbkey sample firmware (composite device) - 2040 LUFA Test PID - 2041 LUFA Mouse Demo Application - 2042 LUFA Keyboard Demo Application - 2043 LUFA Joystick Demo Application - 2044 LUFA CDC Demo Application - 2045 LUFA Mass Storage Demo Application - 2046 LUFA Audio Output Demo Application - 2047 LUFA Audio Input Demo Application - 2048 LUFA MIDI Demo Application - 2049 Stripe Snoop Magnetic Stripe Reader - 204a LUFA CDC Class Bootloader - 204b LUFA USB to Serial Adapter Project - 204c LUFA RNDIS Demo Application - 204d LUFA Combined Mouse and Keyboard Demo Application - 204e LUFA Dual CDC Demo Application - 204f LUFA Generic HID Demo Application - 2060 Benito Programmer Project - 2061 LUFA Combined Mass Storage and Keyboard Demo Application - 2062 LUFA Combined CDC and Mouse Demo Application - 2063 LUFA Datalogger Device - 2064 Interfaceless Control-Only LUFA Devices - 2065 LUFA Test and Measurement Demo Application - 2066 LUFA Multiple Report HID Demo - 2068 LUFA Virtual Serial/Mass Storage Demo - 2103 JTAG ICE mkII - 2104 AVR ISP mkII - 2105 AVRONE! - 2106 STK600 development board - 2107 AVR Dragon - 210d XPLAIN evaluation kit (CDC ACM) - 2122 XMEGA-A1 Explained evaluation kit - 2310 EVK11xx evaluation board - 2ffb at90usb AVR DFU bootloader - 2ffd at89c5130/c5131 DFU bootloader - 2fff at89c5132/c51snd1c DFU bootloader - 3301 at43301 4-Port Hub - 3312 4-Port Hub - 4102 AirVast W-Buddie WN210 - 5601 at76c510 Prism-II 802.11b Access Point - 5603 Cisco 7920 WiFi IP Phone - 6124 at91sam SAMBA bootloader - 7603 D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a] - 7604 at76c503a 802.11b Adapter - 7605 at76c503a 802.11b Adapter - 7606 at76c505 802.11b Adapter - 7611 at76c510 rfmd2948 802.11b Access Point - 7613 WL-1130 USB - 7614 AT76c505a Wireless Adapter - 7615 AT76C505AMX Wireless Adapter - 7617 AT76C505AS Wireless Adapter - ff07 Tux Droid fish dongle -03ec Iwatsu America, Inc. -03ed Mitel Corp. -03ee Mitsumi - 0000 CD-R/RW Drive - 2501 eHome Infrared Receiver - 2502 eHome Infrared Receiver - 5609 Japanese Keyboard - 641f WIF-0402C Bluetooth Adapter - 6438 Bluetooth Device - 6440 WML-C52APR Bluetooth Adapter - 6901 SmartDisk FDD - 6902 Floppy Disk Drive - 7500 CD-R/RW - ffff Dongle with BlueCore in DFU mode -03f0 Hewlett-Packard - 0004 DeskJet 895c - 0011 OfficeJet G55 - 0012 DeskJet 1125C Printer Port - 0024 KU-0316 Keyboard - 002a LaserJet P1102 - 0101 ScanJet 4100c - 0102 PhotoSmart S20 - 0104 DeskJet 880c/970c - 0105 ScanJet 4200c - 0107 CD-Writer Plus - 010c Multimedia Keyboard Hub - 0111 G55xi Printer/Scanner/Copier - 0117 LaserJet 3200 - 011c hn210w 802.11b Adapter - 011d Integrated Bluetooth Module - 0121 HP49g+ Calculator - 0122 HID Internet Keyboard - 0201 ScanJet 6200c - 0202 PhotoSmart S20 - 0204 DeskJet 815c - 0205 ScanJet 3300c - 0207 CD-Writer Plus 8200e - 020c Multimedia Keyboard - 0211 OfficeJet G85 - 0212 DeskJet 1220C - 0217 LaserJet 2200 - 0218 APOLLO P2500/2600 - 0304 DeskJet 810c/812c - 0305 ScanJet 4300c - 0307 CD-Writer+ CD-4e - 0311 OfficeJet G85xi - 0312 Color Inkjet CP1700 - 0314 designjet 30/130 series - 0317 LaserJet 1200 - 0324 SK-2885 keyboard - 0401 ScanJet 5200c - 0404 DeskJet 830c/832c - 0405 ScanJet 3400cse - 0411 OfficeJet G95 - 0412 Printing Support - 0417 LaserJet 1200 series - 0423 HS-COMBO - 0504 DeskJet 885c - 0505 ScanJet 2100c - 0507 DVD+RW - 050c 5219 Wireless Keyboard - 0511 OfficeJet K60 - 0512 DeckJet 450 - 0517 LaserJet 1000 - 051d integrated module with Bluetooth wireless technology. - 0601 ScanJet 6300c - 0604 DeskJet 840c - 0605 ScanJet 2200c - 0611 OfficeJet K60xi - 0612 business inkjet 3000 - 0624 Bluetooth Dongle - 0701 ScanJet 5300c/5370c - 0704 DeskJet 825c - 0705 ScanJet 4400c - 0711 OfficeJet K80 - 0712 DeskJet 1180c - 0714 Printing Support - 0801 ScanJet 7400c - 0804 DeskJet 816c - 0805 HP4470C - 0811 OfficeJet K80xi - 0817 LaserJet 3300 - 0901 ScanJet 2300c - 0904 DeskJet 845c - 0912 Printing Support - 0917 LaserJet 3330 - 0924 Modular Smartcard Keyboard - 0a01 ScanJet 2400c - 0a17 color LaserJet 3700 - 0b01 ScanJet 82x0C - 0b0c Wireless Keyboard and Optical Mouse receiver - 0b17 LaserJet 2300d - 0c17 LaserJet 1010 - 0c24 Bluetooth Dongle - 0d12 OfficeJet 9100 series - 0d17 LaserJet 1012 - 0e17 LaserJet 1015 - 0f0c Wireless Keyboard and Optical Mouse receiver - 0f11 OfficeJet V40 - 0f12 Printing Support - 0f17 LaserJet 1150 - 1001 Photo Scanner 1000 - 1002 PhotoSmart 140 series - 1004 DeskJet 970c/970cse - 1005 ScanJet 5400c - 1011 OfficeJet V40xi - 1016 Jornada 548 / iPAQ HW6515 Pocket PC - 1017 LaserJet 1300 - 1024 Smart Card Keyboard - 1027 Virtual keyboard and mouse - 1102 PhotoSmart 240 series - 1104 DeskJet 959c - 1105 ScanJet 5470c/5490c - 1111 OfficeJet v60 - 1116 Jornada 568 Pocket PC - 1117 LaserJet 1300n - 1151 PSC-750xi Printer/Scanner/Copier - 1202 PhotoSmart 320 series - 1204 DeskJet 930c - 1205 ScanJet 4500C/5550C - 1211 OfficeJet v60xi - 1217 LaserJet 2300L - 1302 PhotoSmart 370 series - 1305 ScanJet 4570c - 1311 OfficeJet V30 - 1312 DeskJet 460 - 1317 LaserJet 1005 - 1405 ScanJet 3670 - 1411 PSC 750 - 1424 f2105 Monitor Hub - 1502 PhotoSmart 420 series - 1504 DeskJet 920c - 150c Mood Lighting (Microchip Technology Inc.) - 1511 PSC 750xi - 1512 Printing Support - 1517 color LaserJet 3500 - 1524 Smart Card Keyboard - KR - 1602 PhotoSmart 330 series - 1604 DeskJet 940c - 1605 ScanJet 5530C PhotoSmart - 1611 psc 780 - 1617 LaserJet 3015 - 161d Wireless Rechargeable Optical Mouse (HID) - 1624 Smart Card Keyboard - JP - 1702 PhotoSmart 380 series - 1704 DeskJet 948C - 1705 ScanJet 5590 - 1711 psc 780xi - 1712 Printing Support - 1717 LaserJet 3020 - 171d Wireless (Bluetooth + WLAN) Interface [Integrated Module] - 1801 Inkjet P-2000U - 1802 PhotoSmart 470 series - 1804 DeskJet 916C - 1805 ScanJet 7650 - 1811 PSC 720 - 1812 OfficeJet Pro K550 - 1817 LaserJet 3030 - 181d integrated module with Bluetooth 2.0 wireless technology. - 1902 PhotoSmart A430 series - 1904 DeskJet 3820 - 1911 OfficeJet V45 - 1917 LaserJet 3380 - 1a02 PhotoSmart A510 series - 1a11 OfficeJet 5100 series - 1a17 color LaserJet 4650 - 1b02 PhotoSmart A610 series - 1b04 DeskJet 3810 - 1b05 ScanJet 4850C/4890C - 1c02 PhotoSmart A710 series - 1c17 Color LaserJet 2550l - 1d02 PhotoSmart A310 series - 1d17 LaserJet 1320 - 1e02 PhotoSmart A320 Printer series - 1e11 PSC-950 - 1e17 LaserJet 1160 series - 1f02 PhotoSmart A440 Printer series - 1f11 PSC 920 - 1f12 OfficeJet Pro K5300 - 1f17 color LaserJet 5550 - 1f1d un2400 Gobi Wireless Modem - 2001 Floppy - 2002 Hub - 2004 DeskJet 640c - 2005 ScanJet 3570c - 2012 OfficeJet Pro K5400 - 201d un2400 Gobi Wireless Modem (QDL mode) - 2102 PhotoSmart 7345 - 2104 DeskJet 630c - 2112 OfficeJet Pro L7500 - 211d Sierra MC5725 [ev2210] - 2202 PhotoSmart 7600 series - 2205 ScanJet 3500c - 2212 OfficeJet Pro L7600 - 2217 color LaserJet 9500 MFP - 2302 PhotoSmart 7600 series - 2304 DeskJet 656c - 2305 ScanJet 3970c - 2311 OfficeJet d series - 2312 OfficeJet Pro L7700 - 2317 LaserJet 4350 - 2402 PhotoSmart 7700 series - 2404 Deskjet F2280 series - 2405 ScanJet 4070 PhotoSmart - 2417 LaserJet 4250 - 241d Gobi 2000 Wireless Modem (QDL mode) - 2424 LP1965 19" Monitor Hub - 2502 PhotoSmart 7700 series - 2504 DeskJet F4200 series - 2505 ScanJet 3770 - 2512 OfficeJet Pro L7300 - 2517 LaserJet 2410 - 251d Gobi 2000 Wireless Modem - 2524 LP3065 30" Monitor Hub - 2602 PhotoSmart A520 series - 2605 ScanJet 3800c - 2611 OfficeJet 7100 series - 2617 Color LaserJet 2820 series - 2624 Pole Display (HP522 2 x 20 Line Display) - 2702 PhotoSmart A620 series - 2704 DeskJet 915 - 2717 Color LaserJet 2830 - 2811 PSC-2100 - 2817 Color LaserJet 2840 - 2902 PhotoSmart A820 series - 2911 PSC 2200 - 2917 LaserJet 2420 - 2a11 PSC 2150 series - 2a17 LaserJet 2430 - 2b11 PSC 2170 series - 2b17 LaserJet 1020 - 2c12 Officejet J4680 - 2c17 LaserJet 1022 - 2c24 Logitech M-UAL-96 Mouse - 2d11 OfficeJet 6110 - 2d17 Printing Support - 2e11 PSC 1000 - 2e17 LaserJet 2600n - 2e24 LP2275w Monitor Hub - 2f11 PSC 1200 - 2f17 EWS 2605dn - 2f24 LP2475w Monitor Hub - 3002 PhotoSmart P1000 - 3004 DeskJet 980c - 3005 ScanJet 4670v - 3011 PSC 1100 series - 3017 Printing Support - 3102 PhotoSmart P1100 Printer w/ Card Reader - 3104 DeskJet 960c - 3111 OfficeJet 4100 series - 3117 EWS 2605dtn - 311d Atheros AR9285 Malbec Bluetooth Adapter - 3202 PhotoSmart 1215 - 3207 4 GB flash drive - 3211 OfficeJet 4105 series - 3217 LaserJet 3050 - 3302 PhotoSmart 1218 - 3304 DeskJet 990c - 3312 OfficeJet J6410 - 3317 LaserJet 3052 - 3402 PhotoSmart 1115 - 3404 DeskJet 6122 - 3417 LaserJet 3055 - 3502 PhotoSmart 230 - 3504 DeskJet 6127c - 3511 PSC 2300 - 3517 LaserJet 3390 - 3602 PhotoSmart 1315 - 3611 PSC 2410 PhotoSmart - 3617 Color LaserJet 2605 - 3711 PSC 2500 - 3717 EWS UPD - 3724 Webcam - 3802 PhotoSmart 100 - 3817 LaserJet P2015 series - 3902 PhotoSmart 130 - 3a02 PhotoSmart 7150 - 3a11 OfficeJet 5500 series - 3a17 Printing Support - 3b02 PhotoSmart 7150~ - 3b11 PSC 1300 series - 3b17 LaserJet M1005 MFP - 3c02 PhotoSmart 7350 - 3c11 PSC 1358 - 3c17 EWS UPD - 3d02 PhotoSmart 7350~ - 3d11 OfficeJet 4215 - 3d17 LaserJet P1005 - 3e02 PhotoSmart 7550 - 3e17 LaserJet P1006 - 3f02 PhotoSmart 7550~ - 3f11 PSC-1315/PSC-1317 - 4002 PhotoSmart 635/715/720/735/935 (storage) - 4004 cp1160 - 4102 PhotoSmart 618 - 4105 ScanJet 4370 - 4111 OfficeJet 7200 series - 4117 LaserJet 1018 - 4202 PhotoSmart 812 - 4205 ScanJet G3010 - 4211 OfficeJet 7300 series - 4217 EWS CM1015 - 4302 PhotoSmart 850 (ptp) - 4305 ScanJet G3110 - 4311 OfficeJet 7400 series - 4317 Color LaserJet CM1017 - 4402 PhotoSmart 935 (ptp) - 4417 EWS UPD - 4502 PhotoSmart 945 (PTP mode) - 4505 ScanJet G4010 - 4511 PhotoSmart 2600 - 4517 EWS UPD - 4605 ScanJet G4050 - 4611 PhotoSmart 2700 - 4717 Color LaserJet CP1215 - 4811 PSC 1600 - 4911 PSC 2350 - 4b11 OfficeJet 6200 - 4c11 PSC 1500 series - 4c17 EWS UPD - 4d11 PSC 1400 - 4d17 EWS UPD - 4e11 PhotoSmart 2570 series - 4f11 OfficeJet 5600 (USBHUB) - 5004 DeskJet 995c - 5011 PhotoSmart 3100 series - 5017 EWS UPD - 5111 PhotoSmart 3200 series - 5211 PhotoSmart 3300 series - 5311 OfficeJet 6300 - 5411 OfficeJet 4300 - 5511 DeskJet F300 series - 5611 PhotoSmart C3180 - 5617 LaserJet M1120 MFP - 5711 PhotoSmart C4100 series - 5717 LaserJet M1120n MFP - 5811 PhotoSmart C5100 series - 5817 LaserJet M1319f MFP - 5911 PhotoSmart C6180 - 5a11 PhotoSmart C7100 series - 5b11 OfficeJet J2100 series - 5c11 PhotoSmart C4200 Printer series - 5d11 PhotoSmart C5200 series - 5e11 PhotoSmart D7400 series - 6004 DeskJet 5550 - 6102 Hewlett Packard Digital Camera - 6104 DeskJet 5650c - 6117 color LaserJet 3550 - 6202 PhotoSmart 215 - 6204 DeskJet 5150c - 6217 Color LaserJet 4700 - 6302 PhotoSmart 318/612 - 6317 Color LaserJet 4730mfp - 6402 PhotoSmart 715 (ptp) - 6411 PhotoSmart C8100 series - 6417 LaserJet 5200 - 6502 PhotoSmart 120 (ptp) - 6511 PhotoSmart C7200 series - 6602 PhotoSmart 320 - 6611 PhotoSmart C4380 series - 6617 LaserJet 5200L - 6702 PhotoSmart 720 (ptp) - 6717 Color LaserJet 3000 - 6802 PhotoSmart 620 (ptp) - 6811 PhotoSmart D5300 series - 6817 Color LaserJet 3800 - 6911 PhotoSmart D7200 series - 6917 Color LaserJet 3600 - 6a02 PhotoSmart 735 (ptp) - 6a11 PhotoSmart C6200 series - 6a17 LaserJet 4240 - 6b02 PhotoSmart R707 (PTP mode) - 6b11 Photosmart C4500 series - 6c17 Color LaserJet 4610 - 6f17 Color LaserJet CP6015 series - 7004 DeskJet 3320c - 7102 PhotoSmart 635 (PTP mode) - 7104 DeskJet 3420c - 7117 CM8060 Color MFP with Edgeline Technology - 7202 PhotoSmart 43x (ptp) - 7204 DeskJet 36xx - 7217 LaserJet M5035 MFP - 7302 PhotoSmart M307 (PTP mode) - 7304 DeskJet 35xx - 7311 Photosmart Premium C309 - 7317 LaserJet P3005 - 7404 Printing Support - 7417 LaserJet M4345 MFP - 7504 Printing Support - 7517 LaserJet M3035 MFP - 7604 DeskJet 3940 - 7611 DeskJet F2492 All-in-One - 7617 LaserJet P3004 - 7702 PhotoSmart R817 (PTP mode) - 7704 DeskJet D4100 - 7717 CM8050 Color MFP with Edgeline Technology - 7804 DeskJet D1360 - 7817 Color LaserJet CP3505 - 7917 LaserJet M5025 MFP - 7a02 PhotoSmart M415 (PTP mode) - 7a04 DeskJet D2460 - 7a17 LaserJet M3027 MFP - 7b02 PhotoSmart M23 (PTP mode) - 7b17 Color LaserJet CP4005 - 7c17 Color LaserJet CM6040 series - 7d04 DeskJet F2100 Printer series - 7d17 Color LaserJet CM4730 MFP - 7e04 DeskJet F4100 Printer series - 8017 LaserJet P4515 - 8104 Printing Support - 8117 LaserJet P4015 - 811c Ethernet HN210E - 8204 Printing Support - 8207 FHA-3510 2.4GHz Wireless Optical Mobile Mouse - 8217 LaserJet P4014 - 8317 LaserJet M9050 MFP - 8404 DeskJet 6800 series - 8417 LaserJet M9040 MFP - 8504 DeskJet 6600 series - 8604 DeskJet 5440 - 8704 DeskJet 5940 - 8804 DeskJet 6980 series - 8904 DeskJet 6940 series - 9002 PhotoSmart M437 - 9102 PhotoSmart M537 - 9302 PhotoSmart R930 series - 9402 PhotoSmart R837 - 9502 PhotoSmart R840 series - 9602 PhotoSmart M730 series - 9702 PhotoSmart R740 series - 9802 PhotoSmart Mz60 series - 9902 PhotoSmart M630 series - 9a02 PhotoSmart E330 series - 9b02 PhotoSmart M540 series - 9c02 PhotoSmart M440 series - a004 DeskJet 5850c - b002 PhotoSmart 7200 series - b102 PhotoSmart 7200 series - b116 Webcam - b202 PhotoSmart 7600 series - b302 PhotoSmart 7600 series - b402 PhotoSmart 7700 series - b502 PhotoSmart 7700 series - b602 PhotoSmart 7900 series - b702 PhotoSmart 7900 series - b802 PhotoSmart 7400 series - b902 PhotoSmart 7800 series - ba02 PhotoSmart 8100 series - bb02 PhotoSmart 8400 series - bc02 PhotoSmart 8700 series - bd02 PhotoSmart Pro B9100 series - bef4 NEC Picty760 - c002 PhotoSmart 7800 series - c102 PhotoSmart 8000 series - c202 PhotoSmart 8200 series - c302 DeskJet D2300 - c402 PhotoSmart D5100 series - c502 PhotoSmart D6100 series - c602 PhotoSmart D7100 series - c702 PhotoSmart D7300 series - c802 PhotoSmart D5060 Printer - d104 Bluetooth Dongle - efbe NEC Picty900 - f0be NEC Picty920 - f1be NEC Picty800 -03f1 Genoa Technology -03f2 Oak Technology, Inc. -03f3 Adaptec, Inc. - 0020 AWN-8020 WLAN - 0080 AVC-1100 Audio Capture - 0083 AVC-2200 Device - 0087 AVC-2210 Loader - 0088 AVC-2210 Device - 008b AVC-2310 Loader - 008c AVC-2310 Device - 0094 eHome Infrared Receiver - 009b AVC-1410 GameBridge TV NTSC - 2000 USBXchange - 2001 USBXchange Adapter - 2002 USB2-Xchange - 2003 USB2-Xchange Adapter - adcc Composite Device Support -03f4 Diebold, Inc. -03f5 Siemens Electromechanical -03f8 Epson Imaging Technology Center -03f9 KeyTronic Corp. - 0100 Keyboard - 0101 Keyboard - 0102 Keyboard Mouse -03fb OPTi, Inc. -03fc Elitegroup Computer Systems -03fd Xilinx, Inc. -03fe Farallon Comunications -0400 National Semiconductor Corp. - 05dc Rigol Technologies DS1000USB Oscilloscope - 0807 Bluetooth Dongle - 080a Bluetooth Device - 09c4 Rigol Technologies DG1022 Arbitrary Waveform Generator - 1000 Mustek BearPaw 1200 Scanner - 1001 Mustek BearPaw 2400 Scanner - 1237 Hub - a000 Smart Display Reference Device - c359 Logitech Harmony (Boot loader mode) - c35b Printing Support - c55d Rigol Technologies DS5000USB Oscilloscope -0401 National Registry, Inc. -0402 ALi Corp. - 5462 M5462 IDE Controller - 5602 M5602 Video Camera Controller - 5603 M5603 Video Camera Controller - 5606 M5606 Video Camera Controller [UVC] - 5621 M5621 High-Speed IDE Controller - 5623 M5623 Scanner Controller - 5627 Welland ME-740PS USB2 3.5" Power Saving Enclosure - 5632 M5632 Host-to-Host Link - 5635 M5635 Flash Card Reader - 5636 USB 2.0 Storage Device - 5637 M5637 IDE Controller - 5661 M5661 MP3 player - 5667 M5667 MP3 player -0403 Future Technology Devices International, Ltd - 0000 H4SMK 7 Port Hub - 0232 Serial Converter - 1060 JTAG adapter - 6001 FT232 USB-Serial (UART) IC - 6007 Serial Converter - 6008 Serial Converter - 6009 Serial Converter - 6010 FT2232C Dual USB-UART/FIFO IC - 6011 FT4232H - 8040 4 Port Hub - 8070 7 Port Hub - 8370 7 Port Hub - 8371 PS/2 Keyboard And Mouse - 8372 FT8U100AX Serial Port - bcd8 Stellaris Development Board - bcd9 Stellaris Evaluation Board - c630 lcd2usb interface - c7d0 RR-CirKits LocoBuffer-USB - c8b8 Alpermann+Velte MTD TCU - c8b9 Alpermann+Velte MTD TCU 1HE - c8ba Alpermann+Velte Rubidium H1 - c8bb Alpermann+Velte Rubidium H3 - c8bc Alpermann+Velte Rubidium S1 - c8bd Alpermann+Velte Rubidium T1 - c8be Alpermann+Velte Rubidium D1 - cc48 product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi - cc49 product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru - cc4a product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal - d010 SCS PTC-IIusb - d011 SCS Position-Tracker/TNC - d012 SCS DRAGON 1 - d013 SCS DRAGON 1 - d6f8 UNI Black BOX - d9a9 Actisense USG-1 NMEA Serial Gateway - d9aa Actisense NGT-1 NMEA2000 PC Interface - e0d0 Total Phase Aardvark I2C/SPI Host Adapter - e521 EVER Sinline XL Series UPS - e700 Elster Unicom III Optical Probe - e888 Expert ISDN Control USB - e889 USB-RS232 OptoBridge - e88a Expert mouseCLOCK USB II - e88b Precision Clock MSF USB - e88c Expert mouseCLOCK USB II HBG - ea90 Eclo 1-Wire Adapter - ed71 HAMEG HO870 Serial Port - ed72 HAMEG HO720 Serial Port - ed73 HAMEG HO730 Serial Port - ed74 HAMEG HO820 Serial Port - ef10 FT1245BL - f070 Serial Converter 422/485 [Vardaan VEUSB422R3] - f1a0 Asix PRESTO Programmer - f208 Papenmeier Braille-Display - f3c0 4N-GALAXY Serial Converter - f680 Suunto Sports Instrument - f758 GW Instek GDS-8x0 Oscilloscope - f850 USB-UIRT (Universal Infrared Receiver+Transmitter) - f918 Ant8 Logic Probe - fa00 Matrix Orbital USB Serial - fa01 Matrix Orbital MX2 or MX3 - fa02 Matrix Orbital MX4 or MX5 - fa03 Matrix Orbital VK/LK202 Family - fa04 Matrix Orbital VK/LK204 Family - fc08 Crystalfontz CFA-632 USB LCD - fc09 Crystalfontz CFA-634 USB LCD - fc0b Crystalfontz CFA-633 USB LCD - fc0c Crystalfontz CFA-631 USB LCD - fc0d Crystalfontz CFA-635 USB LCD - fc82 SEMC DSS-20/DSS-25 SyncStation - fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer - fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer - ff08 ToolHouse LoopBack Adapter - ff18 Logbook Bus - ff19 Logbook Bus - ff1a Logbook Bus - ff1b Logbook Bus - ff1c Logbook Bus - ff1d Logbook Bus - ff1e Logbook Bus - ff1f Logbook Bus -0404 NCR Corp. - 0202 78XX Scanner - 0203 78XX Scanner - Embedded System - 0310 K590 Printer, Self-Service - 0311 7167 Printer, Receipt/Slip - 0312 7197 Printer Receipt - 0320 5932-USB Keyboard - 0321 5953-USB Dynakey - 0322 5932-USB Enhanced Keyboard - 0323 5932-USB Enhanced Keyboard, Flash-Recovery/Download - 0324 5953-USB Enhanced Dynakey - 0325 5953-USB Enhanced Dynakey Flash-Recovery/Download - 0328 K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages) - 0329 K018: USB-MSR JIS 2-Track MSR: POS Standard - 032a K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode - 032b K016/K018: USB-MSR Flash-Recovery/Download -0405 Synopsys, Inc. -0406 Fujitsu-ICL Computers -0407 Fujitsu Personal Systems, Inc. -0408 Quanta Computer, Inc. - 0103 FV TouchCam N1 (Audio) - 030c HP Webcam - 03b2 HP Webcam - 1030 FV TouchCam N1 (Video) - 3000 Optical dual-touch panel - 3001 Optical Touch Screen -0409 NEC Corp. - 0011 PC98 Series Layout Keyboard Mouse - 0012 ATerm IT75DSU ISDN TA - 0014 Japanese Keyboard - 0019 109 Japanese Keyboard with Bus-Powered Hub - 001a PC98 Series Layout Keyboard with Bus-Powered Hub - 0025 Mini Keyboard with Bus-Powered Hub - 0027 MultiSync Monitor - 002c Clik!-USB Drive - 0034 109 Japanese Keyboard with One-touch start buttons - 003f Wireless Keyboard with One-touch start buttons - 0040 Floppy - 004e SuperScript 1400 Series - 004f Wireless Keyboard with One-touch start buttons - 0058 HighSpeed Hub - 0059 HighSpeed Hub - 005a HighSpeed Hub - 006a Conceptronic USB Harddisk Box - 0081 SuperScript 1400 Series - 0082 SuperScript 1400 Series - 0094 Japanese Keyboard with One-touch start buttons - 0095 Japanese Keyboard - 00a9 AtermIT21L 128K Support Standard - 00aa AtermITX72 128K Support Standard - 00ab AtermITX62 128K Support Standard - 00ac AtermIT42 128K Support Standard - 00ae INSMATEV70G-MAX Standard - 00af AtermITX70 128K Support Standard - 00b0 AtermITX80 128K Support Standard - 00b2 AtermITX80D 128K Support Standard - 00c0 Wireless Remocon - 00f7 Smart Display PK-SD10 - 011d e228 Mobile Phone - 0203 HID Audio Controls - 0248 Aterm PA-WL54GU - 0249 Aterm WL300NU-G - 02b4 Aterm WL300NU-AG - 55aa Hub - 55ab Hub [iMac/iTouch kbd] - 8010 Intellibase Hub - 8011 Intellibase Hub - efbe P!cty 900 [HP DJ] - f0be P!cty 920 [HP DJ 812c] -040a Kodak Co. - 0001 DVC-323 - 0002 DVC-325 - 0100 DC-220 - 0110 DC-260 - 0111 DC-265 - 0112 DC-290 - 0120 DC-240 - 0121 DC-240 (PTP firmware) - 0130 DC-280 - 0131 DC-5000 - 0132 DC-3400 - 0140 DC-4800 - 0160 DC4800 - 0170 DX3900 - 0200 Digital Camera - 0300 EZ-200 - 0400 MC3 - 0402 Digital Camera - 0403 Z7590 - 0500 DX3500 - 0510 DX3600 - 0525 DX3215 - 0530 DX3700 - 0535 EasyShare CX4230 Camera - 0540 LS420 - 0550 DX4900 - 0555 DX4330 - 0560 CX4200 - 0565 CX4210 - 0566 CX4300 - 0567 LS753 - 0568 LS443 - 0569 LS663 - 0570 DX6340 - 0571 CX6330 - 0572 DX6440 - 0573 CX6230 - 0574 CX6200 - 0575 DX6490 - 0576 DX4530 - 0577 DX7630 - 0578 CX7300/CX7310 - 0579 CX7220 - 057a CX7330 - 057b CX7430 - 057c CX7530 - 057d DX7440 - 057e C300 - 057f DX7590 - 0580 Z730 - 0581 Digital Camera - 0582 Digital Camera - 0583 Digital Camera - 0584 CX6445 - 0585 Digital Camera - 0586 CX7525 - 0587 Digital Camera - 0588 Digital Camera - 0589 EasyShare C360 - 058a C310 - 058b Digital Camera - 058c C330 - 058d C340 - 058e V530 - 058f V550 - 0590 Digital Camera - 0591 Digital Camera - 0592 Digital Camera - 0593 Digital Camera - 0594 Digital Camera - 0595 Digital Camera - 0596 Digital Camera - 0597 Digital Camera - 0598 Digital Camera - 0599 Digital Camera - 059a Digital Camera - 059b Digital Camera - 059c Digital Camera - 059d Digital Camera - 059e Digital Camera - 059f Digital Camera - 05a0 Digital Camera - 05a1 Digital Camera - 05a2 Digital Camera - 05a3 Digital Camera - 05a4 Digital Camera - 05a5 Digital Camera - 05a6 Digital Camera - 05a7 Digital Camera - 05a8 Digital Camera - 05a9 Digital Camera - 05aa Digital Camera - 05ab Digital Camera - 05ac Digital Camera - 05ad Digital Camera - 05ae Digital Camera - 05af Digital Camera - 05b0 Digital Camera - 05b1 Digital Camera - 05b2 Digital Camera - 05b3 EasyShare Z710 Camera - 05b4 Digital Camera - 05b5 Digital Camera - 05b6 Digital Camera - 05b7 Digital Camera - 05b8 Digital Camera - 05b9 Digital Camera - 05ba Digital Camera - 05bb Digital Camera - 05bc Digital Camera - 05bd Digital Camera - 05be Digital Camera - 05bf Digital Camera - 05c0 Digital Camera - 05c1 Digital Camera - 05c2 Digital Camera - 05c3 Digital Camera - 05c4 Digital Camera - 05c5 Digital Camera - 05c8 EASYSHARE Z1485 IS Digital Camera - 05d3 EasyShare M320 Camera - 05d4 EasyShare C180 Digital Camera - 1001 EasyShare SV811 Digital Picture Frame - 4000 InkJet Color Printer - 4109 EasyShare Printer Dock Series 3 - 410d EasyShare G600 Printer Dock - 5010 Wireless Adapter - 5012 DBT-220 Bluetooth Adapter - 6001 i30 - 6002 i40 - 6003 i50 - 6004 i60 - 6005 i80 -040b Weltrend Semiconductor - 6510 Weltrend Bar Code Reader - 6520 XBOX Xploder - 6533 Speed-Link Competition Pro -040c VTech Computers, Ltd -040d VIA Technologies, Inc. - 3184 VNT VT6656 USB-802.11 Wireless LAN Adapter - 6205 USB 2.0 Card Reader -040e MCCI -040f Echo Speech Corp. -0411 BUFFALO INC. (formerly MelCo., Inc.) - 0001 LUA-TX Ethernet [pegasus] - 0005 LUA-TX Ethernet - 0006 WLI-USB-L11 Wireless LAN Adapter - 0009 LUA2-TX Ethernet - 000b WLI-USB-L11G-WR Wireless LAN Adapter - 000d WLI-USB-L11G Wireless LAN Adapter - 0012 LUA-KTX Ethernet - 0013 USB2-IDE Adapter - 0016 WLI-USB-S11 802.11b Adapter - 0018 USB2-IDE Adapter - 001c USB-IDE Bridge: DUB-PxxG - 0027 WLI-USB-KS11G 802.11b Adapter - 003d LUA-U2-KTX Ethernet - 0044 WLI-USB-KB11 Wireless LAN Adapter - 004b WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB] - 004d WLI-USB-B11 Wireless LAN Adapter - 0050 WLI2-USB2-G54 Wireless LAN Adapter - 005e WLI-U2-KG54-YB WLAN - 0065 Python2 WDM Encoder - 0066 WLI-U2-KG54 WLAN - 0067 WLI-U2-KG54-AI WLAN - 0089 Buffalo RUF-C/U2 Flash Drive - 008b Nintendo Wi-Fi - 0091 WLI-U2-KAMG54 Wireless LAN Adapter - 0092 WLI-U2-KAMG54 Bootloader - 0097 WLI-U2-KG54-BB - 00a9 WLI-U2-AMG54HP Wireless LAN Adapter - 00aa WLI-U2-AMG54HP Bootloader - 00b3 PC-OP-RS1 RemoteStation - 00bc WLI-U2-KG125S 802.11g Adapter [Broadcom 4320 USB] - 00ca 802.11n Network Adapter - 00cb WLI-U2-G300N 802.11n Adapter - 00d8 WLI-U2-SG54HP - 00d9 WLI-U2-G54HP - 00da WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B] - 00e8 Buffalo WLI-UC-G300N Wireless LAN Adapter - 012e Buffalo WLI-UC-AG300N Wireless LAN Adapter - 0148 Buffalo WLI-UC-G300HP Wireless LAN Adapter - 0150 Buffalo WLP-UC-AG300 Wireless LAN Adapter - 0157 Buffalo External Hard Drive HD-PEU2 - 0158 Buffalo WLI-UC-GNHP Wireless LAN Adapter - 015d Buffalo WLI-UC-GN Wireless LAN Adapter [Ralink RT2870] - 016f Buffalo WLI-UC-G301N Wireless LAN Adapter - 017f Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] - 019e Buffalo WLI-UC-GNP Wireless LAN Adapter - 01a1 MiniStation Metro - 01a2 Buffalo WLI-UC-GNM Wireless LAN Adapter -0412 Award Software International -0413 Leadtek Research, Inc. - 1310 WinFast TV - NTSC + FM - 1311 WinFast TV - NTSC + MTS + FM - 1312 WinFast TV - PAL BG + FM - 1313 WinFast TV - PAL BG+TXT + FM - 1314 WinFast TV Audio - PHP PAL I - 1315 WinFast TV Audio - PHP PAL I+TXT - 1316 WinFast TV Audio - PHP PAL DK - 1317 WinFast TV Audio - PHP PAL DK+TXT - 1318 WinFast TV - PAL I/DK + FM - 1319 WinFast TV - PAL N + FM - 131a WinFast TV Audio - PHP SECAM LL - 131b WinFast TV Audio - PHP SECAM LL+TXT - 131c WinFast TV Audio - PHP SECAM DK - 131d WinFast TV - SECAM DK + TXT + FM - 131e WinFast TV - NTSC Japan + FM - 1320 WinFast TV - NTSC - 1321 WinFast TV - NTSC + MTS - 1322 WinFast TV - PAL BG - 1323 WinFast TV - PAL BG+TXT - 1324 WinFast TV Audio - PHP PAL I - 1325 WinFast TV Audio - PHP PAL I+TXT - 1326 WinFast TV Audio - PHP PAL DK - 1327 WinFast TV Audio - PHP PAL DK+TXT - 1328 WinFast TV - PAL I/DK - 1329 WinFast TV - PAL N - 132a WinFast TV Audio - PHP SECAM LL - 132b WinFast TV Audio - PHP SECAM LL+TXT - 132c WinFast TV Audio - PHP SECAM DK - 132d WinFast TV - SECAM DK + TXT - 132e WinFast TV - NTSC Japan - 6023 EMP Audio Device - 6024 WinFast PalmTop/Novo TV Video - 6025 WinFast DTV Dongle (cold state) - 6026 WinFast DTV Dongle (warm state) - 6029 WinFast DTV Dongle Gold - 6125 WinFast DTV Dongle - 6126 WinFast DTV Dongle BDA Driver - 6f00 WinFast DTV Dongle (STK7700P based) -0414 Giga-Byte Technology Co., Ltd -0416 Winbond Electronics Corp. - 0035 W89C35 802.11bg WLAN Adapter - 0101 Hub - 0961 AVL Flash Card Reader - 3810 Smart Card Controller - 3811 Generic Controller - Single interface - 3812 Smart Card Controller_2Interface - 3813 Panel Display - 5518 4-Port Hub - 551a PC Sync Keypad - 551b PC Async Keypad - 551c Sync Tenkey - 551d Async Tenkey - 551e Keyboard - 551f Keyboard w/ Sys and Media - 5521 Keyboard - 6481 16-bit Scanner - 7721 Memory Stick Reader/Writer - 7722 Memory Stick Reader/Writer - 7723 SD Card Reader -0417 Symbios Logic -0418 AST Research -0419 Samsung Info. Systems America, Inc. - 0001 IrDA Remote Controller / Creative Cordless Mouse - 0600 Desktop Wireless 6000 - 3001 Xerox P1202 Laser Printer - 3003 Olivetti PG L12L - 3201 Docuprint P8ex - 3404 SCX-5x12 series - 3406 MFP 830 series - 3407 ML-912 - 3601 InkJet Color Printer - 3602 InkJet Color Printer - 4602 Remote NDIS Network Device - 8001 Hub - 8002 SyncMaster HID Monitor Control - aa03 SDAS-3 MP3 Player -041a Phoenix Technologies, Ltd -041b d'TV -041d S3, Inc. -041e Creative Technology, Ltd - 1002 Nomad II - 1003 Blaster GamePad Cobra - 1050 GamePad Cobra - 1053 Mouse Gamer HD7600L - 200c MuVo V100 - 2020 Zen X-Fi 2 - 2029 ZiiO - 2801 Prodikeys PC-MIDI multifunction keyboard - 3000 SoundBlaster Extigy - 3002 SB External Composite Device - 3010 SoundBlaster MP3+ - 3014 SB External Composite Device - 3015 Sound Blaster Digital Music LX - 3020 SoundBlaster Audigy 2 NX - 3030 SB External Composite Device - 3040 SoundBlaster Live! 24-bit External SB0490 - 3060 Sound Blaster Audigy 2 ZS External - 3061 SoundBlaster Audigy 2 ZS Video Editor - 3090 Sound Blaster Digital Music SX - 3f00 E-Mu Xboard 25 MIDI Controller - 3f02 E-Mu 0202 - 3f04 E-Mu 0404 - 3f07 E-Mu Xmidi 1x1 - 4003 VideoBlaster Webcam Go Plus [W9967CF] - 4004 Nomad II MG - 4005 Webcam Blaster Go ES - 4007 Go Mini - 400a PC-Cam 300 - 400b PC-Cam 600 - 400c Webcam 5 [pwc] - 400d Webcam PD1001 - 400f PC-CAM 550 (Composite) - 4011 Webcam PRO eX - 4012 PC-CAM350 - 4013 PC-Cam 750 - 4015 CardCam Value - 4016 CardCam - 4017 Webcam Mobile [PD1090] - 4018 Webcam Vista [PD1100] - 4019 Audio Device - 401a Webcam Vista [PD1100] - 401c Webcam NX [PD1110] - 401d Webcam NX Ultra - 401e Webcam NX Pro - 401f Webcam Notebook [PD1171] - 4020 Webcam NX - 4021 Webcam NX Ultra - 4022 Webcam NX Pro - 4028 Vista Plus cam [VF0090] - 4029 Webcam Live! - 402f DC-CAM 3000Z - 4034 Webcam Instant - 4035 Webcam Instant - 4036 Webcam Live!/Live! Pro - 4037 Webcam Live! - 4038 ORITE CCD Webcam [PC370R] - 4039 Webcam Live! Effects - 403a Webcam NX Pro 2 - 403b Creative Webcam Vista [VF0010] - 403c Webcam Live! Ultra - 403d Webcam Notebook Ultra - 403e Webcam Vista Plus - 4041 Webcam Live! Motion - 4045 Live! Cam Voice - 4049 Live! Cam Voice - 4051 Live! Cam Notebook Pro [VF0250] - 4052 Live! Cam Vista IM - 4053 Live! Cam Video IM - 4054 Live! Cam Video IM - 4055 Live! Cam Video IM Pro - 4056 Live! Cam Video IM Pro - 4057 Live! Cam Optia - 4058 Live! Cam Optia AF - 4061 Live! Cam Notebook Pro [VF0400] - 4063 Live! Cam Video IM Pro - 4068 Live! Cam Notebook [VF0470] - 406c Live! Cam Sync [VF0520] - 4083 Live! Cam Socialize [VF0640] - 4100 Nomad Jukebox 2 - 4101 Nomad Jukebox 3 - 4102 NOMAD MuVo^2 - 4106 Nomad MuVo - 4107 NOMAD MuVo - 4108 Nomad Jukebox Zen - 4109 Nomad Jukebox Zen NX - 410b Nomad Jukebox Zen USB 2.0 - 410c Nomad MuVo NX - 410f NOMAD MuVo^2 (Flash) - 4110 Nomad Jukebox Zen Xtra - 4111 Dell Digital Jukebox - 4116 MuVo^2 - 4117 Nomad MuVo TX - 411b Zen Touch - 411c Nomad MuVo USB 2.0 - 411d Zen - 411e Zen Micro - 4120 Nomad MuVo TX FM - 4123 Zen Portable Media Center - 4124 MuVo^2 FM (uHDD) - 4126 Dell DJ (2nd gen) - 4127 Dell DJ - 4128 NOMAD Jukebox Zen Xtra (mtp) - 412b MuVo N200 with FM radio - 412f Dell Digital Jukebox 2.Gen - 4130 Zen Micro (mtp) - 4131 Zen Touch (mtp) - 4133 Mass Storage Device - 4134 Zen Neeon - 4136 Zen Sleek - 4137 Zen Sleek (mtp) - 4139 Zen Nano Plus - 413c Zen MicroPhoto - 4150 Zen V (MTP) - 4151 Zen Vision:M (mtp) - 4152 Zen V Plus - 4153 Zen Vision W - 4155 Zen Stone plus - 4157 Zen (MTP) - 500f Broadband Blaster 8012U-V - 5015 TECOM Bluetooth Device - ffff Webcam Live! Ultra -041f LCS Telegraphics -0420 Chips and Technologies - 1307 Celly SIM Card Reader -0421 Nokia Mobile Phones - 0001 E61i (PC Suite mode) - 0018 6288 GSM Smartphone - 0019 6288 GSM Smartphone (imaging mode) - 001a 6288 GSM Smartphone (file transfer mode) - 0024 5610 XpressMusic (Storage mode) - 0025 5610 XpressMusic (PC Suite mode) - 0028 5610 XpressMusic (Imaging mode) - 002d 6120 Phone (Mass storage mode) - 002e 6120 Phone (Media-Player mode) - 002f 6120 Phone (PC-Suite mode) - 0042 E51 (PC Suite mode) - 0064 3109c GSM Phone - 006b 5310 Xpress Music (PC Suite mode) - 006c 5310 Xpress music (Storage mode) - 006d N95 (Storage mode) - 006e N95 (Multimedia mode) - 006f N95 (Printing mode) - 0070 N95 (PC Suite mode) - 0096 N810 Internet Tablet - 00aa E71 (Mass storage mode) - 00ab E71 (PC Suite mode) - 00e4 E71 (Media transfer mode) - 0103 ADL Flashing Engine AVALON Parent - 0104 ADL Re-Flashing Engine Parent - 0105 Nokia Firmware Upgrade Mode - 0106 ROM Parent - 0154 5800 XpressMusic (PC Suite mode) - 0155 5800 XpressMusic (Multimedia mode) - 0156 5800 XpressMusic (Storage mode) - 0157 5800 XpressMusic (Imaging mode) - 0199 6700 Classic (msc) - 019a 6700 Classic (PC Suite) - 019b 6700 Classic (mtp) - 01b0 6303 classic Phone (PC Suite mode) - 01b1 6303 classic Phone (Mass storage mode) - 01b2 6303 classic Phone (Printing and media mode) - 01c7 N900 (Storage Mode) - 01c8 N900 (PC-Suite Mode) - 0228 5530 XpressMusic - 026a N97 (mass storage) - 026b N97 (Multimedia) - 026c N97 (PC Suite) - 026d N97 (Pictures) - 0295 660i/6600i Slide Phone (Mass Storage) - 0297 660i/6600i Slide Phone (Still Image) - 02e1 5230 (Storage mode) - 02e2 5230 (Multimedia mode) - 02e3 5230 (PC-Suite mode) - 02e4 5230 (Imaging mode) - 03a4 C5 (Storage mode) - 0400 7600 Phone Parent - 0401 6650 GSM Phone - 0402 6255 Phone Parent - 0404 5510 - 0405 9500 GSM Communicator - 0407 Music Player HDR-1(tm) - 040b N-Gage GSM Phone - 040d 6620 Phone Parent - 040e 6651 Phone Parent - 040f 6230 GSM Phone - 0410 6630 Imaging Smartphone - 0411 7610 Phone Parent - 0413 6260 Phone Parent - 0414 7370 - 0415 9300 GSM Smartphone - 0416 6170 Phone Parent - 0417 7270 Phone Parent - 0418 E70 (PC Suite mode) - 0419 E60 (PC Suite mode) - 041a 9500 GSM Communicator (RNDIS) - 041b 9300 GSM Smartphone (RNDIS) - 041c 7710 Phone Parent - 041d 6670 Phone Parent - 041e 6680 - 041f 6235 Phone Parent - 0421 3230 Phone Parent - 0422 6681 Phone Parent - 0423 6682 Phone Parent - 0428 6230i Modem - 0429 6230i MultiMedia Card - 0431 770 Internet Tablet - 0432 N90 Phone Parent - 0435 E70 (IP Passthrough/RNDIS mode) - 0436 E60 (IP Passthrough/RNDIS mode) - 0437 6265 Phone Parent - 043a N70 USB Phone Parent - 043b 3155 Phone Parent - 043c 6155 Phone Parent - 043d 6270 Phone Parent - 0443 N70 Phone Parent - 0444 N91 - 044c NM850iG Phone Parent - 044d E61 (PC Suite mode) - 044e E61 (Data Exchange mode) - 044f E61 (IP Passthrough/RNDIS mode) - 0453 9300 Phone Parent - 0456 6111 Phone Parent - 0457 6111 Phone (Printing mode) - 045a 6280 Phone Parent - 045d 6282 Phone Parent - 046e 6110 Navigator - 0471 6110 Navigator - 0485 MTP Device - 04b9 5300 - 04c3 N800 Internet Tablet - 04ce E90 Communicator (PC Suite mode) - 04cf E90 Communicator (Storage mode) - 04f0 Nokia N95 (PC Suite mode) - 04f9 6300 (PC Suite mode) - 0508 E65 (PC Suite mode) - 0509 E65 (Storage mode) - 0600 Digital Pen SU-1B - 0610 CS-15 (Internet Stick 3G modem) - 0800 Connectivity Cable DKU-5 - 0801 Data Cable DKU-6 - 0802 CA-42 Phone Parent -0422 ADI Systems, Inc. -0423 Computer Access Technology Corp. - 000a NetMate Ethernet - 000c NetMate2 Ethernet - 000d USB Chief Analyzer - 0100 Generic Universal Protocol Analyzer - 0101 UPA USBTracer - 0200 Generic 10K Universal Protocol Analyzer - 020a PETracer ML - 0300 Generic Universal Protocol Analyzer - 0301 2500H Tracer Trainer - 030a PETracer x1 - 1237 Andromeda Hub -0424 Standard Microsystems Corp. - 0001 Integrated Hub - 0acd Sitecom Internal Multi Memory reader/writer MD-005 - 0fdc Floppy - 10cd Sitecom Internal Multi Memory reader/writer MD-005 - 2020 USB Hub - 20cd Sitecom Internal Multi Memory reader/writer MD-005 - 20fc 6-in-1 Card Reader - 2228 9-in-2 Card Reader - 223a 8-in-1 Card Reader - 2503 USB 2.0 Hub - 2504 USB 2.0 Hub - 2512 USB 2.0 Hub - 2514 USB 2.0 Hub - 2524 USB MultiSwitch Hub - 2602 USB 2.0 Hub - 2640 USB 2.0 Hub - 4060 Ultra Fast Media Reader - 4064 Ultra Fast Media Reader -0425 Motorola Semiconductors HK, Ltd - 0101 G-Tech Wireless Mouse & Keyboard - f102 G-Tech U+P Wireless Mouse -0426 Integrated Device Technology, Inc. - 0426 WDM Driver -0427 Motorola Electronics Taiwan, Ltd -0428 Advanced Gravis Computer Tech, Ltd - 4001 GamePad Pro -0429 Cirrus Logic -042a Ericsson Austrian, AG -042b Intel Corp. - 9316 8x931Hx Customer Hub -042c Innovative Semiconductors, Inc. -042d Micronics -042e Acer, Inc. - 0380 MP3 Player -042f Molex, Inc. -0430 Sun Microsystems, Inc. - 0002 109 Keyboard - 0005 Type 6 Keyboard - 000a 109 Japanese Keyboard - 000b 109 Japanese Keyboard - 0082 109 Japanese Keyboard - 0083 109 Japanese Keyboard - 00a2 Type 7 Keyboard - 0100 3-button Mouse - 100e 24.1" LCD Monitor v4 / FID-638 Mouse - 36ba Bus Powered Hub - cdab Raritan KVM dongle -0431 Itac Systems, Inc. - 0100 Mouse-Trak 3-button Track Ball -0432 Unisys Corp. -0433 Alps Electric, Inc. - 1101 IBM Game Controller - abab Keyboard -0434 Samsung Info. Systems America, Inc. -0435 Hyundai Electronics America -0436 Taugagreining HF - 0005 CameraMate (DPCM_USB) -0437 Framatome Connectors USA -0438 Advanced Micro Devices, Inc. -0439 Voice Technologies Group -043d Lexmark International, Inc. - 0001 Laser Printer - 0002 Optra E310 Printer - 0003 Laser Printer - 0004 Laser Printer - 0005 Laser Printer - 0006 Laser Printer - 0007 Laser Printer - 0008 Inkjet Color Printer - 0009 Optra S2450 Printer - 000a Laser Printer - 000b Inkjet Color Printer - 000c Optra E312 Printer - 000d Laser Printer - 000e Laser Printer - 000f Laser Printer - 0010 Laser Printer - 0011 Laser Printer - 0012 Inkjet Color Printer - 0013 Inkjet Color Printer - 0014 InkJet Color Printer - 0015 InkJet Color Printer - 0016 Z12 Color Jetprinter - 0017 Z32 printer - 0018 Z52 Printer - 0019 Forms Printer - 001a Z65 Printer - 001b InkJet Photo Printer - 001c Kodak Personal Picture Maker 200 Printer - 001d InkJet Color Printer - 001e InkJet Photo Printer - 001f Kodak Personal Picture Maker 200 Card Reader - 0020 Z51 Printer - 0021 Z33 Printer - 0022 InkJet Color Printer - 0023 Laser Printer - 0024 Laser Printer - 0025 InkJet Color Printer - 0026 InkJet Color Printer - 0027 InkJet Color Printer - 0028 InkJet Color Printer - 0029 Scan Print Copy - 002a Scan Print Copy - 002b Scan Print Copy - 002c Scan Print Copy - 002d X70/X73 Scan/Print/Copy - 002e Scan Print Copy - 002f Scan Print Copy - 0030 Scan Print Copy - 0031 Scan Print Copy - 0032 Scan Print Copy - 0033 Scan Print Copy - 0034 Scan Print Copy - 0035 Scan Print Copy - 0036 Scan Print Copy - 0037 Scan Print Copy - 0038 Scan Print Copy - 0039 Scan Print Copy - 003a Scan Print Copy - 003b Scan Print Copy - 003c Scan Print Copy - 003d X83 Scan/Print/Copy - 003e Scan Print Copy - 003f Scan Print Copy - 0040 Scan Print Copy - 0041 Scan Print Copy - 0042 Scan Print Copy - 0043 Scan Print Copy - 0044 Scan Print Copy - 0045 Scan Print Copy - 0046 Scan Print Copy - 0047 Scan Print Copy - 0048 Scan Print Copy - 0049 Scan Print Copy - 004a Scan Print Copy - 004b Scan Print Copy - 004c Scan Print Copy - 004d Laser Printer - 004e Laser Printer - 004f InkJet Color Printer - 0050 InkJet Color Printer - 0051 Laser Printer - 0052 Laser Printer - 0053 InkJet Color Printer - 0054 InkJet Color Printer - 0057 Z35 Printer - 0058 Laser Printer - 005a X63 - 005c InkJet Color Printer - 0060 X74/X75 Scanner - 0061 X74 Hub - 0065 X5130 - 0069 X74/X75 Printer - 006d X125 - 006e C510 - 0072 X6170 Printer - 0073 InkJet Color Printer - 0078 InkJet Color Printer - 0079 InkJet Color Printer - 007a Generic Hub - 007b InkJet Color Printer - 007c Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185 - 007d Photo 3150 - 008a 4200 series - 008b InkJet Color Printer - 008c to CF/SM/SD/MS Card Reader - 008e InkJet Color Printer - 008f X422 - 0093 X5250 - 0095 E220 Printer - 0096 2200 series - 0097 P6250 - 0098 7100 series - 009e P910 series Human Interface Device - 009f InkJet Color Printer - 00a9 IBM Infoprint 1410 MFP - 00ab InkJet Color Printer - 00b2 3300 series - 00b8 7300 series - 00b9 8300 series - 00ba InkJet Color Printer - 00bb 2300 series - 00bd Printing Support - 00be Printing Support - 00bf Printing Support - 00c0 6300 series - 00c1 4300 series - 00c7 Printing Support - 00c8 Printing Support - 00c9 Printing Support - 00cb Printing Support - 00cc E120(n) - 00d0 9300 series - 00d3 X340 Scanner - 00d4 X342n Scanner - 00d5 Printing Support - 00d6 X340 Scanner - 00e8 X642e - 00e9 2400 series - 00f6 3400 series - 00f7 InkJet Color Printer - 00ff InkJet Color Printer - 010b 2500 series - 010d 3500-4500 series - 010f 6500 series - 0142 X3650 (Printer, Scanner, Copier) - 4303 Xerox WorkCentre Pro 412 -043e LG Electronics USA, Inc. - 3001 AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323] - 42bd Flatron 795FT Plus Monitor - 4a4d Flatron 915FT Plus Monitor - 7001 MF-PD100 Soul Digital MP3 Player - 7013 MP3 Player - 8484 LPC-U30 Webcam II - 8585 LPC-UC35 Webcam - 8888 Electronics VCS Camera II(LPC-U20) - 9800 Remote Control Receiver_iMON - 9803 eHome Infrared Receiver - 9804 DMB Receiver Control - 9c01 LGE Sync -043f RadiSys Corp. -0440 Eizo Nanao Corp. -0441 Winbond Systems Lab. - 1456 Hub -0442 Ericsson, Inc. - abba Bluetooth Device -0443 Gateway, Inc. - 000e Multimedia Keyboard - 002e Millennium Keyboard -0445 Lucent Technologies, Inc. -0446 NMB Technologies Corp. - 6781 Keyboard with PS/2 Mouse Port - 6782 Keyboard -0447 Momentum Microsystems -044a Shamrock Tech. Co., Ltd -044b WSI -044c CCL/ITRI -044d Siemens Nixdorf AG -044e Alps Electric Co., Ltd - 1104 Japanese Keyboard - 2002 MD-5500 Printer - 2014 Bluetooth Device - 3001 UGTZ4 Bluetooth - 3002 Bluetooth Device - 3003 Bluetooth Device - 3004 Bluetooth Adapter - 3005 Integrated Bluetooth Device - 3006 Bluetooth Adapter - 3007 Bluetooth Controller (ALPS/UGX) - 300c Bluetooth Controller (ALPS/UGPZ6) - 300d Bluetooth Controller (ALPS/UGPZ6) - 3010 Bluetooth Adapter - 3017 BCM2046 Bluetooth Device - ffff Compaq Bluetooth Multiport Module -044f ThrustMaster, Inc. - 0400 HOTAS Cougar - a003 Rage 3D Game Pad - a01b PK-GP301 Driving Wheel - a0a0 Top Gun Joystick - a0a1 Top Gun Joystick (rev2) - a0a3 Fusion Digital GamePad - a201 PK-GP201 PlayStick - b10a T.16000M Joystick - b203 360 Modena Pro Wheel - b300 Firestorm Dual Power - b304 Firestorm Dual Power - b307 vibrating Upad - b30b Wireless VibrationPad - b323 Dual Trigger 3-in-1 (PC Mode) - b324 Dual Trigger 3-in-1 (PS3 Mode) - b603 force feedback Wheel - b605 force feedback Racing Wheel - b651 Ferrari GT Rumble Force Wheel - b653 RGT Force Feedback Clutch Racing Wheel - b654 Ferrari GT Force Feedback Wheel - b700 Tacticalboard -0450 DFI, Inc. -0451 Texas Instruments, Inc. - 1234 Bluetooth Device - 1428 Hub - 1446 TUSB2040/2070 Hub - 16a6 BM-USBD1 BlueRobin RF heart rate sensor receiver - 2036 TUSB2036 Hub - 2046 TUSB2046 Hub - 2077 TUSB2077 Hub - 3410 TUSB3410 Microcontroller - 3f00 OMAP1610 - 3f02 SMC WSKP100 Wi-Fi Phone - 5409 Frontier Labs NEX IA+ Digital Audio Player - 6000 AU5 ADSL Modem (pre-reenum) - 6001 AU5 ADSL Modem - 6060 RNDIS/BeWAN ADSL2+ - 6070 RNDIS/BeWAN ADSL2+ - 625f Trekstor USB-Stick 12 CS-D 12 GB - dbc0 Device Bay Controller - e001 GraphLink - e003 TI-84 Plus Calculator - e004 TI-89 Titanium Calculator - e008 TI-84 Plus Silver Calculator - f430 MSP-FET430UIF JTAG Tool - f432 eZ430 Development Tool - ffff Bluetooth Device -0452 Mitsubishi Electronics America, Inc. - 0021 HID Monitor Controls - 0050 Diamond Pro 900u CRT Monitor - 0051 Integrated Hub -0453 CMD Technology - 6781 NMB Keyboard - 6783 Chicony Composite Keyboard -0454 Vobis Microcomputer AG -0455 Telematics International, Inc. -0456 Analog Devices, Inc. - f000 FT2232 JTAG ICE [gnICE] - f001 FT2232H Hi-Speed JTAG ICE [gnICE+] -0457 Silicon Integrated Systems Corp. - 0150 Super Talent 1GB Flash Drive - 0151 Super Flash 1GB / GXT 64MB Flash Drive - 0162 SiS162 usb Wireless LAN Adapter - 0163 802.11 Wireless LAN Adapter - 5401 Wireless Adapter RO80211GS-USB -0458 KYE Systems Corp. (Mouse Systems) - 0001 Mouse - 0002 Genius NetMouse Pro - 0003 Genius NetScroll+ - 0006 Easy Mouse+ USB(USB\Vid_0458&Pid;_0006) Mouse - 000b NetMouse Wheel(P+U) - 000c TACOMA Fingerprint V1.06.01 - 000e VideoCAM Web - 0013 TACOMA Fingerprint Mouse V1.06.01 - 001a Genius WebScroll+ - 0036 Pocket Mouse LE - 0039 NetScroll+ Superior - 003a NetScroll+ Mini Traveler / Genius NetScroll 120 - 004c Slimstar Pro Keyboard - 0056 Ergo 300 Mouse - 0057 Enhanced Gaming Device - 0059 Enhanced Laser Device - 005a Enhanced Device - 005b Enhanced Device - 005c Enhanced Laser Gaming Device - 005d Enhanced Device - 0061 Bluetooth Dongle - 0072 Navigator 335 - 0083 Bluetooth Dongle - 0087 Ergo 525V Laser Mouse - 0100 EasyPen Tablet - 0101 CueCat - 011b NetScroll T220 - 1001 Joystick - 1002 Game Pad - 1003 Genius VideoCam - 1004 Flight2000 F-23 Joystick - 100a Aashima Technology Trust Sight Fighter Vibration Feedback Joystick - 2001 ColorPage-Vivid Pro Scanner - 2004 ColorPage-HR6 V1 Scanner - 2005 ColorPage-HR6/Vivid3 - 2007 ColorPage-HR6 V2 Scanner - 2008 ColorPage-HR6 V2 Scanner - 2009 ColorPage-HR6A Scanner - 2011 ColorPage-Vivid3x Scanner - 2012 Plustek Scanner - 2013 ColorPage-HR7 Scanner - 2014 ColorPage-Vivid4 - 2015 ColorPage-HR7LE Scanner - 2016 ColorPage-HR6X Scanner - 2017 ColorPage-Vivid3xe - 2018 ColorPage-HR7X - 2019 ColorPage-HR6X Slim - 201a ColorPage-Vivid4xe - 201b ColorPage-Vivid4x - 201c ColorPage-HR8 - 201d ColorPage-Vivid 1200 X - 201e ColorPage-Slim 1200 - 201f ColorPage-Vivid 1200 XE - 2020 ColorPage-Slim 1200 USB2 - 2021 ColorPage-SF600 - 3017 SPEED WHEEL 3 Vibration - 3018 Wireless 2.4Ghz Game Pad - 3019 10-Button USB Joystick with Vibration - 301a MaxFire G-12U Vibration - 301d Genius MaxFire MiniPad - 400f Genius TVGo DVB-T02Q MCE - 4012 TVGo DVB-T03 - 5003 G-pen 560 Tablet - 5004 G-pen Tablet - 6001 GF3000F Ethernet Adapter - 7004 VideoCAM Express V2 - 7006 Dsc 1.3 Smart Camera Device - 7007 VideoCAM Web - 7009 G-Shot G312 Still Camera Device - 700c VideoCAM Web V3 - 700d G-Shot G511 Composite Device - 700f VideoCAM Web - 7012 WebCAM USB2.0 - 7014 VideoCAM Live V3 - 701c G-Shot G512 Still Camera - 7020 Sim 321C - 7025 Eye 311Q Camera - 7029 Genius Look 320s (SN9C201 + HV7131R) - 702f Genius Slim 322 - 7035 i-Look 325T Camera - 7045 Genius Look 1320 V2 - 704c Genius i-Look 1321 - 704d Slim 1322AF - 7055 Slim 2020AF camera - 705a Asus USB2.0 Webcam - 705c Genius iSlim 1300AF -0459 Adobe Systems, Inc. -045a SONICblue, Inc. - 07da Supra Express 56K modem - 0b4a SupraMax 2890 56K Modem [Lucent Atlas] - 0b68 SupraMax 56K Modem - 5001 Rio 600 MP3 Player - 5002 Rio 800 MP3 Player - 5003 Nike Psa/Play MP3 Player - 5005 Rio S10 MP3 Player - 5006 Rio S50 MP3 Player - 5007 Rio S35 MP3 Player - 5008 Rio 900 MP3 Player - 5009 Rio S30 MP3 Player - 500d Fuse MP3 Player - 500e Chiba MP3 Player - 500f Cali MP3 Player - 5010 Rio S11 MP3 Player - 501c Virgin MPF-1000 - 501d Rio Fuse - 501e Rio Chiba - 501f Rio Cali - 503f Cali256 MP3 Player - 5202 Rio Riot MP3 Player - 5210 Rio Karma Music Player - 5220 Rio Nitrus MP3 Player - 5221 Rio Eigen -045b Hitachi, Ltd -045d Nortel Networks, Ltd -045e Microsoft Corp. - 0007 SideWinder Game Pad - 0008 SideWinder Precision Pro - 0009 IntelliMouse - 000b Natural Keyboard Elite - 000e SideWinder® Freestyle Pro - 0014 Digital Sound System 80 - 001a SideWinder Precision Racing Wheel - 001b SideWinder Force Feedback 2 Joystick - 001c Internet Keyboard Pro - 001d Natural Keyboard Pro - 001e IntelliMouse Explorer - 0023 Trackball Optical - 0024 Trackball Explorer - 0025 IntelliEye Mouse - 0026 SideWinder GamePad Pro - 0027 SideWinder PnP GamePad - 0028 SideWinder Dual Strike - 0029 IntelliMouse Optical - 002b Internet Keyboard Pro - 002d Internet Keyboard - 002f Integrated Hub - 0033 Sidewinder Strategic Commander - 0034 SideWinder Force Feedback Wheel - 0038 SideWinder Precision 2 - 0039 IntelliMouse Optical - 003b SideWinder Game Voice - 003c SideWinder Joystick - 0040 Wheel Mouse Optical - 0047 IntelliMouse Explorer 3.0 - 0048 Office Keyboard 1.0A - 0053 Optical Mouse - 0059 Wireless IntelliMouse Explorer - 005c Office Keyboard (106/109) - 005f Wireless MultiMedia Keyboard - 0061 Wireless MultiMedia Keyboard (106/109) - 0063 Wireless Natural MultiMedia Keyboard - 0065 Wireless Natural MultiMedia Keyboard (106/109) - 006a Wireless Optical Mouse (IntelliPoint) - 006d eHome Remote Control Keyboard keys - 006e MN510 802.11b Adapter - 006f Smart Display Reference Device - 0070 Wireless MultiMedia Keyboard - 0071 Wireless MultiMedia Keyboard (106/109) - 0072 Wireless Natural MultiMedia Keyboard - 0073 Wireless Natural MultiMedia Keyboard (106/109) - 0079 IXI Ogo CT-17 handheld device - 007a 10/100 USB NIC - 007d Notebook Optical Mouse - 007e Wireless Transceiver for Bluetooth - 0080 Digital Media Pro Keyboard - 0083 Basic Optical Mouse - 0084 Basic Optical Mouse - 008a Wireless Keyboard and Mouse - 008b Dual Receiver Wireless Mouse (IntelliPoint) - 008c Wireless Intellimouse Explorer 2.0 - 0095 IntelliMouse Explorer 4.0 (IntelliPoint) - 009c Wireless Transceiver for Bluetooth 2.0 - 009d Wireless Optical Desktop 3.0 - 00a0 eHome Infrared Receiver - 00b0 Digital Media Pro Keyboard - 00b9 Wireless Optical Mouse 3.0 - 00bb Fingerprint Reader - 00bc Fingerprint Reader - 00bd Fingerprint Reader - 00c2 MN-710 802.11g Wireless Adapter [Intersil ISL3886] - 00c9 MTP Device - 00ca Fingerprint Reader - 00cb Basic Optical Mouse v2.0 - 00ce Generic PPC Flash device - 00d1 Optical Mouse with Tilt Wheel - 00da eHome Infrared Receiver - 00db Natural Ergonomic Keyboard 4000 V1.0 - 00dd Comfort Curve Keyboard 2000 V1.0 - 00e1 Wireless Laser Mouse 6000 Reciever - 00f4 LifeCam VX-6000 (SN9C20x + OV9650) - 00f5 LifeCam VX-3000 - 00f6 Comfort Optical Mouse 1000 - 00f7 LifeCam VX-1000 - 00f8 LifeCam NX-6000 - 00f9 Wireless Desktop Receiver 3.1 - 0202 Xbox Controller - 0280 XBox Device - 0283 Xbox Communicator - 0284 Xbox DVD Playback Kit - 0285 Xbox Controller S - 0288 Xbox Controller S Hub - 0289 Xbox Controller S - 028b Xbox360 DVD Emulator - 028d Xbox360 Memory Unit 64MB - 028e Xbox360 Controller - 028f Xbox360 Wireless Controller - 0290 Xbox360 Performance Pipe (PIX) - 0291 Xbox 360 Wireless Receiver for Windows - 0292 Xbox360 Wireless Networking Adapter - 029c Xbox360 HD-DVD Drive - 029d Xbox360 HD-DVD Drive - 029e Xbox360 HD-DVD Memory Unit - 02a0 Xbox360 Big Button IR - 02a8 Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280] - 02ad Xbox NUI Audio - 02ae Xbox NUI Camera - 02b0 Xbox NUI Motor - 0400 Windows Powered Pocket PC 2002 - 0401 Windows Powered Pocket PC 2002 - 0402 Windows Powered Pocket PC 2002 - 0403 Windows Powered Pocket PC 2002 - 0404 Windows Powered Pocket PC 2002 - 0405 Windows Powered Pocket PC 2002 - 0406 Windows Powered Pocket PC 2002 - 0407 Windows Powered Pocket PC 2002 - 0408 Windows Powered Pocket PC 2002 - 0409 Windows Powered Pocket PC 2002 - 040a Windows Powered Pocket PC 2002 - 040b Windows Powered Pocket PC 2002 - 040c Windows Powered Pocket PC 2002 - 040d Windows Powered Pocket PC 2002 - 040e Windows Powered Pocket PC 2002 - 040f Windows Powered Pocket PC 2002 - 0410 Windows Powered Pocket PC 2002 - 0411 Windows Powered Pocket PC 2002 - 0412 Windows Powered Pocket PC 2002 - 0413 Windows Powered Pocket PC 2002 - 0414 Windows Powered Pocket PC 2002 - 0415 Windows Powered Pocket PC 2002 - 0416 Windows Powered Pocket PC 2002 - 0417 Windows Powered Pocket PC 2002 - 0432 Windows Powered Pocket PC 2003 - 0433 Windows Powered Pocket PC 2003 - 0434 Windows Powered Pocket PC 2003 - 0435 Windows Powered Pocket PC 2003 - 0436 Windows Powered Pocket PC 2003 - 0437 Windows Powered Pocket PC 2003 - 0438 Windows Powered Pocket PC 2003 - 0439 Windows Powered Pocket PC 2003 - 043a Windows Powered Pocket PC 2003 - 043b Windows Powered Pocket PC 2003 - 043c Windows Powered Pocket PC 2003 - 043d Becker Traffic Assist Highspeed 7934 - 043e Windows Powered Pocket PC 2003 - 043f Windows Powered Pocket PC 2003 - 0440 Windows Powered Pocket PC 2003 - 0441 Windows Powered Pocket PC 2003 - 0442 Windows Powered Pocket PC 2003 - 0443 Windows Powered Pocket PC 2003 - 0444 Windows Powered Pocket PC 2003 - 0445 Windows Powered Pocket PC 2003 - 0446 Windows Powered Pocket PC 2003 - 0447 Windows Powered Pocket PC 2003 - 0448 Windows Powered Pocket PC 2003 - 0449 Windows Powered Pocket PC 2003 - 044a Windows Powered Pocket PC 2003 - 044b Windows Powered Pocket PC 2003 - 044c Windows Powered Pocket PC 2003 - 044d Windows Powered Pocket PC 2003 - 044e Windows Powered Pocket PC 2003 - 044f Windows Powered Pocket PC 2003 - 0450 Windows Powered Pocket PC 2003 - 0451 Windows Powered Pocket PC 2003 - 0452 Windows Powered Pocket PC 2003 - 0453 Windows Powered Pocket PC 2003 - 0454 Windows Powered Pocket PC 2003 - 0455 Windows Powered Pocket PC 2003 - 0456 Windows Powered Pocket PC 2003 - 0457 Windows Powered Pocket PC 2003 - 0458 Windows Powered Pocket PC 2003 - 0459 Windows Powered Pocket PC 2003 - 045a Windows Powered Pocket PC 2003 - 045b Windows Powered Pocket PC 2003 - 045c Windows Powered Pocket PC 2003 - 045d Windows Powered Pocket PC 2003 - 045e Windows Powered Pocket PC 2003 - 045f Windows Powered Pocket PC 2003 - 0460 Windows Powered Pocket PC 2003 - 0461 Windows Powered Pocket PC 2003 - 0462 Windows Powered Pocket PC 2003 - 0463 Windows Powered Pocket PC 2003 - 0464 Windows Powered Pocket PC 2003 - 0465 Windows Powered Pocket PC 2003 - 0466 Windows Powered Pocket PC 2003 - 0467 Windows Powered Pocket PC 2003 - 0468 Windows Powered Pocket PC 2003 - 0469 Windows Powered Pocket PC 2003 - 046a Windows Powered Pocket PC 2003 - 046b Windows Powered Pocket PC 2003 - 046c Windows Powered Pocket PC 2003 - 046d Windows Powered Pocket PC 2003 - 046e Windows Powered Pocket PC 2003 - 046f Windows Powered Pocket PC 2003 - 0470 Windows Powered Pocket PC 2003 - 0471 Windows Powered Pocket PC 2003 - 0472 Windows Powered Pocket PC 2003 - 0473 Windows Powered Pocket PC 2003 - 0474 Windows Powered Pocket PC 2003 - 0475 Windows Powered Pocket PC 2003 - 0476 Windows Powered Pocket PC 2003 - 0477 Windows Powered Pocket PC 2003 - 0478 Windows Powered Pocket PC 2003 - 0479 Windows Powered Pocket PC 2003 - 047a Windows Powered Pocket PC 2003 - 047b Windows Powered Pocket PC 2003 - 04c8 Windows Powered Smartphone 2002 - 04c9 Windows Powered Smartphone 2002 - 04ca Windows Powered Smartphone 2002 - 04cb Windows Powered Smartphone 2002 - 04cc Windows Powered Smartphone 2002 - 04cd Windows Powered Smartphone 2002 - 04ce Windows Powered Smartphone 2002 - 04d7 Windows Powered Smartphone 2003 - 04d8 Windows Powered Smartphone 2003 - 04d9 Windows Powered Smartphone 2003 - 04da Windows Powered Smartphone 2003 - 04db Windows Powered Smartphone 2003 - 04dc Windows Powered Smartphone 2003 - 04dd Windows Powered Smartphone 2003 - 04de Windows Powered Smartphone 2003 - 04df Windows Powered Smartphone 2003 - 04e0 Windows Powered Smartphone 2003 - 04e1 Windows Powered Smartphone 2003 - 04e2 Windows Powered Smartphone 2003 - 04e3 Windows Powered Smartphone 2003 - 04e4 Windows Powered Smartphone 2003 - 04e5 Windows Powered Smartphone 2003 - 04e6 Windows Powered Smartphone 2003 - 04e7 Windows Powered Smartphone 2003 - 04e8 Windows Powered Smartphone 2003 - 04e9 Windows Powered Smartphone 2003 - 04ea Windows Powered Smartphone 2003 - 04ec Windows Phone (Zune) - 063e Zune HD Media Player - 0640 KIN Phone - 0641 KIN Phone - 0642 KIN Phone - 0707 Wireless Laser Mouse 8000 - 0708 Transceiver v 3.0 for Bluetooth - 070a Charon Bluetooth Dongle (DFU) - 0710 Zune Media Player - 0713 Wireless Presenter Mouse 8000 - 0719 Xbox 360 Wireless Adapter - 0721 LifeCam NX-3000 (UVC-compliant) - 0723 LifeCam VX-7000 (UVC-compliant) - 0734 Wireless Optical Desktop 700 - 0737 Compact Optical Mouse 500 - 0745 Nano Transceiver v1.0 for Bluetooth - 0750 Wired Keyboard 600 - 075d LifeCam Cinema - 076d LifeCam HD-5000 - 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board - fff8 Keyboard - ffff Windows CE Mass Storage -0460 Ace Cad Enterprise Co., Ltd - 0004 Tablet (5x3.75) - 0006 LCD Tablet (12x9) - 0008 Tablet (3x2.25) -0461 Primax Electronics, Ltd - 0300 G2-300 Scanner - 0301 G2E-300 Scanner - 0302 G2-300 #2 Scanner - 0303 G2E-300 #2 Scanner - 0340 Colorado 9600 Scanner - 0341 Colorado 600u Scanner - 0345 Visioneer 6200 Scanner - 0346 Memorex Maxx 6136u Scanner - 0347 Primascan Colorado 2600u/Visioneer 4400 Scanner - 0360 Colorado 19200 Scanner - 0361 Colorado 1200u Scanner - 0363 VistaScan Astra 3600(ENG) - 0364 LG Electronics Scanworks 600U Scanner - 0365 VistaScan Astra 3600(ENG) - 0366 6400 - 0367 VistaScan Astra 3600(ENG) - 0371 Visioneer Onetouch 8920 Scanner - 0374 UMAX Astra 2500 - 0375 VistaScan Astra 3600(ENG) - 0377 Medion MD 5345 Scanner - 0378 VistaScan Astra 3600(ENG) - 037b Medion MD 6190 Scanner - 037c VistaScan Astra 3600(ENG) - 0380 G2-600 Scanner - 0381 ReadyScan 636i Scanner - 0382 G2-600 #2 Scanner - 0383 G2E-600 Scanner - 038a UMAX Astra 3000/3600 - 038b Xerox 2400 Onetouch - 038c UMAX Astra 4100 - 0392 Medion/Lifetec/Tevion/Cytron MD 6190 - 03a8 9420M - 0813 IBM UltraPort Camera - 0815 Micro Innovations IC200 Webcam - 0819 Fujifilm IX-30 Camera [webcam mode] - 081a Fujifilm IX-30 Camera [storage mode] - 081c Elitegroup ECS-C11 Camera - 081d Elitegroup ECS-C11 Storage - 0a00 Micro Innovations Web Cam 320 - 4d01 Comfort Keyboard - 4d02 Mouse-in-a-Box - 4d03 Kensington Mouse-in-a-box - 4d04 Mouse - 4d06 Balless Mouse (HID) - 4d15 Dell Optical Mouse - 4d17 Optical Mouse - 4d2a PoPo Elixir Mouse (HID) - 4d2b Wireless Laser Mini Mouse (HID) - 4d2c PoPo Mini Pointer Mouse (HID) - 4d2e Optical Mobile Mouse (HID) - 4d51 0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse] - 4d75 Rocketfish RF-FLBTAD Bluetooth Adapter -0463 MGE UPS Systems - 0001 UPS - ffff UPS -0464 AMP/Tycoelectronics Corp. -0467 AT&T Paradyne -0468 Wieson Technologies Co., Ltd -046a Cherry GmbH - 0001 My3000 Keyboard - 0003 My3000 Hub - 0004 CyBoard Keyboard - 0005 XX33 SmartCard Reader Keyboard - 0008 Wireless Keyboard and Mouse - 0010 SmartBoard XX44 - 0011 G83 (RS 6000) Keyboard - 0021 CyMotion Expert Combo - 0023 CyMotion Master Linux Keyboard - 0027 CyMotion Master Solar Keyboard - 002a Wireless Mouse & Keyboard - 002d SmartTerminal XX44 - 003e SmartTerminal ST-2xxx - 0080 eHealth Terminal ST 1503 - 0081 eHealth Keyboard G87 1504 - 0106 R-300 Wireless Mouse Receiver -046b American Megatrends, Inc. - 0001 Keyboard - 0101 PS/2 Keyboard, Mouse & Joystick Ports - 0301 USB 1.0 Hub - 0500 Serial & Parallel Ports -046c Toshiba Corp., Digital Media Equipment -046d Logitech, Inc. - 0082 Acer Aspire 5672 Webcam - 0200 WingMan Extreme Joystick - 0203 M2452 Keyboard - 0301 M4848 Mouse - 0401 HP PageScan - 0402 NEC PageScan - 040f Logitech/Storm PageScan - 0430 Mic (Cordless) - 0801 QuickCam Home - 0802 Webcam C200 - 0804 Webcam C250 - 0805 Webcam C300 - 0807 Webcam B500 - 0808 Webcam C600 - 0809 Webcam Pro 9000 - 080a Portable Webcam C905 - 080f Webcam C120 - 0810 QuickCam Pro - 0819 Webcam C210 - 081b Webcam C310 - 0820 QuickCam VC - 0825 Webcam C270 - 0830 QuickClip - 0840 QuickCam Express - 0850 QuickCam Web - 0870 QuickCam Express - 0890 QuickCam Traveler - 0892 OrbiCam - 0894 CrystalCam - 0895 QuickCam for Dell Notebooks - 0896 OrbiCam - 0897 QuickCam for Dell Notebooks - 0899 QuickCam for Dell Notebooks - 089d QuickCam E2500 series - 08a0 QuickCam IM - 08a1 QuickCam IM with sound - 08a2 Labtec Webcam Pro - 08a3 QuickCam QuickCam Chat - 08a6 QuickCam IM - 08a7 QuickCam Image - 08a9 Notebook Deluxe - 08aa Labtec Notebooks - 08ac QuickCam Cool - 08ad QuickCam Communicate STX - 08ae QuickCam for Notebooks - 08af QuickCam Easy/Cool - 08b0 QuickCam 3000 Pro [pwc] - 08b1 QuickCam Notebook Pro - 08b2 QuickCam Pro 4000 - 08b3 QuickCam Zoom - 08b4 QuickCam Zoom - 08b5 QuickCam Sphere - 08b9 QuickCam IM - 08bd Microphone (Pro 4000) - 08c0 QuickCam Pro 3000 - 08c1 QuickCam Fusion - 08c2 QuickCam PTZ - 08c3 Camera (Notebooks Pro) - 08c5 QuickCam Pro 5000 - 08c6 QuickCam for DELL Notebooks - 08c7 QuickCam OEM Cisco VT Camera II - 08c9 QuickCam Ultra Vision - 08ca Mic (Fusion) - 08cb Mic (Notebooks Pro) - 08cc Mic (PTZ) - 08ce QuickCam Pro 5000 - 08cf QuickCam UpdateMe - 08d0 QuickCam Express - 08d7 QuickCam Communicate STX - 08d8 QuickCam for Notebook Deluxe - 08d9 QuickCam IM/Connect - 08da QuickCam Messanger - 08dd QuickCam for Notebooks - 08e0 QuickCam Express - 08e1 Labtec Webcam - 08f0 QuickCam Messenger - 08f1 QuickCam Express - 08f2 Microphone (Messenger) - 08f3 QuickCam Express - 08f4 Labtec Webcam - 08f5 QuickCam Messenger Communicate - 08f6 QuickCam Messenger Plus - 0900 ClickSmart 310 - 0901 ClickSmart 510 - 0903 ClickSmart 820 - 0905 ClickSmart 820 - 0910 QuickCam Cordless - 0920 QuickCam Express - 0921 Labtec Webcam - 0922 QuickCam Live - 0928 QuickCam Express - 0929 Labtec Webcam Pro - 092a QuickCam for Notebooks - 092b Labtec Webcam Plus - 092c QuickCam Chat - 092d QuickCam Express / Go - 092e QuickCam Chat - 092f QuickCam Express Plus - 0950 Pocket Camera - 0960 ClickSmart 420 - 0970 Pocket750 - 0990 QuickCam Pro 9000 - 0991 QuickCam Pro for Notebooks - 0992 QuickCam Communicate Deluxe - 0994 QuickCam Orbit/Sphere AF - 09a1 QuickCam Communicate MP/S5500 - 09a2 QuickCam Communicate Deluxe/S7500 - 09a4 QuickCam E 3500 - 09a5 Quickcam 3000 For Business - 09a6 QuickCam Vision Pro - 09b0 Acer OrbiCam - 09b2 Fujitsu Webcam - 09c0 QuickCam for Dell Notebooks Mic - 09c1 QuickCam Deluxe for Notebooks - 0a01 USB Headset - 0a02 Premium Stereo USB Headset 350 - 0a03 Logitech USB Microphone - 0a04 V20 portable speakers (USB powered) - 0a07 Z-10 Speakers - 0a0b ClearChat Pro USB - 0a0c Clear Chat Comfort USB Headset - 0a13 Z-5 Speakers - 0a17 G330 Headset - 0b02 BT Mini-Receiver (HID proxy mode) - 8801 Video Camera - b305 BT Mini-Receiver - bfe4 Premium Optical Wheel Mouse - c000 N43 [Pilot Mouse] - c001 N48/M-BB48 [FirstMouse Plus] - c002 M-BA47 [MouseMan Plus] - c003 MouseMan - c004 WingMan Gaming Mouse - c005 WingMan Gaming Wheel Mouse - c00b MouseMan Wheel - c00c Optical Wheel Mouse - c00d MouseMan Wheel+ - c00e M-BJ58/M-BJ69 Optical Wheel Mouse - c00f MouseMan Traveler/Mobile - c011 Optical MouseMan - c012 Mouseman Dual Optical - c014 Corded Workstation Mouse - c015 Corded Workstation Mouse - c016 Optical Wheel Mouse - c018 Optical Wheel Mouse - c019 Optical Tilt Wheel Mouse - c01a M-BQ85 Optical Wheel Mouse - c01b MX310 Optical Mouse - c01c Optical Mouse - c01d MX510 Optical Mouse - c01e MX518 Optical Mouse - c024 MX300 Optical Mouse - c025 MX500 Optical Mouse - c030 iFeel Mouse - c031 iFeel Mouse+ - c032 MouseMan iFeel - c033 iFeel MouseMan+ - c034 MouseMan Optical - c035 Mouse - c036 Mouse - c037 Mouse - c038 Mouse - c03d M-BT96a Pilot Optical Mouse - c03e Premium Optical Wheel Mouse (M-BT58) - c03f M-BT85 [UltraX Optical Mouse] - c040 Corded Tilt-Wheel Mouse - c041 G5 Laser Mouse - c042 G3 Laser Mouse - c043 MX320/MX400 Laser Mouse - c044 LX3 Optical Mouse - c045 Optical Mouse - c046 RX1000 Laser Mouse - c047 Laser Mouse - c048 G9 Laser Mouse - c049 G5 Laser Mouse - c050 RX 250 Optical Mouse - c051 G3 (MX518) Optical Mouse - c053 Laser Mouse - c058 M115 Mouse - c05a Optical Mouse M90 - c05d Optical Mouse - c061 RX1500 Laser Mouse - c062 LS1 Laser Mouse, corded - c068 G500 Laser Mouse - c101 UltraX Media Remote - c110 Harmony 885 Remote - c11f Harmony 900 Remote - c122 Harmony 700 Remote - c201 WingMan Extreme Joystick with Throttle - c202 WingMan Formula - c207 WingMan Extreme Digital 3D - c208 WingMan Gamepad Extreme - c209 WingMan Gamepad - c20a WingMan RumblePad - c20b WingMan Action Pad - c20c WingMan Precision - c20d WingMan Attack 2 - c20e WingMan Formula GP - c211 iTouch Cordless Reciever - c212 WingMan Extreme Digital 3D - c213 J-UH16 (Freedom 2.4 Cordless Joystick) - c214 ATK3 (Attack III Joystick) - c215 Extreme 3D Pro - c216 Dual Action Gamepad - c218 Logitech RumblePad 2 USB - c219 Cordless RumblePad 2 - c21a Precision Gamepad - c21c G13 Advanced Gameboard - c21d F310 Gamepad [XInput Mode] - c21f F710 Wireless Gamepad [XInput Mode] - c221 G11/G15 Keyboard / Keyboard - c222 G15 Keyboard / LCD - c223 G11/G15 Keyboard / USB Hub - c225 G11/G15 Keyboard / G keys - c226 G15 Refresh Keyboard - c227 G15 Refresh Keyboard - c22d G510 Gaming Keyboard - c22e G510 Gaming Keyboard onboard audio - c281 WingMan Force - c283 WingMan Force 3D - c285 WingMan Strike Force 3D - c286 Force 3D Pro - c287 Flight System G940 - c291 WingMan Formula Force - c293 WingMan Formula Force GP - c294 Driving Force - c295 Momo Force Steering Wheel - c298 Driving Force Pro - c299 G25 Racing Wheel - c2a0 Wingman Force Feedback Mouse - c2a1 WingMan Force Feedback Mouse - c301 iTouch Keyboard - c302 iTouch Pro Keyboard - c303 iTouch Keyboard - c305 Internet Keyboard - c307 Internet Keyboard - c308 Internet Navigator Keyboard - c309 Internet Keyboard - c30a iTouch Composite - c30b NetPlay Keyboard - c30c Internet Keys (X) - c30d Internet Keys - c30e UltraX Keyboard (Y-BL49) - c30f Logicool HID-Compliant Keyboard (106 key) - c311 Y-UF49 [Internet Pro Keyboard] - c312 DeLuxe 250 Keyboard - c313 Internet 350 Keyboard - c315 Classic New Touch Keyboard - c316 HID-Compliant Keyboard - c317 Wave Corded Keyboard - c318 Illuminated Keyboard - c31a Comfort Wave 450 - c31b Compact Keyboard K300 - c31c Keyboard K120 for Business - c401 TrackMan Marble Wheel - c402 Marble Mouse (2-button) - c403 Turbo TrackMan Marble FX - c404 TrackMan Wheel - c408 Marble Mouse (4-button) - c501 Cordless Mouse Receiver - c502 Cordless Mouse & iTouch Keys - c503 Cordless Mouse+Keyboard Receiver - c504 Cordless Mouse+Keyboard Receiver - c505 Cordless Mouse+Keyboard Receiver - c506 MX700 Cordless Mouse Receiver - c508 Cordless Trackball - c509 Cordless Keyboard & Mouse - c50a Cordless Mouse - c50b Cordless Desktop Optical - c50c Cordless Desktop S510 - c50d Cordless Mouse - c50e Cordless Mouse Receiver - c510 Cordless Mouse - c512 LX-700 Cordless Desktop Receiver - c513 MX3000 Cordless Desktop Receiver - c514 Cordless Mouse - c515 Cordless 2.4 GHz Presenter Presentation remote control - c517 LX710 Cordless Desktop Laser - c518 MX610 Laser Cordless Mouse - c51a MX Revolution/G7 Cordless Mouse - c51b V220 Cordless Optical Mouse for Notebooks - c521 Cordless Mouse Receiver - c525 MX Revolution Cordless Mouse - c526 Nano Receiver - c529 diNovo Keyboard for notebooks - c52b Unifying Receiver - c52f Wireless Mouse M305 - c623 3Dconnexion Space Traveller 3D Mouse - c625 3Dconnexion Space Pilot 3D Mouse - c626 3Dconnexion Space Navigator 3D Mouse - c627 3Dconnexion Space Explorer 3D Mouse - c702 Cordless Presenter - c703 Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth) - c704 diNovo Wireless Desktop - c705 MX900 Bluetooth Wireless Hub (C-UJ16A) - c707 Bluetooth wireless hub - c708 Bluetooth wireless hub - c709 BT Mini-Receiver (HCI mode) - c70a MX5000 Cordless Desktop - c70b BT Mini-Receiver (HID proxy mode) - c70c BT Mini-Receiver (HID proxy mode) - c70d Bluetooth wireless hub - c70e MX1000 Bluetooth Laser Mouse - c70f Bluetooth wireless hub - c712 Bluetooth wireless hub - c714 diNovo Edge Keyboard - c715 Bluetooth wireless hub - c71a Bluetooth wireless hub - c71d Bluetooth wireless hub - c71f diNovo Mini Wireless Keyboard - c720 Bluetooth wireless hub - ca03 MOMO Racing - ca04 Formula Vibration Feedback Wheel - cab1 Cordless Keyboard for Wii HID Receiver - d001 QuickCam Pro -046e Behavior Tech. Computer Corp. - 0100 Keyboard - 3001 Mass Storage Device - 3002 Mass Storage Device - 3003 Mass Storage Device - 3005 Mass Storage Device - 3008 Mass Storage Device - 5250 KeyMaestro Multimedia Keyboard - 5273 KeyMaestro Multimedia Keyboard - 52e6 Cordless Mouse - 5308 KeyMaestro Keyboard - 5408 KeyMaestro Multimedia Keyboard/Hub - 5500 Portable Keyboard 86+9 keys (Model 6100C US) - 5720 Smart Card Reader - 6782 BTC 7932 mouse+keyboard -046f Crystal Semiconductor -0471 Philips (or NXP) - 0101 DSS350 Digital Speaker System - 0104 DSS330 Digital Speaker System [uda1321] - 0105 UDA1321 - 014f GoGear SA9200 - 0160 MP3 Player - 0161 MP3 Player - 0163 GoGear SA1100 - 0164 GoGear SA1110/02 - 0165 GoGear SA1330 - 0201 Hub - 0222 Creative Nomad Jukebox - 0302 PCA645VC Webcam [pwc] - 0303 PCA646VC Webcam [pwc] - 0304 Askey VC010 Webcam [pwc] - 0307 PCVC675K Webcam [pwc] - 0308 PCVC680K Webcam [pwc] - 030b PC VGA Camera (Vesta Fun) - 030c PCVC690K Webcam [pwc] - 0310 PCVC730K Webcam [pwc] - 0311 PCVC740K ToUcam Pro [pwc] - 0312 PCVC750K Webcam [pwc] - 0314 DMVC 1000K - 0316 DMVC 2000K Video Capture - 0321 FunCam - 0322 DMVC1300K PC Camera - 0325 SPC 200NC PC Camera - 0326 SPC 300NC PC Camera - 0327 Webcam SPC 6000 NC (Webcam w/ mic) - 0328 SPC 700NC PC Camera - 0329 SPC 900NC PC Camera / ORITE CCD Webcam(PC370R) - 032d SPC 210NC PC Camera - 032e SPC 315NC PC Camera - 0330 SPC 710NC PC Camera - 0331 SPC 1300NC PC Camera - 0332 SPC 1000NC PC Camera - 0333 SPC 620NC PC Camera - 0334 SPC 520/525NC PC Camera - 0401 Semiconductors CICT Keyboard - 0402 PS/2 Mouse on Semiconductors CICT Keyboard - 0406 15 inch Detachable Monitor - 0407 10 inch Mobile Monitor - 0471 Digital Speaker System - 0601 OVU1020 IR Dongle (Kbd+Mouse) - 0602 ATI Remote Wonder II Input Device - 0603 ATI Remote Wonder II Controller - 0608 eHome Infrared Receiver - 060a TSU9600 Remote Control - 060c Consumer Infrared Transceiver (HP) - 060d Consumer Infrared Transceiver (SRM5100) - 060e RF Dongle - 060f Consumer Infrared Transceiver - 0613 Infrared Transceiver - 0617 IEEE802.15.4 RF Dongle - 0619 TSU9400 Remote Control - 0666 Hantek DDS-3005 Arbitrary Waveform Generator - 0700 Semiconductors CICT Hub - 0701 150P1 TFT Display - 0809 AVNET Bluetooth Device - 0811 JR24 CDRW - 0814 DCCX38/P data cable - 0815 eHome Infrared Receiver - 0844 SA2111/02 1GB Flash Audio Player - 084a GoGear SA3125 - 084e GoGear SA60xx (mtp) - 0888 Hantek DDS-3005 Arbitrary Waveform Generator - 1103 Digital Speaker System - 1120 Creative Rhomba MP3 player - 1125 Nike psa[128max Player - 1137 HDD065 MP3 player - 1201 Arima Bluetooth Device - 1230 Wireless Adapter 11g - 1232 SNU6500 Wireless Adapter - 1233 Wireless Adapter Bootloader Download - 1236 SNU5600 802.11bg - 1237 TalkTalk SNU5630NS/05 802.11bg - 1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit - 1801 Diva MP3 player - 200a Wireless Network Adapter - 200f 802.11n Wireless Adapter - 2021 SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L] - 2022 GoGear SA52XX - 2034 Webcam SPC530NC - 2036 Webcam SPC1030NC - 203f TSU9200 Remote Control - 2046 TSU9800 Remote Control - 204e GoGear RaGa (SA1942/02) - 205e TSU9300 Remote Control - 2070 GoGear Mix - 2076 GoGear Aria - 2079 GoGear Opus - 2088 MCE IR Receiver with ALS- Spinel plus for ASUS - 262c SPC230NC Webcam - 485d Senselock SenseIV v2.x - df55 LPCXpresso LPC-Link -0472 Chicony Electronics Co., Ltd - 0065 PFU-65 Keyboard [Chicony] - b086 Asus USB2.0 Webcam - b091 Webcam -0473 Sanyo Information Business Co., Ltd -0474 Sanyo Electric Co., Ltd - 0110 Digital Voice Recorder R200 - 0217 Xacti J2 - 022f C5 Digital Media Camera (mass storage mode) - 0230 C5 Digital Media Camera (PictBridge mode) - 0231 C5 Digital Media Camera (PC control mode) - 0401 Optical Drive - 0701 SCP-4900 Cellphone - 071f Usb Com Port Enumerator - 0722 W33SA Camera -0475 Relisys/Teco Information System - 0100 NEC Petiscan - 0103 Eclipse 1200U/Episode - 0210 Scorpio Ultra 3 -0476 AESP -0477 Seagate Technology, Inc. -0478 Connectix Corp. - 0001 QuickCam - 0002 QuickClip - 0003 QuickCam Pro -0479 Advanced Peripheral Laboratories -047a Semtech Corp. - 0004 ScreenCoder UR7HCTS2-USB -047b Silitek Corp. - 0001 Keyboard - 0002 Keyboard and Mouse - 00f9 SK-1789u Keyboard - 0101 BlueTooth Keyboard and Mouse - 020b SK-3105 SmartCard Reader - 050e Internet Compact Keyboard - 1000 Trust Office Scan USB 19200 - 1002 HP ScanJet 4300c Parallel Port -047c Dell Computer Corp. -047d Kensington - 1001 Mouse*in*a*Box - 1002 Expert Mouse Pro - 1003 Orbit TrackBall - 1004 MouseWorks - 1005 TurboBall - 1006 TurboRing - 1009 Orbit TrackBall for Mac - 1012 PocketMouse - 1013 Mouse*in*a*Box Optical Pro - 1014 Expert Mouse Pro Wireless - 1015 Expert Mouse - 1016 ADB/USB Orbit - 1018 Studio Mouse - 101d Mouse*in*a*Box Optical Pro - 101e Studio Mouse Wireless - 101f PocketMouse Pro - 1020 Expert Mouse Trackball - 1021 Expert Mouse Wireless - 1022 Orbit Optical - 1023 Pocket Mouse Pro Wireless - 1024 PocketMouse - 1025 Mouse*in*a*Box Optical Elite Wireless - 1026 Pocket Mouse Pro - 1027 StudioMouse - 1028 StudioMouse Wireless - 1029 Mouse*in*a*Box Optical Elite - 102a Mouse*in*a*Box Optical - 102b PocketMouse - 102c Iridio - 102d Pilot Optical - 102e Pilot Optical Pro - 102f Pilot Optical Pro Wireless - 1043 Ci65m Wireless Notebook Optical Mouse - 104a PilotMouse Mini Retractable - 105d PocketMouse Bluetooth - 105e Bluetooth EDR Dongle - 1061 PocketMouse Grip - 1062 PocketMouse Max - 1063 PocketMouse Max Wireless - 1064 PocketMouse 2.0 Wireless - 1065 PocketMouse 2.0 - 1066 PocketMouse Max Glow - 1067 ValueMouse - 1068 ValueOpt White - 1069 ValueOpt Black - 106a PilotMouse Laser Wireless Mini - 106b PilotMouse Laser - 3 Button - 106c PilotMouse Laser - Gaming - 106d PilotMouse Laser - Wired - 106e PilotMouse Micro Laser - 1070 ValueOpt Travel - 1071 ValueOpt RF TX - 1072 PocketMouse Colour - 1073 PilotMouse Laser - 6 Button - 1074 PilotMouse Laser Wireless Mini - 1075 SlimBlade Presenter Media Mouse - 1076 SlimBlade Media Mouse - 1077 SlimBlade Presenter Mouse - 1152 Bluetooth EDR Dongle - 2002 Optical Elite Wireless - 2010 Wireless Presentation Remote - 2012 Wireless Presenter with Laser Pointer - 2021 PilotBoard Wireless - 2030 PilotBoard Wireless - 2034 SlimBlade Media Notebook Set - 2041 SlimBlade Trackball - 4003 Gravis Xterminator Digital Gamepad - 4005 Gravis Eliminator GamePad Pro - 4006 Gravis Eliminator AfterShock - 4007 Gravis Xterminator Force - 4008 Gravis Destroyer TiltPad - 5001 Cabo I Camera - 5002 VideoCam CABO II - 5003 VideoCam -047e Agere Systems, Inc. (Lucent) - 0300 ORiNOCO Card - 1001 USS720 Parallel Port - 2892 Systems Soft Modem - bad1 Lucent 56k Modem - f101 Atlas Modem -047f Plantronics, Inc. - 0101 Bulk Driver - 0301 Bulk Driver - 0ca1 USB DSP v4 Audio Interface - 4254 BUA-100 Bluetooth Adapter -0480 Toshiba America Info. Systems, Inc. - 0001 InTouch Module - 0004 InTouch Module - 0011 InTouch Module - 0014 InTouch Module -0481 Zenith Data Systems -0482 Kyocera Corp. - 000e FS-1020D Printer - 0100 Finecam S3x - 0101 Finecam S4 - 0103 Finecam S5 - 0105 Finecam L3 - 0106 Finecam - 0107 Digital Camera Device - 0108 Digital Camera Device - 0203 AH-K3001V - 0204 iBurst Terminal -0483 SGS Thomson Microelectronics - 0137 BeWAN ADSL USB ST (blue or green) - 0138 Unicorn II (ST70138B + MTC-20174TQ chipset) - 1307 Cytronix 6in1 Card Reader - 163d Cool Icam Digi-MP3 - 2015 TouchChip Fingerprint Reader - 2016 Fingerprint Reader - 2017 Biometric Smart Card Reader - 2018 BioSimKey - 2302 Portable Flash Device (PFD) - 4810 ISDN adapter - 481d BT Digital Access adapter - 5000 ST Micro Bluetooth Device - 5001 ST Micro Bluetooth Device - 5721 Hantek DDS-3X25 Arbitrary Waveform Generator - 7270 ST Micro Serial Bridge - 7554 56k SoftModem - ff10 Swann ST56 Modem -0484 Specialix -0485 Nokia Monitors -0486 ASUS Computers, Inc. - 0185 EeePC T91MT HID Touch Panel -0487 Stewart Connector -0488 Cirque Corp. -0489 Foxconn / Hon Hai - 0502 SmartMedia Card Reader Firmware Loader - 0503 SmartMedia Card Reader - d00c Rollei Compactline (Storage Mode) - d00e Rollei Compactline (Video Mode) - e000 T-Com TC 300 - e003 Pirelli DP-L10 - e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter] - e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250] - e02c Atheros AR5BBU12 Bluetooth Device -048a S-MOS Systems, Inc. -048c Alps Electric Ireland, Ltd -048d Integrated Technology Express, Inc. - 9009 Zolid HD DVD Maker - 9135 Zolid Mini DVB-T Stick -048f Eicon Tech. -0490 United Microelectronics Corp. -0491 Capetronic - 0003 Taxan Monitor Control -0492 Samsung SemiConductor, Inc. - 0140 MP3 player - 0141 MP3 Player -0493 MAG Technology Co., Ltd -0495 ESS Technology, Inc. -0496 Micron Electronics -0497 Smile International - c001 Camera Device -0498 Capetronic (Kaohsiung) Corp. -0499 Yamaha Corp. - 1000 UX256 MIDI I/F - 1001 MU1000 - 1002 MU2000 - 1003 MU500 - 1004 UW500 - 1005 MOTIF6 - 1006 MOTIF7 - 1007 MOTIF8 - 1008 UX96 MIDI I/F - 1009 UX16 MIDI I/F - 100a EOS BX - 100c UC-MX - 100d UC-KX - 100e S08 - 100f CLP-150 - 1010 CLP-170 - 1011 P-250 - 1012 TYROS - 1013 PF-500 - 1014 S90 - 1015 MOTIF-R - 1016 MDP-5 - 1017 CVP-204 - 1018 CVP-206 - 1019 CVP-208 - 101a CVP-210 - 101b PSR-1100 - 101c PSR-2100 - 101d CLP-175 - 101e PSR-K1 - 101f EZ-J24 - 1020 EZ-250i - 1021 MOTIF ES 6 - 1022 MOTIF ES 7 - 1023 MOTIF ES 8 - 1024 CVP-301 - 1025 CVP-303 - 1026 CVP-305 - 1027 CVP-307 - 1028 CVP-309 - 1029 CVP-309GP - 102a PSR-1500 - 102b PSR-3000 - 102e ELS-01/01C - 1030 PSR-295/293 - 1031 DGX-205/203 - 1032 DGX-305 - 1033 DGX-505 - 1037 PSR-E403 - 103c MOTIF-RACK ES - 1054 S90XS Keyboard/Music Synthesizer - 2000 DGP-7 - 2001 DGP-5 - 3001 YST-MS55D USB Speaker - 3003 YST-M45D USB Speaker - 4000 NetVolante RTA54i Broadband&ISDN Router - 4001 NetVolante RTW65b Broadband Wireless Router - 4002 NetVolante RTW65i Broadband&ISDN Wireless Router - 4004 NetVolante RTA55i Broadband VoIP Router - 5000 CS1D - 5001 DSP1D - 5002 DME32 - 5003 DM2000 - 5004 02R96 - 5005 ACU16-C - 5006 NHB32-C - 5007 DM1000 - 5008 01V96 - 5009 SPX2000 - 500a PM5D - 500b DME64N - 500c DME24N - 6001 CRW2200UX Lightspeed 2 External CD-RW Drive - 7000 DTX - 7010 UB99 -049a Gandalf Technologies, Ltd -049b Curtis Computer Products -049c Acer Advanced Labs, Inc. - 0002 Keyboard (???) -049d VLSI Technology -049f Compaq Computer Corp. - 0002 InkJet Color Printer - 0003 iPAQ PocketPC - 000e Internet Keyboard - 0012 InkJet Color Printer - 0018 PA-1/PA-2 MP3 Player - 0019 InkJet Color Printer - 001a S4 100 Scanner - 001e IJ650 Inkjet Printer - 001f WL215 Adapter - 0021 S200 Scanner - 0027 Bluetooth Multiport Module by Compaq - 002a 1400P Inkjet Printer - 002b A3000 - 002c Lexmark X125 - 0032 802.11b Adapter [ipaq h5400] - 0033 802.11b Adapter [orinoco] - 0036 Bluetooth Multiport Module - 0051 KU-0133 Easy Access Interner Keyboard - 0076 Wireless LAN MultiPort W200 - 0080 GPRS Multiport - 0086 Bluetooth Device - 504a Personal Jukebox PJB100 - 505a Linux-USB "CDC Subset" Device, or Itsy (experimental) - 8511 iPAQ Networking 10/100 Ethernet [pegasus2] -04a0 Digital Equipment Corp. -04a1 SystemSoft Corp. - fff0 Telex Composite Device -04a2 FirePower Systems -04a3 Trident Microsystems, Inc. -04a4 Hitachi, Ltd - 0004 DVD-CAM DZ-MV100A Camcorder - 001e DVDCAM USB HS Interface -04a5 Acer Peripherals Inc. (now BenQ Corp.) - 0001 Keyboard - 0002 API Ergo K/B - 0003 API Generic K/B Mouse - 12a6 AcerScan C310U - 1a20 Prisa 310U - 1a2a Prisa 620U - 2022 Prisa 320U/340U - 2040 Prisa 620UT - 205e ScanPrisa 640BU - 2060 Prisa 620U+/640U - 207e Prisa 640BU - 209e ScanPrisa 640BT - 20ae S2W 3000U - 20b0 S2W 3300U/4300U - 20be Prisa 640BT - 20c0 Prisa 1240UT - 20de S2W 4300U+ - 20f8 Benq 5000 - 20fc Benq 5000 - 20fe SW2 5300U - 2137 Benq 5150/5250 - 2202 Benq 7400UT - 2311 Benq 5560 - 3003 Benq Webcam - 3008 Benq 1500 - 300a Benq 3410 - 300c Benq 1016 - 3019 Benq DC C40 - 4000 P30 Composite Device - 4013 BenQ-Siemens EF82/SL91 - 4044 BenQ-Siemens SF71 - 4045 BenQ-Siemens E81 - 4048 BenQ M7 - 6001 Mass Storage Device - 6002 Mass Storage Device - 6003 ATA/ATAPI Adapter - 6004 Mass Storage Device - 6005 Mass Storage Device - 6006 Mass Storage Device - 6007 Mass Storage Device - 6008 Mass Storage Device - 6009 Mass Storage Device - 600a Mass Storage Device - 600b Mass Storage Device - 600c Mass Storage Device - 600d Mass Storage Device - 600e Mass Storage Device - 600f Mass Storage Device - 6010 Mass Storage Device - 6011 Mass Storage Device - 6012 Mass Storage Device - 6013 Mass Storage Device - 6014 Mass Storage Device - 6015 Mass Storage Device - 6125 MP3 Player - 6180 MP3 Player - 6200 MP3 Player - 7500 Hi-Speed Mass Storage Device - 9000 AWL300 Wireless Adapter - 9001 AWL400 Wireless Adapter - 9213 Kbd Hub -04a6 Nokia Display Products - 00b9 Audio - 0180 Hub Type P - 0181 HID Monitor Controls -04a7 Visioneer - 0100 StrobePro - 0101 Strobe Pro Scanner (1.01) - 0102 StrobePro Scanner - 0211 OneTouch 7600 Scanner - 0221 OneTouch 5300 Scanner - 0223 OneTouch 8200 - 0224 OneTouch 4800 USB/Microtek Scanport 3000 - 0225 VistaScan Astra 3600(ENG) - 0226 OneTouch 5300 USB - 0229 OneTouch 7100 - 022a OneTouch 6600 - 022c OneTouch 9000/9020 - 0231 6100 Scanner - 0311 6200 EPP/USB Scanner - 0321 OneTouch 8100 EPP/USB Scanner - 0331 OneTouch 8600 EPP/USB Scanner - 0341 6400 - 0361 VistaScan Astra 3600(ENG) - 0362 OneTouch 9320 - 0371 OneTouch 8700/8920 - 0380 OneTouch 7700 - 0382 Photo Port 7700 - 0390 9650 - 03a0 Xerox 4800 One Touch - 0410 OneTouch Pro 8800/8820 - 0421 9450 USB - 0423 9750 Scanner - 0424 Strobe XP 450 - 0425 Strobe XP 100 - 0426 Strobe XP 200 - 0427 Strobe XP 100 - 0444 OneTouch 7300 - 0445 CardReader 100 - 0446 Xerox DocuMate 510 - 0447 XEROX DocuMate 520 - 0448 XEROX DocuMate 250 - 0449 Xerox DocuMate 252 - 044a Xerox 6400 - 044c Xerox DocuMate 262 - 0474 Strobe XP 300 - 0475 Xerox DocuMate 272 - 0478 Strobe XP 220 - 0479 Strobe XP 470 - 047a 9450 - 047b 9650 - 047d 9420 - 0480 9520 - 048f Strobe XP 470 - 0491 Strobe XP 450 - 0493 9750 - 0494 Strobe XP 120 - 0497 Patriot 430 - 0498 Patriot 680 - 0499 Patriot 780 - 049b Strobe XP 100 - 04a0 7400 - 04ac Xerox Travel Scanner 100 -04a8 Multivideo Labs, Inc. - 0101 Hub - 0303 Peripheral Switch - 0404 Peripheral Switch -04a9 Canon, Inc. - 1005 BJ Printer Hub - 1035 PD Printer Storage - 1050 BJC-8200 - 1051 BJC-3000 Color Printer - 1052 BJC-6100 - 1053 BJC-6200 - 1054 BJC-6500 - 1055 BJC-85 - 1056 BJC-2110 Color Printer - 1057 LR1 - 105a BJC-55 - 105b S600 Printer - 105c S400 - 105d S450 Printer - 105e S800 - 1062 S500 Printer - 1063 S4500 - 1064 S300 Printer - 1065 S100 - 1066 S630 - 1067 S900 - 1068 S9000 - 1069 S820 - 106a S200 Printer - 106b S520 Printer - 106d S750 Printer - 106e S820D - 1070 S530D - 1072 I850 Printer - 1073 I550 Printer - 1074 S330 Printer - 1076 i70 - 1077 i950 - 107a S830D - 107b i320 - 107c i470D - 107d i9100 - 107e i450 - 107f i860 - 1082 i350 - 1084 i250 - 1085 i255 - 1086 i560 - 1088 i965 - 108a i455 - 108b i900D - 108c i475D - 108d PIXMA iP2000 - 108f i80 - 1090 i9900 Photo Printer - 1091 PIXMA iP1500 - 1093 PIXMA iP4000 - 1094 PIXMA iP3000x Printer - 1095 PIXMA iP6000D - 1097 PIXMA iP5000 - 1098 PIXMA iP1000 - 1099 PIXMA iP8500 - 109c PIXMA iP4000R - 109d iP90 - 10a0 PIXMA iP1600 Printer - 10a2 iP4200 - 10a4 iP5200R - 10a5 iP5200 - 10a7 iP6210D - 10a8 iP6220D - 10a9 iP6600D - 10b6 PIXMA iP4300 Printer - 10c2 PIXMA iP1800 Printer - 10c4 Pixma iP4500 Printer - 1404 W6400PG - 1405 W8400PG - 150f BIJ2350 PCL - 1510 BIJ1350 PCL - 1512 BIJ1350D PCL - 1601 DR-2080C Scanner - 1607 DR-6080 Scanner - 1700 PIXMA MP110 Scanner - 1701 PIXMA MP130 Scanner - 1702 MP410 Composite - 1703 MP430 Composite - 1704 MP330 Composite - 1706 PIXMA MP750 Scanner - 1707 PIXMA MP780 Scanner - 1708 PIXMA MP760 Scanner - 1709 PIXMA MP150 Scanner - 170a PIXMA MP170 Scanner - 170b PIXMA MP450 Scanner - 170c PIXMA MP500 Scanner - 170d PIXMA MP800 Scanner - 170e MP800R - 1710 MP950 - 1712 MP530 - 1713 PIXMA MP830 Scanner - 1714 MP160 - 1715 MP180 Storage - 1716 MP460 Composite - 1717 MP510 - 1718 MP600 Storage - 171a MP810 Storage - 171b MP960 - 1721 MP210 ser - 1723 MP470 ser - 1725 MP610 ser - 1726 MP970 ser - 1727 MX300 ser - 1728 MX310 ser - 1729 MX700 ser - 172b MP140 ser - 173e MP560 - 173f Pixma MP640 Multifunction device - 1748 Pixma MG5150 - 1900 CanoScan LiDE 90 - 1901 CanoScan 8800F - 1904 CanoScan LiDE 100 - 1905 CanoScan LiDE 200 - 1906 CanoScan 5600F - 1907 CanoScan LiDE 700F - 1909 CanoScan LiDE 110 - 190a CanoScan LiDE 210 - 2200 CanoScan LiDE 25 - 2201 CanoScan FB320U - 2202 CanoScan FB620U - 2204 CanoScan FB630U - 2205 CanoScan FB1210U - 2206 CanoScan N650U/N656U - 2207 CanoScan 1220U - 2208 CanoScan D660U - 220a CanoScan D2400UF - 220b CanoScan D646U - 220c CanoScan D1250U2 - 220d CanoScan N670U/N676U/LiDE 20 - 220e CanoScan N1240U/LiDE 30 - 220f CanoScan 8000F - 2210 CanoScan 9900F - 2212 CanoScan 5000F - 2213 CanoScan LiDE 50/LiDE 35/LiDE 40 - 2214 CanoScan LiDE 80 - 2215 CanoScan 3000/3000F/3000ex - 2216 CanoScan 3200F - 2217 CanoScan 5200F - 2219 CanoScan 9950F - 221b CanoScan 4200F - 221c CanoScan LiDE 60 - 221e CanoScan 8400F - 221f CanoScan LiDE 500F - 2220 CanoScan LIDE 25 - 2224 CanoScan LiDE 600F - 2225 CanoScan LiDE 70 - 2228 CanoScan 4400F - 2602 MultiPASS C555 - 2603 MultiPASS C755 - 260a CAPT Printer - 260e LBP-2000 - 2610 MPC600F - 2611 SmartBase MPC400 - 2612 MultiPASS C855 - 2617 CAPT Printer - 261a iR1600 - 261b iR1610 - 261c iC2300 - 261f MPC200 Printer - 2621 iR2000 - 2622 iR2010 - 2623 FAX-B180C - 2629 FAXPHONE L75 - 262b LaserShot LBP-1120 Printer - 262d iR C3200 - 262f MultiPASS MP730 - 2630 MultiPASS MP700 - 2631 LASER CLASS 700 - 2632 FAX-L2000 - 2635 MPC190 - 2637 iR C6800 - 2638 iR C3100 - 263c Smartbase MP360 - 263d MP370 - 263e MP390 FAX - 263f MP375 - 2646 MF5530 Scanner Device V1.9.1 - 2647 MF5550 Composite - 264d PIXMA MP710 - 264e MF5630 - 264f MF5650 (FAX) - 2650 iR 6800C EUR - 2651 iR 3100C EUR - 2655 FP-L170/MF350/L380/L398 - 2659 MF8100 - 265b CAPT Printer - 265c iR C3220 - 265d MF5730 - 265e MF5750 - 265f MF5770 - 2660 MF3110 - 2663 iR3570/iR4570 - 2664 iR2270/iR2870 - 2665 iR C2620 - 2666 iR C5800 - 2667 iR85PLUS - 2669 iR105PLUS - 266a CAPT Device - 266b iR8070 - 266c iR9070 - 266d iR 5800C EUR - 266e CAPT Device - 266f iR2230 - 2670 iR3530 - 2671 iR5570/iR6570 - 2672 iR C3170 - 2673 iR 3170C EUR - 2674 L120 - 2675 iR2830 - 2676 CAPT Device - 2677 iR C2570 - 2678 iR 2570C EUR - 2679 CAPT Device - 267a iR2016 - 267b iR2020 - 267d MF7100 series - 2684 MF3200 series - 2686 MF6500 series - 2687 iR4530 - 2688 LBP3460 - 268c iR C6870 - 268d iR 6870C EUR - 268e iR C5870 - 268f iR 5870C EUR - 2691 iR7105 - 26a3 MF4100 series - 26b0 MF4600 series - 26b4 MF4010 series - 26b5 MF4200 series - 3041 PowerShot S10 - 3042 CanoScan FS4000US Film Scanner - 3043 PowerShot S20 - 3044 EOS D30 - 3045 PowerShot S100 - 3046 IXY Digital - 3047 Digital IXUS - 3048 PowerShot G1 - 3049 PowerShot Pro90 IS - 304a CP-10 - 304b IXY Digital 300 - 304c PowerShot S300 - 304d Digital IXUS 300 - 304e PowerShot A20 - 304f PowerShot A10 - 3050 PowerShot unknown 1 - 3051 PowerShot S110 - 3052 Digital IXUS V - 3055 PowerShot G2 - 3056 PowerShot S40 - 3057 PowerShot S30 - 3058 PowerShot A40 - 3059 PowerShot A30 - 305b ZR45MC Digital Camcorder - 305c PowerShot unknown 2 - 3060 EOS D60 - 3061 PowerShot A100 - 3062 PowerShot A200 - 3063 CP-100 - 3065 PowerShot S200 - 3066 Digital IXUS 330 - 3067 MV550i Digital Video Camera - 3069 PowerShot G3 - 306a Digital unknown 3 - 306b MVX2i Digital Video Camera - 306c PowerShot S45 - 306d PowerShot S45 PtP Mode - 306e PowerShot G3 (normal mode) - 306f PowerShot G3 (ptp) - 3070 PowerShot S230 - 3071 PowerShot S230 (ptp) - 3072 PowerShot SD100 / Digital IXUS II (ptp) - 3073 PowerShot A70 (ptp) - 3074 PowerShot A60 (ptp) - 3075 IXUS 400 Camera - 3076 PowerShot A300 - 3077 PowerShot S50 - 3078 ZR70MC Digital Camcorder - 307a MV650i (normal mode) - 307b MV630i Digital Video Camera - 307c MV630i (normal mode) - 307d CP-300 - 307f Optura 20 - 3080 MVX150i (normal mode) / Optura 20 (normal mode) - 3081 Optura 10 - 3082 MVX100i / Optura 10 - 3083 EOS 10D - 3084 EOS 300D / EOS Digital Rebel - 3085 PowerShot G5 - 3087 Elura 50 (PTP mode) - 3088 Elura 50 (normal mode) - 308d MVX3i - 308e FV M1 (normal mode) / MVX 3i (normal mode) / Optura Xi (normal mode) - 3093 Optura 300 - 3096 IXY DV M2 (normal mode) / MVX 10i (normal mode) - 3099 EOS 300D (ptp) - 309a PowerShot A80 - 309b Digital IXUS (ptp) - 309c PowerShot S1 IS - 309d Camera - 309f Camera - 30a0 Camera - 30a1 Camera - 30a2 Camera - 30a8 Elura 60E/Optura 40 (ptp) - 30a9 MVX25i (normal mode) / Optura 40 (normal mode) - 30b1 PowerShot S70 (normal mode) / PowerShot S70 (PTP mode) - 30b2 PowerShot S60 (normal mode) / PowerShot S60 (PTP mode) - 30b3 PowerShot G6 (normal mode) / PowerShot G6 (PTP mode) - 30b4 PowerShot S500 - 30b5 PowerShot A75 - 30b6 Digital IXUS II2 / Digital IXUS II2 (PTP mode) / PowerShot SD110 (PTP mode) / PowerShot SD110 Digital ELPH - 30b7 PowerShot A400 / PowerShot A400 (PTP mode) - 30b8 PowerShot A310 / PowerShot A310 (PTP mode) - 30b9 Powershot A85 - 30ba PowerShot S410 Digital Elph - 30bb PowerShot A95 - 30bd CP-220 - 30be CP-330 - 30bf Digital IXUS 40 - 30c0 Digital IXUS 30 (PTP mode) / PowerShot SD200 (PTP mode) - 30c1 Digital IXUS 50 (normal mode) / IXY Digital 55 (normal mode) / PowerShot A520 (PTP mode) / PowerShot SD400 (normal mode) - 30c2 PowerShot A510 (normal mode) / PowerShot A510 (PTP mode) - 30c4 Digital IXUS i5 (normal mode) / IXY Digital L2 (normal mode) / PowerShot SD20 (normal mode) - 30ea EOS 1D Mark II (PTP mode) - 30eb EOS 20D - 30ec EOS 20D (ptp) - 30ee EOS 350D - 30ef EOS 350D (ptp) - 30f0 PowerShot S2 IS (PTP mode) - 30f2 Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode) - 30f6 SELPHY CP400 - 30f8 Powershot A430 - 30f9 PowerShot A410 (PTP mode) - 30fc PowerShot A620 (PTP mode) - 30fd PowerShot A610 (normal mode)/PowerShot A610 (PTP mode) - 30fe Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode) - 30ff Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode) - 310b SELPHY CP600 - 310e Digital IXUS 50 (PTP mode) - 3110 EOS Digital Rebel XTi - 3116 Digital IXUS 750 (PTP mode) - 3117 PowerShot A700 - 312d Elura 100 - 3138 PowerShot A710 IS - 3147 EOS 1Ds Mark III - 3155 PowerShot A450 - 315a PowerShot G9 - 315d PowerShot A720 - 3160 Digital IXUS 860 IS - 3175 IXY Digital 25 IS - 3176 PowerShot A590 - 317a Powershot A470 - 3184 Digital IXUS 80 IS (PTP mode) - 319a EOS 7D - 31bc PowerShot D10 - 31c0 PowerShot SX200 IS - 31e5 Digital IXUS 200 IS - 31ee SELPHY ES40 - 31f3 PowerShot Digital ELPH SD1400 IS - 31ff Digital IXUS 55 -04aa DaeWoo Telecom, Ltd -04ab Chromatic Research -04ac Micro Audiometrics Corp. -04ad Dooin Electronics - 2501 Bluetooth Device -04af Winnov L.P. -04b0 Nikon Corp. - 0102 Coolpix 990 - 0103 Coolpix 880 - 0104 Coolpix 995 - 0106 Coolpix 775 - 0107 Coolpix 5000 - 0108 Coolpix 2500 - 0109 Coolpix 2500 (ptp) - 010a Coolpix 4500 - 010b Coolpix 4500 (ptp) - 010d Coolpix 5700 (ptp) - 010e Coolpix 4300 (storage) - 010f Coolpix 4300 (ptp) - 0110 Coolpix 3500 (Sierra Mode) - 0111 Coolpix 3500 (ptp) - 0112 Coolpix 885 (ptp) - 0113 Coolpix 5000 (ptp) - 0114 Coolpix 3100 (storage) - 0115 Coolpix 3100 (ptp) - 0117 Coolpix 2100 (ptp) - 0119 Coolpix 5400 (ptp) - 011d Coolpix 3700 (ptp) - 0121 Coolpix 3200 (ptp) - 0122 Coolpix 2200 (ptp) - 0124 Coolpix 8400 (mass storage mode) - 0125 Coolpix 8400 (ptp) - 0126 Coolpix 8800 - 0129 Coolpix 4800 (ptp) - 012c Coolpix 4100 (storage) - 012d Coolpix 4100 (ptp) - 012e Coolpix 5600 (ptp) - 0130 Coolpix 4600 (ptp) - 0135 Coolpix 5900 (ptp) - 0136 Coolpix 7900 (storage) - 0137 Coolpix 7900 (ptp) - 013a Coolpix 100 (storage) - 013b Coolpix 100 (ptp) - 0141 Coolpix P2 (storage) - 0142 Coolpix P2 (ptp) - 0163 Coolpix P5100 (ptp) - 0169 Coolpix P50 (ptp) - 0202 Coolpix SQ (ptp) - 0203 Coolpix 4200 (mass storage mode) - 0204 Coolpix 4200 (ptp) - 0205 Coolpix 5200 (storage) - 0206 Coolpix 5200 (ptp) - 0301 Coolpix 2000 (storage) - 0302 Coolpix 2000 (ptp) - 0317 Coolpix L20 (ptp) - 0402 DSC D100 (ptp) - 0403 D2H (mass storage mode) - 0404 D2H SLR (ptp) - 0405 D70 (mass storage mode) - 0406 DSC D70 (ptp) - 0408 D2X SLR (ptp) - 0409 D50 digital camera - 040a D50 (ptp) - 040c D2Hs - 040e DSC D70s (ptp) - 040f D200 (mass storage mode) - 0410 D200 (ptp) - 0413 D40 (mass storage mode) - 0422 D700 (ptp) - 0425 D300S - 0f03 PD-10 Wireless Printer Adapter - 4000 Coolscan LS 40 ED - 4001 LS 50 ED/Coolscan V ED - 4002 Super Coolscan LS-5000 ED -04b1 Pan International -04b3 IBM Corp. - 3003 Rapid Access III Keyboard - 3004 Media Access Pro Keyboard - 300a Rapid Access IIIe Keyboard - 3016 UltraNav Keyboard Hub - 3018 UltraNav Keyboard - 301b SK-8815 Keyboard - 301c Enhanced Performance Keyboard - 3020 Enhanced Performance Keyboard - 3100 NetVista Mouse - 3103 ScrollPoint Pro Mouse - 3104 ScrollPoint Wireless Mouse - 3105 ScrollPoint Optical (HID) - 3107 ThinkPad 800dpi Optical Travel Mouse - 3108 800dpi Optical Mouse w/ Scroll Point - 3109 Optical ScrollPoint Pro Mouse - 310b Red Wheel Mouse - 310c Wheel Mouse - 4427 Portable CD ROM - 4482 Serial Converter - 4485 Serial Converter - 4525 Double sided CRT - 4550 NVRAM (128 KB) - 4554 Cash Drawer - 4580 Hub w/ NVRAM - 4581 4800-2xx Hub w/ Cash Drawer - 4604 Keyboard w/ Card Reader - 4671 4820 LCD w/ MSR/KB -04b4 Cypress Semiconductor Corp. - 0000 Dacal DC-101 CD Library - 0001 Mouse - 0002 CY7C63x0x Thermometer - 0033 Mouse - 0100 Cino FuzzyScan F760-B - 0101 Keyboard/Hub - 0102 Keyboard with APM - 0130 MyIRC Remote Receiver - 0306 Telephone Receiver - 0407 Optical Skype Mouse - 0bad MetaGeek Wi-Spy - 1002 CY7C63001 R100 FM Radio - 1006 Human Interface Device - 2050 hub - 2830 Opera1 DVB-S (cold state) - 4381 SCAPS USC-1 Scanner Controller - 4611 Storage Adapter FX2 (CY) - 4616 Flash Disk (TPP) - 5201 Combi Keyboard-Hub (Hub) - 5202 Combi Keyboard-Hub (Keyboard) - 5500 HID->COM RS232 Adapter - 6370 ViewMate Desktop Mouse CC2201 - 6560 CY7C65640 USB-2.0 "TetraHub" - 6830 CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI - 6831 Storage Adapter ISD-300LP (CY) - 7417 Wireless PC Lock/Ultra Mouse - 8329 USB To keyboard/Mouse Converter - 8613 CY7C68013 EZ-USB FX2 USB 2.0 Development Kit - 8614 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 861f Anysee E30 USB 2.0 DVB-T Receiver - bca1 Barcode Reader - cc04 Centor USB RACIA-ALVAR USB PORT - cc06 Centor-P RACIA-ALVAR USB PORT - d5d5 CY7C63x0x Zoltrix Z-Boxer GamePad - de61 Barcode Reader - de64 Barcode Reader - f000 CY30700 Licorice evaluation board - f111 CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit - f115 PSoC FirstTouch Programmer -04b5 ROHM LSI Systems USA, LLC -04b6 Hint Corp. -04b7 Compal Electronics, Inc. -04b8 Seiko Epson Corp. - 0001 Stylus Color 740 / Photo 750 - 0002 ISD Smart Cable for Mac - 0003 ISD Smart Cable - 0004 Printer - 0005 Printer - 0006 Printer - 0007 Printer - 0101 Perfection 636 - 0102 GT-2200 - 0103 Perfection 610 - 0104 Perfection 1200 - 0105 StylusScan 2000 - 0106 Stylus Scan 2500 - 0107 Expression 1600U - 0109 Expression 1640 XL - 010a Perfection 1640SU - 010b Perfection 1240 - 010c Perfection 640 - 010e Perfection 1680 - 010f Perfection 1250 - 0110 Perfection 1650 - 0112 Perfection 2450 - 0114 Perfection 660 - 0116 Perfection 3170 (GT-9400) - 0118 Perfection 4180 (GF-F600) - 0119 Perfection 4490 Photo - 011a 1000 ICS - 011b Perfection 2400 Photo - 011c Perfection 3200 - 011d Perfection 1260 Photo - 011e Perfection 1660 Photo - 011f Perfection 1670 - 0120 Perfection 1270 scanner - 0121 Perfection 2480 Photo - 0122 Perfection 3590 scanner - 0126 GT-15000 (ES-7000) - 0128 Perfection 4870 (GT-X700) - 0129 Expression 10000XL (ES-10000G) - 012a Perfection 4990 Photo scanner - 012b GT-2500 (ES-H300) - 012c Perfection V700 Photo (GT-X900) - 012d Perfection V10/V100 (GT-S600/F650) - 012f Perfection V350 (GT-F700) - 0130 Perfection V500 (GT-X770) - 0131 Perfection V300 - 0202 Receipt Printer M129C - 0401 CP 800 Digital Camera - 0402 PhotoPC 850z - 0403 PhotoPC 3000z - 0509 JVC PIX-MC10 - 0601 Stylus Photo 875DC Card Reader - 0602 Stylus Photo 895 Card Reader - 0801 Stylus CX5200/CX5400/CX6600 - 0802 Stylus CX3200 - 0803 Printer (Composite Device) - 0804 Storage Device - 0805 Stylus CX6400 - 0806 Stylus Photo RX600/610 - 0807 Stylus Photo RX500/510 - 0808 Stylus CX5200 - 0809 Storage Device - 080a Storage Device - 080c ME100 - 080d Stylus CX4500/4600 - 080e CX-3500/3600/3650 MFP - 080f Stylus Photo RX425 scanner - 0810 Stylus Photo RX700 (PM-A900) - 0811 Stylus Photo RX620 all-in-one - 0812 MFP Composite Device - 0813 Stylus CX6500/6600 - 0814 (PM-A700) - 0815 AcuLaser CX11 (LP-A500) - 0816 Printer (Composite Device) - 0817 (LP-M5500) - 0818 Stylus CX3700/CX3800/DX3800 - 0819 Stylus CX4700/CX4800/DX4800 (PX-A750) - 081a Stylus Photo RX520/RX530 (PM-A750) - 081b MFP Composite Device - 081c Stylus Photo RX640/RX650 (PM-A890) - 081d (PM-A950) - 081e MFP Composite Device - 081f Stylus CX7700/7800 - 0820 CX4200 MP scanner - 0821 MFP Composite Device - 0822 Storage Device - 0823 MFP Composite Device - 0824 Storage Device - 0825 MFP Composite Device - 0826 Storage Device - 0827 Stylus Photo RX560/580/590 (PM-A820) - 0828 (PM-A970) - 0829 (PM-T990) - 082a (PM-A920) - 082b Stylus DX5050 - 082c Storage Device - 082d Storage Device - 082e 0x082e DX-60x0 MFP scanner - 082f Stylus DX4050 - 0830 Stylus CX2800/CX2900/ME200 - 0831 MFP Composite Device - 0832 MFP Composite Device - 0833 (LP-M5600) - 0834 MFP Composite Device - 0835 AcuLaser CX21 - 0836 MFP Composite Device - 0837 MFP Composite Device - 0838 CX7300/CX7400/DX7400 - 0839 CX8300/CX8400/DX8400 - 083a CX9300F/CX9400Fax/DX9400F - 083b MFP Composite Device - 083c MFP Composite Device - 083d MFP Composite Device - 083e MFP Composite Device - 083f Stylus DX4450 - 0849 Stylus SX205 - 084d Stylus SX115 - 0856 Stylus SX515W -04b9 Rainbow Technologies, Inc. - 0300 SafeNet USB SuperPro/UltraPro - 1000 iKey 1000 Token - 1001 iKey 1200 Token - 1002 iKey Token - 1003 iKey Token - 1004 iKey Token - 1005 iKey Token - 1006 iKey Token - 1200 iKey 2000 Token - 1201 iKey Token - 1202 iKey 2032 Token - 1203 iKey Token - 1204 iKey Token - 1205 iKey Token - 1206 iKey 4000 Token - 1300 iKey 3000 Token - 1301 iKey 3000 - 1302 iKey Token - 1303 iKey Token - 1304 iKey Token - 1305 iKey Token - 1306 iKey Token -04ba Toucan Systems, Ltd -04bb I-O Data Device, Inc. - 0101 USB2-IDE/ATAPI Bridge Adapter - 0201 USB2-IDE/ATAPI Bridge Adapter - 0204 DVD Multi-plus unit iU-CD2 - 0206 DVD Multi-plus unit DVR-UEH8 - 0301 Storage Device - 0314 USB-SSMRW SD-card - 0319 USB2-IDE/ATAPI Bridge Adapter - 031a USB2-IDE/ATAPI Bridge Adapter - 031b USB2-IDE/ATAPI Bridge Adapter - 031e USB-SDRW SD-card - 0502 Nogatech Live! (BT) - 0528 GV-USB Video Capture - 0901 USB ETT - 0904 ET/TX Ethernet [pegasus] - 0913 ET/TX-S Ethernet [pegasus2] - 0919 USB WN-B11 - 0922 IOData AirPort WN-B11/USBS 802.11b - 0930 ETG-US2 - 0937 WN-WAG/USL Wireless LAN Adapter - 0938 WN-G54/USL Wireless LAN Adapter - 093b WN-GDN/USB - 093f WNGDNUS2 802.11n - 0944 WHG-AGDN/US Wireless LAN Adapter - 0945 WN-GDN/US3 Wireless LAN Adapter - 0947 WN-G150U Wireless LAN Adapter - 0948 WN-G300U Wireless LAN Adapter - 0a03 Serial USB-RSAQ1 - 0a07 USB2-iCN Adapter - 0a08 USB2-iCN Adapter - 0c01 FM-10 Pro Disk -04bd Toshiba Electronics Taiwan Corp. -04be Telia Research AB -04bf TDK Corp. - 0100 MediaReader CF - 0115 USB-PDC Adapter UPA9664 - 0116 USB-cdmaOne Adapter UCA1464 - 0117 USB-PHS Adapter UHA6400 - 0118 USB-PHS Adapter UPA6400 - 0135 MediaReader Dual - 0202 73S1121F Smart Card Reader- - 0309 Bluetooth USB dongle - 030a IBM Bluetooth Ultraport Module - 030b Bluetooth Device - 030c Ultraport Bluetooth Device - 0310 Integrated Bluetooth - 0311 Integrated Bluetooth Device - 0317 Bluetooth UltraPort Module from IBM - 0318 IBM Integrated Bluetooth - 0319 Bluetooth Adapter - 0320 Bluetooth Adapter - 0321 Bluetooth Device - 0a28 INDI AV-IN Device -04c1 U.S. Robotics (3Com) - 0020 56K Voice Pro - 0022 56K Voice Pro - 007e ISDN TA - 0082 OfficeConnect Analog Modem - 008f Pro ISDN TA - 0097 OfficeConnect Analog - 009d HomeConnect Webcam [vicam] - 00a9 ISDN Pro TA-U - 00b9 HomeConnect IDSL Modem - 3021 56k Voice FaxModem Pro -04c2 Methode Electronics Far East PTE, Ltd -04c3 Maxi Switch, Inc. - 1102 Mouse - 2102 Mouse -04c4 Lockheed Martin Energy Research -04c5 Fujitsu, Ltd - 1029 fi-4010c Scanner - 1033 fi-4110CU - 1041 fi-4120c Scanner - 1042 fi-4220c Scanner - 105b AH-F401U Air H device - 1096 fi-5110EOX - 1097 fi-5110C - 10ae fi-4120C2 - 10af fi-4220C2 - 10e0 fi-5120c Scanner - 10e1 fi-5220C - 10e7 fi-5900C - 10fe S500 -04c6 Toshiba America Electronic Components -04c7 Micro Macro Technologies -04c8 Konica Corp. - 0720 Digital Color Camera - 0721 e-miniD Camera - 0722 e-mini - 0723 KD-200Z Camera - 0726 KD-310Z Camera - 0728 Revio C2 Mass Storage Device - 0729 Revio C2 Digital Camera - 072c Revio KD20M - 072d Revio KD410Z -04ca Lite-On Technology Corp. - 1766 HID Monitor Controls - 9304 Hub -04cb Fuji Photo Film Co., Ltd - 0100 FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom - 0103 FinePix NX-500/NX-700 printer - 0104 FinePix A101, 2600/2800/4800/6800 Zoom (PC CAM) - 0108 FinePix F601 Zoom (DSC) - 0109 FinePix F601 Zoom (PC CAM) - 010a FinePix S602 (Pro) Zoom (DSC) - 010b FinePix S602 (Pro) Zoom (PC CAM) - 010d FinePix Digital Camera 020531 - 010e FinePix F402 Zoom (DSC) - 010f FinePix F402 Zoom (PC CAM) - 0110 FinePix M603 Zoom (DSC) - 0111 FinePix M603 Zoom (PC CAM) - 0112 FinePix A202, A200 Zoom (DSC) - 0113 FinePix A202, A200 Zoom (PC CAM) - 0114 FinePix F401 Zoom (DSC) - 0115 FinePix F401 Zoom (PC CAM) - 0116 FinePix A203 Zoom (DSC) - 0117 FinePix A203 Zoom (PC CAM) - 0118 FinePix A303 Zoom (DSC) - 0119 FinePix A303 Zoom (PC CAM) - 011a FinePix S304/3800 Zoom (DSC) - 011b FinePix S304/3800 Zoom (PC CAM) - 011c FinePix A204/2650 Zoom (DSC) - 011d FinePix A204/2650 Zoom (PC CAM) - 0120 FinePix F700 Zoom (DSC) - 0121 FinePix F700 Zoom (PC CAM) - 0122 FinePix F410 Zoom (DSC) - 0123 FinePix F410 Zoom (PC CAM) - 0124 FinePix A310 Zoom (DSC) - 0125 FinePix A310 Zoom (PC CAM) - 0126 FinePix A210 Zoom (DSC) - 0127 FinePix A210 Zoom (PC CAM) - 0128 FinePix A205(S) Zoom (DSC) - 0129 FinePix A205(S) Zoom (PC CAM) - 012a FinePix F610 Zoom (DSC) - 012b FinePix Digital Camera 030513 - 012c FinePix S7000 Zoom (DSC) - 012d FinePix S7000 Zoom (PC CAM) - 012f FinePix Digital Camera 030731 - 0130 FinePix S5000 Zoom (DSC) - 0131 FinePix S5000 Zoom (PC CAM) - 013b FinePix Digital Camera 030722 - 013c FinePix S3000 Zoom (DSC) - 013d FinePix S3000 Zoom (PC CAM) - 013e FinePix F420 Zoom (DSC) - 013f FinePix F420 Zoom (PC CAM) - 0142 FinePix S7000 Zoom (PTP) - 0148 FinePix A330 Zoom (DSC) - 0149 FinePix A330 Zoom (UVC) - 014a FinePix A330 Zoom (PTP) - 014b FinePix A340 Zoom (DSC) - 014c FinePix A340 Zoom (UVC) - 0159 FinePix F710 Zoom (DSC) - 0165 FinePix S3500 Zoom (DSC) - 0168 FinePix E500 Zoom (DSC) - 0169 FinePix E500 Zoom (UVC) - 016b FinePix E510 Zoom (DSC) - 016c FinePix E510 Zoom (PC CAM) - 016e FinePix S5500 Zoom (DSC) - 016f FinePix S5500 Zoom (UVC) - 0171 FinePix E550 Zoom (DSC) - 0172 FinePix E550 Zoom (UVC) - 0177 FinePix F10 (DSC) - 0179 Finepix F10 (PTP) - 0186 FinePix S5200/S5600 Zoom (DSC) - 0188 FinePix S5200/S5600 Zoom (PTP) - 018e FinePix S9500 Zoom (DSC) - 018f FinePix S9500 Zoom (PTP) - 0192 FinePix E900 Zoom (DSC) - 0193 FinePix E900 Zoom (PTP) - 019b FinePix F30 (PTP) - 01af FinePix A700 (PTP) - 01bf FinePix F6000fd/S6500fd Zoom (PTP) - 01c0 FinePix F20 (PTP) - 01c1 FinePix F31fd (PTP) - 01c4 FinePix S5700 Zoom (PTP) - 01c5 FinePix F40fd (PTP) - 01c6 FinePix A820 Zoom (PTP) - 01d2 FinePix A800 Zoom (PTP) - 01d4 FinePix F50fd (PTP) - 01d5 FinePix F47 (PTP) - 01f7 FinePix J250 (PTP) - 01fd A160 -04cc ST-Ericsson - 1122 Hub - 1520 USB 2.0 Hub (Avocent KVM) - 1521 USB 2.0 Hub - 1a62 GW Instek GSP-830 Spectrum Analyzer (HID) - 2533 NFC device (PN533) - 8116 Camera -04cd Tatung Co. Of America -04ce ScanLogic Corp. - 0002 SL11R-IDE IDE Bridge - 0100 USB2PRN Printer Class - 0300 Phantom 336CX - C3 scanner - 04ce SL11DEMO, VID: 0x4ce, PID: 0x4ce - 07d1 SL11R, VID: 0x4ce, PID: 0x07D1 -04cf Myson Century, Inc. - 0800 MTP800 Mass Storage Device - 8810 CS8810 Mass Storage Device - 8811 CS8811 Mass Storage Device - 8813 CS8813 Mass Storage Device - 8818 USB2.0 to ATAPI Bridge Controller - 8819 USB 2.0 SD/MMC Reader - 9920 CS8819A2-114 Mass Storage Device -04d0 Digi International -04d1 ITT Canon -04d2 Altec Lansing Technologies - 0070 ADA70 Speakers - 0305 Non-Compliant Audio Device - 0311 ADA-310 Speakers - 2060 Claritel-i750 - vp - ff05 ADA-305 Speakers - ff47 Lansing HID Audio Controls - ff49 Lansing HID Audio Controls -04d3 VidUS, Inc. -04d4 LSI Logic, Inc. -04d5 Forte Technologies, Inc. -04d6 Mentor Graphics -04d7 Oki Semiconductor - 1be4 Bluetooth Device -04d8 Microchip Technology, Inc. - 0002 PicoLCD 20x2 - 0003 PICkit 2 Microcontroller Programmer - 000a CDC RS-232 Emulation Demo - 000b PIC18F2550 (32K Flashable 10 Channel, 10 Bit A/D USB Microcontroller) - 0032 PICkit1 - 0033 PICkit2 - 0036 PICkit Serial Analyzer - 00e0 PIC32 Starter Board - 0a04 AGP LIN Serial Analyzer - 8000 In-Circuit Debugger - 8001 ICD2 in-circuit debugger - 900a PICkit3 - c001 PicoLCD 20x4 - fbba DiscFerret Magnetic Disc Analyser (bootloader mode) - fbbb DiscFerret Magnetic Disc Analyser (active mode) -04d9 Holtek Semiconductor, Inc. - 0022 Portable Keyboard - 048e Optical Mouse - 0499 Optical Mouse - 1203 Keyboard - 1400 PS/2 keyboard + mouse controller - 1503 Shortboard Lefty -04da Panasonic (Matsushita) - 0901 LS-120 Camera - 0912 SDR-S10 - 0b01 CD-R/RW Drive - 0b03 SuperDisk 240MB - 0d01 CD-R Drive KXL-840AN - 0d09 CD-R Drive KXL-RW32AN - 0d0a CD-R Drive KXL-CB20AN - 0d0d CDRCB03 - 0d0e DVD-ROM & CD-R/RW - 0f40 Printer - 1500 MFSUSB Driver - 1800 DY-WL10 802.11abgn Adapter [Broadcom BCM4323] - 1b00 MultiMediaCard - 2121 EB-VS6 - 2316 DVC Mass Storage Device - 2317 DVC USB-SERIAL Driver for WinXP - 2318 NV-GS11/230/250 (webcam mode) - 2319 NV-GS15 (webcam mode) - 231a NV-GS11/230/250 (DV mode) - 231d DVC Web Camera Device - 231e DVC DV Stream Device - 2372 Lumix Camera - 2374 DMC-FZ18/FZ20 - 2451 HDC-SD9 - 2497 HDC-TM700 - 250c Gobi Wireless Modem (QDL mode) - 250d Gobi Wireless Modem - 3904 N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010] - 3c04 JT-P100MR-20 [ePassport Reader] -04db Hypertec Pty, Ltd -04dc Huan Hsin Holdings, Ltd -04dd Sharp Corp. - 13a6 MFC2000 - 6006 AL-1216 - 6007 AL-1045 - 6008 AL-1255 - 6009 AL-1530CS - 600a AL-1540CS - 600b AL-1456 - 600c AL-1555 - 600d AL-1225 - 600e AL-1551CS - 600f AR-122E - 6010 AR-152E - 6011 AR-157E - 6012 SN-1045 - 6013 SN-1255 - 6014 SN-1456 - 6015 SN-1555 - 6016 AR-153E - 6017 AR-122E N - 6018 AR-153E N - 6019 AR-152E N - 601a AR-157E N - 601b AL-1217 - 601c AL-1226 - 601d AR-123E - 6021 IS01 - 7002 DVC Ver.1.0 - 7004 VE-CG40U Digital Still Camera - 7005 VE-CG30 Digital Still Camera - 7007 VL-Z7S Digital Camcorder - 8004 Zaurus SL-5000D/SL-5500 PDA - 8005 Zaurus A-300 - 8006 Zaurus SL-B500/SL-5600 PDA - 8007 Zaurus C-700 PDA - 9014 IM-DR80 Portable NetMD Player - 9031 Zaurus C-750/C-760/C-860/SL-C3000 PDA - 9032 Zaurus SL-6000 - 903a GSM GPRS - 9050 Zaurus C-860 PDA - 9056 Viewcam Z - 9073 AM-900 - 9074 GSM GPRS - 90a9 Sharp Composite - 90d0 USB-to-Serial Comm. Port - 90f2 Sharp 3G GSM USB Control - 9120 WS004SH - 9122 WS007SH - 9123 W-ZERO3 ES Smartphone - 91a3 922SH Internet Machine -04de MindShare, Inc. -04df Interlink Electronics -04e1 Iiyama North America, Inc. - 0201 Monitor Hub -04e2 Exar Corp. -04e3 Zilog, Inc. -04e4 ACC Microelectronics -04e5 Promise Technology -04e6 SCM Microsystems, Inc. - 0001 E-USB ATA Bridge - 0002 eUSCSI SCSI Bridge - 0003 eUSB SmartMedia Card Reader - 0005 eUSB SmartMedia/CompactFlash Card Reader - 0006 eUSB SmartMedia Card Reader - 0007 Hifd - 0009 eUSB ATA/ATAPI Adapter - 000a eUSB CompactFlash Adapter - 000b eUSCSI Bridge - 000c eUSCSI Bridge - 000d Dazzle MS - 0012 Dazzle SD/MMC - 0101 eUSB ATA Bridge (Sony Spressa USB CDRW) - 0311 Dazzle DM-CF - 0312 Dazzle DM-SD/MMC - 0313 Dazzle SM - 0314 Dazzle MS - 0322 e-Film Reader-5 - 0325 eUSB ORCA Quad Reader - 0327 Digital Media Reader - 03fe DMHS2 DFU Adapter - 0406 eUSB SmartDM Reader - 04e6 eUSB DFU Adapter - 04e7 STCII DFU Adapter - 04e8 eUSBDM DFU Adapter - 04e9 DM-E DFU Adapter - 0500 Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard - 0701 DCS200 Loader Device - 0702 DVD Creation Station 200 - 0703 DVC100 Loader Device - 0704 Digital Video Creator 100 - 1001 SCR300 Smart Card Reader - 1010 USBAT-2 CompactFlash Card Reader - 1014 e-Film Reader-3 - 1020 USBAT ATA/ATAPI Adapter - 2007 RSA SecurID ComboReader - 2009 Citibank Smart Card Reader - 200a Reflex v.2 Smart Card Reader - 200d STR391 Reader - 5111 SCR331-DI SmartCard Reader - 5113 SCR333 SmartCard Reader - 5114 SCR331-DI SmartCard Reader - 5115 SCR335 SmartCard Reader - 5116 SCR331-LC1 / SCR3310 SmartCard Reader - 5117 SCR3320 - Smart Card Reader - 5118 Expresscard SIM Card Reader - 5119 SCR3340 - ExpressCard54 Smart Card Reader - 511b SmartCard Reader - 511d SCR3311 Smart Card Reader - 5120 SCR331-DI SmartCard Reader - 5121 SDI010 Smart Card Reader - 5151 SCR338 Keyboard Smart Card Reader - 5292 SCL011 RFID reader - 5410 SCR35xx Smart Card Reader - e000 SCRx31 Reader - e001 SCR331 SmartCard Reader - e003 SPR532 PinPad SmartCard Reader -04e7 Elo TouchSystems - 0001 TouchScreen - 0002 Touchmonitor Interface 2600 Rev 2 - 0004 4000U CarrollTouch® Touchmonitor Interface - 0007 2500U IntelliTouch® Touchmonitor Interface - 0008 3000U AccuTouch® Touchmonitor Interface - 0009 4000U CarrollTouch® Touchmonitor Interface - 0020 Touchscreen Interface (2700) - 0021 Touchmonitor Interface - 0030 4500U CarrollTouch® Touchmonitor Interface - 0032 Touchmonitor Interface - 0033 Touchmonitor Interface - 0041 5010 Surface Capacitive Touchmonitor Interface - 0042 Touchmonitor Interface - 0050 2216 AccuTouch® Touchmonitor Interface - 0071 Touchmonitor Interface - 0072 Touchmonitor Interface - 0081 Touchmonitor Interface - 0082 Touchmonitor Interface - 00ff Touchmonitor Interface -04e8 Samsung Electronics Co., Ltd - 0100 Kingston Flash Drive (128MB) - 0110 Connect3D Flash Drive - 0111 Connect3D Flash Drive - 1003 MP3 Player and Recorder - 1006 SDC-200Z - 2018 WIS09ABGN LinkStick Wireless LAN Adapter - 2035 Digital Photo Frame Mass Storage - 2036 Digital Photo Frame Mini Monitor - 3004 ML-4600 - 3005 Docuprint P1210 - 3008 ML-6060 laser printer - 300c ML-1210 Printer - 300e Laser Printer - 3104 ML-3550N - 3210 ML-5200A Laser Printer - 3226 Laser Printer - 3228 Laser Printer - 322a Laser Printer - 322c Laser Printer - 3230 ML-1440 - 3232 Laser Printer - 3236 ML-1450 - 3238 ML-1430 - 323a ML-1710 Printer - 323b Phaser 3130 - 323c Laser Printer - 323d Phaser 3120 - 323e Laser Printer - 3240 Laser Printer - 3242 ML-1510 Laser Printer - 3248 Color Laser Printer - 324a Laser Printer - 324c ML-1740 Printer - 324d Phaser 3121 - 3256 ML-1520 Laser Printer - 325b Xerox Phaser 3117 Laser Printer - 325f Phaser 3425 Laser Printer - 3260 CLP-510 Color Laser Printer - 3268 ML-1610 Mono Laser Printer - 326c ML-2010P Mono Laser Printer - 3276 ML-3050/ML-3051 Laser Printer - 328e CLP-310 Color Laser Printer - 3296 ML-2580N Mono Laser Printer - 3297 ML-191x/ML-252x Laser Printer - 3409 SCX-4216F Scanner - 340c SCX-5x15 series - 340d SCX-6x20 series - 340e MFP 560 series - 340f Printing Support - 3412 SCX-4x20 series - 3413 SCX-4100 Scanner - 3415 Composite Device - 3419 Composite Device - 341a Printing Support - 341b SCX-4200 series - 341c Composite Device - 341d Composite Device - 341f Composite Device - 3420 Composite Device - 3426 SCX-4500 Laser Printer - 3605 InkJet Color Printer - 3606 InkJet Color Printer - 3609 InkJet Color Printer - 3902 InkJet Color Printer - 3903 Xerox WorkCentre XK50cx - 390f InkJet Color Printer - 3911 SCX-1020 series - 4005 GT-S8000 Jet (msc) - 4f1f GT-S8000 Jet (mtp) - 5000 YP-MF series - 5001 YP-100 - 5002 YP-30 - 5003 YP-700 - 5004 YP-30 - 5005 YP-300 - 5006 YP-750 - 500d MP3 Player - 5010 Yepp YP-35 - 5011 YP-780 - 5013 YP-60 - 5015 yepp upgrade - 501b MP3 Player - 5021 Yepp YP-ST5 - 5026 YP-MT6V - 5027 YP-T7 - 502b YP-F1 - 5032 YP-J70 - 503b YP-U1 MP3 Player - 503d YP-T7F - 5041 YP-Z5 - 5050 YP-U2 MP3 Player - 5051 YP-F2R - 5055 YP-T9 - 507d YP-U3 (mtp) - 507f YP-T9J - 5080 Yepp YP-K3 (msc) - 5081 Yepp YP-K3 (mtp) - 5082 YP-P2 (msc) - 5083 YP-P2 (mtp) - 508a YP-T10 - 508b YP-S5 MP3 Player - 508c YP-S5 - 5090 YP-S3 (msc) - 5091 YP-S3 (mtp) - 5092 YP-U4 (msc) - 5093 YP-U4 (mtp) - 5095 YP-S2 - 510f YP-R1 - 5119 Yepp YP-P3 - 511c YP-Q2 - 5121 YP-U5 - 5123 Yepp YP-M1 - 5a00 YP-NEU - 5a01 YP-NDU - 5a03 Yepp MP3 Player - 5a04 YP-800 - 5a08 YP-90 - 5a0f Meizu M6 MiniPlayer - 5b01 Memory Stick Reader/Writer - 5b02 Memory Stick Reader/Writer - 5b03 Memory Stick Reader/Writer - 5b04 Memory Stick Reader/Writer - 5b05 Memory Stick Reader/Writer - 5b11 SEW-2001u Card - 5f00 NEXiO Sync - 5f01 NEXiO Sync - 5f02 NEXiO Sync - 5f03 NEXiO Sync - 5f04 NEXiO Sync - 6032 G2 Portable hard drive - 6601 Mobile Phone - 6602 Galaxy - 6603 Galaxy - 6611 MITs Sync - 6613 MITs Sync - 6615 MITs Sync - 6617 MITs Sync - 6619 MITs Sync - 661b MITs Sync - 661e Handheld - 6620 Handheld - 6622 Handheld - 6624 Handheld - 662e MITs Sync - 6630 MITs Sync - 6632 MITs Sync - 663e D900e Phone - 663f SGH-E720/SGH-E840 - 6640 Usb Modem Enumerator - 6702 X830 - 6708 U600 Phone - 6709 U600 - 6734 Juke - 6759 D900e Media Player - 675a D900e Mass Storage - 675b D900e Camera - 6772 Standalone LTE device (Trial) - 6795 S5230 - 6802 Standalone HSPA device - 6806 Composite LTE device (Trial) - 6807 Composite HSPA device - 681c Galaxy Portal/Spica/S - 681d Galaxy Portal/Spica Android Phone - 684e Wave (GT-S8500) - 6875 GT-B3710 Standalone LTE device (Commercial) - 6876 GT-B3710 LTE Modem - 6877 Galaxy S - 6888 GT-B3730 Composite LTE device (Commercial) - 6889 GT-B3730 Composite LTE device (Commercial) - 689a LTE Storage Driver [CMC2xx] - 7011 SEW-2003U Card - 7021 Bluetooth Device - 7061 eHome Infrared Receiver - 7080 Anycall SCH-W580 - 7081 Human Interface Device - 8001 Handheld - e020 SERI E02 SCOM 6200 UMTS Phone - e021 SERI E02 SCOM 6200 Virtual UARTs - e022 SERI E02 SCOM 6200 Flash Load Disk - ff30 SG_iMON -04e9 PC-Tel, Inc. -04ea Brooktree Corp. -04eb Northstar Systems, Inc. - e004 eHome Infrared Transceiver -04ec Tokyo Electron Device, Ltd -04ed Annabooks -04ef Pacific Electronic International, Inc. -04f0 Daewoo Electronics Co., Ltd -04f1 Victor Company of Japan, Ltd - 0001 GC-QX3 Digital Still Camera - 0004 GR-DVL815U Digital Video Camera - 0006 DV Camera Storage - 0008 GZ-MG30AA/MC500E Digital Video Camera - 0009 GR-DX25EK Digital Video Camera - 000a GR-D72 Digital Video Camera - 1001 GC-A50 Camera Device - 3008 MP-PRX1 Ethernet - 3009 MP-XP7250 WLAN Adapter -04f2 Chicony Electronics Co., Ltd - 0001 KU-8933 Keyboard - 0002 NT68P81 Keyboard - 0110 KU-2971 Keyboard - 0111 KU-9908 Keyboard - 0112 KU-8933 Keyboard with PS/2 Mouse port - 0116 KU-2971/KU-0325 Keyboard - 0220 Wireless HID Receiver - 0402 Genius LuxeMate i200 Keyboard - 0403 KU-0420 keyboard - 0418 KU-0418 Tactical Pad - 0760 Acer KU-0760 Keyboard - 0860 2.4G Multimedia Wireless Kit - a001 E-Video DC-100 Camera - a120 ORITE CCD Webcam(PC370R) - a121 ORITE CCD Webcam(PC370R) - a122 ORITE CCD Webcam(PC370R) - a123 ORITE CCD Webcam(PC370R) - a124 ORITE CCD Webcam(PC370R) - a128 PC Camera (SN9C202 + OV7663 + EEPROM) - a133 Gateway Webcam - a136 LabTec Webcam 5500 - a204 DSC WIA Device (1300) - a208 DSC WIA Device (2320) - a209 Labtec DC-2320 - a20a DSC WIA Device (3310) - a20c DSC WIA Device (3320) - a210 Audio Device - b008 USB 2.0 Camera - b009 Integrated Camera - b010 Integrated Camera - b012 1.3 MPixel UVC Webcam - b013 USB 2.0 Camera - b015 VGA 24fps UVC Webcam - b016 VGA 30fps UVC Webcam - b018 2M UVC Webcam - b021 ViewSonic 1.3M, USB2.0 Webcam - b022 Gateway USB 2.0 Webcam - b023 Gateway USB 2.0 Webcam - b024 USB 2.0 Webcam - b025 Camera - b027 Gateway USB 2.0 Webcam - b028 VGA UVC Webcam - b029 1.3M UVC Webcam - b036 Asus Integrated 0.3M UVC Webcam - b044 Acer CrystalEye Webcam - b057 integrated USB webcam - b071 2.0M UVC Webcam / CNF7129 - b091 Webcam - b104 CNF7069 Webcam - b107 CNF7070 Webcam - b14c CNF8050 Webcam - b175 4-Port Hub - b1aa Webcam-101 - b1b4 Lenovo Integrated Camera - b1cf Lenovo Integrated Camera -04f3 Elan Microelectronics Corp. - 0210 AM-400 Hama Optical Mouse - 0212 Laser Mouse - 0214 Lynx M9 Optical Mouse - 0230 3D Optical Mouse - 02f4 2.4G Cordless Mouse -04f4 Harting Elektronik, Inc. -04f5 Fujitsu-ICL Systems, Inc. -04f6 Norand Corp. -04f7 Newnex Technology Corp. -04f8 FuturePlus Systems -04f9 Brother Industries, Ltd - 0002 HL-1050 Laser Printer - 0005 Printer - 0006 HL-1240 Laser Printer - 0007 HL-1250 Laser Printer - 0008 HL-1270 Laser Printer - 0009 Printer - 000a P2500 series - 000b Printer - 000c Printer - 000d HL-1440 Laser Printer - 000e HL-1450 series - 000f HL-1470N series - 0010 Printer - 0011 Printer - 0012 Printer - 0013 Printer - 0014 Printer - 0015 Printer - 0016 Printer - 0017 Printer - 0018 Printer - 001a HL-1430 Laser Printer - 001c Printer - 001e Printer - 0020 HL-5130 series - 0021 HL-5140 series - 0022 HL-5150D series - 0023 HL-5170DN series - 0024 Printer - 0025 Printer - 0027 HL-2030 Laser Printer - 0028 Printer - 0029 Printer - 002a HL-52x0 series - 002b HL-5250DN Printer - 002c Printer - 002d Printer - 0100 MFC8600/9650 series - 0101 MFC9600/9870 series - 0102 MFC9750/1200 series - 0104 MFC-8300J - 0105 MFC-9600J - 0106 MFC-7300C - 0107 MFC-7400C - 0108 MFC-9200C - 0109 MFC-830 - 010a MFC-840 - 010b MFC-860 - 010c MFC-7400J - 010d MFC-9200J - 010e MFC3100C Scanner - 010f MFC 5100C - 0110 MFC4800 Scanner - 0111 MFC 6800 - 0112 DCP1000 Port(FaxModem) - 0113 MFC-8500 - 0114 MFC9700 Port(FaxModem) - 0115 MFC9800 Scanner - 0116 DCP1400 Scanner - 0119 MFC-9660 - 011b MFC-9880 - 011c MFC-9760 - 011d MFC-9070 - 011e MFC-9180 - 011f MFC-9160 - 0120 MFC580 Port(FaxModem) - 0121 MFC-590 - 0122 MFC-5100J - 0129 Imagistics 2500 (MFC-8640D clone) - 012f FAX-4750e - 0132 MFC-5200C RemovableDisk - 0135 MFC-100 Scanner - 0136 MFC-150CL Scanner - 013c MFC-890 Port - 013d MFC-5200J Printer - 013e MFC-4420C RemovableDisk - 013f MFC-4820C RemovableDisk - 0140 DCP-8020 - 0141 DCP-8025D - 0142 MFC-8420 - 0143 MFC-8820D - 0144 DCP-4020C RemovableDisk - 0146 MFC-3220C - 0147 FAX-1820C Printer - 0148 MFC-3320CN Printer - 0149 FAX-1920CN Printer - 014a MFC-3420C - 014b MFC-3820CN - 014d FAX-1815C Printer - 014e MFC-8820J - 0150 MFC-8220 Port(FaxModem) - 0151 MFC-8210J - 0157 MFC-3420J Printer - 0158 MFC-3820JN Port(FaxModem) - 015d MFC Composite Device - 015e DCP-8045D - 015f MFC-8440 - 0160 MFC-8840D - 0161 MFC-210C - 0162 MFC-420CN Remote Setup Port - 0163 MFC-410CN RemovableDisk - 0165 MFC-620CN - 0166 MFC-610CLN RemovableDisk - 0168 MFC-620CLN - 0169 DCP-110C RemovableDisk - 016b DCP-310CN RemovableDisk - 016c FAX-2440C Printer - 016d MFC-5440CN - 016e MFC-5840CN Remote Setup Port - 0170 FAX-1840C Printer - 0171 FAX-1835C Printer - 0172 FAX-1940CN Printer - 0173 MFC-3240C Remote Setup Port - 0174 MFC-3340CN RemovableDisk - 017b Imagistics sx2100 - 0180 MFC-7420 - 0181 MFC-7820N Port(FaxModem) - 0182 Composite Device - 0183 DCP-7020 - 0184 DCP-7025 Printer - 0185 MFC-7220 Printer - 0186 Composite Device - 0187 FAX-2820 Printer - 0188 FAX-2920 Printer - 018a MFC-9420CN - 018c DCP-115C - 018d DCP-116C - 018e DCP-117C - 018f DCP-118C - 0190 DCP-120C - 0191 DCP-315CN - 0192 DCP-340CW - 0193 MFC-215C - 0194 MFC-425CN - 0195 MFC-820CW Remote Setup Port - 0196 MFC-820CN Remote Setup Port - 0197 MFC-640CW - 019a MFC-840CLN Remote Setup Port - 01a2 MFC-8640D - 01a3 Composite Device - 01a4 DCP-8065DN Printer - 01a5 MFC-8460N Port(FaxModem) - 01a6 MFC-8860DN Port(FaxModem) - 01a7 MFC-8870DW Printer - 01a8 DCP-130C - 01a9 DCP-330C - 01aa DCP-540CN - 01ab MFC-240C - 01ae DCP-750CW RemovableDisk - 01af MFC-440CN - 01b0 MFC-660CN - 01b1 MFC-665CW Remote Setup Port - 01b2 MFC-845CW Remote Setup Port - 01b4 MFC-460CN Remote Setup Port - 01b5 MFC-630CD - 01b6 MFC-850CDN - 01b7 MFC-5460CN Remote Setup Port - 01b8 MFC-5860CN - 01ba MFC-3360C - 01bd MFC-8660DN - 01be DCP-750CN RemovableDisk - 01bf MFC-860CDN Remote Setup Port - 01c0 DCP-128C - 01c1 DCP-129C - 01c2 DCP-131C - 01c3 DCP-329C - 01c4 DCP-331C - 01c5 MFC-239C - 01ca MFC-9440CN Remote Setup Port - 01ce DCP-135C - 01cf DCP-150C - 01d0 DCP-350C - 01d1 DCP-560CN - 01d4 MFC-230C - 01d5 MFC-235C - 01d6 MFC-260C - 01df DCP-155C - 01e0 MFC-265C - 01e1 DCP-153C - 01e2 DCP-157C - 01e3 DCP-353C - 01e4 DCP-357C - 01e7 MFC-7340 - 01e9 DCP-7040 - 01ea DCP-7030 - 01eb MFC-7320 - 01f4 MFC-5890CN - 1000 Printer - 1002 Printer - 2002 PTUSB Printing - 2004 PT-2300/2310 p-Touch Laber Printer - 2015 QL-500 P-touch label printer - 2016 QL-550 P-touch label printer - 201a PT-18R P-touch label printer - 2027 QL-560 P-Touch Label Printer - 2100 Card Reader Writer -04fa Dallas Semiconductor - 2490 DS1490F 2-in-1 Fob, 1-Wire adapter - 4201 DS4201 Audio DAC -04fb Biostar Microtech International Corp. -04fc Sunplus Technology Co., Ltd - 0003 CM1092 Optical Scroller Mouse - 0005 USB OpticalWheel Mouse - 0013 ViewMate Desktop Mouse CC2201 - 0015 ViewMate Desktop Mouse CC2201 - 00d3 00052486 / Laser Mouse M1052 [hama] - 0171 SPCA1527A/SPCA1528 SD card camera (Mass Storage mode) - 0232 Fingerprint - 0561 Flexcam 100 - 05d8 Wireless keyboard/mouse - 0c15 SPIF215A SATA bridge - 0c25 SATALink SPIF225A - 1528 SPCA1527A/SPCA1528 SD card camera (webcam mode) - 1533 Mass Storage - 2080 ASUS Webcam - 500c CA500C Digital Camera - 504a Aiptek Mini PenCam 1.3 - 504b Aiptek Mega PockerCam 1.3/Maxell MaxPocket LE 1.3 - 5330 Digitrex 2110 - 5331 Vivitar Vivicam 10 - 5360 Sunplus Generic Digital Camera - 5720 Card Reader Driver - 7333 Finet Technology Palmpix DC-85 - 757a Aiptek, MP315 MP3 Player - ffff PureDigital Ritz Disposable -04fd Soliton Systems, K.K. - 0003 Smart Card Reader II -04fe PFU, Ltd -04ff E-CMOS Corp. -0500 Siam United Hi-Tech - 0001 DART Keyboard Mouse - 0002 DART-2 Keyboard -0501 Fujikura DDK, Ltd -0502 Acer, Inc. - 0001 Handheld - 0736 Handheld - 15b1 PDA n311 - 1631 c10 Series - 1632 c20 Series - 16e1 n10 Handheld Sync - 16e2 n20 Pocket PC Sync - 16e3 n30 Handheld Sync - 3202 Liquid - 3203 Liquid (Debug mode) - d001 Divio NW801/DVC-V6+ Digital Camera -0503 Hitachi America, Ltd -0504 Hayes Microcomputer Products -0506 3Com Corp. - 009d HomeConnect Camera - 00a0 3CREB96 Bluetooth Adapter - 00a1 Bluetooth Device - 00a2 Bluetooth Device - 00df 3Com Home Connect lite - 0100 HomeConnect ADSL Modem Driver - 03e8 3C19250 Ethernet [klsi] - 0a01 3CRSHEW696 Wireless Adapter - 0a11 3CRWE254G72 802.11g Adapter - 11f8 HomeConnect 3C460 - 2922 HomeConnect Cable Modem External with - 3021 U.S.Robotics 56000 Voice FaxModem Pro - 4601 3C460B 10/100 Ethernet Adapter - f002 3CP4218 ADSL Modem (pre-init) - f003 3CP4218 ADSL Modem - f100 3CP4218 ADSL Modem (pre-init) -0507 Hosiden Corp. - 0011 Konami ParaParaParadise Controller -0508 Clarion Co., Ltd -0509 Aztech Systems, Ltd - 0801 ADSL Modem - 0802 ADSL Modem (RFC1483) - 0806 DSL Modem - 080f Binatone ADSL500 Modem Network Interface - 0812 Pirelli ADSL Modem Network Interface -050a Cinch Connectors -050b Cable System International -050c InnoMedia, Inc. -050d Belkin Components - 0004 Direct Connect - 0012 F8T012 Bluetooth Adapter - 0013 F8T013 Bluetooth Adapter - 0017 B8T017 Bluetooth+EDR 2.1 - 0050 F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a] - 0081 F8T001v2 Bluetooth - 0083 Bluetooth Device - 0084 F8T003v2 Bluetooth - 0102 Flip KVM - 0103 F5U103 Serial Adapter [etek] - 0106 VideoBus II Adapter, Video - 0108 F1DE108B KVM - 0109 F5U109/F5U409 PDA Adapter - 0115 SCSI Adapter - 0119 F5U120-PC Dual PS/2 Ports / F5U118-UNV ADB Adapter - 0121 F5D5050 100Mbps Ethernet - 0122 Ethernet Adapter - 0131 Bluetooth Device with trace filter - 016a Bluetooth Mini Dongle - 0201 Peripheral Switch - 0208 USBView II Video Adapter [nt1004] - 0210 F5U228 Hi-Speed USB 2.0 DVD Creator - 0211 F5U211 USB 2.0 15-in-1 Media Reader & Writer - 0224 F5U224 USB 2.0 4-Port Hub - 0234 F5U234 USB 2.0 4-Port Hub - 0237 F5U237 USB 2.0 7-Port Hub - 0240 F5U240 USB 2.0 CF Card Reader - 0249 USB 2 Flash Media Device - 0257 F5U257 Serial - 0304 FSU304 USB 2.0 - 4 Ports Hub - 0409 F5U409 Serial - 0551 F6C550-AVR UPS - 0802 Nostromo n40 Gamepad - 0803 Nostromo 1745 GamePad - 0805 Nostromo N50 GamePad - 0815 Nostromo n52 HID SpeedPad Mouse Wheel - 0826 ErgoFit Wireless Optical Mouse (HID) - 0980 HID UPS Battery - 1102 Realtek RTL8188CE-VAU 1T1R 802.11n WLAN Adapter - 1202 F5U120-PC Parallel Printer Port - 1203 F5U120-PC Serial Port - 258a F5U258 Host to Host cable - 3101 F1DF102U/F1DG102U Flip Hub - 3201 F1DF102U/F1DG102U Flip KVM - 4050 ZD1211B - 5055 F5D5055 Gigabit Network Adapter [AX88xxx] - 6051 F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] - 7050 F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB] - 705a F5D7050 Wireless G Adapter v3000 [Ralink RT2573] - 705b Wireless G Adapter - 705c F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B] - 705e F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B] - 8053 F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870] - 805c F5D8053 N Wireless Adapter v3000 [Ralink RT2870] - 805e F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U] - 815c F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870] - 815f F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU] - 825a F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870] - 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070] - 845a F7D2101deSH [rtl8192su] - 905b F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573] - 905c F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573] - 935a F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870] - 935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070] - 945a F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU] -050e Neon Technology, Inc. -050f KC Technology, Inc. - 0001 Hub - 0003 KC82C160S Hub - 0180 KC-180 IrDA Dongle - 0190 KC2190 USB Host-to-Host cable -0510 Sejin Electron, Inc. - 0001 Keyboard - 1000 Keyboard with PS/2 Mouse Port - e001 Mouse -0511 N'Able (DataBook) Technologies, Inc. -0512 Hualon Microelectronics Corp. -0513 digital-X, Inc. -0514 FCI Electronics -0515 ACTC -0516 Longwell Electronics -0517 Butterfly Communications -0518 EzKEY Corp. - 0001 USB to PS2 Adaptor v1.09 - 0002 EZ-9900C Keyboard -0519 Star Micronics Co., Ltd - 0003 TSP100ECO/TSP100II - c002 Xlive Bluetooth XBM-100S MP3 Player -051a WYSE Technology - a005 Smart Display Version 9973 -051b Silicon Graphics -051c Shuttle, Inc. - 0005 VFD Module - c001 eHome Infrared Receiver - c002 eHome Infrared Receiver -051d American Power Conversion - 0001 UPS - 0002 Uninterruptible Power Supply - 0003 UPS -051e Scientific Atlanta, Inc. -051f IO Systems (Elite Electronics), Inc. -0520 Taiwan Semiconductor Manufacturing Co. -0521 Airborn Connectors -0522 Advanced Connectek, Inc. -0523 ATEN GmbH -0524 Sola Electronics -0525 Netchip Technology, Inc. - 100d RFMD Bluetooth Device - 1080 NET1080 USB-USB Bridge - 1265 File-backed Storage Gadget - a140 USB Clik! 40 - a141 (OME) PocketZip 40 MP3 Player Driver - a220 GVC Bluetooth Wireless Adapter - a4a0 Linux-USB "Gadget Zero" - a4a1 Linux-USB Ethernet Gadget - a4a2 Linux-USB Ethernet/RNDIS Gadget - a4a3 Linux-USB user-mode isochronous source/sink - a4a4 Linux-USB user-mode bulk source/sink - a4a5 Linux-USB File Storage Gadget - a4a6 Linux-USB Serial Gadget - a4a7 Linux-USB Serial Gadget (CDC ACM mode) - a4a8 Linux-USB Printer Gadget - a4a9 Linux-USB OBEX Gadget - a4aa Linux-USB CDC Composite Gadge (Ethernet and ACM) -0526 Temic MHS S.A. -0527 ALTRA -0528 ATI Technologies, Inc. - 7561 TV Wonder - 7562 TV Wonder, Edition (FN5) - 7563 TV Wonder, Edition (FI) - 7564 TV Wonder, Edition (FQ) - 7565 TV Wonder, Edition (NTSC+) - 7566 TV Wonder, Edition (FN5) - 7567 TV Wonder, Edition (FI) - 7568 TV Wonder, Edition (FQ) - 7569 Live! Pro (A) - 756a Live! Pro Audio (O) -0529 Aladdin Knowledge Systems - 0001 HASP v0.06 - 030b eToken R1 v3.1.3.x - 0313 eToken R1 v3.2.3.x - 031b eToken R1 v3.3.3.x - 0323 eToken R1 v3.4.3.x - 0412 eToken R2 v2.2.4.x - 041a eToken R2 v2.2.4.x - 0422 eToken R2 v2.4.4.x - 042a eToken R2 v2.5.4.x - 050c eToken Pro v4.1.5.x - 0514 eToken Pro v4.2.5.4 - 0600 eToken Pro 64k (4.2) -052a Crescent Heart Software -052b Tekom Technologies, Inc. - 0102 Ca508A HP1020 Camera v.1.3.1.6 - 0801 Yakumo MegaImage 37 - 1512 Yakumo MegaImage IV - 1513 Aosta CX100 Webcam - 1514 Aosta CX100 Webcam Storage - 1905 Yakumo MegaImage 47 - 1911 Yakumo MegaImage 47 SL - 2202 WDM Still Image Capture - 2203 Sound Vision Stream Driver - 3a06 DigiLife DDV-5120A - d001 P35U Camera Capture -052c Canon Information Systems, Inc. -052d Avid Electronics Corp. -052e Standard Microsystems Corp. -052f Unicore Software, Inc. -0530 American Microsystems, Inc. -0531 Wacom Technology Corp. -0532 Systech Corp. -0533 Alcatel Mobile Phones -0534 Motorola, Inc. -0535 LIH TZU Electric Co., Ltd -0536 Hand Held Products (Welch Allyn, Inc.) - 01a0 PDT -0537 Inventec Corp. -0538 Caldera International, Inc. (SCO) -0539 Shyh Shiun Terminals Co., Ltd -053a PrehKeyTec GmbH - 0b00 Hub -053b Global Village Communication -053c Institut of Microelectronic & Mechatronic Systems -053d Silicon Architect -053e Mobility Electronics -053f Synopsys, Inc. -0540 UniAccess AB - 0101 Panache Surf ISDN TA -0541 Sirf Technology, Inc. -0543 ViewSonic Corp. - 00fe G773 Monitor Hub - 00ff P815 Monitor Hub - 0bf2 airpanel V150 Wireless Smart Display - 0bf3 airpanel V110 Wireless Smart Display - 0ed9 Color Pocket PC V35 - 0f01 airsync Wi-Fi Wireless Adapter - 1527 Color Pocket PC V36 - 1529 Color Pocket PC V37 - 152b Color Pocket PC V38 - 152e Pocket PC - 1921 Communicator Pocket PC - 1922 Smartphone - 1923 Pocket PC V30 - 1a11 Wireless 802.11g Adapter - 1e60 TA310 - ATSC/NTSC/PAL Driver(PCM4) - 4153 ViewSonic G773 Control (?) -0544 Cristie Electronics, Ltd -0545 Xirlink, Inc. - 7333 Trution Web Camera - 8002 IBM NetCamera - 8009 Veo PC Camera - 800c Veo Stingray - 800d Veo PC Camera - 8080 IBM C-It Webcam - 808a Veo PC Camera - 808b Veo Stingray - 808d Veo PC Camera - 810a Veo Advanced Connect Webcam - 810b Veo PC Camera - 810c Veo PC Camera - 8135 Veo Mobile/Advanced Web Camera - 813a Veo PC Camera - 813b Veo PC Camera - 813c Veo Mobile/Advanced Web Camera - 8333 Veo Stingray/Connect Web Camera - 888c eVision 123 digital camera - 888d eVision 123 digital camera -0546 Polaroid Corp. - 0daf PDC 2300Z - 1bed PDC 1320 Camera - 3097 PDC 310 - 3155 PDC 3070 Camera - 3187 Digital Camera - 3191 Ion 80 Camera - 3273 PDC 2030 Camera - 3304 a500 Digital Camera - dccf Sound Vision Stream Driver -0547 Anchor Chips, Inc. - 0001 ICSI Bluetooth Device - 1002 Python2 WDM Encoder - 2131 AN2131 EZUSB Microcontroller - 2235 AN2235 EZUSB-FX Microcontroller - 2710 EZ-Link Loader (EZLNKLDR.SYS) - 2720 AN2720 USB-USB Bridge - 2727 Xircom PGUNET USB-USB Bridge - 2750 EZ-Link (EZLNKUSB.SYS) - 2810 Cypress ATAPI Bridge - 7777 Bluetooth Device - 9999 AN2131 uninitialized (?) -0548 Tyan Computer Corp. - 1005 EZ Cart II GameBoy Flash Programmer -0549 Pixera Corp. -054a Fujitsu Microelectronics, Inc. -054b New Media Corp. -054c Sony Corp. - 0001 HUB - 0002 Standard HUB - 0010 DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera - 0014 Nogatech USBVision (SY) - 0022 Storage Adapter V2 (TPP) - 0023 CD Writer - 0024 Mavica CD-1000 Camera - 0025 NW-MS7 Walkman MemoryStick Reader - 002b Portable USB Harddrive V2 - 002c USB Floppy Disk Drive - 002d MSAC-US1 MemoryStick Reader - 002e Sony HandyCam MemoryStick Reader - 0030 Storage Adapter V2 (TPP) - 0032 MemoryStick MSC-U01 Reader - 0035 Network Walkman (E) - 0036 Net MD - 0037 MG Memory Stick Reader/Writer - 0038 Clie PEG-S300/D PalmOS PDA - 0039 Network Walkman (MS) - 003c VAIO-MX LCD Control - 0045 Digital Imaging Video - 0046 Network Walkman - 004a Memory Stick Hi-Fi System - 004b Memory Stick Reader/Writer - 004e DSC-xxx (ptp) - 0056 MG Memory Stick Reader/Writer - 0058 Clie PEG-N7x0C PalmOS PDA Mass Storage - 0066 Clie PEG-N7x0C/PEG-T425 PalmOS PDA Serial - 0067 CMR-PC3 Webcam - 0069 Memorystick MSC-U03 Reader - 006c FeliCa S310 [PaSoRi] - 006d Clie PEG-T425 PDA Mass Storage - 006f Network Walkman (EV) - 0073 Storage CRX1750U - 0075 Net MD - 0076 Storage Adapter ACR-U20 - 007c Net MD - 007f IC Recorder (MS) - 0080 Net MD - 0081 Net MD - 0084 Net MD - 0085 Net MD - 0086 Net MD - 008b Micro Vault 64M Mass Storage - 0095 Sony Clie s360 - 0099 Clie NR70 PDA Mass Storage - 009a Clie NR70 PDA Serial - 00ab Visual Communication Camera (PCGA-UVC10) - 00af DPP-EX Series Digital Photo Printer - 00bf IC Recorder (S) - 00c0 Handycam DCR-30 - 00c6 Net MD - 00c7 Net MD - 00c8 MZ-N710 Minidisc Walkman - 00c9 Net MD - 00ca MZ-DN430 Minidisc Walkman - 00cb MSAC-US20 Memory Stick Reader - 00da Sony Clie nx60 - 00e8 Network Walkman (MS) - 00e9 Handheld - 00eb Net MD - 0101 Net MD - 0103 IC Recorder (ST) - 0105 Micro Vault Hub - 0107 VCC-U01 Visual Communication Camera - 0110 Digital Imaging Video - 0113 Net MD - 0116 IC Recorder (P) - 0144 Clie PEG-TH55 PDA - 0147 Visual Communication Camera (PCGA-UVC11) - 014c Aiwa AM-NX9 Net MD Music Recorder MDLP - 014d Memory Stick Reader/Writer - 0154 Eyetoy Audio Device - 015f IC Recorder (BM) - 0169 Clie PEG-TJ35 PDA Serial - 016a Clie PEG-TJ35 PDA Mass Storage - 016b Mobile HDD - 016d IC Recorder (SX) - 016e DPP-EX50 Digital Photo Printer - 0171 Fingerprint Sensor 3500 - 017e Net MD - 017f Hi-MD WALKMAN - 0180 Net MD - 0181 Hi-MD WALKMAN - 0182 Net MD - 0183 Hi-MD WALKMAN - 0184 Net MD - 0185 Hi-MD WALKMAN - 0186 Net MD - 0187 Hi-MD MZ-NH600 WALKMAN - 0188 Net MD - 018a Net MD - 018b Hi-MD SOUND GATE - 019e Micro Vault 1.0G Mass Storage - 01ad ATRAC HDD PA - 01bb FeliCa S320 [PaSoRi] - 01bd MRW62E Multi-Card Reader/Writer - 01c3 NW-E55 Network Walkman - 01c6 MEMORY P-AUDIO - 01c7 Printing Support - 01c8 PSP Type A - 01c9 PSP Type B - 01d0 DVD+RW External Drive DRU-700A - 01d5 IC RECORDER - 01de VRD-VC10 [Video Capture] - 01e9 Net MD - 01ea Hi-MD WALKMAN - 01ee IC RECORDER - 01fa Sony IC Recorder (P) - 01fb NW-E405 Network Walkman - 020f Device - 0210 ATRAC HDD PA - 0219 Net MD - 021a Hi-MD WALKMAN - 021b Net MD - 021c Hi-MD WALKMAN - 021d Net MD - 0227 Printing Support - 022c Net MD - 022d Hi-MD AUDIO - 0233 ATRAC HDD PA - 0236 Mobile HDD - 023b DVD+RW External Drive DRU-800UL - 023c Net MD - 023d Hi-MD WALKMAN - 0243 MicroVault Flash Drive - 024b Vaio VGX Mouse - 0257 IFU-WLM2 USB Wireless LAN Module (Wireless Mode) - 0258 IFU-WLM2 USB Wireless LAN Module (Memory Mode) - 0259 IC RECORDER - 0267 Tachikoma Device - 0268 Batoh Device / PlayStation 3 Controller - 0269 HDD WALKMAN - 026a HDD WALKMAN - 0271 IC Recorder (P) - 027c NETWORK WALKMAN - 027e SONY Communicator - 027f IC RECORDER - 0286 Net MD - 0287 Hi-MD WALKMAN - 0290 VGP-UVC100 Visual Communication Camera - 029b PRS-500 eBook reader - 02a5 MicroVault Flash Drive - 02af Handycam DCR-DVD306E - 02c4 Device - 02d1 DVD RW - 02d2 PSP Slim - 02e1 FeliCa S330 [PaSoRi] - 02ea PlayStation 3 Memory Card Adaptor - 02f9 DSC-H9 - 0317 WALKMAN - 031a Walkman NWD-B103F - 031e PRS-300/PRS-505 eBook reader - 033e DSC-W120 - 0346 Handycam DCR-SR55E - 0348 HandyCam HDR-TG3E - 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) - 03bc Webbie HD - MHS-CM1 - 03d3 DR-BT100CX - 03d5 PlayStation Move motion controller - 03fc WALKMAN [NWZ-E345] - 03fd Walkman NWZ-E443 - 0440 DSC-H55 - 0485 MHS-PM5 HD camcorder - 04cb WALKMAN NWZ-E354 - 1000 Wireless Buzz! Receiver -054d Try Corp. -054e Proside Corp. -054f WYSE Technology Taiwan -0550 Fuji Xerox Co., Ltd - 0002 InkJet Color Printer - 0004 InkJet Color Printer - 0005 InkJet Color Printer -0551 CompuTrend Systems, Inc. -0552 Philips Monitors -0553 STMicroelectronics Imaging Division (VLSI Vision) - 0001 TerraCAM - 0002 CPiA Webcam - 0100 STV0672 Camera - 0140 Video Camera - 0150 CDE CAM 100 - 0151 Digital Blue QX5 Microscope - 0200 Dual-mode Camera0 - 0201 Dual-mode Camera1 - 0202 Aiptek PenCam 1 - 0674 Multi-mode Camera - 0679 NMS Video Camera (Webcam) - 1002 Che-ez! Splash -0554 Dictaphone Corp. -0555 ANAM S&T Co., Ltd -0556 Asahi Kasei Microsystems Co., Ltd - 0001 AK5370 I/F A/D Converter -0557 ATEN International Co., Ltd - 2001 UC-1284 Printer Port - 2002 10Mbps Ethernet [klsi] - 2004 UC-100KM PS/2 Mouse and Keyboard adapter - 2006 UC-1284B Printer Port - 2007 UC-110T 100Mbps Ethernet [pegasus] - 2008 UC-232A Serial Port [pl2303] - 2009 UC-210T Ethernet - 2011 UC-2324 4xSerial Ports [mos7840] - 2202 CS124U Miniview II KVM Switch - 2213 CS682 2-Port USB 2.0 DVI KVM Switch - 2600 IDE Bridge - 2701 CE700A KVM Extender - 4000 DSB-650 10Mbps Ethernet [klsi] - 7000 Hub - 7820 UC-2322 2xSerial Ports [mos7820] -0558 Truevision, Inc. - 1009 GW Instek GDS-1000 Oscilloscope - 100a GW Instek GDS-1000A Oscilloscope - 2009 GW Instek GDS-2000 Oscilloscope -0559 Cadence Design Systems, Inc. -055a Kenwood USA -055b KnowledgeTek, Inc. -055c Proton Electronic Ind. -055d Samsung Electro-Mechanics Co. - 0001 Keyboard - 0bb1 Bluetooth Device - 1030 Optical Wheel Mouse (OMS3CB/OMGB30) - 1031 Optical Wheel Mouse (OMA3CB/OMGI30) - 1040 Mouse HID Device - 1050 E-Mail Optical Wheel Mouse (OMS3CE) - 1080 Optical Wheel Mouse (OMS3CH) - 2020 Floppy Disk Drive - 6780 Keyboard V1 - 6781 Keyboard Mouse - 8001 E.M. Hub - 9000 AnyCam [pwc] - 9001 MPC-C30 AnyCam Premium for Notebooks [pwc] - a000 SWL-2100U - a010 WLAN Adapter(SWL-2300) - a011 Boot Device - a012 WLAN Adapter(SWL-2300) - a013 WLAN Adapter(SWL-2350) - a230 Boot Device - b000 11Mbps WLAN Mini Adapter - b230 Netopia 802.11b WLAN Adapter - b231 LG Wireless LAN 11b Adapter -055e CTX Opto-Electronics Corp. -055f Mustek Systems, Inc. - 0001 ScanExpress 1200 CU - 0002 ScanExpress 600 CU - 0003 ScanExpress 1200 USB - 0006 ScanExpress 1200 UB - 0007 ScanExpress 1200 USB Plus - 0008 ScanExpress 1200 CU Plus - 0010 BearPaw 1200F - 0210 ScanExpress A3 USB - 0218 BearPaw 2400 TA - 0219 BearPaw 2400 TA Plus - 021a BearPaw 2448 TA Plus - 021b BearPaw 1200 CU Plus - 021c BearPaw 1200 CU Plus - 021d BearPaw 2400 CU Plus - 021e BearPaw 1200 TA/CS - 021f SNAPSCAN e22 - 0400 BearPaw 2400 TA Pro - 0401 P 3600 A3 Pro - 0408 BearPaw 2448 CU Pro - 0409 BearPaw 2448 TA Pro - 0873 ScanExpress 600 USB - 1000 BearPaw 4800 TA Pro - a350 gSmart 350 Camera - a800 MDC 800 Camera - b500 MDC 3000 Camera - c005 PC CAM 300A - c200 gSmart 300 - c211 Kowa Bs888e Microcamera - c220 gSmart mini - c230 Digicam 330K - c232 MDC3500 Camera - c360 DV 4000 Camera - c420 gSmart mini 2 Camera - c430 gSmart LCD 2 Camera - c440 DV 3000 Camera - c520 gSmart mini 3 Camera - c530 gSmart LCD 2 Camera - c540 gSmart D30 Camera - c630 MDC 4000 Camera - c631 MDC 4000 Camera - c650 MDC 5500Z Camera - d001 WCam 300 - d003 WCam 300A - d004 WCam 300AN -0560 Interface Corp. -0561 Oasis Design, Inc. -0562 Telex Communications, Inc. - 0001 Enhanced Microphone - 0002 Telex Microphone -0563 Immersion Corp. -0564 Kodak Digital Product Center, Japan Ltd. (formerly Chinon Industries Inc.) -0565 Peracom Networks, Inc. - 0001 Serial Port [etek] - 0002 Enet Ethernet [klsi] - 0003 @Home Networks Ethernet [klsi] - 0005 Enet2 Ethernet [klsi] - 0041 Peracom Remote NDIS Ethernet Adapter -0566 Monterey International Corp. - 0110 ViewMate Desktop Mouse CC2201 - 1001 ViewMate Desktop Mouse CC2201 - 1002 ViewMate Desktop Mouse CC2201 - 1003 ViewMate Desktop Mouse CC2201 - 1004 ViewMate Desktop Mouse CC2201 - 1005 ViewMate Desktop Mouse CC2201 - 1006 ViewMate Desktop Mouse CC2201 - 1007 ViewMate Desktop Mouse CC2201 - 2800 MIC K/B - 2801 MIC K/B Mouse - 2802 Kbd Hub - 3004 Genius KB-29E -0567 Xyratex International, Ltd -0568 Quartz Ingenierie -0569 SegaSoft -056a Wacom Co., Ltd - 0000 PenPartner - 0001 PenPartner 4x5 - 0002 PenPartner 6x8 - 0003 Cintiq Partner - 0010 Graphire - 0011 Graphire 2 4x5 - 0012 Graphire 2 5x7 - 0013 Graphire 3 4x5 - 0014 Graphire 3 6x8 - 0015 Graphire 4 4x5 - 0016 Graphire 4 6x8 - 0017 Bamboo Fun 4x5 - 0018 Bamboo Fun 6x8 - 0019 Bamboo One Medium - 0020 Intuos 4x5 - 0021 Intuos 6x8 - 0022 Intuos 9x12 - 0023 Intuos 12x12 - 0024 Intuos 12x18 - 0030 PL400 - 0031 PL500 - 0032 PL600 - 0033 PL600SX - 0034 PL550 - 0035 PL800 - 0037 PL700 - 0038 PL510 - 0039 DTU-710 - 003f Cintiq 21UX - 0041 Intuos2 4x5 - 0042 Intuos2 6x8 - 0043 Intuos2 9x12 - 0044 Intuos2 12x12 - 0045 Intuos2 12x18 - 0047 Intuos2 6x8 - 0060 Volito - 0061 PenStation2 - 0062 Volito2 4x5 - 0063 Volito2 2x3 - 0064 PenPartner2 - 0065 Bamboo - 0069 Bamboo One - 0081 Graphire Wireless 6x8 - 0090 TPC90 - 0093 TPC93 - 009a TPC9A - 00b0 Intuos3 4x5 - 00b1 Intuos3 6x18 - 00b2 Intuos3 9x12 - 00b3 Intuos3 12x12 - 00b4 Intuos3 12x19 - 00b5 Intuos3 6x11 (PTZ-631W) - 00b7 Intuos3 4x6 - 00b8 Intuos4 4x6 - 00b9 Intuos4 6x9 - 00ba Intuos4 8x13 - 00bb Intuos4 12x19 - 00c0 DTF-521 - 00c4 DTF-720 - 00c5 Cintiq 20WSX - 00c6 Cintiq 12WX - 00c7 DTU-1931 - 00d1 Bamboo Pen & Touch (CTH-460-DE) - 00d3 Bamboo Fun (CTH-661) - 00db Bamboo Fun (CTH-661SE-NL) - 0400 PenPartner 4x5 - 4850 PenPartner 6x8 -056b Decicon, Inc. -056c eTEK Labs - 0006 KwikLink Host-Host Connector - 8007 Kwik232 Serial Port - 8100 KwikLink Host-Host Connector - 8101 KwikLink USB-USB Bridge -056d EIZO Corp. - 0000 Hub - 0001 Monitor - 0002 HID Monitor Controls - 0003 Device Bay Controller -056e Elecom Co., Ltd - 0002 29UO Mouse - 200c LD-USB/TX - 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] - 4005 LD-USBL/TX - 400b LD-USB/TX - 4010 LD-USB20 - 5003 UC-SGT - 5004 UC-SGT - abc1 LD-USB/TX -056f Korea Data Systems Co., Ltd - cd00 CDM-751 CD organizer -0570 Epson America -0571 Interex, Inc. - 0002 echoFX InterView Lite -0572 Conexant Systems (Rockwell), Inc. - 0001 Ezcam II Webcam - 0002 Ezcam II Webcam - 0040 Wondereye CP-115 Webcam - 0041 Webcam Notebook - 0042 Webcam Notebook - 1232 V.90 modem - 1234 Typhoon Redfun Modem V90 56k - 1252 HCF V90 Data Fax Voice Modem - 1253 Zoom V.92 Faxmodem - 1300 SoftK56 Data Fax Voice CARP - 1301 Modem Enumerator - 2000 SoftGate 802.11 Adapter - 2002 SoftGate 802.11 Adapter - 8390 WinFast PalmTop/Novo TV Video - 8392 WinFast PalmTop/Novo TV Video - cafe AccessRunner ADSL Modem - cb00 ADSL Modem - cb01 ADSL Modem - cb06 StarModem Network Interface -0573 Zoran Co. Personal Media Division (Nogatech) - 0003 USBGear USBG-V1 - 0400 D-Link V100 - 0600 Dazzle USBVision (1006) - 1300 leadtek USBVision (1006) - 2000 X10 va10a Wireless Camera - 2001 Dazzle EmMe (2001) - 2101 Zoran Co. PMD (Nogatech) AV-grabber Manhattan - 2d00 Osprey 50 - 2d01 Hauppauge USB-Live Model 600 - 3000 Dazzle MicroCam (NTSC) - 3001 Dazzle MicroCam (PAL) - 4000 Nogatech TV! (NTSC) - 4001 Nogatech TV! (PAL) - 4002 Nogatech TV! (PAL-I-) - 4003 Nogatech TV! (MF-) - 4008 Nogatech TV! (NTSC) (T) - 4009 Nogatech TV! (PAL) (T) - 4010 Nogatech TV! (NTSC) (A) - 4100 USB-TV FM (NTSC) - 4110 PNY USB-TV (NTSC) FM - 4400 Nogatech TV! Pro (NTSC) - 4401 Nogatech TV! Pro (PAL) - 4450 PixelView PlayTv-USB PRO (PAL) FM - 4451 Nogatech TV! Pro (PAL+) - 4452 Nogatech TV! Pro (PAL-I+) - 4500 Nogatech TV! Pro (NTSC) - 4501 Nogatech TV! Pro (PAL) - 4550 ZTV ZT-721 2.4GHz A/V Receiver - 4551 Dazzle TV! Pro Audio (P+) - 4d00 Hauppauge WinTV-USB USA - 4d01 Hauppauge WinTV-USB - 4d02 Hauppauge WinTV-USB UK - 4d03 Hauppauge WinTV-USB France - 4d04 Hauppauge WinTV (PAL D/K) - 4d10 Hauppauge WinTV-USB with FM USA radio - 4d11 Hauppauge WinTV-USB (PAL) with FM radio - 4d12 Hauppauge WinTV-USB UK with FM Radio - 4d14 Hauppauge WinTV (PAL D/K FM) - 4d20 Hauppauge WinTV-USB II (PAL) with FM radio - 4d21 Hauppauge WinTV-USB II (PAL) - 4d22 Hauppauge WinTV-USB II (PAL) Model 566 - 4d23 Hauppauge WinTV-USB France 4D23 - 4d24 Hauppauge WinTV Pro (PAL D/K) - 4d25 Hauppauge WinTV-USB Model 40209 rev B234 - 4d26 Hauppauge WinTV-USB Model 40209 rev B243 - 4d27 Hauppauge WinTV-USB Model 40204 Rev B281 - 4d28 Hauppauge WinTV-USB Model 40204 rev B283 - 4d29 Hauppauge WinTV-USB Model 40205 rev B298 - 4d2a Hauppague WinTV-USB Model 602 Rev B285 - 4d2b Hauppague WinTV-USB Model 602 Rev B282 - 4d2c Hauppauge WinTV Pro (PAL/SECAM) - 4d30 Hauppauge WinTV-USB FM Model 40211 Rev B123 - 4d31 Hauppauge WinTV-USB III (PAL) with FM radio Model 568 - 4d32 Hauppauge WinTV-USB III (PAL) FM Model 573 - 4d34 Hauppauge WinTV Pro (PAL D/K FM) - 4d35 Hauppauge WinTV-USB III (PAL) FM Model 597 - 4d36 Hauppauge WinTV Pro (PAL B/G FM) - 4d37 Hauppauge WinTV-USB Model 40219 rev E189 - 4d38 Hauppauge WinTV Pro (NTSC FM) -0574 City University of Hong Kong -0575 Philips Creative Display Solutions -0576 BAFO/Quality Computer Accessories -0577 ELSA -0578 Intrinsix Corp. -0579 GVC Corp. -057a Samsung Electronics America -057b Y-E Data, Inc. - 0000 FlashBuster-U Floppy - 0001 Tri-Media Reader Floppy - 0006 Tri-Media Reader Card Reader - 0010 Memory Stick Reader Writer - 0020 HEXA Media Drive 6-in-1 Card Reader Writer - 0030 Memory Card Viewer (TV) -057c AVM GmbH - 0b00 ISDN-Controller B1 Family - 0c00 ISDN-Controller FRITZ!Card - 1000 ISDN-Controller FRITZ!Card v2.0 - 1900 ISDN-Controller FRITZ!Card v2.1 - 2000 ISDN-Connector FRITZ!X - 2200 BlueFRITZ! - 2300 Teledat X130 DSL - 2800 ISDN-Connector TA - 3200 Teledat X130 DSL - 3500 FRITZ!Card DSL SL - 3701 FRITZ!Box SL - 3702 FRITZ!Box - 3800 BlueFRITZ! Bluetooth Stick - 3a00 FRITZ!Box Fon - 3c00 FRITZ!Box WLAN - 3d00 Fritz!Box - 3e01 FRITZ!Box (Annex A) - 4001 FRITZ!Box Fon (Annex A) - 4101 FRITZ!Box WLAN (Annex A) - 4201 FRITZ!Box Fon WLAN (Annex A) - 4601 Eumex 5520PC (WinXP/2000) - 4602 Eumex 400 (WinXP/2000) - 4701 AVM FRITZ!Box Fon ata - 5401 Eumex 300 IP - 5601 AVM Fritz!WLAN [Texas Instruments TNETW1450] - 6201 AVM Fritz!WLAN v1.1 [Texas Instruments TNETW1450] - 62ff AVM Fritz!WLAN USB (in CD-ROM-mode) - 8401 AVM Fritz!WLAN N [Atheros AR9001U] - 8402 AVM Fritz!WLAN N 2.4 [Atheros AR9001U] - 84ff AVM Fritz!WLAN USB N (in CD-ROM-mode) -057d Shark Multimedia, Inc. -057e Nintendo Co., Ltd - 0306 Wii Remote Controller RVL-003 -057f QuickShot, Ltd - 6238 USB StrikePad -0580 Denron, Inc. -0581 Racal Data Group -0582 Roland Corp. - 0000 UA-100 - 0002 UM-4/MPU-64 MIDI Interface - 0003 SoundCanvas SC-8850 - 0004 U-8 - 0005 Edirol UM-2 MIDI Adapter - 0007 SoundCanvas SC-8820 - 0008 PC-300 - 0009 Edirol UM-1SX MIDI Adapter - 000b SK-500 - 000c SC-D70 - 0010 EDIROL UA-5 - 0011 Edirol UA-5 Sound Capture - 0012 XV-5050 - 0013 XV-5050 - 0014 EDIROL UM-880 MIDI I/F (native) - 0015 EDIROL UM-880 MIDI I/F (generic) - 0016 EDIROL SD-90 - 0017 EDIROL SD-90 - 0018 UA-1A - 001b MMP-2 - 001c MMP-2 - 001d V-SYNTH - 001e V-SYNTH - 0023 EDIROL UM-550 - 0024 EDIROL UM-550 - 0025 EDIROL UA-20 - 0026 EDIROL UA-20 - 0027 EDIROL SD-20 - 0028 EDIROL SD-20 - 0029 EDIROL SD-80 - 002a EDIROL SD-80 - 002b EDIROL UA-700 - 002c EDIROL UA-700 - 002d XV-2020 Synthesizer - 002e XV-2020 Synthesizer - 002f VariOS - 0030 VariOS - 0033 EDIROL PCR - 0034 EDIROL PCR - 0037 Digital Piano - 0038 Digital Piano - 003b BOSS GS-10 - 003c BOSS GS-10 - 0040 GI-20 - 0041 GI-20 - 0042 RS-70 - 0043 RS-70 - 0044 EDIROL UA-1000 - 0047 EDIROL UR-80 WAVE - 0048 EDIROL UR-80 MIDI - 0049 EDIROL UR-80 WAVE - 004a EDIROL UR-80 MIDI - 004b EDIROL M-100FX - 004c EDIROL PCR-A WAVE - 004d EDIROL PCR-A MIDI - 004e EDIROL PCR-A WAVE - 004f EDIROL PCR-A MIDI - 0050 EDIROL UA-3FX - 0052 EDIROL UM-1SX - 0054 Digital Piano - 0060 EXR Series - 0064 EDIROL PCR-1 WAVE - 0065 EDIROL PCR-1 MIDI - 0066 EDIROL PCR-1 WAVE - 0067 EDIROL PCR-1 MIDI - 006a SP-606 - 006b SP-606 - 006d FANTOM-X - 006e FANTOM-X - 0073 EDIROL UA-25 - 0074 EDIROL UA-25 - 0075 BOSS DR-880 - 0076 BOSS DR-880 - 007a RD - 007b RD - 007d EDIROL UA-101 - 0080 G-70 - 0081 G-70 - 008b EDIROL PC-50 - 008c EDIROL PC-50 - 008d EDIROL UA-101 USB1 - 0092 EDIROL PC-80 WAVE - 0093 EDIROL PC-80 MIDI - 0096 EDIROL UA-1EX - 009a EDIROL UM-3EX - 009d EDIROL UM-1 - 00a2 Digital Piano - 00a3 EDIROL UA-4FX - 00a6 Juno-G - 00ad SH-201 - 00c4 EDIROL M-16DX - 00db BOSS GT-10 Guitar Effects Processor - 00de Fantom-G7 - 00e6 EDIROL UA-25EX (Advanced mode) - 00e7 EDIROL UA-25EX - 010f A-PRO - 0110 A-PRO -0583 Padix Co., Ltd (Rockfire) - 0001 4 Axis 12 button +POV - 0002 4 Axis 12 button +POV - 2030 RM-203 USB Nest [mode 1] - 2031 RM-203 USB Nest [mode 2] - 2032 RM-203 USB Nest [mode 3] - 2033 RM-203 USB Nest [mode 4] - 2050 PX-205 PSX Bridge - 205f PSX/USB converter - 206f USB, 2-axis 8-button gamepad - 3050 QF-305u Gamepad - 3379 Rockfire X-Force - 337f Rockfire USB RacingStar Vibra - 509f USB,4-Axis,12-Button with POV - 5259 Rockfire USB SkyShuttle Vibra - 525f USB Vibration Pad - 5308 USB Wireless VibrationPad - 5359 Rockfire USB SkyShuttle Pro - 535f USB,real VibrationPad - 5659 Rockfire USB SkyShuttle Vibra - 565f USB VibrationPad - 6009 Revenger - 600f USB,GameBoard II - 6258 USB, 4-axis, 6-button joystick w/view finder - 6889 Windstorm Pro - 688f QF-688uv Windstorm Pro Joystick - 7070 QF-707u Bazooka Joystick - a000 MaxFire G-08XU Gamepad - a015 4-Axis,16-Button with POV - a019 USB, Vibration ,4-axis, 8-button joystick w/view finder - a020 USB,4-Axis,10-Button with POV - a021 USB,4-Axis,12-Button with POV - a022 USB,4-Axis,14-Button with POV - a023 USB,4-Axis,16-Button with POV - a024 4axis,12button vibrition audio gamepad - a025 4axis,12button vibrition audio gamepad - a130 USB Wireless 2.4GHz Gamepad - a131 USB Wireless 2.4GHz Joystick - a132 USB Wireless 2.4GHz Wheelpad - a133 USB Wireless 2.4GHz Wheel&Gamepad - a202 ForceFeedbackWheel - a209 MetalStrike FF - b000 USB,4-Axis,12-Button with POV - b001 USB,4-Axis,12-Button with POV - b002 Vibration,12-Button USB Wheel - b005 USB,12-Button Wheel - b008 USB Wireless 2.4GHz Wheel - b009 USB,12-Button Wheel - b00a PSX/USB converter - b00b PSX/USB converter - b00c PSX/USB converter - b00d PSX/USB converter - b00e 4-Axis,12-Button with POV - b00f USB,5-Axis,10-Button with POV - b010 MetalStrike Pro - b012 Wireless MetalStrike - b013 USB,Wiress 2.4GHZ Joystick - b016 USB,5-Axis,10-Button with POV - b018 TW6 Wheel - ff60 USB Wireless VibrationPad -0584 RATOC System, Inc. - 0008 Fujifilm MemoryCard ReaderWriter - 0220 U2SCX SCSI Converter - b000 REX-USB60 -0585 FlashPoint Technology, Inc. - 0001 Digital Camera - 0002 Digital Camera - 0003 Digital Camera - 0004 Digital Camera - 0005 Digital Camera - 0006 Digital Camera - 0007 Digital Camera - 0008 Digital Camera - 0009 Digital Camera - 000a Digital Camera - 000b Digital Camera - 000c Digital Camera - 000d Digital Camera - 000e Digital Camera - 000f Digital Camera -0586 ZyXEL Communications Corp. - 0025 802.11b/g/n USB Wireless Network Adapter - 0102 omni.net II ISDN TA - 1000 Omni NET Modem / ISDN TA - 1500 Omni 56K Plus - 2011 Scorpion-980N keyboard - 3304 LAN Modem - 3309 ADSL Modem Prestige 600 series - 330a ADSL Modem Interface - 330e USB Broadband ADSL Modem Rev 1.10 - 3400 ZyAIR B-220 IEEE 802.11b Adapter - 3401 ZyAIR G-220 802.11bg - 3402 ZyAIR G-220F 802.11bg - 3407 G-200 v2 802.11bg - 3409 AG-225H 802.11bg - 340a M-202 802.11bg - 340f G-220 v2 802.11bg - 3410 ZyAIR G-202 802.11bg - 3412 802.11bg - 3413 ZyAIR AG-225H v2 802.11bg - 3415 G-210H 802.11g Wireless Adapter - 3416 NWD-210N 802.11b/g/n-draft wireless adapter - 3417 NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG] - 3418 NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870] - 341a NWD-270N Wireless N-lite USB Adapter -0587 America Kotobuki Electronics Industries, Inc. -0588 Sapien Design -0589 Victron -058a Nohau Corp. -058b Infineon Technologies -058c In Focus Systems - 0007 Flash - 0008 LP130 - 000a LP530 - 0010 Projector - 0011 Projector - 0012 Projector - 0013 Projector - 0014 Projector - 0015 Projector - 0016 Projector - 0017 Projector - 0018 Projector - 0019 Projector - 001a Projector - 001b Projector - 001c Projector - 001d Projector - 001e Projector - 001f Projector -058d Micrel Semiconductor -058e Tripath Technology, Inc. -058f Alcor Micro Corp. - 1234 Flash Drive - 2412 SCard R/W CSR-145 - 2802 Monterey Keyboard - 5492 Hub - 6232 Hi-Speed 16-in-1 Flash Card Reader/Writer - 6254 USB Hub - 6331 SD/MMC/MS Card Reader - 6332 Multi-Function Card Reader - 6335 SD/MMC Card Reader - 6360 Multimedia Card Reader - 6361 Multimedia Card Reader - 6362 Flash Card Reader/Writer - 6366 Multi Flash Reader - 6377 Multimedia Card Reader - 6386 Memory Card - 6387 Transcend JetFlash Flash Drive - 6390 USB 2.0-IDE bridge - 9213 MacAlly Kbd Hub - 9215 AU9814 Hub - 9254 Hub - 9310 Mass Storage (UID4/5A & UID7A) - 9320 Micro Storage Driver for Win98 - 9321 Micro Storage Driver for Win98 - 9330 SD Reader - 9331 Micro Storage Driver for Win98 - 9340 Delkin eFilm Reader-32 - 9350 Delkin eFilm Reader-32 - 9360 8-in-1 Media Card Reader - 9361 Multimedia Card Reader - 9368 Multimedia Card Reader - 9380 Flash Drive - 9382 Acer/Sweex Flash drive - 9384 qdi U2Disk T209M - 9410 Keyboard - 9472 Keyboard Hub - 9510 ChunghwaTL USB02 Smartcard Reader - 9520 EMV Certified Smart Card Reader - 9720 USB-Serial Adapter -0590 Omron Corp. - 0004 Cable Modem - 000b MR56SVS - 0028 HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E -0591 Questra Consulting -0592 Powerware Corp. - 0002 UPS (X-Slot) -0593 Incite -0594 Princeton Graphic Systems -0595 Zoran Microelectronics, Ltd - 1001 Digitrex DSC-1300/DSC-2100 (mass storage mode) - 2002 DIGITAL STILL CAMERA 6M 4X - 4343 Digital Camera EX-20 DSC -0596 MicroTouch Systems, Inc. - 0001 Touchscreen - 0002 Touch Screen Controller - 0500 PCT Multitouch HID Controller -0597 Trisignal Communications -0598 Niigata Canotec Co., Inc. -0599 Brilliance Semiconductor, Inc. -059a Spectrum Signal Processing, Inc. -059b Iomega Corp. - 0001 Zip 100 (Type 1) - 000b Zip 100 (Type 2) - 0021 Win98 Disk Controller - 0030 Zip 250 (Ver 1) - 0031 Zip 100 (Type 3) - 0032 Zip 250 (Ver 2) - 0034 Zip 100 Driver - 0037 Zip 750 MB - 0040 SCSI Bridge - 0042 Rev 70 GB - 0050 Zip CD 650 Writer - 0053 CDRW55292EXT CD-RW External Drive - 0057 Mass Storage Device - 005d Mass Storage Device - 005f CDRW64892EXT3-C CD-RW 52x24x52x External Drive - 0060 PCMCIA PocketZip Dock - 0061 Varo PocketZip 40 MP3 Player - 006d HipZip MP3 Player - 007c Ultra Max USB/1394 - 007e Mini 256MB/512MB Flash Drive [IOM2D5] - 00db FotoShow Zip 250 Driver - 0150 Mass Storage Device - 015d Super DVD Writer - 0173 Hi-Speed USB-to-IDE Bridge Controller - 0174 Hi-Speed USB-to-IDE Bridge Controller - 0176 Hi-Speed USB-to-IDE Bridge Controller - 0177 Hi-Speed USB-to-IDE Bridge Controller - 0178 Hi-Speed USB-to-IDE Bridge Controller - 0179 Hi-Speed USB-to-IDE Bridge Controller - 017a HDD - 017b HDD/1394A - 017c HDD/1394B - 0251 Optical - 0252 Optical - 027a LPHD250-U [Portable Hard Drive Silver Series 250 Go] - 0470 Prestige Portable Hard Drive - 047a Select Portable Hard Drive - 0579 eGo Portable Hard Drive - 1052 DVD+RW External Drive -059c A-Trend Technology Co., Ltd -059d Advanced Input Devices -059e Intelligent Instrumentation -059f LaCie, Ltd - 0201 StudioDrive USB2 - 0202 StudioDrive USB2 - 0203 StudioDrive USB2 - 0211 PocketDrive - 0212 PocketDrive - 0213 PocketDrive USB2 - 0323 LaCie d2 Drive USB2 - 0421 Big Disk G465 - 0641 Mobile Hard Drive - 1010 Desktop Hard Drive - 1019 Desktop Hard Drive - 102a Rikiki Hard Drive - a601 HardDrive - a602 CD R/W -05a0 Vetronix Corp. -05a1 USC Corp. -05a2 Fuji Film Microdevices Co., Ltd -05a3 ARC International - 8388 Marvell 88W8388 802.11a/b/g WLAN -05a4 Ortek Technology, Inc. - 2000 WKB-2000 Wireless Keyboard with Touchpad - 9720 Keyboard Mouse - 9722 Keyboard - 9731 MCK-600W/MCK-800USB Keyboard - 9783 Wireless Keypad -05a5 Sampo Technology Corp. -05a6 Cisco Systems, Inc. - 0001 CVA124 Cable Voice Adapter (WDM) - 0002 CVA122 Cable Voice Adapter (WDM) - 0003 CVA124E Cable Voice Adapter (WDM) - 0004 CVA122E Cable Voice Adapter (WDM) -05a7 Bose Corp. -05a8 Spacetec IMC Corp. -05a9 OmniVision Technologies, Inc. - 0511 OV511 Webcam - 0518 OV518 Webcam - 0519 OV519 Microphone - 1550 VEHO Filmscanner - 2640 OV2640 Webcam - 2643 Monitor Webcam - 264b Monitor Webcam - 2800 SuperCAM - 4519 Webcam Classic - 7670 OV7670 Webcam - 8519 OV519 Webcam - a511 OV511+ Webcam - a518 D-Link DSB-C310 Webcam -05aa Utilux South China, Ltd -05ab In-System Design - 0002 Parallel Port - 0030 Storage Adapter V2 (TPP) - 0031 ATA Bridge - 0060 USB 2.0 ATA Bridge - 0061 Storage Adapter V3 (TPP-I) - 0101 Storage Adapter (TPP) - 0130 Compact Flash and Microdrive Reader (TPP) - 0200 USS725 ATA Bridge - 0201 Storage Adapter (TPP) - 0202 ATA Bridge - 0300 Portable Hard Drive (TPP) - 0301 Portable Hard Drive V2 - 0350 Portable Hard Drive (TPP) - 0351 Portable Hard Drive V2 - 081a ATA Bridge - 0cda ATA Bridge for CD-R/RW - 1001 BAYI Printer Class Support - 5700 Storage Adapter V2 (TPP) - 5701 USB Storage Adapter V2 - 5901 Smart Board (TPP) - 5a01 ATI Storage Adapter (TPP) - 5d01 DataBook Adapter (TPP) -05ac Apple, Inc. - 0201 USB Keyboard [Alps or Logitech, M2452] - 0202 Keyboard [ALPS] - 0205 Extended Keyboard [Mitsumi] - 0206 Extended Keyboard [Mitsumi] - 020b Pro Keyboard [Mitsumi, A1048/US layout] - 020c Extended Keyboard [Mitsumi] - 020d Pro Keyboard [Mitsumi, A1048/JIS layout] - 020e Internal Keyboard/Trackpad (ANSI) - 020f Internal Keyboard/Trackpad (ISO) - 0214 Internal Keyboard/Trackpad (ANSI) - 0215 Internal Keyboard/Trackpad (ISO) - 0216 Internal Keyboard/Trackpad (JIS) - 0217 Internal Keyboard/Trackpad (ANSI) - 0218 Internal Keyboard/Trackpad (ISO) - 0219 Internal Keyboard/Trackpad (JIS) - 021a Internal Keyboard/Trackpad (ANSI) - 021b Internal Keyboard/Trackpad (ISO) - 021c Internal Keyboard/Trackpad (JIS) - 021d Aluminum Mini Keyboard (ANSI) - 021e Aluminum Mini Keyboard (ISO) - 021f Aluminum Mini Keyboard (JIS) - 0220 Aluminum Keyboard (ANSI) - 0221 Aluminum Keyboard (ISO) - 0222 Aluminum Keyboard (JIS) - 0223 Internal Keyboard/Trackpad (ANSI) - 0224 Internal Keyboard/Trackpad (ISO) - 0225 Internal Keyboard/Trackpad (JIS) - 0229 Internal Keyboard/Trackpad (MacBook Pro) (ANSI) - 022a Internal Keyboard/Trackpad (MacBook Pro) (ISO) - 022b Internal Keyboard/Trackpad (MacBook Pro) (JIS) - 0230 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI) - 0231 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ISO) - 0232 Internal Keyboard/Trackpad (MacBook Pro 4,1) (JIS) - 0236 Internal Keyboard/Trackpad (ANSI) - 0237 Internal Keyboard/Trackpad (ISO) - 0238 Internal Keyboard/Trackpad (JIS) - 0301 USB Mouse [Mitsumi, M4848] - 0302 Optical Mouse [Fujitsu] - 0304 Optical USB Mouse [Mitsumi] - 0306 Optical USB Mouse [Fujitsu] - 030a Internal Trackpad - 030b Internal Trackpad - 030e Wireless Trackpad [Magic Trackpad] - 1000 Bluetooth HCI MacBookPro (HID mode) - 1001 Keyboard Hub [ALPS] - 1002 Extended Keyboard Hub [Mitsumi] - 1003 Hub in Pro Keyboard [Mitsumi, A1048] - 1006 Hub in Aluminum Keyboard - 1101 Speakers - 1201 3G iPod - 1202 iPod 2G - 1203 iPod 4.Gen Grayscale 40G - 1204 iPod [Photo] - 1205 iPod Mini 1.Gen/2.Gen - 1206 iPod '06' - 1207 iPod '07' - 1208 iPod '08' - 1209 iPod Video - 120a iPod Nano - 1223 iPod Classic/Nano 3.Gen (DFU mode) - 1224 iPod Nano 3.Gen (DFU mode) - 1225 iPod Nano 4.Gen (DFU mode) - 1227 Mobile Device (DFU Mode) - 1231 iPod Nano 5.Gen (DFU mode) - 1240 iPod Nano 2.Gen (DFU mode) - 1242 iPod Nano 3.Gen (WTF mode) - 1243 iPod Nano 4.Gen (WTF mode) - 1245 iPod Classic 3.Gen (WTF mode) - 1246 iPod Nano 5.Gen (WTF mode) - 1255 iPod Nano 4.Gen (DFU mode) - 1260 iPod Nano 2.Gen - 1261 iPod Classic - 1262 iPod Nano 3.Gen - 1263 iPod Nano 4.Gen - 1265 iPod Nano 5.Gen - 1266 iPod Nano 6.Gen - 1281 Apple Mobile Device [Recovery Mode] - 1290 iPhone - 1291 iPod Touch 1.Gen - 1292 iPhone 3G - 1293 iPod Touch 2.Gen - 1294 iPhone 3GS - 1296 iPod Touch 3.Gen (8GB) - 1297 iPhone 4 - 1299 iPod Touch 3.Gen - 129a iPad - 129e iPod Touch 4.Gen - 1300 iPod Shuffle - 1301 iPod Shuffle 2.Gen - 1302 iPod Shuffle 3.Gen - 1303 iPod Shuffle 4.Gen - 1401 Modem - 8202 HCF V.90 Data/Fax Modem - 8203 Bluetooth HCI - 8204 Bluetooth HCI [Bluetooth 2.0 + EDR, built-in] - 8205 Bluetooth HCI - 8206 Bluetooth HCI - 820f Bluetooth HCI - 8215 Bluetooth USB Host Controller - 8216 Bluetooth USB Host Controller - 8217 Bluetooth USB Host Controller - 8218 Bluetooth Host Controller - 8240 IR Receiver [built-in] - 8241 IR Receiver [built-in] - 8242 IR Receiver [built-in] - 8300 Built-in iSight (no firmware loaded) - 8403 Internal Memory Card Reader - 8501 Built-in iSight [Micron] - 8502 Built-in iSight - 8505 Built-in iSight - 8507 Built-in iSight - 912f Hub in 30" Cinema Display - 9221 30" Cinema Display - ffff Bluetooth in DFU mode - Driver -05ad Y.C. Cable U.S.A., Inc. -05ae Synopsys, Inc. -05af Jing-Mold Enterprise Co., Ltd - 0809 Wireless Keyboard and Mouse - 0821 IDE to - 3062 Cordless Keyboard - 9167 KB 9151B - 678 - 9267 KB 9251B - 678 Mouse -05b0 Fountain Technologies, Inc. -05b1 First International Computer, Inc. - 1389 Bluetooth Wireless Adapter -05b4 LG Semicon Co., Ltd - 4857 M-Any DAH-210 - 6001 Digisette DUO-MP3 AR-100 -05b5 Dialogic Corp. -05b6 Proxima Corp. -05b7 Medianix Semiconductor, Inc. -05b8 Agiler, Inc. - 3002 Scroll Mouse -05b9 Philips Research Laboratories -05ba DigitalPersona, Inc. - 0007 Fingerprint Reader - 0008 Fingerprint Reader - 000a Fingerprint Reader -05bb Grey Cell Systems -05bc 3G Green Green Globe Co., Ltd - 0004 Trackball -05bd RAFI GmbH & Co. KG -05be Tyco Electronics (Raychem) -05bf S & S Research -05c0 Keil Software -05c1 Kawasaki Microelectronics, Inc. -05c2 Media Phonics (Suisse) S.A. -05c5 Digi International, Inc. - 0002 AccelePort USB 2 - 0004 AccelePort USB 4 - 0008 AccelePort USB 8 -05c6 Qualcomm, Inc. - 0114 Select RW-200 CDMA Wireless Modem - 1000 Mass Storage Device - 3100 CDMA Wireless Modem/Phone - 3196 CDMA Wireless Modem - 3197 CDMA Wireless Modem/Phone - 6000 Siemens SG75 - 6503 AnyData APE-540H - 6613 Onda H600/N501HS ZTE MF330 - 9000 SIMCom SIM5218 modem - 9001 Gobi Wireless Modem - 9002 Gobi Wireless Modem - 9008 Gobi Wireless Modem (QDL mode) - 9201 Gobi Wireless Modem (QDL mode) - 9202 Gobi Wireless Modem - 9203 Gobi Wireless Modem - 9211 Acer Gobi Wireless Modem (QDL mode) - 9212 Acer Gobi Wireless Modem - 9214 Acer Gobi 2000 Wireless Modem (QDL mode) - 9215 Acer Gobi 2000 Wireless Modem - 9221 Gobi Wireless Modem (QDL mode) - 9222 Gobi Wireless Modem - 9224 Sony Gobi 2000 Wireless Modem (QDL mode) - 9225 Sony Gobi 2000 Wireless Modem - 9231 Gobi Wireless Modem (QDL mode) - 9234 Top Global Gobi 2000 Wireless Modem (QDL mode) - 9235 Top Global Gobi 2000 Wireless Modem - 9244 Samsung Gobi 2000 Wireless Modem (QDL mode) - 9245 Samsung Gobi 2000 Wireless Modem - 9264 Asus Gobi 2000 Wireless Modem (QDL mode) - 9265 Asus Gobi 2000 Wireless Modem - 9274 iRex Technologies Gobi 2000 Wireless Modem (QDL mode) - 9275 iRex Technologies Gobi 2000 Wireless Modem -05c7 Qtronix Corp. - 0113 PC Line Mouse - 1001 Lynx Mouse - 2001 Keyboard - 2011 SCorpius Keyboard - 6001 Ten-Keypad -05c8 Cheng Uei Precision Industry Co., Ltd (Foxlink) - 0103 FO13FF-65 PC-CAM - 0403 Webcam -05c9 Semtech Corp. -05ca Ricoh Co., Ltd - 0101 RDC-5300 Camera - 0325 Caplio GX (ptp) - 032d Caplio GX 8 (ptp) - 032f Caplio R3 (ptp) - 03a1 IS200e - 0403 Printing Support - 0405 Type 101 - 0406 Type 102 - 1803 V5 camera [R5U870] - 1810 Pavilion Webcam [R5U870] - 1812 Pavilion Webcam - 1814 HD Webcam - 1830 Visual Communication Camera VGP-VCC2 [R5U870] - 1832 Visual Communication Camera VGP-VCC3 [R5U870] - 1833 Visual Communication Camera VGP-VCC2 [R5U870] - 1834 Visual Communication Camera VGP-VCC2 [R5U870] - 1835 Visual Communication Camera VGP-VCC5 [R5U870] - 1836 Visual Communication Camera VGP-VCC4 [R5U870] - 1837 Visual Communication Camera VGP-VCC4 [R5U870] - 1839 Visual Communication Camera VGP-VCC6 [R5U870] - 183a Visual Communication Camera VGP-VCC7 [R5U870] - 183b Visual Communication Camera VGP-VCC8 [R5U870] - 183d Sony Vaio Integrated Webcam - 183e Visual Communication Camera VGP-VCC9 [R5U870] - 1841 Fujitsu F01/ Lifebook U810 [R5U870] - 1870 Webcam 1000 - 18b0 Sony Vaio Integrated Webcam - 18b1 Sony Vaio Integrated Webcam - 18b3 Sony Vaio Integrated Webcam - 2201 RDC-7 Camera - 2202 Caplio RR30 - 2203 Caplio 300G - 2204 Caplio G3 - 2205 Caplio RR30 / Medion MD 6126 Camera - 2206 Konica DG-3Z - 2207 Caplio Pro G3 - 2208 Caplio G4 - 2209 Caplio 400G wide - 220a KONICA MINOLTA DG-4Wide - 220b Caplio RX - 220c Caplio GX - 220d Caplio R1/RZ1 - 220e Sea & Sea 5000G - 220f Rollei dr5 / Rollei dr5 (PTP mode) - 2211 Caplio R1S - 2212 Caplio R1v Camera - 2213 Caplio R2 - 2214 Caplio GX 8 - 2215 DSC 725 - 2216 Caplio R3 - 2222 RDC-i500 -05cb PowerVision Technologies, Inc. - 1483 PV8630 interface (scanners, webcams) -05cc ELSA AG - 2100 MicroLink ISDN Office - 2219 MicroLink ISDN - 2265 MicroLink 56k - 2267 MicroLink 56k (V.250) - 2280 MicroLink 56k Fun - 3000 Micolink USB2Ethernet [pegasus] - 3100 AirLancer USB-11 - 3363 MicroLink ADSL Fun -05cd Silicom, Ltd -05ce sci-worx GmbH -05cf Sung Forn Co., Ltd -05d0 GE Medical Systems Lunar -05d1 Brainboxes, Ltd - 0003 Bluetooth Adapter BL-554 -05d2 Wave Systems Corp. -05d3 Tohoku Ricoh Co., Ltd -05d5 Super Gate Technology Co., Ltd -05d6 Philips Semiconductors, CICT -05d7 Thomas & Betts Corp. - 0099 10Mbps Ethernet [klsi] -05d8 Ultima Electronics Corp. - 4001 Artec Ultima 2000 - 4002 Artec Ultima 2000 (GT6801 based)/Lifetec LT9385/ScanMagic 1200 UB Plus Scanner - 4003 Artec E+ 48U - 4004 Artec E+ Pro - 4005 MEM48U - 4006 TRUST EASY WEBSCAN 19200 - 4007 TRUST 240H EASY WEBSCAN GOLD - 4008 Trust Easy Webscan 19200 - 4009 Umax Astraslim - 4013 IT Scan 1200 - 8105 Artec T1 USB TVBOX (cold) - 8106 Artec T1 USB TVBOX (warm) - 8107 Artec T1 USB TVBOX with AN2235 (cold) - 8108 Artec T1 USB TVBOX with AN2235 (warm) - 8109 Artec T1 USB2.0 TVBOX (cold -05d9 Axiohm Transaction Solutions - a225 A225 Printer - a758 A758 Printer - a794 A794 Printer -05da Microtek International, Inc. - 0091 ScanMaker X6u - 0093 ScanMaker V6USL - 0094 Phantom 336CX/C3 - 0099 ScanMaker X6/X6U - 009a Phantom C6 - 00a0 Phantom 336CX/C3 (#2) - 00a3 ScanMaker V6USL - 00ac ScanMaker V6UL - 00b6 ScanMaker V6UPL - 00ef ScanMaker V6UPL - 1006 Jenoptik JD350 entrance - 1011 NHJ Che-ez! Kiss Digital Camera - 1018 Digital Dream Enigma 1.3 - 1020 Digital Dream l'espion xtra - 1025 Take-it Still Camera Device - 1026 Take-it - 1043 Take-It 1300 DSC Bulk Driver - 1045 Take-it D1 - 1047 Take-it Camera Composite Device - 1048 Take-it Q3 - 1049 3M Still Camera Device - 1051 Camcorder Series - 1052 Mass Storage Device - 1053 Take-it DV Composite Device - 1054 Mass Storage Device - 1055 Digital Camera Series(536) - 1056 Mass Storage Device - 1057 Take-it DSC Camera Device(536) - 1058 Mass Storage Device - 1059 Camcorder DSC Series - 1060 Microtek Take-it MV500 - 2007 ArtixScan DI 1210 - 200c 1394_USB2 Scanner - 200e ArtixScan DI 810 - 2017 UF ICE Scanner - 201c 4800 Scanner - 201d ArtixScan DI 1610 - 201f 4800 Scanner-ICE - 202e ArtixScan DI 2020 - 208b ScanMaker 6800 - 208f ArtixScan DI 2010 - 209e ScanMaker 4700LP - 20a7 ScanMaker 5600 - 20b0 ScanMaker X12USL - 20b1 ScanMaker 8700 - 20b4 ScanMaker 4700 - 20bd ScanMaker 5700 - 20c9 ScanMaker 6700 - 20d2 Microtek ArtixScan 1800f - 20d6 PS4000 - 20de ScanMaker 9800XL - 20e0 ScanMaker 9700XL - 20ed ScanMaker 4700 - 20ee Micortek ScanMaker X12USL - 3008 Scanner - 300a 4800 ICE Scanner - 300b 4800 Scanner - 300f MiniScan C5 - 3020 4800dpi Scanner - 3021 1200dpi Scanner - 3022 Scanner 4800dpi - 3023 USB1200II Scanner - 30c1 USB600 Scanner - 30ce ScanMaker 3800 - 30cf ScanMaker 4800 - 30d4 USB1200 Scanner - 30d8 Scanner - 30d9 USB2400 Scanner - 30e4 ScanMaker 4100 - 30e5 USB3200 Scanner - 30e6 ScanMaker i320 - 40b3 ScanMaker 3600 - 40b8 ScanMaker 3700 - 40c7 ScanMaker 4600 - 40ca ScanMaker 3600 - 40cb ScanMaker 3700 - 40dd ScanMaker 3750i - 40ff ScanMaker 3600 - 5003 Goya - 5013 3200 Scanner - 80a3 ScanMaker V6USL (#2) - 80ac ScanMaker V6UL/SpicyU -05db Sun Corp. (Suntac?) - 0003 SUNTAC U-Cable type D2 - 0005 SUNTAC U-Cable type P1 - 0009 SUNTAC Slipper U - 000a SUNTAC Ir-Trinity - 000b SUNTAC U-Cable type A3 - 0011 SUNTAC U-Cable type A4 -05dc Lexar Media, Inc. - 0001 jumpSHOT CompactFlash Reader - 0002 JumpShot - 0003 JumpShot - 0080 Jumpdrive Secure 64MB - 0081 RBC Compact Flash Drive - 00a7 JumpDrive Impact - 0100 JumpDrive PRO - 0200 JumpDrive 2.0 Pro - 0300 Jumpdrive Geysr - 0301 JumpDrive Classic - 0302 JD Micro - 0303 JD Micro Pro - 0304 JD Secure II - 0310 JumpDrive - 0311 JumpDrive Classic - 0312 JD Micro - 0313 JD Micro Pro - 0320 JumpDrive - 0321 JD Micro - 0322 JD Micro Pro - 0323 UFC - 0330 JumpDrive Expression - 0340 JumpDrive TAD - 0350 Express Card - 0400 UFDC - 0401 UFDC - 0403 Locked B Device - 0405 Locked C Device - 0407 Locked D Device - 0409 Locked E Device - 040b Locked F Device - 040d Locked G Device - 040f Locked H Device - 0410 JumpDrive - 0411 JumpDrive - 0413 Locked J Device - 0415 Locked K Device - 0417 Locked L Device - 0419 Locked M Device - 041b Locked N Device - 041d Locked O Device - 041f Locked P Device - 0420 JumpDrive - 0421 JumpDrive - 0423 Locked R Device - 0425 Locked S Device - 0427 Locked T Device - 0429 Locked U Device - 042b Locked V Device - 042d Locked W Device - 042f Locked X Device - 0431 Locked Y Device - 0433 Locked Z Device - 4d02 MP3 Player - 4d12 MP3 Player - 4d30 MP3 Player - a300 JumpDrive2 - a400 JumpDrive trade; Pro 40-501 - a410 JumpDrive 128MB/256MB - a411 JumpDrive Traveler - a420 JumpDrive Pro - a421 JumpDrive Pro II - a422 JumpDrive Micro Pro - a430 JumpDrive Secure - a431 JumpDrive Secure II - a432 JumpDrive Classic - a440 JumpDrive Lightning - a450 JumpDrive TouchGuard - a460 JD Mercury - a501 JumpDrive Classic - a510 JumpDrive Sport - a530 JumpDrive Expression - a531 JumpDrive Secure II - a560 JumpDrive FireFly - a701 JumpDrive FireFly - a731 JumpDrive FireFly - a790 JumpDrive 2GB - b002 USB CF Reader - b018 Multi-Card Reader - b047 SDHC Reader [RW047-7000] -05dd Delta Electronics, Inc. - ff31 AWU-120 - ff32 FriendlyNET AeroLAN AL2011 - ff35 PCW 100 - Wireless 802.11b Adapter - ff91 2Wire PC Port Phoneline 10Mbps Adapter -05df Silicon Vision, Inc. -05e0 Symbol Technologies - 0700 Bar Code Scanner (CS1504) - 0800 Spectrum24 Wireless LAN Adapter - 1200 DS6608 Bar Code Scanner - 1900 SNAPI Imaging Device - 2000 MC3090 Rugged Mobile Computer - 200d MC70 Rugged Mobile Computer -05e1 Syntek Semiconductor Co., Ltd - 0100 802.11g + Bluetooth Wireless Adapter - 0408 STK1160 Video Capture Device - 0500 DC-112X Webcam - 0501 DC-1125 Webcam - 0890 STK011 Camera - 0892 STK013 Camera - 0895 STK016 Camera - 0896 STK017 Camera -05e2 ElecVision, Inc. -05e3 Genesys Logic, Inc. - 000a Keyboard with PS/2 Port - 000b Mouse - 0100 Nintendo Game Boy Advance SP - 0120 Pacific Image Electronics PrimeFilm 1800u slide/negative scanner - 0131 CF/SM Reader/Writer - 0142 Multiple Slides Scanner-3600 - 0143 Multiple Frames Film Scanner-36series - 0180 Plustek Scanner - 0182 Wize Media 1000 - 0189 ScanJet 4600 series - 018a Xerox 6400 - 0300 GLUSB98PT Parallel Port - 0301 USB2LPT Cable Release2 - 0406 Hub - 0501 GL620USB Host-Host interface - 0502 GL620USB-A GeneLink USB-USB Bridge - 0503 Webcam - 0504 HID Keyboard Filter - 0604 USB 1.1 Hub - 0605 USB 2.0 Hub [ednet] - 0606 USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub - 0608 USB-2.0 4-Port HUB - 0660 USB 2.0 Hub - 0700 SIIG US2256 CompactFlash Card Reader - 0701 USB 2.0 IDE Adapter - 0702 USB 2.0 IDE Adapter [GL811E] - 0703 Card Reader - 0704 Card Reader - 0705 Card Reader - 0706 Card Reader - 0707 Card Reader - 0708 Card Reader - 0709 Card Reader - 070a Pen Flash - 070b DMHS1B Rev 3 DFU Adapter - 070e USB 2.0 Card Reader - 070f Pen Flash - 0710 USB 2.0 33-in-1 Card Reader - 0711 Card Reader - 0712 Delkin Mass Storage Device - 0715 USB 2.0 microSD Reader - 0716 USB 2.0 Multislot Card Reader/Writer - 0718 IDE/SATA Adapter - 0723 GL827L SD/MMC/MS Flash Card Reader - 0760 USB 2.0 Card Reader/Writer - 0761 Genesys Mass Storage Device - 0780 USBFS DFU Adapter - 07a0 Pen Flash - 0880 Wasp (SL-6612) - 0927 Card Reader - 1205 Afilias Optical Mouse H3003 - a700 Pen Flash - f102 VX7012 TV Box - f103 VX7012 TV Box - f104 VX7012 TV Box - fd21 3M TL20 Temperature Logger - fe00 Razer Mouse -05e4 Red Wing Corp. -05e5 Fuji Electric Co., Ltd -05e6 Keithley Instruments -05e8 ICC, Inc. -05e9 Kawasaki LSI - 0008 KL5KUSB101B Ethernet [klsi] - 0009 Sony 10Mbps Ethernet [pegasus] - 000c USB-to-RS-232 - 000d USB-to-RS-232 - 0014 RS-232 J104 - 0040 Ethernet Adapter - 2008 Ethernet Adapter -05eb FFC, Ltd -05ec COM21, Inc. -05ee Cytechinfo Inc. -05ef AVB, Inc. [anko?] - 020a Top Shot Pegasus Joystick - 8884 Mag Turbo Force Wheel - 8888 Top Shot Force Feedback Racing Wheel -05f0 Canopus Co., Ltd - 0101 DA-Port DAC -05f1 Compass Communications -05f2 Dexin Corp., Ltd - 0010 AQ Mouse -05f3 PI Engineering, Inc. - 0007 Kinesis Advantage PRO MPC/USB Keyboard - 0081 Kinesis Integrated Hub - 00ff VEC Footpedal - 020b PS2 Adapter - 0232 X-Keys Switch Interface, Programming Mode - 0261 X-Keys Switch Interface, SPLAT Mode - 0264 X-Keys Switch Interface, Composite Mode -05f5 Unixtar Technology, Inc. -05f6 AOC International -05f7 RFC Distribution(s) PTE, Ltd -05f9 PSC Scanning, Inc. - 2602 Datalogic Magellan 1100i Barcode Scanner -05fa Siemens Telecommunications Systems, Ltd - 3301 Keyboard with PS/2 Mouse Port - 3302 Keyboard - 3303 Keyboard with PS/2 Mouse Port -05fc Harman Multimedia - 7849 Harman/Kardon SoundSticks -05fd InterAct, Inc. - 0239 SV-239 HammerHead Digital - 0251 Raider Pro - 0253 ProPad 8 Digital - 0286 SV-286 Cyclone Digital - 107a PowerPad Pro X-Box pad - 262a 3dfx HammerHead FX - 262f HammerHead Fx - daae Game Shark -05fe Chic Technology Corp. - 0001 Mouse - 0003 Cypress USB Mouse - 0005 Viewmaster 4D Browser Mouse - 0007 Twinhead Mouse - 0009 Inland Pro 4500/5000 Mouse - 0011 Browser Mouse - 0014 Gamepad - 1010 Optical Wireless -05ff LeCroy Corp. -0600 Barco Display Systems -0601 Jazz Hipster Corp. - 0003 Internet Security Co., Ltd. SecureKey -0602 Vista Imaging, Inc. - 1001 ViCam Webcam -0603 Novatek Microelectronics Corp. - 00f1 Keyboard - 6871 Mouse -0604 Jean Co., Ltd -0605 Anchor C&C Co., Ltd -0606 Royal Information Electronics Co., Ltd -0607 Bridge Information Co., Ltd -0608 Genrad Ads -0609 SMK Manufacturing, Inc. - 031d eHome Infrared Receiver - 0322 eHome Infrared Receiver - 0334 eHome Infrared Receiver - ff12 SMK Bluetooth Device -060a Worthington Data Solutions, Inc. -060b Solid Year - 0001 MacAlly Keyboard - 1006 Japanese Keyboard - 260U - 2101 Keyboard - 2231 KSK-6001 UELX Keyboard - 5811 ACK-571U Wireless Keyboard - 5903 Japanese Keyboard - 595U - 6001 SolidTek USB 2p HUB - 6002 SolidTek USB Keyboard - 6003 Japanese Keyboard - 600HM - a001 Maxwell Compact Pc PM3 -060c EEH Datalink GmbH -060d Auctor Corp. -060e Transmonde Technologies, Inc. -060f Joinsoon Electronics Mfg. Co., Ltd -0610 Costar Electronics, Inc. -0611 Totoku Electric Co., Ltd -0613 TransAct Technologies, Inc. -0614 Bio-Rad Laboratories -0615 Quabbin Wire & Cable Co., Inc. -0616 Future Techno Designs PVT, Ltd -0617 Swiss Federal Insitute of Technology -0618 MacAlly - 0101 Mouse -0619 Seiko Instruments, Inc. - 0101 SLP-100 Driver - 0102 SLP-200 Driver - 0103 SLP-100N Driver - 0104 SLP-200N Driver - 0105 SLP-240 Driver - 0501 SLP-440 Driver - 0502 SLP-450 Driver -061a Veridicom International, Inc. - 0110 5thSense Fingerprint Sensor - 0200 FPS200 Fingerprint Sensor - 8200 VKI-A Fingerprint Sensor/Flash Storage (dumb) - 9200 VKI-B Fingerprint Sensor/Flash Storage (smart) -061b Promptus Communications, Inc. -061c Act Labs, Ltd -061d Quatech, Inc. -061e Nissei Electric Co. - 0001 nissei 128DE-USB - - 0010 nissei 128DE-PNA - -0620 Alaris, Inc. - 0004 QuickVideo weeCam - 0007 QuickVideo weeCam - 000a QuickVideo weeCam - 000b QuickVideo weeCam -0621 ODU-Steckverbindungssysteme GmbH & Co. KG -0622 Iotech, Inc. -0623 Littelfuse, Inc. -0624 Avocent Corp. - 0294 Dell 03R874 KVM dongle -0625 TiMedia Technology Co., Ltd -0626 Nippon Systems Development Co., Ltd -0627 Adomax Technology Co., Ltd -0628 Tasking Software, Inc. -0629 Zida Technologies, Ltd -062a Creative Labs - 0000 Optical mouse - 0001 Notebook Optical Mouse - 0102 Wireless Keyboard/Mouse Combo [MK1152WC] - 0201 Defender Office Keyboard (K7310) S Zodiak KM-9010 - 0252 Emerge Uni-retractable Laser Mouse - 9003 VoIP Conference Hub (A16GH) - 9004 USR9602 USB Internet Mini Phone -062b Greatlink Electronics Taiwan, Ltd -062c Institute for Information Industry -062d Taiwan Tai-Hao Enterprises Co., Ltd -062e Mainsuper Enterprises Co., Ltd -062f Sin Sheng Terminal & Machine, Inc. -0631 JUJO Electronics Corp. -0633 Cyrix Corp. -0634 Micron Technology, Inc. -0635 Methode Electronics, Inc. -0636 Sierra Imaging, Inc. - 0003 Vivicam 35Xx -0638 Avision, Inc. - 0268 iVina 1200U Scanner - 026a Minolta Dimage Scan Dual II - 0a10 iVina FB1600/UMAX Astra 4500 - 0a13 AV600U - 0a16 SC-215 - 0a30 UMAX Astra 6700 Scanner - 0a41 Avision AM3000/MF3000 Series - 0f01 fi-4010CU - 4004 Minolta Dimage Scan Elite II -0639 Chrontel, Inc. -063a Techwin Corp. -063b Taugagreining HF -063c Yamaichi Electronics Co., Ltd (Sakura) -063d Fong Kai Industrial Co., Ltd -063e RealMedia Technology, Inc. -063f New Technology Cable, Ltd -0640 Hitex Development Tools - 0026 LPC-Stick -0641 Woods Industries, Inc. -0642 VIA Medical Corp. -0644 TEAC Corp. - 0000 Floppy - 0200 All-In-One Multi-Card Reader CA200/B/S - 1000 CD-ROM Drive - 800d TASCAM Portastudio DP-01FX - 800e TASCAM US-122L - 8021 TASCAM US-122mkII - d001 CD-R/RW Unit - d002 CD-R/RW Unit - d010 CD-RW/DVD Unit -0645 Who? Vision Systems, Inc. -0646 UMAX -0647 Acton Research Corp. - 0100 ARC SpectraPro UV/VIS/IR Monochromator/Spectrograph - 0101 ARC AM-VM Mono Airpath/Vacuum Monochromator/Spectrograph - 0102 ARC Inspectrum Mono - 0103 ARC Filterwheel - 03e9 Inspectrum 128x1024 F VIS Spectrograph - 03ea Inspectrum 256x1024 F VIS Spectrograph - 03eb Inspectrum 128x1024 B VIS Spectrograph - 03ec Inspectrum 256x1024 B VIS Spectrograph -0648 Inside Out Networks -0649 Weli Science Co., Ltd -064b Analog Devices, Inc. (White Mountain DSP) - 0165 Blackfin 535 [ADZS HPUSB ICE] -064c Ji-Haw Industrial Co., Ltd -064d TriTech Microelectronics, Ltd -064e Suyin Corp. - a100 Acer OrbiCam - a101 Acer CrystalEye Webcam - a102 Acer/Lenovo Webcam [CN0316] - a103 Acer/HP Integrated Webcam [CN0314] - a110 HP Webcam - a136 Asus Integrated Webcam [CN031B] - a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) - c107 HP webcam [dv6-1190en] - d101 Acer CrystalEye Webcam - e201 Lenovo Integrated Webcam - e203 Lenovo Integrated Webcam - f102 Lenovo Integrated Webcam [R5U877] - f103 Lenovo Integrated Webcam [R5U877] -064f WIBU-Systems AG - 03e9 Propellerhead Record Ignition Key - 03f2 CmStick/M (article no. 1010) - 03f3 CmStick/M (article no. 1011) - 0bd7 BOX/U - 0bd8 BOX/RU -0650 Dynapro Systems -0651 Likom Technology Sdn. Bhd. -0652 Stargate Solutions, Inc. -0653 CNF, Inc. -0654 Granite Microsystems, Inc. - 0005 Device Bay Controller - 0006 Hub - 0007 Device Bay Controller - 0016 Hub -0655 Space Shuttle Hi-Tech Co., Ltd -0656 Glory Mark Electronic, Ltd -0657 Tekcon Electronics Corp. -0658 Sigma Designs, Inc. -0659 Aethra -065a Optoelectronics Co., Ltd - 0001 Barcode scanner -065b Tracewell Systems -065e Silicon Graphics -065f Good Way Technology Co., Ltd & GWC technology Inc. -0660 TSAY-E (BVI) International, Inc. -0661 Hamamatsu Photonics K.K. -0662 Kansai Electric Co., Ltd -0663 Topmax Electronic Co., Ltd - 0103 CobraPad -0664 Groovy Technology Corp. - 0301 GTouch Touch Screen - 0302 GTouch Touch Screen - 0303 GTouch Touch Screen - 0304 GTouch Touch Screen - 0305 GTouch Touch Screen - 0306 GTouch Touch Screen - 0307 GTouch Touch Screen - 0309 GTouch Touch Screen -0665 Cypress Semiconductor - 5161 USB to Serial -0667 Aiwa Co., Ltd - 0fa1 TD-U8000 Tape Drive -0668 WordWand -0669 Oce' Printing Systems GmbH -066a Total Technologies, Ltd -066b Linksys, Inc. - 0105 SCM eUSB SmartMedia Card Reader - 010a Melco MCR-U2 SmartMedia / CompactFlash Reader - 200c USB10TX - 2202 USB10TX Ethernet [pegasus] - 2203 USB100TX Ethernet [pegasus] - 2204 USB100TX HomePNA Ethernet [pegasus] - 2206 USB Ethernet [pegasus] - 2207 HomeLink Phoneline 10M Network Adapter - 2211 WUSB11 802.11b Adapter - 2212 WUSB11v2.5 802.11b Adapter - 2213 WUSB12v1.1 802.11b Adapter - 2219 Instant Wireless Network Adapter - 400b USB10TX -066d Entrega, Inc. -066e Acer Semiconductor America, Inc. -066f SigmaTel, Inc. - 003b MP3 Player - 003e MP3 Player - 003f MP3 Player - 0040 MP3 Player - 0041 MP3 Player - 0042 MP3 Player - 0043 MP3 Player - 004b A-Max PA11 MP3 Player - 3400 STMP3400 D-Major MP3 Player - 3410 STMP3410 D-Major MP3 Player - 3500 Player Recovery Device - 4200 STIr4200 IrDA Bridge - 4210 STIr4210 IrDA Bridge - 8000 MSCN MP3 Player - 8001 SigmaTel MSCN Audio Player - 8004 MSCNMMC MP3 Player - 8008 i-Bead 100 MP3 Player - 8020 MP3 Player - 8034 MP3 Player - 8036 MP3 Player - 8038 MP3 Player - 8056 MP3 Player - 8060 MP3 Player - 8066 MP3 Player - 807e MP3 Player - 8092 MP3 Player - 8096 MP3 Player - 809a MP3 Player - 80aa MP3 Player - 80ac MP3 Player - 80b8 MP3 Player - 80ba MP3 Player - 80bc MP3 Player - 80bf MP3 Player - 80c5 MP3 Player - 80c8 MP3 Player - 80ca MP3 Player - 80cc MP3 Player - 8104 MP3 Player - 8106 MP3 Player - 8108 MP3 Player - 810a MP3 Player - 810c MP3 Player - 8122 MP3 Player - 8124 MP3 Player - 8126 MP3 Player - 8128 MP3 Player - 8134 MP3 Player - 8136 MP3 Player - 8138 MP3 Player - 813a MP3 Player - 813e MP3 Player - 8140 MP3 Player - 8142 MP3 Player - 8144 MP3 Player - 8146 MP3 Player - 8148 MP3 Player - 814c MP3 Player - 8201 MP3 Player - 8202 Jens of Sweden / I-BEAD 150M/150H MP3 player - 8203 MP3 Player - 8204 MP3 Player - 8205 MP3 Player - 8206 Digital MP3 Music Player - 8207 MP3 Player - 8208 MP3 Player - 8209 MP3 Player - 820a MP3 Player - 820b MP3 Player - 820c MP3 Player - 820d MP3 Player - 820e MP3 Player - 820f MP3 Player - 8210 MP3 Player - 8211 MP3 Player - 8212 MP3 Player - 8213 MP3 Player - 8214 MP3 Player - 8215 MP3 Player - 8216 MP3 Player - 8217 MP3 Player - 8218 MP3 Player - 8219 MP3 Player - 821a MP3 Player - 821b MP3 Player - 821c MP3 Player - 821d MP3 Player - 821e MP3 Player - 821f MP3 Player - 8220 MP3 Player - 8221 MP3 Player - 8222 MP3 Player - 8223 MP3 Player - 8224 MP3 Player - 8225 MP3 Player - 8226 MP3 Player - 8227 MP3 Player - 8228 MP3 Player - 8229 MP3 Player - 8230 MP3 Player - 829c MP3 Player - 82e0 MP3 Player - 835d MP3 Player - 9000 MP3 Player - 9001 MP3 Player - 9002 MP3 Player -0670 Sequel Imaging - 0001 Calibrator - 0005 Enable Cable -0672 Labtec, Inc. - 1041 LCS1040 Speaker System - 5000 SpaceBall 4000 FLX -0673 HCL - 5000 Keyboard -0674 Key Mouse Electronic Enterprise Co., Ltd -0675 DrayTek Corp. - 0110 Vigor 128 ISDN TA - 0530 Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280) - 0550 Vigor550 - 1688 miniVigor 128 ISDN TA - 6694 USB ISDN TA -0676 Teles AG -0677 Aiwa Co., Ltd - 07d5 TM-ED1285(USB) - 0fa1 TD-U8000 Tape Drive -0678 ACard Technology Corp. -067b Prolific Technology, Inc. - 0000 PL2301 USB-USB Bridge - 0001 PL2302 USB-USB Bridge - 0307 Motorola Serial Adapter - 04bb PL2303 Serial (IODATA USB-RSAQ2) - 0610 Onext EG210U MODEM - 0611 AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem - 2303 PL2303 Serial Port - 2305 PL2305 Parallel Port - 2306 Raylink Bridge Controller - 2307 PL2307 USB-ATAPI4 Bridge - 2313 FITEL PHS U Cable Adaptor - 2315 Flash Disk Embedded Hub - 2316 Flash Disk Security Device - 2317 Mass Storage Device - 2501 PL2501 USB-USB Bridge (USB 2.0) - 2507 PL2507 Hi-speed USB to IDE bridge controller - 2515 Flash Disk Embedded Hub - 2517 Flash Disk Mass Storage Device - 25a1 PL25A1 Host-Host Bridge - 3400 Hi-Speed Flash Disk with TruePrint AES3400 - 3500 Hi-Speed Flash Disk with TruePrint AES3500 - 3507 PL3507 ATAPI6 Bridge - aaa0 Prolific Pharos - aaa2 PL2303 Serial Adapter (IODATA USB-RSAQ3) -067c Efficient Networks, Inc. - 1001 Siemens SpeedStream 100MBps Ethernet - 1022 Siemens SpeedStream 1022 802.11b Adapter - 1023 SpeedStream Wireless - 4020 SpeedStream 4020 ATM/ADSL Installer - 4031 Efficient ADSL Modem - 4032 SpeedStream 4031 ATM/ADSL Installer - 4033 SpeedStream 4031 ATM/ADSL Installer - 4060 Alcatel Speedstream 4060 ADSL Modem - 4062 Efficient Networks 4060 Loader - 5667 Efficient Networks Virtual Bus for ADSL Modem - c031 SpeedStream 4031 ATM/ADSL Installer - c032 SpeedStream 4031 ATM/ADSL Installer - c033 SpeedStream 4031 ATM/ADSL Installer - c060 SpeedStream 4060 Miniport ATM/ADSL Adapter - d667 Efficient Networks Virtual Bus for ADSL Modem - e240 Speedstream Ethernet Adapter E240 - e540 Speedstream Ethernet Adapter E240 -067d Hohner Corp. -067e Intermec Technologies Corp. - 0801 HID Keyboard, Barcode scanner - 0803 VCP, Barcode scanner - 0805 VCP + UVC, Barcode scanner - 1001 Mobile Computer -067f Virata, Ltd - 4552 DSL-200 ADSL Modem - 6542 DSL Modem - 6549 DSL Modem - 7541 DSL Modem -0680 Realtek Semiconductor Corp., CPP Div. (Avance Logic) - 0002 Arowana Optical Wheel Mouse MSOP-01 -0681 Siemens Information and Communication Products - 0001 Dect Base - 0002 Gigaset 3075 Passive ISDN - 0005 ID-Mouse with Fingerprint Reader - 0012 I-Gate 802.11b Adapter - 001b WLL013 - 001d Hipath 1000 - 0022 Gigaset SX353 ISDN - 0026 DECT Data - Gigaset M34 - 002b A-100-I ADSL Modem - 002e ADSL Router_S-141 - 0034 GSM module MC35/ES75 USB Modem - 3c06 54g USB Network Adapter -0682 Victor Company of Japan, Ltd -0684 Actiontec Electronics, Inc. -0686 Minolta Co., Ltd - 2001 PagePro 4110W - 2004 PagePro 1200W - 2005 Magicolor 2300 DL - 3001 PagePro 4100 - 3005 PagePro 1250E - 3006 PagePro 1250W - 3009 Magicolor 2300W - 300b PagePro 1350W - 300c PagePro 1300W - 302e Develop D 1650iD PCL - 3034 Develop D 2050iD PCL - 4001 Dimage 2300 - 4003 Dimage 2330 Zoom Camera - 4004 Scan Elite II - 4005 Minolta DiMAGE E201 Mass Storage Device - 4006 Dimage 7 Camera - 4007 Dimage S304 Camera - 4008 Dimage 5 Camera - 4009 Dimage X Camera - 400a Dimage S404 Camera - 400b Dimage 7i Camera - 400c Dimage F100 Camera - 400d Scan Dual III - 400e Dimage 5400 - 400f Dimage 7Hi Camera - 4010 Dimage Xi Camera - 4011 Dimage F300 Camera - 4012 Dimage F200 Camera - 4014 Dimage S414 Camera - 4015 Dimage XT Camera [storage] - 4016 Dimage XT Camera [remote mode] - 4017 Dimage E223 - 4018 Dimage Z1 Camera - 4019 Dimage A1 Camera [remote mode] - 401a Dimage A1 Camera [storage] - 401c Dimage X20 Camera - 401e Dimage E323 Camera -068a Pertech, Inc. -068b Potrans International, Inc. -068e CH Products, Inc. - 00d3 OEM 3 axis 5 button joystick - 00e2 HFX OEM Joystick - 00f1 Pro Throttle - 00f2 Flight Sim Pedals - 00f3 Fighterstick - 00f4 Combatstick - 00fa Flight Sim Pedals - 00ff Flight Sim Yoke - 0500 GameStick 3D - 0501 CH Pro Pedals - 0504 F-16 Combat Stick -0690 Golden Bridge Electech, Inc. -0693 Hagiwara Sys-Com Co., Ltd - 0002 FlashGate SmartMedia Card Reader - 0003 FlashGate CompactFlash Card Reader - 0005 FlashGate - 0006 SM PCCard R/W and SPD - 0007 FlashGate ME (Authenticated) - 000a SDCard/MMC Reader/Writer -0694 Lego Group - 0001 Mindstorms Tower - 0002 Mindstorms NXT -0698 Chuntex (CTX) - 1786 1300ex Monitor - 2003 CTX M730V built in Camera - 9999 VLxxxx Monitor+Hub -0699 Tektronix, Inc. -069a Askey Computer Corp. - 0001 VC010 Webcam [pwc] - 0303 Cable Modem - 0311 ADSL Router Remote NDIS Device - 0318 Remote NDIS Device - 0319 220V Remote NDIS Device - 0320 IEEE 802.11b Wireless LAN Card - 0321 Dynalink WLL013 / Compex WLU11A 802.11b Adapter - 0402 Scientific Atlanta WebSTAR 100 & 200 series Cable Modem - 0811 BT Virtual Bus for Helium - 0821 BT Voyager 1010 802.11b Adapter - 4402 Scientific Atlanta WebSTAR 2000 series Cable Modem - 4403 Scientific Atlanta WebSTAR 300 series Cable Modem - 4501 Scientific-Atlanta WebSTAR 2000 series Cable Modem -069b Thomson, Inc. - 0704 DCM245 Cable Modem - 0705 THG540K Cable Modem - 070c MP3 Player - 070d MP3 Player - 070e MP3 Player - 070f RCA Lyra RD1071 MP3 Player - 0731 Lyra M200E256 - 0761 RCA H100A - 0778 PEARL USB Device - 2220 RCA Kazoo RD1000 MP3 Player - 300a RCA Lyra MP3 Player - 3012 MP3 Player - 3013 MP3 Player - 5557 RCA CDS6300 -069d Hughes Network Systems (HNS) - 0001 Satellite Receiver Device - 0002 Satellite Device -069e Marx - 0005 CryptoBox v1.2 -069f Allied Data Technologies BV - 0010 Tornado Speakerphone FaxModem 56.0 - 0011 Tornado Speakerphone FaxModem 56.0 - 1000 ADT VvBus for CopperJet - 1004 CopperJet 821 RouterPlus -06a2 Topro Technology, Inc. - 0033 USB Mouse -06a3 Saitek PLC - 0006 Cyborg Gold Joystick - 0109 P880 Pad - 0160 ST290 Pro - 0200 Xbox Adrenalin Hub - 0241 Xbox Adrenalin Gamepad - 0255 X52 Flight Controller - 040b P990 Dual Analog Pad - 040c P2900 Wireless Pad - 0422 ST90 Joystick - 0460 ST290 Pro Flight Stick - 0463 ST290 - 0464 Cyborg Evo - 0471 Cyborg Graphite Stick - 0501 R100 Sports Wheel - 0502 ST200 Stick - 0506 R220 Digital Wheel - 051e Cyborg Digital II Stick - 052d P750 Gamepad - 053c X45 Flight Controller - 053f X36F Flightstick - 056c P2000 Tilt Pad - 056f P2000 Tilt Pad - 05d2 PC Dash 2 - 075c X52 Flight Controller - 0762 Saitek X52 Pro Flight Control System - 0805 R440 Force Wheel - 1003 GM2 Action Pad - 1009 Action Pad - 100a SP550 Pad and Joystick Combo - 100b SP550 Pad - 1509 P3000 Wireless Pad - 1589 P3000 Wireless Pad - 2541 X45 Flight Controller - 3509 P3000 RF GamePad - 353e Cyborg Evo Wireless - 3589 P3000 Wireless Pad - 35be Cyborg Evo - 5509 P3000 Wireless Pad - 8000 Gamers' Keyboard - 801e Cyborg 3D Digital Stick II - 8020 Eclipse Keyboard - 8021 Eclipse II Keyboard - 802d P750 Pad - 803f X36 Flight Controller - 806f P2000 Tilt Pad - 80c0 Pro Gamer Command Unit - 80c1 Cyborg Command Pad Unit - a502 Gaming Mouse - f518 P3200 Rumble Force Game Pad - ff04 R440 Force Wheel - ff0c Cyborg Force Rumble Pad - ff0d P2600 Rumble Force Pad - ff12 Cyborg 3D Force Stick - ff17 ST 330 Rumble Force Stick - ff52 Cyborg 3D Rumble Force Joystick - ffb5 Cyborg Evo Force Joystick -06a4 Xiamen Doowell Electron Co., Ltd -06a5 Divio - 0000 Typhoon Webcam 100k [nw8000] - d001 ProLink DS3303u Webcam - d800 Chicony TwinkleCam - d820 Wize Media 1000 -06a7 MicroStore, Inc. -06a8 Topaz Systems, Inc. - 0042 SignatureGem 1X5 Pad - 0043 SignatureGem 1X5-HID Pad -06a9 Westell - 0005 WireSpeed Dual Connect Modem - 0006 WireSpeed Dual Connect Modem - 000a WireSpeed Dual Connect Modem - 000b WireSpeed Dual Connect Modem - 000e A90-211WG-01 802.11g Adapter [Intersil ISL3887] -06aa Sysgration, Ltd -06ac Fujitsu Laboratories of America, Inc. -06ad Greatland Electronics Taiwan, Ltd -06ae Professional Multimedia Testing Centre -06af Harting, Inc. of North America -06b8 Pixela Corp. -06b9 Alcatel Telecom - 0120 SpeedTouch 120g 802.11g Wireless Adapter [Intersil ISL3886] - 0121 SpeedTouch 121g Wireless Dongle - 2001 SPEED TOUCH Card - 4061 SpeedTouch ISDN or ADSL Modem - a5a5 DynaMiTe Modem -06ba Smooth Cord & Connector Co., Ltd -06bb EDA, Inc. -06bc Oki Data Corp. - 000b Okipage 14ex Printer - 0a91 B2500MFP (printer+scanner) - 3801 B6100 Laser Printer -06bd AGFA-Gevaert NV - 0001 SnapScan 1212U - 0002 SnapScan 1236U - 0100 SnapScan Touch - 0101 SNAPSCAN ELITE - 0200 ScanMaker 8700 - 02bf DUOSCAN f40 - 0400 CL30 - 0401 Mass Storage - 0403 ePhoto CL18 Camera - 0404 ePhoto CL20 Camera - 2061 SnapScan 1212U (?) - 208d Snapscan e40 - 208f SnapScan e50 - 2091 SnapScan e20 - 2093 SnapScan e10 - 2095 SnapScan e25 - 2097 SnapScan e26 - 20fd SnapScan e52 - 20ff SnapScan e42 -06be AME Optimedia Technology Co., Ltd - 0800 Optimedia Camera - 1005 Dazzle DPVM! (1005) - d001 P35U Camera Capture -06bf Leoco Corp. -06c2 Phidgets Inc. (formerly GLAB) - 0030 PhidgetRFID - 0038 4-Motor PhidgetServo v3.0 - 0039 1-Motor PhidgetServo v3.0 - 003a 8-Motor PhidgetAvancedServo - 0040 PhidgetInterface Kit 0-0-4 - 0044 PhidgetInterface Kit 0-16-16 - 0045 PhidgetInterface Kit 8-8-8 - 0048 PhidgetStepper (Under Development) - 0049 PhidgetTextLED Ver 1.0 - 004a PhidgetLED Ver 1.0 - 004b PhidgetEncoder Ver 1.0 - 0051 PhidgetInterface Kit 0-5-7 (Custom) - 0052 PhidgetTextLCD - 0053 PhidgetInterfaceKit 0-8-8 - 0058 PhidgetMotorControl Ver 1.0 - 0070 PhidgetTemperatureSensor Ver 1.0 - 0071 PhidgetAccelerometer Ver 1.0 - 0072 PhidgetWeightSensor Ver 1.0 - 0073 PhidgetHumiditySensor - 0074 PhidgetPHSensor - 0075 PhidgetGyroscope -06c4 Bizlink International Corp. -06c5 Hagenuk, GmbH -06c6 Infowave Software, Inc. -06c8 SIIG, Inc. -06c9 Taxan (Europe), Ltd - 0005 Monitor Control - 0007 Monitor Control - 0009 Monitor Control -06ca Newer Technology, Inc. -06cb Synaptics, Inc. - 0001 HID Device - 0002 HID Device - 0003 HID Device - 0005 Touchpad/FPS - 0006 HID Device - 0007 HID Device - 0008 HID Device - 0009 Composite TouchPad and TrackPoint - 000e HID Device - 0010 Composite Human Interface Device - 0013 Human Interface Device -06cc Terayon Communication Systems - 0101 Cable Modem - 0102 Cable Modem - 0103 Cable Modem - 0104 Cable Modem - 0304 Cable Modem -06cd Keyspan - 0101 USA-28 PDA [no firmware] - 0102 USA-28X PDA [no firmware] - 0103 USA-19 PDA [no firmware] - 0104 PDA [prerenum] - 0105 USA-18X PDA [no firmware] - 0106 USA-19W PDA [no firmware] - 0107 USA-19 PDA - 0108 USA-19W PDA - 0109 USA-49W serial adapter [no firmware] - 010a USA-49W serial adapter - 010b USA-19Qi serial adapter [no firmware] - 010c USA-19Qi serial adapter - 010d USA-19Q serial Adapter (no firmware) - 010e USA-19Q serial Adapter - 010f USA-28 PDA - 0110 USA-28Xb PDA - 0111 USA-18 serial Adapter - 0112 USA-18X PDA - 0113 USA-28Xb PDA [no firmware] - 0114 USA-28Xa PDA [no firmware] - 0115 USA-28Xa PDA - 0116 USA-18XA serial Adapter (no firmware) - 0117 USA-18XA serial Adapter - 0118 USA-19QW PDA [no firmware] - 0119 USA-19QW PDA - 011a USA-49Wlc serial adapter [no firmware] - 011b MPR Serial Preloader (MPRQI) - 011c MPR Serial (MPRQI) - 011d MPR Serial Preloader (MPRQ) - 011e MPR Serial (MPRQ) - 0121 USA-19hs serial adapter - 012a USA-49Wlc serial adapter - 0201 UIA-10 Digital Media Remote [Cypress AN2131SC] - 0202 UIA-11 Digital Media Remote -06cf SpheronVR AG - 1010 PanoCam 10 - 1012 PanoCam 12/12X -06d0 LapLink, Inc. - 0622 LapLink Gold USB-USB Bridge [net1080] -06d1 Daewoo Electronics Co., Ltd -06d3 Mitsubishi Electric Corp. - 0380 CP8000D Port - 0381 CP770D Port - 0385 CP900D Port - 0387 CP980D Port - 038b CP3020D Port - 038c CP900DW(ID) Port - 0393 CP9500D/DW Port - 0394 CP9000D/DW Port - 03a1 CP9550D/DW Port -06d4 Cisco Systems -06d5 Toshiba - 4000 Japanese Keyboard -06d6 Aashima Technology B.V. - 0025 Gamepad - 0026 Predator TH 400 Gamepad - 002d Trust PowerC@m 350FT - 002e Trust PowerC@m 350FS - 0030 Trust 710 LCD POWERC@M ZOOM - MSD - 0031 Trust 610/710 LCD POWERC@M ZOOM - 003a Trust PowerC@m 770Z (mass storage mode) - 003b Trust PowerC@m 770Z (webcam mode) - 003c Trust 910z PowerC@m - 003f Trust 735S POWERC@M ZOOM, WDM DSC Bulk Driver - 0050 Trust 738AV LCD PV Digital Camera - 0062 TRUST 782AV LCD P. V. Video Capture - 0066 TRUST Digital PCTV and Movie Editor - 0067 Trust 350FS POWERC@M FLASH - 006b TRUST AUDIO VIDEO EDITOR -06d7 Network Computing Devices (NCD) -06d8 Technical Marketing Research, Inc. -06da Phoenixtec Power Co., Ltd - 0002 UPS - 0003 1300VA UPS -06db Paradyne -06dc Foxlink Image Technology Co., Ltd - 0012 Scan 1200c Scanner - 0014 Prolink Winscan Pro 2448U -06de Heisei Electronics Co., Ltd -06e0 Multi-Tech Systems, Inc. - f101 MT5634ZBA-USB MultiModemUSB (old firmware) - f103 MT5634MU MultiMobileUSB - f104 MT5634ZBA-USB MultiModemUSB (new firmware) - f107 MT5634ZBA-USB-V92 MultiModemUSB -06e1 ADS Technologies, Inc. - 0008 UBS-10BT Ethernet [klsi] - 0009 UBS-10BT Ethernet - 0833 Mass Storage Device - a155 FM Radio Receiver/Instant FM Music (RDX-155-EF) - a160 Instant Video-To-Go RDX-160 (no firmware) - a161 Instant Video-To-Go RDX-160 - a190 Instand VCD Capture - a191 Instant VideoXpress - a337 Mini DigitalTV - a701 DVD Xpress - b337 Mini DigitalTV - b701 DVD Xpress B -06e4 Alcatel Microelectronics -06e6 Tiger Jet Network, Inc. - 0200 Internet Phone - 0201 Internet Phone - 0202 Composite Device - 0203 Internet Phone - 0210 Composite Device - 0211 Internet Phone - 0212 Internet Phone - 031c Internet Phone - 031d Internet Phone - 031e Internet Phone - 3200 Composite Device - 3201 Internet Phone - 3202 Composite Device - 3203 Composite Device - 7200 Composite Device - 7210 Composite Device - 7250 Composite Device - 825c Internet Phone - 831c Internet Phone - 831d Composite Device - 831e Composite Device - b200 Composite Device - b201 Composite Device - b202 Internet Phone - b210 Internet Phone - b211 Composite Device - b212 Composite Device - b250 Composite Device - b251 Internet Phone - b252 Internet Phone - c200 Internet Phone - c201 Internet Phone - c202 Composite Device - c203 Internet Phone - c210 Personal PhoneGateway - c211 Personal PhoneGateway - c212 Personal PhoneGateway - c213 PPG Device - c25c Composite Device - c290 PPG Device - c291 PPG Device - c292 PPG Device - c293 Personal PhoneGateway - c31c Composite Device - c39c Personal PhoneGateway - c39d PPG Device - c39e PPG Device - c39f PPG Device - c700 Internet Phone - c701 Internet Phone - c702 Composite Device - c703 Internet Phone - c710 VoIP Combo Device - c711 VoIP Combo - c712 VoIP Combo Device - c713 VoIP Combo Device - cf00 Composite Device - cf01 Internet Phone - cf02 Internet Phone - cf03 Composite Device - d210 Personal PhoneGateway - d211 PPG Device - d212 PPG Device - d213 Personal PhoneGateway - d700 Composite Device - d701 Composite Device - d702 Internet Phone - d703 Composite Device - d710 VoIP Combo - d711 VoIP Combo Device - d712 VoIP Combo - d713 VoIP Combo - df00 Composite Device - df01 Composite Device - df02 Internet Phone - df03 Internet Phone - f200 Internet Phone - f201 Internet Phone - f202 Composite Device - f203 Composite Device - f210 Internet Phone - f250 Composite Device - f252 Internet Phone - f310 Internet Phone - f350 Composite Device -06ea Sirius Technologies - 0001 NetCom Roadster II 56k - 0002 Roadster II 56k -06eb PC Expert Tech. Co., Ltd -06ef I.A.C. Geometrische Ingenieurs B.V. -06f0 T.N.C Industrial Co., Ltd - de01 DualCam Video Camera - de02 DualCam Still Camera -06f1 Opcode Systems, Inc. - a011 SonicPort - a021 SonicPort Optical -06f2 Emine Technology Co. - 0011 KVM Switch Keyboard -06f6 Wintrend Technology Co., Ltd -06f7 Wailly Technology Ltd - 0003 USB->Din 4 Adaptor -06f8 Guillemot Corp. - 3002 Hercules Blog Webcam - 3004 Hercules Classic Silver - 3005 Hercules Dualpix Exchange - 3007 Hercules Dualpix Chat and Show - a300 Dual Analog Leader GamePad - b000 Hercules DJ Console - c000 Hercules Muse Pocket - d002 Hercules DJ Console - e000 HWGUSB2-54 WLAN - e010 HWGUSB2-54-LB - e020 HWGUSB2-54V2-AP - e031 Hercules HWNUm-300 Wireless N mini [Realtek RTL8191S] - e032 HWGUm-54 [Hercules Wireless G Ultra Mini Key] -06f9 ASYST electronic d.o.o. -06fa HSD S.r.L -06fc Motorola Semiconductor Products Sector -06fd Boston Acoustics - 0101 Audio Device - 0102 Audio Device - 0201 2-piece Audio Device -06fe Gallant Computer, Inc. -0701 Supercomal Wire & Cable SDN. BHD. -0703 Bvtech Industry, Inc. -0705 NKK Corp. -0706 Ariel Corp. -0707 Standard Microsystems Corp. - 0100 2202 Ethernet [klsi] - 0200 2202 Ethernet [pegasus] - 0201 EZ Connect USB Ethernet - ee04 SMCWUSB32 802.11b Wireless LAN Card - ee06 SMC2862W-G v1 EZ Connect 802.11g Adapter [Intersil ISL3886] - ee13 SMC2862W-G v2 EZ Connect 802.11g Adapter [Intersil ISL3887] -0708 Putercom Co., Ltd - 047e USB-1284 BRIDGE -0709 Silicon Systems, Ltd (SSL) -070a Oki Electric Industry Co., Ltd - 4002 Bluetooth Device - 4003 Bluetooth Device -070d Comoss Electronic Co., Ltd -070e Excel Cell Electronic Co., Ltd -0710 Connect Tech, Inc. - 0001 WhiteHeat (fake ID) - 8001 WhiteHeat -0711 Magic Control Technology Corp. - 0100 Hub - 0180 IRXpress Infrared Device - 0181 IRXpress Infrared Device - 0200 BAY-3U1S1P Serial Port - 0210 MCT1S Serial Port - 0230 MCT-232 Serial Port - 0231 PS/2 Mouse Port - 0232 Serial On Port - 0240 PS/2 to USB Converter - 0300 BAY-3U1S1P Parallel Port - 0302 Parallel Port - 0900 SVGA Adapter - 5001 Trigger UV-002BD[Startech USBVGAE] -0713 Interval Research Corp. -0714 NewMotion, Inc. - 0003 ADB to USB convertor -0717 ZNK Corp. -0718 Imation Corp. - 0002 SuperDisk 120MB - 0003 SuperDisk 120MB (Authenticated) - 0060 Flash Drive - 0061 Flash Drive - 0062 Flash Drive - 0063 Swivel Flash Drive - 0064 Flash Drive - 0065 Flash Drive - 0066 Flash Drive - 0067 Flash Drive - 0068 Flash Drive - 0084 Flash Drive Mini - 0582 Revo Flash Drive - d000 Disc Stakka CD/DVD Manager -0719 Tremon Enterprises Co., Ltd -071b Domain Technologies, Inc. - 0002 DTI-56362-USB Digital Interface Unit - 0101 Audio4-USB DSP Data Acquisition Unit - 0201 Audio4-5410 DSP Data Acquisition Unit - 0301 SB-USB JTAG Emulator - 3203 Rockchip Media Player - 32bb Music Mediatouch -071c Xionics Document Technologies, Inc. -071d Eicon Networks Corp. - 1000 Diva ISDN TA - 1003 Diva - 2000 Teledat Surf -071e Ariston Technologies -0723 Centillium Communications Corp. - 0002 Palladia 300/400 Adsl Modem -0726 Vanguard International Semiconductor-America -0729 Amitm - 1000 USC-1000 Serial Port -072e Sunix Co., Ltd -072f Advanced Card Systems, Ltd - 0001 AC1030-based SmartCard Reader - 0008 ACR 80 Smart Card Reader - 1000 PLDT Drive - 1001 PLDT Drive - 8002 AET63 BioTRUSTKey - 8003 ACR120 - 8103 ACR120 - 9000 ACR38 AC1038-based Smart Card Reader - 90cc ACR38 SmartCard Reader - 90cf ACR38 SAM Smart Card Reader - 90d0 PertoSmart EMV - Card Reader -0731 Susteen, Inc. - 0528 SonyEricsson DCU-11 Cable -0732 Goldfull Electronics & Telecommunications Corp. -0733 ViewQuest Technologies, Inc. - 0101 Digital Video Camera - 0110 VQ110 Video Camera - 0401 CS330 Webcam - 0402 M-318B Webcam - 0430 Intel Pro Share Webcam - 0630 VQ630 Dual Mode Digital Camera(Bulk) - 0631 Hercules Dualpix - 0780 Smart Cam Deluxe(composite) - 1310 Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 - 1311 Digital Dream Epsilon 1.3 - 1314 Mercury 2.1MEG Deluxe Classic Cam - 2211 Jenoptik jdc 21 LCD Camera - 2221 Mercury Digital Pro 3.1p - 3261 Concord 3045 spca536a Camera - 3281 Cyberpix S550V -0734 Lasat Communications A/S - 0001 560V Modem - 0002 Lasat 560V Modem - 043a DVS Audio - 043b 3DeMon USB Capture -0735 Asuscom Network - 2100 ISDN Adapter - 2101 ISDN Adapter - 6694 ISDNlink 128K - c541 ISDN TA 280 -0736 Lorom Industrial Co., Ltd -0738 Mad Catz, Inc. - 4507 XBox Device - 4516 XBox Device - 4520 XBox Device - 4526 XBox Device - 4536 XBox Device - 4540 XBox Device - 4556 XBox Device - 4566 XBox Device - 4576 XBox Device - 4586 XBox Device - 4588 XBox Device - 8818 Street Fighter IV Arcade FightStick (PS3) -073a Chaplet Systems, Inc. -073b Suncom Technologies -073c Industrial Electronic Engineers, Inc. - 0305 Pole Display (PC305-3415 2 x 20 Line Display) - 0322 Pole Display (PC322-3415 2 x 20 Line Display) - 0324 Pole Display (LB324-USB 4 x 20 Line Display) - 0330 Pole Display (P330-3415 2 x 20 Line Display) - 0424 Pole Display (SP324-4415 4 x 20 Line Display) - 0450 Pole Display (L450-USB Graphic Line Display) - 0505 Pole Display (SPC505-3415 2 x 20 Line Display) - 0522 Pole Display (SPC522-3415 2 x 20 Line Display) - 0624 Pole Display (SP324-3415 4 x 20 Line Display) -073d Eutron S.p.a. - 0005 Crypto Token - 0007 CryptoIdentity CCID - 0025 SmartKey 3 - 0c00 Pocket Reader - 0d00 StarSign Bio Token 3.0 EU -073e NEC, Inc. - 0301 Game Pad -0745 Syntech Information Co., Ltd -0746 Onkyo Corp. - 5500 SE-U55 Audio Device -0747 Labway Corp. -0748 Strong Man Enterprise Co., Ltd -0749 EVer Electronics Corp. -074a Ming Fortune Industry Co., Ltd -074b Polestar Tech. Corp. -074c C-C-C Group PLC -074d Micronas GmbH - 3553 Composite USB-Device - 3554 Composite USB-Device - 3556 Composite USB-Device -074e Digital Stream Corp. - 0001 PS/2 Adapter - 0002 PS/2 Adapter -0755 Aureal Semiconductor -0757 Network Technologies, Inc. -075b Sophisticated Circuits, Inc. - 0001 Kick-off! Watchdog -0763 Midiman - 0115 O2 / KeyRig 25 - 0117 Trigger Finger - 0119 MidAir - 0150 M-Audio Uno - 0160 M-Audio 1x1 - 0192 M-Audio Keystation 88es - 0193 ProKeys 88 - 0194 ProKeys 88sx - 0195 Oxygen 8 v2 - 0196 Oxygen 49 - 0197 Oxygen 61 - 0198 Axiom 25 - 0199 Axiom 49 - 019a Axiom 61 - 019b KeyRig 49 - 019c KeyStudio - 1001 MidiSport 2x2 - 1002 MidiSport 2x2 - 1003 MidiSport 2x2 - 1010 MidiSport 1x1 - 1011 MidiSport 1x1 - 1014 M-Audio Keystation Loader - 1015 M-Audio Keystation - 1020 Midisport 4x4 - 1021 MidiSport 4x4 - 1030 Midisport 8x8 - 1031 MidiSport 8x8/s Loader - 1033 MidiSport 8x8/s - 1040 M-Audio MidiSport 2x4 Loader - 1041 M-Audio MidiSport 2x4 - 1110 MidiSport 1x1 - 2001 M Audio Quattro - 2002 M Audio Duo - 2003 M Audio AudioPhile - 2004 M-Audio MobilePre - 2006 M-Audio Transit - 2007 M-Audio Sonica Theater - 2008 M-Audio Ozone - 200d M-Audio OmniStudio - 200f M-Audio MobilePre - 2010 M-Audio Fast Track - 2012 M-Audio Fast Track Pro - 2013 M-Audio JamLab - 2015 M-Audio RunTime DFU - 2016 M-Audio RunTime DFU - 2019 M-Audio Ozone Academic - 201a M-Audio Micro - 201b M-Audio RunTime DFU - 201d M-Audio Producer - 2080 M-Audio RunTime DFU - 2081 M-Audio RunTime DFU / Fast Track Ultra 8R - 2803 M-Audio Audiophile DFU - 2804 M-Audio MobilePre DFU - 2806 M-Audio Transit DFU - 2815 M-Audio DFU - 2816 M-Audio DFU - 281b M-Audio DFU - 2880 M-Audio DFU - 2881 M-Audio DFU -0764 Cyber Power System, Inc. - 0005 Cyber Power UPS - 0501 CP1500 AVR UPS -0765 X-Rite, Inc. - d094 X-Rite DTP94 [Quato Silver Haze Pro] -0766 Jess-Link Products Co., Ltd - 0204 TopSpeed Cyberlink Remote Control -0767 Tokheim Corp. -0768 Camtel Technology Corp. - 0006 Camtel Technology USB TV Genie Pro FM Model TVB330 - 0023 eHome Infrared Receiver -0769 Surecom Technology Corp. - 11f2 EP-9001-g 802.11g 54M WLAN Adapter - 11f3 RT2570 - 11f7 802.11g 54M WLAN Adapter - 31f3 RT2573 -076a Smart Technology Enablers, Inc. -076b OmniKey AG - 0596 CardMan 2020 - 1021 CardMan 1021 - 1221 CardMan 1221 - 1784 CardMan 6020 - 3021 CardMan 3121 - 3610 CardMan 3620 - 3621 CardMan 3621 - 3821 CardMan 3821 - 4321 CardMan 4321 - 5121 CardMan 5121 - 5125 CardMan 5125 - 6622 CardMan 6121 - a011 CCID Smart Card Reader Keyboard - a021 CCID Smart Card Reader - a022 CardMan Smart@Link - c000 CardMan 3x21 CS - c001 CardMan 5121 CS -076c Partner Tech -076d Denso Corp. -076e Kuan Tech Enterprise Co., Ltd -076f Jhen Vei Electronic Co., Ltd -0770 Welch Allyn, Inc - Medical Division -0771 Observator Instruments BV - 4455 OMC45III - ae0f OMC45III -0774 AmTRAN Technology Co., Ltd -0775 Longshine Electronics Corp. -0776 Inalways Corp. -0777 Comda Enterprise Corp. -0778 Volex, Inc. -0779 Fairchild Semiconductor -077a Sankyo Seiki Mfg. Co., Ltd -077b Linksys - 08be BEFCMU10 v4 Cable Modem - 2219 WUSB11 V2.6 802.11b Adapter - 2226 USB200M 100baseTX Adapter - 2227 Network Everywhere NWU11B -077c Forward Electronics Co., Ltd - 0005 NEC Keyboard -077d Griffin Technology - 0223 IMic Audio In/Out - 0405 iMate, ADB Adapter - 0410 PowerMate - 041a PowerWave - 04aa SoundKnob - 07af iMic - 1016 AirClick - 627a Radio SHARK -077f Well Excellent & Most Corp. -0780 Sagem Monetel GmbH - 1202 ORGA 900 Smart Card Terminal Virtual Com Port - 1302 ORGA 6000 Smart Card Terminal Virtual Com Port - 1303 ORGA 6000 Smart Card Terminal USB RNDIS - df55 ORGA 900/6000 Smart Card Terminal DFU -0781 SanDisk Corp. - 0001 SDDR-05a ImageMate CompactFlash Reader - 0002 SDDR-31 ImageMate II CompactFlash Reader - 0005 SDDR-05b (CF II) ImageMate CompactFlash Reader - 0100 ImageMate SDDR-12 - 0200 SDDR-09 (SSFDC) ImageMate SmartMedia Reader [eusb] - 0400 SecureMate SD/MMC Reader - 0621 SDDR-86 Imagemate 6-in-1 Reader - 0720 Sansa C200 series in recovery mode - 0729 Sansa E200 series in recovery mode - 0810 SDDR-75 ImageMate CF-SM Reader - 0830 ImageMate CF/MMC/SD Reader - 1234 Cruzer Mini Flash Drive - 5150 SDCZ2 Cruzer Mini Flash Drive (thin) - 5151 Cruzer Micro Flash Drive - 5153 Cruzer Flash Drive - 5402 U3 Cruzer Micro - 5406 Cruzer Micro U3 - 5408 Cruzer Titanium U3 - 540e Cruzer Contour Flash Drive - 5530 Cruzer - 5567 Cruzer Blade - 5e10 Encrypted - 6100 Ultra II SD Plus 2GB - 7100 Cruzer Mini - 7101 Pen Flash - 7102 Cruzer Mini - 7103 Cruzer Mini - 7104 Cruzer Micro Mini 256MB Flash Drive - 7105 Cruzer Mini - 7106 Cruzer Mini - 7112 Cruzer Micro 128MB Flash Drive - 7113 Cruzer Micro 256MB Flash Drive - 7114 Cruzer Mini - 7115 Cruzer Mini - 7301 Sansa e100 series (mtp) - 7302 Sansa e100 series (msc) - 7400 Sansa M200 series (mtp) - 7401 Sansa M200 series (msc) - 7420 Sansa E200 series (mtp) - 7421 Sansa E200 Series (msc) - 7422 Sansa E200 series v2 (mtp) - 7423 Sansa E200 series v2 (msc) - 7430 Sansa M200 series - 7431 Sansa M200 series V4 (msc) - 7432 Sansa Clip (mtp) - 7433 Sansa Clip (msc) - 7434 Sansa Clip V2 (mtp) - 7435 Sansa Clip V2 (msc) - 7450 Sansa C250 - 7451 Sansa C240 - 7460 Sansa Express - 7480 Sansa Connect - 7481 Sansa Connect (in recovery mode) - 74b0 Sansa View (msc) - 74b1 Sansa View (mtp) - 74c0 Sansa Fuze (mtp) - 74c1 Sansa Fuze (msc) - 74c2 Sansa Fuze V2 (mtp) - 74c3 Sansa Fuze V2 (msc) - 74d0 Sansa Clip+ (mtp) - 74d1 Sansa Clip+ (msc) - 8181 Pen Flash - 8183 Hi-Speed Mass Storage Device - 8185 SDCZ2 Cruzer Mini Flash Drive (older, thick) - 8888 Card Reader - 8889 SDDR-88 Imagemate 8-in-1 Reader - 8919 Card Reader - 8989 ImageMate 12-in-1 Reader - 9191 ImageMate CF - 9219 Card Reader - 9292 ImageMate CF Reader/Writer - 9393 ImageMate SD-MMC - 9595 ImageMate xD-SM - 9797 ImageMate MS-PRO - 9919 Card Reader - 9999 SDDR-99 5-in-1 Reader - a7e8 SDDR-113 MicroMate SDHC Reader - b2b3 SDDR-103 MobileMate SD+ Reader - b4b5 SDDR-89 V4 ImageMate 12-in-1 Reader -0782 Trackerball -0783 C3PO - 0003 LTC31 SmartCard Reader - 0006 LTC31v2 - 0009 KBR36 - 0010 LTC32 -0784 Vivitar, Inc. - 0100 Vivicam 2655 - 1310 Vivicam 3305 - 1688 Vivicam 3665 - 1689 Gateway DC-M42/Labtec DC-505/Vivitar Vivicam 3705 - 2620 AOL Photocam Plus - 2888 Polaroid DC700 - 3330 Nytec ND-3200 Camera - 4300 Traveler D1 - 5260 Werlisa Sport PX 100 / JVC GC-A33 Camera - 5300 Pretec dc530 -0785 NTT-ME - 0001 MN128mini-V ISDN TA - 0003 MN128mini-J ISDN TA -0789 Logitec Corp. - 0026 LHD Device - 0033 DVD Multi-plus unit LDR-H443SU2 - 0063 LDR Device - 0064 LDR-R Device - 00b3 DVD Multi-plus unit LDR-H443U2 - 010c Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter - 0162 LAN-WN22/U2 Wireless LAN Adapter - 0163 LAN-WN12/U2 Wireless LAN Adapter - 0164 LAN-W150/U2M Wireless LAN Adapter - 0166 LAN-W300N/U2 Wireless LAN Adapter - 0168 LAN-W150N/U2 Wireless LAN Adapter -078b Happ Controls, Inc. - 0010 Driving UGCI - 0020 Flying UGCI - 0030 Fighting UGCI -078c GTCO/CalComp - 0090 Tablet Adapter - 0100 Tablet Adapter - 0200 Tablet Adapter - 0300 Tablet Adapter - 0400 Digitizer (Whiteboard) -078e Brincom, Inc. -0790 Pro-Image Manufacturing Co., Ltd -0791 Copartner Wire and Cable Mfg. Corp. -0792 Axis Communications AB -0793 Wha Yu Industrial Co., Ltd -0794 ABL Electronics Corp. -0795 RealChip, Inc. -0796 Certicom Corp. -0797 Grandtech Semiconductor Corp. - 6801 Flatbed Scanner - 6802 InkJet Color Printer - 8001 SmartCam - 801a Typhoon StyloCam - 801c Meade Binoculars/Camera - 8901 ScanHex SX-35a - 8909 ScanHex SX-35b - 8911 ScanHex SX-35c -0798 Optelec - 0001 Braille Voyager -0799 Altera - 7651 Programming Unit -079b Sagem - 0027 USB-Serial Controller - 002f Mobile - 0030 Mobile Communication Device - 0042 Mobile - 004a XG-760A 802.11bg - 004b Wi-Fi 11g adapter - 0056 Agfa AP1100 Photo Printer - 005d Mobile Mass Storage - 0062 XG-76NA 802.11bg - 0078 Laser Pro Monochrome MFP -079d Alfadata Computer Corp. - 0201 GamePort Adapter -07a1 Digicom S.p.A. - d952 Palladio USB V.92 Modem -07a2 National Technical Systems -07a3 Onnto Corp. -07a4 Be, Inc. -07a6 ADMtek, Inc. - 07c2 AN986A Ethernet - 0986 AN986 Pegasus Ethernet - 8266 Infineon WildCard-USB Wireless LAN Adapter - 8511 ADM8511 Pegasus II Ethernet - 8513 AN8513 Ethernet - 8515 AN8515 Ethernet -07aa Corega K.K. - 0001 Ether USB-T Ethernet [klsi] - 0004 FEther USB-TX Ethernet [pegasus] - 000c WirelessLAN USB-11 - 000d FEther USB-TXS - 0011 Wireless LAN USB-11 mini - 0012 Stick-11 802.11b Adapter - 0017 FEther USB2-TX - 0018 Wireless LAN USB-11 mini 2 - 001a ULUSB-11 Key - 001c CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] - 002f CG-WLUSB2GNL - 003c CG-WLUSB2GNL - 003f CG-WLUSB300AGN - 0041 CG-WLUSB300GNS - 0042 CG-WLUSB300GNM - 0043 CG-WLUSB300N rev A2 [Realtek RTL8192U] - 0047 CG-WLUSBNM - 0051 CG-WLUSB300NM - 7613 Stick-11 V2 802.11b Adapter - 9601 FEther USB-TXC -07ab Freecom Technologies - fc01 IDE bridge - fc02 Cable II USB-2 - fc03 USB2-IDE IDE bridge - fcd6 Freecom HD Classic - fcf6 DataBar 512 MB - fcf8 Freecom Classic SL Network Drive -07af Microtech - 0004 SCSI-DB25 SCSI Bridge [shuttle] - 0005 SCSI-HD50 SCSI Bridge [shuttle] - 0006 CameraMate SmartMedia and CompactFlash Card Reader [eusb/shuttle] - fc01 Freecom USB-IDE -07b0 Trust Technologies - 0001 ISDN TA - 0002 ISDN TA128 Plus - 0003 ISDN TA128 Deluxe - 0005 ISDN TA128 SE - 0006 ISDN TA128 CE - 0007 ISDN TA - 0008 ISDN TA -07b1 IMP, Inc. -07b2 Motorola BCS, Inc. - 0100 SURFboard Voice over IP Cable Modem - 0900 SURFboard Gateway - 0950 SURFboard SBG950 Gateway - 1000 SURFboard SBG1000 Gateway - 4100 SurfBoard SB4100 Cable Modem - 4200 SurfBoard SB4200 Cable Modem - 4210 SurfBoard 4210 Cable Modem - 4220 SURFboard SB4220 Cable Modem - 4500 CG4500 Communications Gateway - 450b CG4501 Communications Gateway - 450e CG4500E Communications Gateway - 5100 SurfBoard SB5100 Cable Modem - 5101 SurfBoard SB5101 Cable Modem - 5120 SurfBoard SB5120 Cable Modem (RNDIS) - 5121 Surfboard 5121 Cable Modem - 7030 Wireless Adapter WU830G -07b3 Plustek, Inc. - 0001 OpticPro 1212U Scanner - 0003 Scanner - 0010 OpticPro U12 Scanner - 0011 OpticPro U24 Scanner - 0013 OpticPro UT12 Scanner - 0014 Scanner - 0015 OpticPro U24 Scanner - 0017 OpticPro UT12/16/24 Scanner - 0204 Scanner - 0400 OpticPro 1248U Scanner - 0401 OpticPro 1248U Scanner #2 - 0403 OpticPro U16B Scanner - 0404 Scanner - 0405 A8 Namecard-s Controller - 0406 A8 Namecard-D Controller - 0410 Scanner - 0412 Scanner - 0413 OpticSlim 1200 Scanner - 0601 OpticPro ST24 Scanner - 0800 OpticPro ST48 Scanner - 0906 OpticBook 3600 Scanner - 0a06 TVcam VD100 - 0b00 SmartPhoto F50 - 0c03 OpticPro ST64+ Scanner - 0c04 Optic Film 7200i scanner - 0c26 OpticBook 4600 Scanner - 0c2b Mobile Office D428 Scanner -07b4 Olympus Optical Co., Ltd - 0100 Camedia C-2100/C-3000 Ultra Zoom Camera - 0102 Camedia E-10/C-220/C-50 Camera - 0105 Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560/C-3020Z Zoom Camera - 0109 C-370Z/C-500Z/D-535Z/X-450 - 010a MAUSB-10 xD and SmartMedia Card Reader - 0112 MAUSB-100 xD Card Reader - 0113 Mju 500 - 0114 C-350Z Camera - 0118 Digital Camera - 0184 P-S100 port - 0203 Digital Voice Recorder DW-90 - 0206 Digital Voice Recorder DS-330 - 0207 Digital Voice Recorder & Camera W-10 - 0209 Digital Voice Recorder DM-20 - 020d Digital Voice Recorder VN-240PC - 0280 m:robe 100 -07b5 Mega World International, Ltd - 0017 Joystick - 0213 Thrustmaster Firestorm Digital 3 Gamepad - 0312 Gamepad - 9902 GamePad -07b6 Marubun Corp. -07b7 TIME Interconnect, Ltd -07b8 AboCom Systems Inc - 110c XX1 - 1201 IEEE 802.11b Adapter - 200c XX2 - 2573 Wireless LAN Card - 2770 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 2870 802.11n/b/g Wireless LAN USB2.0 Adapter - 3070 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 3071 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 3072 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 4000 DU-E10 Ethernet [klsi] - 4002 DU-E100 Ethernet [pegasus] - 4003 1/10/100 Ethernet Adapter - 4004 XX4 - 4007 XX5 - 400b XX6 - 400c XX7 - 401a RTL8151 - 4102 USB 1.1 10/100M Fast Ethernet Adapter - 4104 XX9 - 420a UF200 Ethernet - 5301 GW-US54ZGL 802.11bg - 6001 802.11bg - a001 WUG2200 802.11g Wireless Adapter [Envara WiND512] - abc1 DU-E10 Ethernet [pegasus] - b000 BWU613 - b02a AboCom Bluetooth Device - b02b Bluetooth dongle - b02c BCM92045DG-Flash with trace filter - b02d BCM92045DG-Flash with trace filter - b02e BCM92045DG-Flash with trace filter - b030 BCM92045DG-Flash with trace filter - b031 BCM92045DG-Flash with trace filter - b032 BCM92045DG-Flash with trace filter - b033 BCM92045DG-Flash with trace filter - b21a WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450] - b21b HWU54DM - b21c RT2573 - b21d RT2573 - b21e RT2573 - b21f WUG2700 - d011 MP3 Player - e001 Mass Storage Device - e002 Mass Storage Device - e003 Mass Storage Device - e004 Mass Storage Device - e005 Mass Storage Device - e006 Mass Storage Device - e007 Mass Storage Device - e008 Mass Storage Device - e009 Mass Storage Device - e00a Mass Storage Device - e4f0 Card Reader Driver - f101 DSB-560 Modem [atlas] -07bc Canon Computer Systems, Inc. -07bd Webgear, Inc. -07be Veridicom -07c0 Code Mercenaries Hard- und Software GmbH - 1121 The Claw - 1500 IO-Warrior 40 - 1501 IO-Warrior 24 - 1502 IO-Warrior 48 - 1503 IO-Warrior 28 - 1511 IO-Warrior 24 Power Vampire - 1512 IO-Warrior 24 Power Vampire -07c1 Keisokugiken - 0068 HKS-0200 USBDAQ -07c4 Datafab Systems, Inc. - 0102 USB to LS120 - 0103 USB to IDE - 1234 USB to ATAPI - a000 CompactFlash Card Reader - a001 CompactFlash & SmartMedia Card Reader [eusb] - a002 Disk Drive - a003 Datafab-based Reader - a004 USB to MMC Class Drive - a005 CompactFlash & SmartMedia Card Reader - a006 SmartMedia Card Reader - a007 Memory Stick Class Drive - a103 MDSM-B reader - a107 USB to Memory Stick (LC1) Drive - a109 LC1 CompactFlash & SmartMedia Card Reader - a10b USB to CF+MS(LC1) - a200 DF-UT-06 Hama MMC/SD Reader - a400 CompactFlash & Microdrive Reader - a600 Card Reader - ad01 Mass Storage Device - ae01 Mass Storage Device - af01 Mass Storage Device - b000 USB to CF(LC1) - b001 USB to CF+PCMCIA - b004 MMC/SD Reader - b006 USB to PCMCIA - b00a USB to CF+SD Drive(LC1) - b00b USB to Memory Stick(LC1) -07c5 APG Cash Drawer -07c6 ShareWave, Inc. - 0002 Bodega Wireless Access Point -07c7 Powertech Industrial Co., Ltd -07c8 B.U.G., Inc. - 0202 MN128-SOHO PAL -07c9 Allied Telesyn International - b100 AT-USB100 -07ca AVerMedia Technologies, Inc. - 0002 AVerTV PVR USB/EZMaker Pro Device - 0026 AVerTV - 0337 A867 DVB-T dongle - 1228 MPEG-2 Capture Device (M038) - 1830 AVerTV Volar Video Capture (H830) - 850a AverTV Volar Black HD (A850) - 850b AverTV Red HD+ (A850T) - a309 AVerTV DVB-T (A309) - a801 AVerTV DVB-T (A800) - a815 AVerTV DVB-T Volar X (A815) - a867 AVerTV DVB-T (A867) - b800 MR800 FM Radio - e880 MPEG-2 Capture Device (E880) - e882 MPEG-2 Capture Device (E882) -07cb Kingmax Technology, Inc. -07cc Carry Computer Eng., Co., Ltd - 0000 CF Card Reader - 0001 Reader (UICSE) - 0002 Reader (UIS) - 0003 SM Card Reader - 0004 SM/CF/PCMCIA Card Reader - 0005 Reader (UISA2SE) - 0006 SM/CF/PCMCIA Card Reader - 0007 Reader (UISA6SE) - 000c SM/CF Card Reader - 000d SM/CF Card Reader - 000e Reader (UISDA) - 000f Reader (UICLIK) - 0010 Reader (UISMA) - 0012 Reader (UISC6SE-FLASH) - 0014 Litronic Fortezza Reader - 0030 Mass Storage (UISDMC12S) - 0040 Mass Storage (UISDMC13S) - 0100 Reader (UID) - 0101 Reader (UIM) - 0102 Reader (UISDMA) - 0103 Reader (UISDMC) - 0104 Reader (UISDM) - 0200 6-in-1 Card Reader - 0201 Mass Storage (UISDMC1S & UISDMC3S) - 0202 Mass Storage (UISDMC5S) - 0203 Mass Storage (UISMC5S) - 0204 Mass Storage (UIM4/5S & UIM7S) - 0205 Mass Storage (UIS4/5S & UIS7S) - 0206 Mass Storage (UISDMC10S & UISDMC11S) - 0207 Mass Storage (UPIDMA) - 0208 Mass Storage (UCFC II) - 0210 Mass Storage (UPIXXA) - 0213 Mass Storage (UPIDA) - 0214 Mass Storage (UPIMA) - 0215 Mass Storage (UPISA) - 0217 Mass Storage (UPISDMA) - 0223 Mass Storage (UCIDA) - 0224 Mass Storage (UCIMA) - 0225 Mass Storage (UIS7S) - 0227 Mass Storage (UCIDMA) - 0234 Mass Storage (UIM7S) - 0235 Mass Storage (UIS4S-S) - 0237 Velper (UISDMC4S) - 0300 6-in-1 Card Reader - 0301 6-in-1 Card Reader - 0303 Mass Storage (UID10W) - 0304 Mass Storage (UIM10W) - 0305 Mass Storage (UIS10W) - 0308 Mass Storage (UIC10W) - 0309 Mass Storage (UISC3W) - 0310 Mass Storage (UISDMA2W) - 0311 Mass Storage (UISDMC14W) - 0320 Mass Storage (UISDMC4W) - 0321 Mass Storage (UISDMC37W) - 0330 WINTERREADER Reader - 0350 9-in-1 Card Reader - 0500 Mass Storage - 0501 Mass Storage -07cd Elektor - 0001 USBuart Serial Port -07cf Casio Computer Co., Ltd - 1001 QV-8000SX/5700/3000EX Digicam; Exilim EX-M20 - 1003 Exilim EX-S500 - 1004 Exilim EX-Z120 - 1011 USB-CASIO PC CAMERA - 1116 EXILIM EX-Z19 - 1133 Exilim EX-Z350 Digital Camera (mass storage mode) - 1233 Exilim EX-Z350 Digital Camera (PictBridge mode) - 2002 E-125 Cassiopeia Pocket PC - 3801 WMP-1 MP3-Watch - 4001 Label Printer KL-P1000 - 4007 CW50 Device - 4104 Cw75 Device - 4107 CW-L300 Device - 4500 LV-20 Digital Camera - 6801 PL-40R - 6802 MIDI Keyboard -07d0 Dazzle - 0001 Digital Video Creator I - 0002 Global Village VideoFX Grabber - 0003 Fusion Model DVC-50 Rev 1 (NTSC) - 0004 DVC-800 (PAL) Grabber - 0005 Fusion Video and Audio Ports - 0006 DVC 150 Loader Device - 0007 DVC 150 - 0327 Fusion Digital Media Reader - 1001 DM-FLEX DFU Adapter - 1002 DMHS2 DFU Adapter - 1102 CF Reader/Writer - 1103 SD Reader/Writer - 1104 SM Reader/Writer - 1105 MS Reader/Writer - 1106 xD/SM Reader/Writer - 1202 MultiSlot Reader/Writer - 2000 FX2 DFU Adapter - 2001 eUSB CompactFlash Reader - 4100 Kingsun SF-620 Infrared Adapter - 4101 Connectivity Cable (CA-42 clone) - 4959 Kingsun KS-959 Infrared Adapter -07d1 D-Link System - 13ec VvBus for Helium 2xx - 13ed VvBus for Helium 2xx - 13f1 DSL-302G Modem - 13f2 DSL-502G Router - 3300 DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8192SU] - 3302 DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8192SU] - 3303 DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU] - 3a07 WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523] - 3a08 WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523] - 3a09 DWA-160 Xtreme N Dual Band USB Adapter(rev.A2) [Atheros AR9001U-(2)NG] - 3a0d DWA-120 802.11g Wireless 108G Adapter [Atheros AR5523] - 3a0f DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9001U-(2)NG] - 3a10 DWA-126 802.11n Wireless Adapter [Atheros AR9271] - 3b01 AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010] - 3b10 RangeBooster N Adapter - 3b11 DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell W8360USB] - 3c03 AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT73] - 3c04 WUA-1340 - 3c05 EH103 Wireless G Adapter - 3c07 Wireless G DWA-110 Adapter - 3c09 DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870] - 3c0a DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT2870] - 3c0b DWA-110 Wireless G USB Adapter(rev.B) - 3c0d DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT2870] - 3c0e WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070] - 3c0f AirPlus G DWL-G122 Wireless Adapter(rev.E) [Ralink RT2870] - 3c10 DWA-160 Xtreme N Dual Band USB Adapter(rev.A) [Atheros AR9001U-(2)NG] - 3c11 DWA-160 Xtreme N Dual Band USB Adapter(rev.B) [Ralink RT2870] - 3c13 DWA-130 802.11n Wireless N Adapter(rev.B) [Ralink RT2870] - 3c15 DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT2870] - 3c16 DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT2870] - 3e02 DWM-156 3.75G HSUPA Adapter - 5100 Remote NDIS Device - a800 DWM-152 3.75G HSUPA Adapter - f101 DBT-122 Bluetooth - fc01 DBT-120 Bluetooth Adapter -07d2 Aptio Products, Inc. -07d3 Cyberdata Corp. -07d5 Radiant Systems -07d7 GCC Technologies, Inc. -07da Arasan Chip Systems -07de Diamond Multimedia - 2820 VC500 Video Capture Dongle -07df David Electronics Co., Ltd -07e1 Ambient Technologies, Inc. - 5201 V.90 Modem -07e2 Elmeg GmbH & Co., Ltd -07e3 Planex Communications, Inc. -07e4 Movado Enterprise Co., Ltd - 0967 SCard R/W CSR-145 - 0968 SCard R/W CSR-145 -07e5 QPS, Inc. - 05c2 IDE-to-USB2.0 PCA - 5c01 Que! CDRW -07e6 Allied Cable Corp. -07e7 Mirvo Toys, Inc. -07e8 Labsystems -07ea Iwatsu Electric Co., Ltd -07eb Double-H Technology Co., Ltd -07ec Taiyo Electric Wire & Cable Co., Ltd -07ee Torex Retail (formerly Logware) - 0002 Cash Drawer I/F -07ef STSN - 0001 Internet Access Device -07f2 Microcomputer Applications, Inc. - 0001 KEYLOK II -07f6 Circuit Assembly Corp. -07f7 Century Corp. - 0005 ScanLogic/Century Corporation uATA - 011e Century USB Disk Enclosure -07f9 Dotop Technology, Inc. -07fa DrayTek Corp. - 0778 miniVigor 128 ISDN TA - 1012 BeWAN ADSL USB ST (grey) - 1196 BWIFI-USB54AR 802.11bg - a904 BeWAN ADSL - a905 BeWAN ADSL ST -07fd Mark of the Unicorn - 0000 FastLane MIDI Interface - 0001 FastLane Quad MIDI Interface - 0002 MOTU Audio for 64 bit -07ff Unknown - 00ff Portable Hard Drive -0801 Mag-Tek - 0001 Mini Swipe Reader (Keyboard Emulation) - 0002 Mini Swipe Reader -0802 Mako Technologies, LLC -0803 Zoom Telephonics, Inc. - 1300 V92 Faxmodem - 4310 Wireless-G - 5241 Cable Modem - 5551 DSL Modem - 9700 2986L FaxModem - 9800 Cable Modem - a312 Wireless-G -0809 Genicom Technology, Inc. -080a Evermuch Technology Co., Ltd -080b Cross Match Technologies - 0002 Fingerprint Scanner (After ReNumeration) - 0010 300LC Series Fingerprint Scanner (Before ReNumeration) -080c Datalogic S.p.A. - 0300 Gryphon D120 Barcode Scanner - 0400 Gryphon D120 Barcode Scanner - 0500 Gryphon D120 Barcode Scanner - 0600 Gryphon M100 Barcode Scanner -080d Teco Image Systems Co., Ltd - 0102 Hercules Scan@home 48 - 0104 3.2Slim - 0110 UMAX AstraSlim 1200 Scanner -0810 Personal Communication Systems, Inc. - 0001 Dual PSX Adaptor - 0002 Dual PCS Adaptor -0813 Mattel, Inc. - 0001 Intel Play QX3 Microscope - 0002 Dual Mode Camera Plus -0819 eLicenser - 0101 License Management and Copy Protection -081a MG Logic - 1000 Duo Pen Tablet -081b Indigita Corp. - 0600 Storage Adapter - 0601 Storage Adapter -081c Mipsys -081e AlphaSmart, Inc. - df00 Handheld -0822 Reudo Corp. - 2001 IRXpress Infrared Device -0825 GC Protronics -0826 Data Transit -0827 BroadLogic, Inc. -0828 Sato Corp. -0829 DirecTV Broadband, Inc. (Telocity) -082d Handspring - 0100 Visor - 0200 Treo - 0300 Treo 600 - 0400 Handheld - 0500 Handheld - 0600 Handheld -0830 Palm, Inc. - 0001 m500 - 0002 m505 - 0003 m515 - 0004 Handheld - 0005 Handheld - 0006 Handheld - 0010 Handheld - 0011 Handheld - 0012 Handheld - 0013 Handheld - 0014 Handheld - 0020 i705 - 0021 Handheld - 0022 Handheld - 0023 Handheld - 0024 Handheld - 0030 Handheld - 0031 Tungsten W - 0032 Handheld - 0033 Handheld - 0034 Handheld - 0040 m125 - 0041 Handheld - 0042 Handheld - 0043 Handheld - 0044 Handheld - 0050 m130 - 0051 Handheld - 0052 Handheld - 0053 Handheld - 0054 Handheld - 0060 Tungsten C/E/T/T2/T3 / Zire 71 - 0061 Lifedrive / Treo 650/680 / Tunsten E2/T5/TX / Centro / Zire 21/31/72 / Z22 - 0062 Handheld - 0063 Handheld - 0064 Handheld - 0070 Zire - 0071 Handheld - 0072 Handheld - 0080 Serial Adapter [for Palm III] - 0081 Handheld - 0082 Handheld - 00a0 Treo 800w - 0101 Pre -0832 Kouwell Electronics Corp. - 5850 Cable -0833 Sourcenext Corp. - 012e KeikaiDenwa 8 with charger - 039f KeikaiDenwa 8 -0835 Action Star Enterprise Co., Ltd -0839 Samsung Techwin Co., Ltd - 0005 Digimax Camera - 0008 Digimax 230 Camera - 0009 Digimax 340 - 000a Digimax 410 - 000e Digimax 360 - 0010 Digimax 300 - 1003 Digimax 210SE - 1005 Digimax 220 - 1009 Digimax V4 - 1012 6500 Document Camera - 1058 S730 Camera - 1064 Digimax D830 Camera - 1542 Digimax 50 Duo - 3000 Digimax 35 MP3 -083a Accton Technology Corp. - 1046 10/100 Ethernet [pegasus] - 1060 HomeLine Adapter - 1f4d SMC8013WG Broadband Remote NDIS Device - 3046 10/100 Series Adapter - 3060 1/10/100 Adapter - 3501 2664W - 3502 WN3501D Wireless Adapter - 3503 T-Sinus 111 Wireless Adapter - 4501 T-Sinus 154data - 4502 Siemens S30853-S1016-R107 802.11g Wireless Adapter [Intersil ISL3886] - 4505 SMCWUSB-G 802.11bg - 4507 SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523] - 4521 Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887] - 5046 SpeedStream 10/100 Ethernet [pegasus] - 5501 Wireless Adapter 11g - 6500 Cable Modem - 6618 802.11n Wireless Adapter - 7511 Arcadyan 802.11N Wireless Adapter - 7512 Arcadyan 802.11N Wireless Adapter - 7522 Arcadyan 802.11N Wireless Adapter - 8522 Arcadyan 802.11N Wireless Adapter - 8541 WN4501F 802.11g Wireless Adapter [Intersil ISL3887] - a512 Arcadyan 802.11N Wireless Adapter - a618 SMCWUSBS-N EZ Connect N Draft 11n Wireless Adapter [Ralink RT2870] - a701 SMCWUSBS-N3 EZ Connect N Wireless Adapter [Ralink RT3070] - b004 CPWUE001 USB/Ethernet Adapter - b522 SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870] - bb01 BlueExpert Bluetooth Device - c003 802.11b Wireless Adapter - c501 Zoom Wireless-G - c561 802.11a/g Wireless Adapter - d522 Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter - e501 ZD1211B - e503 Arcadyan WN4501 802.11b/g - e506 WUS-201 802.11bg - f501 802.11g Wireless Adapter - f502 802.11g Wireless Adapter - f522 Arcadyan WN7512 802.11n -083f Global Village - b100 TelePort V.90 Fax/Modem -0840 Argosy Research, Inc. - 0060 Storage Adapter Bridge Module -0841 Rioport.com, Inc. - 0001 Rio 500 -0844 Welland Industrial Co., Ltd -0846 NetGear, Inc. - 1001 EA101 10 Mbps 10BASE-T Ethernet [Kawasaki LSI KL5KLUSB101B] - 1002 Ethernet - 1020 FA101 Fast Ethernet USB 1.1 - 1040 FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x] - 4110 MA111(v1) 802.11b Wireless [Intersil Prism 3.0] - 4200 WG121(v1) 54 Mbps Wireless [Intersil ISL3886] - 4210 WG121(v2) 54 Mbps Wireless [Intersil ISL3886] - 4220 WG111(v1) 54 Mbps Wireless [Intersil ISL3886] - 4230 MA111(v2) 802.11b Wireless [SIS SIS 162] - 4240 WG111(v1) rev 2 54 Mbps Wireless [Intersil ISL3887] - 4250 WG111T 802.11g Wireless Adapter [Atheros AR5523] - 4260 WG111v3 54 Mbps Wireless [realtek RTL8187B] - 4300 WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] - 4301 WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] - 5f00 WPN111 802.11g Wireless Adapter [Atheros AR5523] - 6a00 WG111v2 54 Mbps Wireless [RealTek RTL8187L] - 7100 WN121T RangeMax Next Wireless-N [Marvell TopDog] - 9000 WN111(v1) RangeMax Next Wireless [Marvell TopDog] - 9001 WN111(v2) RangeMax Next Wireless [Atheros AR9001U-(2)NG] - 9010 WNDA3100(v1) 802.11n [Atheros AR9001U-(2)NG] - 9011 WNDA3100(v2) 802.11n [Broadcom BCM4323] - 9018 WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] - 9020 WNA3100(v1) Wireless-N 300 [Broadcom BCM43231] - 9030 WNA1100 Wireless-N 150 [Atheros AR9271] - 9040 WNA1000 Wireless-N 150 [Atheros AR9001U-(2)NG] - a001 PA101 10 Mbps HPNA Home Phoneline RJ-1 -084d Minton Optic Industry Co., Inc. - 0001 Jenoptik JD800i - 0003 S-Cam F5/D-Link DSC-350 Digital Camera - 0011 Argus DC3500 Digital Camera - 0014 Praktica DC 32 - 0019 Praktica DPix3000 - 0025 Praktica DC 60 - 1001 ScanHex SX-35d -084e KB Gear - 0001 JamCam Camera - 1001 Jam Studio Tablet - 1002 Pablo Tablet -084f Empeg - 0001 Empeg-Car Mark I/II Player -0850 Fast Point Technologies, Inc. -0851 Macronix International Co., Ltd - 1542 SiPix Blink - 1543 Maxell WS30 Slim Digital Camera, or Pandigital PI8004W01 digital photo frame - a168 MXIC -0852 CSEM -0853 Topre Corporation - 0100 HHKB Professional -0854 ActiveWire, Inc. - 0100 I/O Board - 0101 I/O Board, rev1 -0856 B&B Electronics - ac01 uLinks USOTL4 RS422/485 Adapter -0858 Hitachi Maxell, Ltd - 3102 Bluetooth Device - ffff Maxell module with BlueCore in DFU mode -0859 Minolta Systems Laboratory, Inc. -085a Xircom - 0001 Portstation Dual Serial Port - 0003 Portstation Paraller Port - 0008 Ethernet - 0009 Ethernet - 000b Portstation Dual PS/2 Port - 0021 1 port to Serial Converter - 0022 Parallel Port - 0023 2 port to Serial Converter - 0024 Parallel Port - 0027 1 port to Serial Converter - 0028 PortGear to SCSI Converter - 0032 PortStation SCSI Module - 003c Bluetooth Adapter - 0299 Colorvision, Inc. Monitor Spyder - 8021 1 port to Serial - 8023 2 port to Serial - 8027 PGSDB9 Serial Port -085c ColorVision, Inc. - 0200 Monitor Spyder -0862 Teletrol Systems, Inc. -0863 Filanet Corp. -0864 NetGear, Inc. - 4100 MA101 802.11b Adapter - 4102 MA101 802.11b Adapter -0867 Data Translation, Inc. - 9812 ECON Data acquisition unit - 9816 DT9816 ECON data acquisition module - 9836 DT9836 data acquisition card -086a Emagic Soft- und Hardware GmbH - 0001 Unitor8 - 0002 AMT8 - 0003 MT4 -086c DeTeWe - Deutsche Telephonwerke AG & Co. - 1001 Eumex 504PC ISDN TA - 1002 Eumex 504PC (FlashLoad) - 1003 TA33 ISDN TA - 1004 TA33 (FlashLoad) - 1005 Eumex 604PC HomeNet - 1006 Eumex 604PC HomeNet (FlashLoad) - 1007 Eumex 704PC DSL - 1008 Eumex 704PC DSL (FlashLoad) - 1009 Eumex 724PC DSL - 100a Eumex 724PC DSL (FlashLoad) - 100b OpenCom 30 - 100c OpenCom 30 (FlashLoad) - 100d BeeTel Home 100 - 100e BeeTel Home 100 (FlashLoad) - 1011 USB2DECT - 1012 USB2DECT (FlashLoad) - 1013 Eumex 704PC LAN - 1014 Eumex 704PC LAN (FlashLoad) - 1021 OpenCom 40 - 1022 OpenCom 40 (FlashLoad) - 1023 OpenCom 45 - 1024 OpenCom 45 (FlashLoad) - 1025 Sinus 61 data - 1029 dect BOX - 102c Eumex 604PC HomeNet [FlashLoad] - 1030 Eumex 704PC DSL [FlashLoad] - 1032 OpenCom 40 [FlashLoad] - 1033 OpenCom 30 plus - 1034 OpenCom 30 plus (FlashLoad) - 1055 Eumex 220 ISDN TA - 2000 OpenCom 1000 -086e System TALKS, Inc. - 1920 SGC-X2UL -086f MEC IMEX, Inc. -0870 Metricom - 0001 Ricochet GS -0871 SanDisk, Inc. - 0001 SDDR-01 Compact Flash Reader - 0002 SDDR-31 Compact Flash Reader - 0005 SDDR-05 Compact Flash Reader -0873 Xpeed, Inc. -0874 A-Tec Subsystem, Inc. -0879 Comtrol Corp. -087c Adesso/Kbtek America, Inc. -087d Jaton Corp. - 5704 Ethernet -087e Fujitsu Computer Products of America -087f Virtual IP Group, Inc. -0880 APT Technologies, Inc. -0883 Recording Industry Association of America (RIAA) -0885 Boca Research, Inc. -0886 XAC Automation Corp. - 0630 Intel PC Camera CS630 -0887 Hannstar Electronics Corp. -088b MassWorks, Inc. - 4944 MassWorks ID-75 TouchScreen -088c Swecoin AB - 2030 Ticket Printer TTP 2030 -088e iLok - 5036 Portable secure storage for software licenses -0892 DioGraphy, Inc. - 0101 Smartdio Reader/Writer -0897 Lauterbach - 0002 Power Debug/Power Debug II -089c United Technologies Research Cntr. -089d Icron Technologies Corp. -089e NST Co., Ltd -089f Primex Aerospace Co. -08a5 e9, Inc. -08a8 Andrea Electronics -08ae Macally (Mace Group, Inc.) -08b4 Sorenson Vision, Inc. -08b7 NATSU - 0001 Playstation adapter -08b8 J. Gordon Electronic Design, Inc. - 01f4 USBSIMM1 -08b9 RadioShack Corp. (Tandy) -08bb Texas Instruments Japan - 2702 Speakers - 2900 PCM2900 Audio Codec - 2901 PCM2901 Audio Codec - 2902 PCM2902 Audio Codec - 2904 PCM2904 Audio Codec - 2910 PCM2912 Audio Codec -08bd Citizen Watch Co., Ltd - 0208 CLP-521 Label Printer - 1100 X1-USB Floppy -08c3 Precise Biometrics - 0001 100 SC - 0002 100 A - 0003 100 SC BioKeyboard - 0006 100 A BioKeyboard - 0100 100 MC ISP - 0101 100 MC FingerPrint and SmartCard Reader - 0300 100 AX - 0400 100 SC - 0401 150 MC - 0402 200 MC FingerPrint and SmartCard Reader - 0404 100 SC Upgrade - 0405 150 MC Upgrade - 0406 100 MC Upgrade -08c4 Proxim, Inc. - 0100 Skyline 802.11b Wireless Adapter - 02f2 Farallon Home Phoneline Adapter -08c7 Key Nice Enterprise Co., Ltd -08c8 2Wire, Inc. -08c9 Nippon Telegraph and Telephone Corp. -08ca Aiptek International, Inc. - 0001 Tablet - 0010 Tablet - 0020 APT-6000U Tablet - 0021 APT-2 Tablet - 0022 Tablet - 0023 Tablet - 0024 Tablet - 0100 Pen Drive - 0102 DualCam - 0103 Pocket DV Digital Camera - 0104 Pocket DVII - 0105 Mega DV(Disk) - 0106 Pocket DV3100+ - 0107 Pocket DV3100 - 0109 Nisis DV4 Digital Camera - 010a Trust 738AV LCD PV Mass Storage - 0111 PenCam VGA Plus - 2008 Mini PenCam 2 - 2010 Pocket CAM 3 Mega (webcam) - 2011 Pocket CAM 3 Mega (storage) - 2016 PocketCam 2 Mega - 2018 Pencam SD 2M - 2020 Slim 3000F - 2022 Slim 3200 - 2024 Pocket DV3500 - 2028 Pocket Cam4M - 2040 Pocket DV4100M - 2042 Pocket DV5100M Composite Device - 2043 Pocket DV5100M (Disk) - 2060 Pocket DV5300 -08cd Jue Hsun Ind. Corp. -08ce Long Well Electronics Corp. -08cf Productivity Enhancement Products -08d1 smartBridges, Inc. - 0001 smartNIC Ethernet [catc] - 0003 smartNIC 2 PnP Ethernet -08d3 Virtual Ink -08d4 Fujitsu Siemens Computers - 0009 SCR SmartCard Reader -08d8 IXXAT Automation GmbH - 0002 USB-to-CAN compact - 0003 USB-to-CAN II - 0100 USB-to-CAN -08d9 Increment P Corp. -08dd Billionton Systems, Inc. - 0112 Wireless LAN Adapter - 0113 Wireless LAN Adapter - 0986 USB-100N Ethernet [pegasus] - 0987 USBLP-100 HomePNA Ethernet [pegasus] - 0988 USBEL-100 Ethernet [pegasus] - 1986 10/100 LAN Adapter - 2103 DVB-T TV-Tuner Card-R - 8511 USBE-100 Ethernet [pegasus2] - 90ff USB2AR Ethernet -08de ??? - 7a01 802.11b Adapter -08df Spyrus, Inc. - 0001 Rosetta Token V1 - 0002 Rosetta Token V2 - 0003 Rosetta Token V3 - 0a00 Lynks Interface -08e3 Olitec, Inc. - 0002 USB-RS232 Bridge - 0100 Interface ADSL - 0101 Interface ADSL - 0102 ADSL - 0301 RNIS -08e4 Pioneer Corp. -08e5 Litronic -08e6 Gemplus - 0001 GemPC-Touch 430 - 0430 GemPC430 SmartCard Reader - 0432 GemPC432 SmartCard Reader - 0435 GemPC435 SmartCard Reader - 0437 GemPC433 SL SmartCard Reader - 1359 UA SECURE STORAGE TOKEN - 2202 Gem e-Seal Pro Token - 3437 GemPC Twin SmartCard Reader - 3438 GemPC Key SmartCard Reader - 3478 PinPad Smart Card Reader - 4433 GemPC433-Swap - 5501 GemProx-PU Contactless Smart Card Reader - ace0 UA HYBRID TOKEN -08e7 Pan-International Wire & Cable -08e8 Integrated Memory Logic -08e9 Extended Systems, Inc. - 0100 XTNDAccess IrDA Dongle -08ea Ericsson, Inc., Blue Ridge Labs - 00c9 ADSL Modem HM120dp Loader - 00ca ADSL WAN Modem HM120dp - 00ce HM230d Virtual Bus for Helium - abba USB Driver for Bluetooth Wireless Technology - abbb Bluetooth Device in DFU State -08ec M-Systems Flash Disk Pioneers - 0001 TravelDrive 2C - 0002 TravelDrive 2C - 0005 TravelDrive 2C - 0008 TravelDrive 2C - 0010 DiskOnKey - 0011 DiskOnKey - 0012 TravelDrive 2C - 0014 TravelDrive 2C - 0015 Kingston DataTraveler ELITE - 0016 Kingston DataTraveler U3 - 0020 TravelDrive - 0021 TravelDrive - 0022 TravelDrive - 0023 TravelDrive - 0024 TravelDrive - 0025 TravelDrive - 0026 TravelDrive - 0027 TravelDrive - 0028 TravelDrive - 0029 TravelDrive - 0030 TravelDrive - 0822 TravelDrive 2C - 0832 Hi-Speed Mass Storage Device - 0834 M-Disk 220 - 0998 Kingston Data Traveler2.0 Disk Driver - 0999 Kingston Data Traveler2.0 Disk Driver - 1000 TravelDrive 2C - 2000 TravelDrive 2C - 2038 TravelDrive - 2039 TravelDrive - 204a TravelDrive - 204b TravelDrive -08ed MediaTek Inc. - 0002 CECT M800 memory card -08ee CCSI/Hesso -08f0 Corex Technologies -08f1 CTI Electronics Corp. -08f2 Gotop Information Inc. - 007f Super Q2 Tablet -08f5 SysTec Co., Ltd -08f6 Logic 3 International, Ltd -08f7 Vernier - 0001 LabPro - 0002 EasyTemp/Go!Temp - 0003 Go!Link - 0004 Go!Motion -08f8 Keen Top International Enterprise Co., Ltd -08f9 Wipro Technologies -08fa Caere -08fb Socket Communications -08fc Sicon Cable Technology Co., Ltd -08fd Digianswer A/S - 0001 Bluetooth Device -08ff AuthenTec, Inc. - 1600 AES1600 - 1610 AES1600 - 2500 AES2501 - 2501 AES2501 - 2502 AES2501 - 2503 AES2501 - 2504 AES2501 - 2505 AES2501 - 2506 AES2501 - 2507 AES2501 - 2508 AES2501 - 2509 AES2501 - 250a AES2501 - 250b AES2501 - 250c AES2501 - 250d AES2501 - 250e AES2501 - 250f AES2501 - 2510 AES2510 - 2580 AES2501 Fingerprint Sensor - 2588 AES2501 - 2589 AES2501 - 258a AES2501 - 258b AES2501 - 258c AES2501 - 258d AES2501 - 258e AES2501 - 258f AES2501 - 2810 AES2810 - 3400 AES3400 TruePrint Sensor - 3401 AES3400 Sensor - 3402 AES3400 Sensor - 3403 AES3400 Sensor - 3404 AES3400 TruePrint Sensor - 3405 AES3400 TruePrint Sensor - 3406 AES3400 TruePrint Sensor - 3407 AES3400 TruePrint Sensor - 4902 BioMV with TruePrint AES3500 - 4903 BioMV with TruePrint AES3400 - 5500 AES4000 - 5501 AES4000 TruePrint Sensor - 5503 AES4000 TruePrint Sensor - 5505 AES4000 TruePrint Sensor - 5507 AES4000 TruePrint Sensor - 55ff AES4000 TruePrint Sensor. - 5700 AES3500 Fingerprint Reader - 5701 AES3500 TruePrint Sensor - 5702 AES3500 TruePrint Sensor - 5703 AES3500 TruePrint Sensor - 5704 AES3500-BZ TruePrint Sensor - 5705 AES3500-BZ TruePrint Sensor - 5706 AES3500-BZ TruePrint Sensor - 5707 AES3500-BZ TruePrint Sensor - 5710 AES3500 TruePrint Sensor - 5711 AES3500 TruePrint Sensor - 5712 AES3500 TruePrint Sensor - 5713 AES3500 TruePrint Sensor - 5714 AES3500-BZ TruePrint Sensor - 5715 AES3500-BZ TruePrint Sensor - 5716 AES3500-BZ TruePrint Sensor - 5717 AES3500-BZ TruePrint Sensor - 5730 AES3500 TruePrint Sensor - 5731 AES3500 TruePrint Sensor - 5732 AES3500 TruePrint Sensor - 5733 AES3500 TruePrint Sensor - 5734 AES3500-BZ TruePrint Sensor - 5735 AES3500-BZ TruePrint Sensor - 5736 AES3500-BZ TruePrint Sensor - 5737 AES3500-BZ TruePrint Sensor - afe3 FingerLoc Sensor Module (Anchor) - afe4 FingerLoc Sensor Module (Anchor) - afe5 FingerLoc Sensor Module (Anchor) - afe6 FingerLoc Sensor Module (Anchor) - fffd AES2510 Sensor (USB Emulator) - ffff Sensor (Emulator) -0900 Pinnacle Systems, Inc. -0901 VST Technologies - 0001 Hard Drive Adapter (TPP) - 0002 SigmaDrive Adapter (TPP) -0906 Faraday Technology Corp. -0908 ShenZhen SANZHAI Technology Co.,Ltd - 2701 Spy Pen VGA -0909 Audio-Technica Corp. -090a Trumpion Microelectronics, Inc. - 1001 T33520 Flash Card Controller - 1100 Comotron C3310 MP3 player - 1200 MP3 player - 1540 Digitex Container Flash Disk -090b Neurosmith -090c Silicon Motion, Inc. - Taiwan (formerly Feiya Technology Corp.) - 0371 Silicon Motion SM371 Camera - 0373 Silicon Motion Camera - 037a Silicon Motion Camera - 037b Silicon Motion Camera - 1000 Flash Drive - 1132 5-in-1 Card Reader - 337b Silicon Motion Camera - 3710 Silicon Motion Camera - 3720 Silicon Motion Camera - 37c0 Silicon Motion Camera - 6000 SD/SDHC Card Reader (SG365 / FlexiDrive XC+) - 6200 microSD card reader - 837b Silicon Motion Camera - 937b Silicon Motion Camera - b370 Silicon Motion SM370 Camera - b371 Silicon Motion SM371 Camera -090d Multiport Computer Vertriebs GmbH -090e Shining Technology, Inc. -090f Fujitsu Devices, Inc. -0910 Alation Systems, Inc. -0911 Philips Speech Processing - 2512 SpeechMike Pro -0912 Voquette, Inc. -0915 GlobeSpan, Inc. - 0001 DSL Modem - 0002 ADSL ATM Modem - 0005 LAN Modem - 2000 802.11 Adapter - 2002 802.11 Adapter - 8000 ADSL LAN Modem - 8005 DSL-302G Modem - 8101 ADSL WAN Modem - 8102 DSL-200 ADSL Modem - 8103 DSL-200 ADSL Modem - 8104 DSL-200 Modem - 8400 DSL Modem - 8401 DSL Modem - 8402 DSL Modem - 8500 DSL Modem - 8501 DSL Modem -0917 SmartDisk Corp. - 0001 eFilm Reader-11 SM/CF - 0002 eFilm Reader-11 SM - 0003 eFilm Reader-11 CF - 0200 FireFly - 0201 FireLite - 0202 STORAGE ADAPTER (FirePower) - 0204 FlashTrax Storage - 0205 STORAGE ADAPTER (CrossFire) - 0206 FireFly 20G HDD - 0207 FireLite - 020f STORAGE ADAPTER (FireLite) - da01 eFilm Reader-11 Test - ffff eFilm Reader-11 (Class/PDR) -0919 Tiger Electronics - 0100 Fast Flicks Digital Camera -091e Garmin International - 0003 GPS (various models) - 0004 iQue 3600 - 0200 Data Card Programmer (install) - 1200 Data Card Programmer - 21a5 etrex Cx (msc) - 2271 Edge 605/705 - 2295 Colorado 300 - 22b6 eTrex Vista HCx (Mass Storage mode) - 2353 Nüvi 205T - 2535 Edge 800 -0920 Echelon Co. - 7500 Network Interface -0921 GoHubs, Inc. - 1001 GoCOM232 Serial -0922 Dymo-CoStar Corp. - 0007 LabelWriter 330 - 0009 LabelWriter 310 -0923 IC Media Corp. - 010f SIIG MobileCam -0924 Xerox - 23dd DocuPrint M760 (X760_USB) - 3ce8 Phaser 3428 Printer - 3d5b Phaser 6115MFP TWAIN Scanner - 420f WorkCentre PE220 Series - 421f M20 Scanner - 423b Printing Support - ffef WorkCenter M15 - fffb DocuPrint M750 (X750_USB) -0925 Lakeview Research - 0005 Gamtec.,Ltd SmartJoy PLUS Adapter - 8101 Phidgets, Inc., 1-Motor PhidgetServo v2.0 - 8104 Phidgets, Inc., 4-Motor PhidgetServo v2.0 - 8800 WiseGroup Ltd, MP-8800 Quad Joypad - 8866 WiseGroup Ltd, MP-8866 Dual Joypad -0927 Summus, Ltd -0928 Oxford Semiconductor, Ltd -0929 American Biometric Co. -092a Toshiba Information & Industrial Sys. And Services -092b Sena Technologies, Inc. -092f Northern Embedded Science/CAVNEX - 0004 JTAG-4 - 0005 JTAG-5 -0930 Toshiba Corp. - 0009 Gigabeat F/X (HDD audio player) - 000c Gigabeat F (mtp) - 0010 Gigabeat S (mtp) - 0301 PCX1100U Cable Modem (WDM) - 0302 PCX2000 Cable Modem (WDM) - 0305 Cable Modem PCX3000 - 0307 Cable Modem PCX2500 - 0308 PCX2200 Cable Modem (WDM) - 0309 PCX5000 Cable Modem (WDM) - 030b Cable Modem PCX2600 - 0501 Bluetooth Controller - 0502 Integrated Bluetooth - 0503 Bluetooth Controller - 0505 Integrated Bluetooth - 0506 Integrated Bluetooth - 0507 Bluetooth Adapter - 0508 Integrated Bluetooth HCI - 0509 BT EDR Dongle - 0706 PocketPC e740 - 0707 Pocket PC e330 Series - 0708 Pocket PC e350 Series - 0709 Pocket PC e750 Series - 070a Pocket PC e400 Series - 070b Pocket PC e800 Series - 0a07 WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572] - 0b05 PX1220E-1G25 External hard drive - 0b09 PX1396E-3T01 External hard drive - 1300 Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port - 1301 Wireless Broadband (CDMA EV-DO) Minicard Status Port - 1302 Wireless Broadband (3G HSDPA) SM-Bus Minicard Status Port - 1303 Wireless Broadband (3G HSDPA) Minicard Status Port - 1308 Broadband (3G HSDPA) SM-Bus Minicard Diagnostics Port - 130b F3507g Mobile Broadband Module - 130c F3607gw Mobile Broadband Module - 1311 F3607gw v2 Mobile Broadband Module - 642f TravelDrive - 6506 TravelDrive 2C - 6507 TravelDrive 2C - 6508 TravelDrive 2C - 6509 TravelDrive 2C - 6510 TravelDrive 2C - 6517 TravelDrive 2C - 6518 TravelDrive 2C - 6519 Kingston DataTraveler 2.0 USB Stick - 651a TravelDrive 2C - 651b TravelDrive 2C - 651c TravelDrive 2C - 651d TravelDrive 2C - 651e TravelDrive 2C - 651f TravelDrive 2C - 6520 TravelDrive 2C - 6521 TravelDrive 2C - 6522 TravelDrive 2C - 6523 TravelDrive - 6524 TravelDrive - 6525 TravelDrive - 6526 TravelDrive - 6527 TravelDrive - 6528 TravelDrive - 6529 TravelDrive - 652a TravelDrive - 652b TravelDrive - 652c TravelDrive - 652d TravelDrive - 652f TravelDrive - 6530 TravelDrive - 6531 TravelDrive - 6532 256M Stick - 6533 512M Stick - 6534 TravelDrive - 653c Kingston DataTraveler 2.0 Stick (512M) - 653d Kingston DataTraveler 2.0 Stick (1GB) - 653e Flash Memory - 6540 TransMemory Flash Memory - 6544 Kingston DataTraveler 2.0 Stick (2GB) - 6545 Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick -0931 Harmonic Data Systems, Ltd -0932 Crescentec Corp. - 0300 VideoAdvantage - 0302 Syntek DC-112X - 0320 VideoAdvantage - 0482 USB2.0 TVBOX - 1100 DC-1100 Video Enhamcement Device - 1112 Veo Web Camera - a311 Video Enhancement Device -0933 Quantum Corp. -0934 Netcom Systems -0936 NuTesla - 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID - 003c Rhythmedics HID Bootloader -0939 Lumberg, Inc. -093a Pixart Imaging, Inc. - 0007 CMOS 100K-R Rev. 1.90 - 010e Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A - 010f Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55 - 020f Bullet Line Photo Viewer - 050f Mars-Semi Pc-Camera - 2460 Q-TEC WEBCAM 100 - 2468 SoC PC-Camera - 2470 SoC PC-Camera - 2471 SoC PC-Camera - 2500 USB Optical Mouse - 2510 Optical Mouse - 2600 Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508 - 2601 SPC 610NC Laptop Camera - 2603 PAC7312 Camera - 2608 PAC7311 Trust WB-3300p - 260e PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350 - 260f PAC7311 SnakeCam - 2621 PAC731x Trust Webcam - 2624 Webcam -093b Plextor Corp. - 0010 Storage Adapter - 0011 PlexWriter 40/12/40U - 0041 PX-708A DVD RW - 0042 PX-712UF DVD RW - a002 ConvertX M402U XLOADER - a003 ConvertX AV100U A/V Capture Audio - a004 ConvertX TV402U XLOADER - a005 ConvertX TV100U A/V Capture - a102 ConvertX M402U A/V Capture - a104 ConvertX PX-TV402U/NA -093c Intrepid Control Systems, Inc. - 0601 ValueCAN - 0701 NeoVI Blue vehicle bus interface -093d InnoSync, Inc. -093e J.S.T. Mfg. Co., Ltd -093f Olympia Telecom Vertriebs GmbH -0940 Japan Storage Battery Co., Ltd -0941 Photobit Corp. -0942 i2Go.com, LLC -0943 HCL Technologies India Private, Ltd -0944 KORG, Inc. - 0001 PXR4 4-Track Digital Recorder - 0020 KAOSS Pad KP3 Dynamic Effect/Sampler - 010d nanoKEY MIDI keyboard - 010e nanoPAD pad controller - 010f nanoKONTROL studio controller - 0f03 K-Series K61P MIDI studio controller -0945 Pasco Scientific -0948 Kronauer music in digital - 0301 USB Pro (24/48) - 0302 USB Pro (24/96 playback) - 0303 USB Pro (24/96 record) - 0304 USB Pro (16/48) - 1105 USB One -094b Linkup Systems Corp. - 0001 neonode N2 -094d Cable Television Laboratories -094f Yano - 0101 U640MO-03 - 05fc METALWEAR-HDD -0951 Kingston Technology - 0008 Ethernet - 000a KNU101TX 100baseTX Ethernet - 1600 DataTraveler II Pen Drive - 1601 DataTraveler II+ Pen Drive - 1602 DataTraveler Mini - 1603 DataTraveler 1GB/2GB Pen Drive - 1607 DataTraveler 100 - 1613 DataTraveler DT101C Flash Drive - 1616 Kingston DataTraveler Locker (4GB) - 1624 DataTraveler G2 - 1625 DataTraveler 101 II - 162a DataTraveler 112 4GB Pen Drive - 1643 DataTraveler G3 4GB -0954 RPM Systems Corp. -0955 NVidia Corp. -0956 BSquare Corp. -0957 Agilent Technologies, Inc. - 0200 E-Video DC-350 Camera - 0202 E-Video DC-350 Camera -0958 CompuLink Research, Inc. -0959 Cologne Chip AG - 2bd0 Intelligent ISDN (Ver. 3.60.04) -095a Portsmith - 3003 Express Ethernet -095b Medialogic Corp. -095c K-Tec Electronics -095d Polycom, Inc. - 0001 Polycom ViaVideo -0967 Acer (??) - 0204 WarpLink 802.11b Adapter -0968 Catalyst Enterprises, Inc. -096e Feitian Technologies, Inc. - 0802 ePass2000 (G&D STARCOS SPK 2.4) -0971 Gretag-Macbeth AG - 2003 Eye-One display - 2005 Huey - 2007 ColorMunki -0973 Schlumberger - 0001 e-gate Smart Card -0974 Datagraphix, a business unit of Anacomp -0975 OL'E Communications, Inc. -0976 Adirondack Wire & Cable -0977 Lightsurf Technologies -0978 Beckhoff GmbH -0979 Jeilin Technology Corp., Ltd - 0224 JL2005A Toy Camera - 0226 JL2005A Toy Camera -097a Minds At Work LLC - 0001 Digital Wallet -097b Knudsen Engineering, Ltd -097c Marunix Co., Ltd -097d Rosun Technologies, Inc. -097f Barun Electronics Co., Ltd -0981 Oak Technology, Ltd -0984 Apricorn - 0200 Hard Drive Storage (TPP) -0985 cab Produkttechnik GmbH & Co KG - 0045 Mach4/200 Label Printer - 00a3 A3/200 or A3/300 Label Printer -0986 Matsushita Electric Works, Ltd. -098c Vitana Corp. -098d INDesign -098e Integrated Intellectual Property, Inc. -098f Kenwood TMI Corp. -0993 Gemstar eBook Group, Ltd - 0001 REB1100 eBook Reader - 0002 eBook -0996 Integrated Telecom Express, Inc. -099a Zippy Technology Corp. - 0638 Sanwa Supply Inc. Small Keyboard - 610c EL-610 Super Mini Electron luminescent Keyboard - 7160 Hyper Slim Keyboard -09a3 PairGain Technologies -09a4 Contech Research, Inc. -09a5 VCON Telecommunications -09a6 Poinchips - 8001 Mass Storage Device -09a7 Data Transmission Network Corp. -09a8 Lin Shiung Enterprise Co., Ltd -09a9 Smart Card Technologies Co., Ltd -09aa Intersil Corp. - 1000 Prism GT 802.11b/g Adapter - 3642 Prism 2.x 802.11b Adapter -09ab Japan Cash Machine Co., Ltd. -09ae Tripp Lite -09b2 Franklin Electronic Publishers, Inc. - 0001 eBookman Palm Computer -09b3 Altius Solutions, Inc. -09b4 MDS Telephone Systems -09b5 Celltrix Technology Co., Ltd -09bc Grundig - 0002 MPaxx MP150 MP3 Player -09be MySmart.Com - 0001 MySmartPad -09bf Auerswald GmbH & Co. KG - 00c0 COMpact 2104 ISDN PBX - 00db COMpact 4410/2206 ISDN ISDN - 00f1 COMfort System Telephones -09c0 Genpix Electronics, LLC - 0202 8PSK DVB-S tuner - 0203 Skywalker-1 DVB-S tuner - 0204 Skywalker-CW3K DVB-S tuner - 0205 Skywalker-CW3K DVB-S tuner - 0206 Skywalker-2 DVB-S tuner -09c1 Arris Interactive LLC - 1337 TOUCHSTONE DEVICE -09c2 Nisca Corp. -09c3 ActivCard, Inc. - 0007 Reader V2 - 0008 ZFG-9800-AC SmartCard Reader -09c4 ACTiSYS Corp. - 0011 ACT-IR2000U IrDA Dongle -09c5 Memory Corp. -09cc Workbit Corp. - 0404 BAFO USB-ATA/ATAPI Bridge Controller -09cd Psion Dacom Home Networks, Ltd - 2001 Psion WaveFinder DAB radio receiver -09ce City Electronics, Ltd -09cf Electronics Testing Center, Taiwan -09d1 NeoMagic, Inc. -09d2 Vreelin Engineering, Inc. -09d3 Com One - 0001 ISDN TA -09d7 Novatel Wireless - 0100 NovAtel FlexPack GPS receiver -09d9 KRF Tech, Ltd -09da A4 Tech Co., Ltd - 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse - 000a Port Mouse - 0018 Trust Human Interface Device - 001a Wireless Mouse & RXM-15 Receiver - 002a Wireless Optical Mouse NB-30 - 022b Wireless Mouse (Battery Free) - 024f RF Receiver and G6-20D Wireless Optical Mouse - 032b Wireless Mouse (Battery Free) - 9090 XL-750BK Laser Mouse -09db Measurement Computing Corp. - 0075 MiniLab 1008 - 0076 PMD-1024 - 007a PMD-1208LS - 0081 USB-1616FS - 0082 USB-1208FS - 0088 USB-1616FS internal hub -09dc Aimex Corp. -09dd Fellowes, Inc. -09df Addonics Technologies Corp. -09e1 Intellon Corp. - 5121 MicroLink dLAN -09e5 Jo-Dan International, Inc. -09e6 Silutia, Inc. -09e7 Real 3D, Inc. -09e8 AKAI Professional M.I. Corp. - 0062 MPD16 MIDI Pad Controller Unit - 006d EWI electronic wind instrument - 0071 MPK25 MIDI Keyboard - 0076 LPK25 MIDI Keyboard -09e9 Chen-Source, Inc. -09eb IM Networks, Inc. - 4331 iRhythm Tuner Remote -09ef Xitel - 0101 MD-Port DG2 MiniDisc Interface -09f3 GoFlight, Inc. - 0018 GF-46 Multi-Mode Display Module - 0028 RP-48 Combination Pushbutton-Rotary Module - 0048 LGTII - Landing Gear and Trim Control Module - 0064 MCPPro - Airliner Mode Control Panel (Autopilot) - 0300 EFIS - Electronic Flight Information System -09f5 AresCom - 0168 Network Adapter - 0188 LAN Adapter - 0850 Adapter -09f6 RocketChips, Inc. -09f7 Edu-Science (H.K.), Ltd -09f8 SoftConnex Technologies, Inc. -09f9 Bay Associates -09fa Mtek Vision -09fb Altera - 6001 Blaster -09ff Gain Technology Corp. -0a00 Liquid Audio -0a01 ViA, Inc. -0a07 Ontrak Control Systems Inc. - 0064 ADU100 Data Acquisition Interface - 0078 ADU120 Data Acquisition Interface - 0082 ADU130 Data Acquisition Interface - 00c8 ADU200 Relay I/O Interface - 00d0 ADU208 Relay I/O Interface - 00da ADU218 Solid-State Relay I/O Interface -0a0b Cybex Computer Products Co. -0a11 Xentec, Inc. -0a12 Cambridge Silicon Radio, Ltd - 0001 Bluetooth Dongle (HCI mode) - 0002 Frontline Test Equipment Bluetooth Device - 0003 Nanosira - 0004 Nanosira WHQL Reference Radio - 0005 Nanosira-Multimedia - 0006 Nanosira-Multimedia WHQL Reference Radio - 0007 Nanosira3-ROM - 0008 Nanosira3-ROM - 0009 Nanosira4-EDR WHQL Reference Radio - 000a Nanosira4-EDR-ROM - 000b Nanosira5-ROM - 0043 Bluetooth Device - 0100 Casira with BlueCore2-External Module - 0101 Casira with BlueCore2-Flash Module - 0102 Casira with BlueCore3-Multimedia Module - 0103 Casira with BlueCore3-Flash Module - 0104 Casira with BlueCore4-External Module - 0105 Casira with BlueCore4-Multimedia Module - 1000 Bluetooth Dongle (HID proxy mode) - 1010 Bluetooth Device - 1011 Bluetooth Device - 1012 Bluetooth Device - ffff USB Bluetooth Device in DFU State -0a13 Telebyte, Inc. -0a14 Spacelabs Medical, Inc. -0a15 Scalar Corp. -0a16 Trek Technology (S) PTE, Ltd - 1111 ThumbDrive - 8888 IBM USB Memory Key - 9988 Trek2000 TD-G2 -0a17 Pentax Corp. - 0004 Optio 330 - 0006 Optio S - 0007 Optio 550 - 0009 Optio 33WR - 000a Optio 555 - 000c Optio 43WR (mass storage mode) - 000d Optio 43WR - 0015 Optio S40/S5i - 003b Optio 50 (mass storage mode) - 003d Optio S55 - 0043 *ist DL - 0047 Optio S60 - 0052 Optio 60 Digital Camera - 006e K10D - 0070 K100D - 0093 K200D - 00a7 Optio E50 - 1001 EI2000 Camera powered by Digita! -0a18 Heidelberger Druckmaschinen AG -0a19 Hua Geng Technologies, Inc. -0a21 Medtronic Physio Control Corp. - 8001 MMT-7305WW [Medtronic Minimed CareLink] -0a22 Century Semiconductor USA, Inc. -0a27 Datacard Group - 0102 SP35 -0a2c AK-Modul-Bus Computer GmbH - 0008 GPIO Ports -0a34 TG3 Electronics, Inc. - 0101 TG82tp - 0110 Deck 82-key backlit keyboard -0a35 Radikal Technologies - 002a SAC - Software Assigned Controller - 008a SAC Hub -0a39 Gilat Satellite Networks, Ltd -0a3a PentaMedia Co., Ltd - 0163 KN-W510U 1.0 Wireless LAN Adapter -0a3c NTT DoCoMo, Inc. -0a3d Varo Vision -0a3f Swissonic AG -0a43 Boca Systems, Inc. -0a46 Davicom Semiconductor, Inc. - 0268 ST268 - 6688 ZT6688 Fast Ethernet Adapter - 8515 ADMtek ADM8515 NIC - 9000 DM9000E Fast Ethernet Adapter - 9601 DM9601 Fast Ethernet Adapter -0a47 Hirose Electric -0a48 I/O Interconnect - 3233 Multimedia Card Reader - 3239 Multimedia Card Reader - 3258 Dane Elec zMate SD Reader - 3259 Dane Elec zMate CF Reader - 5000 MediaGear xD-SM - 500a Mass Storage Device - 500f Mass Storage Device - 5010 Mass Storage Device - 5011 Mass Storage Device - 5014 Mass Storage Device - 5020 Mass Storage Device - 5021 Mass Storage Device - 5022 Mass Storage Device - 5023 Mass Storage Device - 5024 Mass Storage Device - 5025 Mass Storage Device -0a4b Fujitsu Media Devices, Ltd -0a4c Computex Co., Ltd -0a4d Evolution Electronics, Ltd - 0064 MK-225 Driver - 0065 MK-225C Driver - 0066 MK-225C Driver - 0067 MK-425C Driver - 0078 MK-37 Driver - 0079 MK-37C Driver - 007a MK-37C Driver - 008c TerraTec MIDI MASTER - 008d MK-249C Driver - 008e MK-249C MIDI Keyboard - 008f MK-449C Driver - 0090 Keystation 49e Driver - 0091 Keystation 61es Driver - 00a0 MK-361 Driver - 00a1 MK-361C Driver - 00a2 MK-361C Driver - 00a3 MK-461C MIDI Keyboard - 00b5 Keystation Pro 88 Driver - 00d2 E-Keys Driver - 00f0 UC-16 Driver - 00f1 X-Session Driver - 00f5 UC-33e MIDI Controller -0a4e Steinberg Soft-und Hardware GmbH -0a4f Litton Systems, Inc. -0a50 Mimaki Engineering Co., Ltd -0a51 Sony Electronics, Inc. -0a52 Jebsee Electronics Co., Ltd -0a53 Portable Peripheral Co., Ltd - 1000 Scanner - 2000 Q-Scan A6 Scanner - 2001 Q-Scan A6 Scanner - 2013 Media Drive A6 Scanner - 2014 Media Drive A6 Scanner - 2015 BizCardReader 600C - 2016 BizCardReader 600C - 202a Scanshell-CSSN - 3000 Q-Scan A8 Scanner - 3002 Q-Scan A8 Reader - 3015 BizCardReader 300G - 302a LM9832 - PA570 Mini Business Card Scanner [Targus] - 5001 BizCardReader 900C -0a5a Electronics For Imaging, Inc. -0a5b EAsics NV -0a5c Broadcom Corp. - 0201 iLine10(tm) Network Adapter - 2000 Bluetooth Device - 2001 Bluetooth Device - 2009 Bluetooth Controller - 200a BCM2035 Bluetooth dongle - 200f Bluetooth Controller - 201d Bluetooth Device - 201e IBM Integrated Bluetooth IV - 2020 Bluetooth dongle - 2033 BCM2033 Bluetooth - 2035 BCM2035 Bluetooth - 2038 Blutonium Device - 2039 Bluetooth Device - 2045 Bluetooth Controller - 2046 Bluetooth Device - 2047 Bluetooth Device - 205e Bluetooth Device - 2100 Bluetooth 2.0+eDR dongle - 2101 Bluetooth Controller - 2102 ANYCOM Blue USB-200/250 - 2110 Bluetooth Controller - 2111 ANYCOM Blue USB-UHE 200/250 - 2120 2045 Bluetooth 2.0 USB-UHE Device with trace filter - 2121 BCM2210 Bluetooth - 2122 Bluetooth 2.0+EDR dongle - 2123 Bluetooth dongle - 2130 2045 Bluetooth 2.0 USB-UHE Device with trace filter - 2131 2045 Bluetooth 2.0 Device with trace filter - 2145 Bluetooth with Enhanced Data Rate II - 2148 BCM92046DG-CL1ROM Bluetooth 2.1 Adapter - 2150 BCM2046 Bluetooth Device - 2151 Bluetooth - 217f Bluetooth Controller - 219b Bluetooth 2.1 Device - 21b1 HP Bluetooth Module - 21b4 BCM2070 Bluetooth 2.1 + EDR - 21b9 BCM2070 Bluetooth 2.1 + EDR - 21ba BCM2070 Bluetooth 2.1 + EDR - 21bb BCM2070 Bluetooth 2.1 + EDR - 21bc BCM2070 Bluetooth 2.1 + EDR - 21bd BCM2070 Bluetooth 2.1 + EDR - 22be BCM2070 Bluetooth 3.0 + HS - 4500 BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth) - 4502 Keyboard (Boot Interface Subclass) - 4503 Mouse (Boot Interface Subclass) - 5800 BCM5880 Secure Applications Processor - 5801 BCM5880 Secure Applications Processor with fingerprint swipe sensor - 5802 BCM5880 Secure Applications Processor with fingerprint touch sensor - 5803 BCM5880 Secure Applications Processor with secure keyboard - 6300 Pirelli Remote NDIS Device - bd13 Arcadyan WN8522B [Broadcom BCM4323] - d11b Eminent EM4045 [Broadcom 4320 USB] -0a5d Diatrend Corp. -0a5f Zebra - 0009 LP2844 Printer - 0081 GK420t Label Printer - 008b HC100 wristbands Printer - 930a Printer -0a62 MPMan - 0010 MPMan MP-F40 MP3 Player -0a66 ClearCube Technology -0a67 Medeli Electronics Co., Ltd -0a68 Comaide Corp. -0a69 Chroma ate, Inc. -0a6b Green House Co., Ltd - 0001 Compact Flash R/W with MP3 player - 000f FlashDisk -0a6c Integrated Circuit Systems, Inc. -0a6d UPS Manufacturing -0a6e Benwin -0a6f Core Technology, Inc. - 0400 Xanboo -0a70 International Game Technology -0a71 VIPColor Technologies USA, Inc. - 0001 VP485 Printer -0a72 Sanwa Denshi -0a7d NSTL, Inc. -0a7e Octagon Systems Corp. -0a80 Rexon Technology Corp., Ltd -0a81 Chesen Electronics Corp. - 0101 Keyboard - 0103 Keyboard - 0203 Mouse - 0205 PS/2 Keyboard+Mouse Adapter - 0701 USB Missile Launcher -0a82 Syscan - 4600 TravelScan 460/464 -0a83 NextComm, Inc. -0a84 Maui Innovative Peripherals -0a85 Idexx Labs -0a86 NITGen Co., Ltd -0a8d Picturetel -0a8e Japan Aviation Electronics Industry, Ltd - 2011 Filter Driver For JAE XMC R/W -0a90 Candy Technology Co., Ltd -0a91 Globlink Technology, Inc. - 3801 Targus PAKP003 Mouse -0a92 EGO SYStems, Inc. - 0011 SYS WaveTerminal U2A - 0021 GIGAPort - 0031 GIGAPortAG - 0053 AudioTrak Optoplay - 0061 Waveterminal U24 - 0071 MAYA EX7 - 0091 Maya 44 - 00b1 MAYA EX5 - 1000 MIDI Mate - 1010 RoMI/O - 1020 M4U - 1030 M8U - 1090 KeyControl49 - 10a0 KeyControl25 -0a93 C Technologies AB - 0002 C-Pen 10 - 0005 MyPen Light - 000d Input Pen - 0010 C-Pen 20 - 0a93 PayPen -0a94 Intersense -0aa3 Lava Computer Mfg., Inc. -0aa4 Develco Elektronik -0aa5 First International Digital - 0002 irock! 500 Series - 0801 MP3 Player -0aa6 Perception Digital, Ltd - 0101 Hercules Jukebox - 1501 Store 'n' Go HD Drive -0aa7 Wincor Nixdorf International GmbH - 0100 POS Keyboard, TA58P-USB - 0101 POS Keyboard, TA85P-USB - 0102 POS Keyboard, TA59-USB - 0103 POS Keyboard, TA60-USB - 0104 SNIkey Keyboard, SNIKey-KB-USB - 0200 Operator Display, BA63-USB - 0201 Operator Display, BA66-USB - 0202 Operator Display & Scanner, XiCheck-BA63 - 0203 Operator Display & Scanner, XiCheck-BA66 - 0204 Graphics Operator Display, BA63GV - 0300 POS Printer (printer class mode), TH210 - 0301 POS Printer (native mode), TH210 - 0302 POS Printer (printer class mode), TH220 - 0303 POS Printer (native mode), TH220 - 0304 POS Printer, TH230 - 0305 Lottery Printer, XiPrintPlus - 0306 POS Printer (printer class mode), TH320 - 0307 POS Printer (native mode), TH320 - 0308 POS Printer (printer class mode), TH420 - 0309 POS Printer (native mode), TH420 - 030a POS Printer, TH200B - 0400 Lottery Scanner, Xiscan S - 0401 Lottery Scanner, Xiscan 3 - 0402 Programmable Magnetic Swipe Card Reader, MSRP-USB - 0500 IDE Adapter - 0501 Hub Printer Interface - 0502 Hub SNIKey Keyboard - 4304 Banking Printer TP07 - 4305 Banking Printer TP07c - 4500 WN Central Special Electronics -0aa8 TriGem Computer, Inc. - 0060 TG 11Mbps WLAN Mini Adapter - 1001 DreamComboM4100 - 3002 InkJet Color Printer - 8001 TG_iMON - 8002 TG_KLOSS - a001 TG_X2 - a002 TGVFD_KLOSS - ffda iMON_VFD -0aa9 Baromtec Co. - f01b Medion MD 6242 MP3 Player -0aaa Japan CBM Corp. -0aab Vision Shape Europe SA -0aac iCompression, Inc. -0aad Rohde & Schwarz GmbH & Co. KG -0aae NEC infrontia Corp. (Nitsuko) -0aaf Digitalway Co., Ltd -0ab0 Arrow Strong Electronics Co., Ltd -0ab1 FEIG ELECTRONIC GmbH - 0002 OBID RFID-Reader -0aba Ellisys - 8001 Tracker 110 Protocol Analyzer - 8002 Explorer 200 Protocol Analyzer -0abe Stereo-Link - 0101 SL1200 DAC -0abf Diolan - 3370 I2C/SPI Adapter - U2C-12 -0ac3 Sanyo Semiconductor Company Micro -0ac4 Leco Corp. -0ac5 I & C Corp. -0ac6 Singing Electrons, Inc. -0ac7 Panwest Corp. -0ac8 Z-Star Microelectronics Corp. - 0301 Web Camera - 0302 ZC0302 Webcam - 0321 Vimicro generic vc0321 Camera - 0323 Luxya WC-1200 USB 2.0 Webcam - 0328 A4Tech PK-130MG - 0336 Elecom UCAM-DLQ30 - 301b ZC0301 Webcam - 303b ZC0303 Webcam - 305b ZC0305 Webcam - 307b USB 1.1 Webcam - 332d Vega USB 2.0 Camera - 3343 Sirius USB 2.0 Camera - 3420 Venus USB2.0 Camera - c001 Sony embedded vimicro Camera - c002 Visual Communication Camera VGP-VCC1 - c302 Vega USB 2.0 Camera - c303 Saturn USB 2.0 Camera - c326 Namuga 1.3M Webcam - c33f Webcam -0ac9 Micro Solutions, Inc. - 0000 Backpack CD-ReWriter - 0001 BACKPACK 2 Cable - 0010 BACKPACK - 0011 Backpack 40GB Hard Drive - 0110 BACKPACK - 0111 BackPack - 1234 BACKPACK -0aca OPEN Networks Ltd - 1060 OPEN NT1 Plus II -0acc Koga Electronics Co. -0acd ID Tech - 0401 ID TECH Spectrum III Hybrid Smartcard Reader - 0630 ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC -0ace ZyDAS - 1201 ZD1201 802.11b - 1211 ZEW 2501 802.11bg Wireless Adapter - 1215 ZD1211B 802.11g - 1221 ZD1221 802.11n - 1602 ZyXEL Omni FaxModem 56K - 1608 ZyXEL Omni FaxModem 56K UNO - 1611 ZyXEL Omni FaxModem 56K Plus - 2011 Virtual media for 802.11bg - 20ff Virtual media for 802.11bg - a211 ZD1211 802.11b/g Wireless Adapter - b215 802.11bg -0acf Intoto, Inc. -0ad0 Intellix Corp. -0ad1 Remotec Technology, Ltd -0ad2 Service & Quality Technology Co., Ltd -0ada Data Encryption Systems Ltd. - 0005 DK2 -0ae3 Allion Computer, Inc. -0ae4 Taito Corp. -0ae7 Neodym Systems, Inc. -0ae8 System Support Co., Ltd -0ae9 North Shore Circuit Design L.L.P. -0aea SciEssence, LLC -0aeb TTP Communications, Ltd -0aec Neodio Technologies Corp. - 2101 SmartMedia Card Reader - 2102 CompactFlash Card Reader - 2103 MMC/SD Card Reader - 2104 MemoryStick Card Reader - 2201 SmartMedia+CompactFlash Card Reader - 2202 SmartMedia+MMC/SD Card Reader - 2203 SmartMedia+MemoryStick Card Reader - 2204 CompactFlash+MMC/SD Card Reader - 2205 CompactFlash+MemoryStick Card Reader - 2206 MMC/SD+MemoryStick Card Reader - 2301 SmartMedia+CompactFlash+MMC/SD Card Reader - 2302 SmartMedia+CompactFlash+MemoryStick Card Reader - 2303 SmartMedia+MMC/SD+MemoryStick Card Reader - 2304 CompactFlash+MMC/SD+MemoryStick Card Reader - 3016 MMC/SD+Memory Stick Card Reader - 3050 ND3050 8-in-1 Card Reader - 3060 1.1 FS Card Reader - 3101 MMC/SD Card Reader - 3102 MemoryStick Card Reader - 3201 MMC/SD+MemoryStick Card Reader - 3216 HS Card Reader - 3260 7-in-1 Card Reader - 5010 ND5010 Card Reader -0af0 Option - 5000 UMTS Card - 6000 GlobeTrotter 3G datacard - 6300 GT 3G Quad UMTS/GPRS Card - 6600 GlobeTrotter 3G+ datacard - 6711 GlobeTrotter Express 7.2 v2 - 6971 Globetrotter HSDPA Modem - 7251 Globetrotter HSUPA Modem (aka iCON HSUPA E) - 7501 Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760") - 7601 Globetrotter MO40x 3G Modem (GTM 382) - 7701 Globetrotter HSUPA Modem (aka icon 451) -0af6 Silver I Co., Ltd -0af7 B2C2, Inc. - 0101 Digital TV USB Receiver (DVB-S/T/C / ATSC) -0af9 Hama, Inc. - 0010 USB SightCam 100 - 0011 Micro Innovations IC50C Webcam -0afc Zaptronix Ltd -0afd Tateno Dennou, Inc. -0afe Cummins Engine Co. -0aff Jump Zone Network Products, Inc. -0b00 INGENICO -0b05 ASUSTek Computer, Inc. - 1101 Mass Storage (UISDMC4S) - 1706 WL-167G v1 802.11g Adapter [Ralink RT2500USB] - 1707 WL-167G v1 802.11g Adapter [Ralink RT2500USB] - 1708 Mass Storage Device - 170b Mass Storage Device - 170c WL-159g 802.11bg - 170d 802.11b/g Wireless Network Adapter - 1712 BT-183 Bluetooth 2.0+EDR adapter - 1715 2045 Bluetooth 2.0 Device with trace filter - 1716 Bluetooth Device - 1717 WL169gE 802.11g Adapter [Broadcom 4320 USB] - 171b A9T wireless 802.11bg - 171c 802.11b/g Wireless Network Adapter - 171f My Cinema U3000 Mini [DiBcom DiB7700P] - 1723 WL-167G v2 802.11g Adapter [Ralink RT73] - 1724 RT2573 - 1726 Laptop OLED Display - 172a ASUS 802.11n Network Adapter - 172b 802.11n Network Adapter - 1731 802.11n Network Adapter - 1732 802.11n Network Adapter - 1734 ASUS AF-200 - 173c BT-183 Bluetooth 2.0 - 173f My Cinema U3100 Mini - 1742 802.11n Network Adapter - 1743 Xonar U1 Audio Station - 1751 BT-253 Bluetooth Adapter - 175b Laptop OLED Display - 1760 802.11n Network Adapter - 1761 802.11n Network Adapter - 1774 Gobi Wireless Modem (QDL mode) - 1776 Gobi Wireless Modem - 1779 My Cinema U3100 Mini Plus [AF9035A] - 1784 USB-N13 802.11n Network Adapter [Ralink RT2870] - 6101 Cable Modem - 620a Remote NDIS Device - b700 Broadcom Bluetooth 2.1 -0b0b Datamax-O'Neil - 106e Datamax E-4304 -0b0c Todos AB - 0009 Todos Argos Mini II Smart Card Reader - 001e e.dentifier2 (ABN AMRO electronic banking card reader NL) - 002e C200 smartcard controller (Nordea card reader) - 003f Todos C400 smartcard controller (Handelsbanken card reader) - 0050 Argos Mini II Smart Card Reader (CCID) -0b0d ProjectLab - 0000 CenturyCD -0b0e GN Netcom -0b0f AVID Technology -0b10 Pcally -0b11 I Tech Solutions Co., Ltd -0b1e Electronic Warfare Assoc., Inc. (EWA) -0b1f Insyde Software Corp. -0b20 TransDimension, Inc. -0b21 Yokogawa Electric Corp. -0b22 Japan System Development Co., Ltd -0b23 Pan-Asia Electronics Co., Ltd -0b24 Link Evolution Corp. -0b27 Ritek Corp. -0b28 Kenwood Corp. -0b2c Village Center, Inc. -0b30 PNY Technologies, Inc. - 0006 SM Media-Shuttle Card Reader -0b33 Contour Design, Inc. - 0020 ShuttleXpress -0b37 Hitachi ULSI Systems Co., Ltd -0b38 Gear Head - 0010 107-Key Keyboard -0b39 Omnidirectional Control Technology, Inc. - 0001 Composite USB PS2 Converter - 0109 USB TO Ethernet - 0421 Serial - 0801 USB-Parallel Bridge - 0901 OCT To Fast Ethernet Converter - 0c03 LAN DOCK Serial Converter -0b3a IPaxess -0b3b Tekram Technology Co., Ltd - 0163 TL-WN320G 1.0 WLAN Adapter - 1601 Allnet 0193 802.11b Adapter - 1602 ZyXEL ZyAIR B200 802.11b Adapter - 1612 AIR.Mate 2@net 802.11b Adapter - 1613 802.11b Wireless LAN Adapter - 1620 Allnet USB 2.0 Wireless Network Adapter - 1630 QuickWLAN 802.11bg - 5630 802.11bg - 6630 ZD1211 -0b3c Olivetti Techcenter - a010 Simple_Way Printer/Scanner/Copier - c000 Olicard 100 - c700 Olicard 100 (Mass Storage mode) -0b3e Kikusui Electronics Corp. -0b41 Hal Corp. - 0011 Crossam2+USB IR commander -0b43 Play.com, Inc. - 0003 PS2 Controller Converter -0b47 Sportbug.com, Inc. -0b48 TechnoTrend AG - 1003 Technotrend/Hauppauge USB-Nova - 1004 TT-PCline - 1005 Technotrend/Hauppauge USB-Nova - 1006 Technotrend/Hauppauge DEC3000-s - 1007 TT-micro plus Device - 1008 Technotrend/Hauppauge DEC2000-t - 1009 Technotrend/Hauppauge DEC2540-t - 3001 DVB-S receiver - 3002 DVB-C receiver - 3003 DVB-T receiver - 3004 TT TV-Stick - 3005 TT TV-Stick (8kB EEPROM) - 3006 TT-connect S-2400 DVB-S receiver - 3007 TT-connect S2-3600 - 3008 TT-connect - 3009 TT-connect S-2400 DVB-S receiver (8kB EEPROM) - 300a TT-connect S2-3650 CI - 300b TT-connect C-3650 CI - 300c TT-connect T-3650 CI - 300d TT-connect CT-3650 CI - 300e TT-connect C-2400 -0b49 ASCII Corp. - 064f Trance Vibrator -0b4b Pine Corp. Ltd. - 0100 D'music MP3 Player -0b4d Graphtec America, Inc. - 110a Graphtec CC200-20 -0b4e Musical Electronics, Ltd - 6500 MP3 Player - 8028 MP3 Player - 8920 MP3 Player -0b50 Dumpries Co., Ltd -0b51 Comfort Keyboard Co. - 0020 Comfort Keyboard -0b52 Colorado MicroDisplay, Inc. -0b54 Sinbon Electronics Co., Ltd -0b56 TYI Systems, Ltd -0b57 Beijing HanwangTechnology Co., Ltd -0b59 Lake Communications, Ltd -0b5a Corel Corp. -0b5f Green Electronics Co., Ltd -0b60 Nsine, Ltd -0b61 NEC Viewtechnology, Ltd -0b62 Orange Micro, Inc. - 000b Bluetooth Device - 0059 iBOT2 Webcam -0b63 ADLink Technology, Inc. -0b64 Wonderful Wire Cable Co., Ltd -0b65 Expert Magnetics Corp. -0b69 CacheVision -0b6a Maxim Integrated Products -0b6f Nagano Japan Radio Co., Ltd -0b70 PortalPlayer, Inc. - 00ba iRiver H10 20GB -0b71 SHIN-EI Sangyo Co., Ltd -0b72 Embedded Wireless Technology Co., Ltd -0b73 Computone Corp. -0b75 Roland DG Corp. -0b79 Sunrise Telecom, Inc. -0b7a Zeevo, Inc. - 07d0 Bluetooth Dongle -0b7b Taiko Denki Co., Ltd -0b7c ITRAN Communications, Ltd -0b7d Astrodesign, Inc. -0b81 id3 Semiconductors - 0001 Biothentic II smartcard reader with fingerprint sensor - 0002 DFU-Enabled Devices (DFU) - 0012 BioPAD biometric module (DFU + CDC) - 0102 Certis V1 fingerprint reader - 0103 Certis V2 fingerprint reader - 0200 CL1356T / CL1356T5 / CL1356A smartcard readers (CCID) - 0201 CL1356T / CL1356T5 / CL1356A smartcard readers (DFU + CCID) - 0220 CL1356A FFPJP smartcard reader (CCID + HID) - 0221 CL1356A smartcard reader (DFU + CCID + HID) -0b84 Rextron Technology, Inc. -0b85 Elkat Electronics, Sdn., Bhd. -0b86 Exputer Systems, Inc. - 5100 XMC5100 Zippy Drive - 5110 XMC5110 Flash Drive - 5200 XMC5200 Zippy Drive - 5201 XMC5200 Zippy Drive - 5202 XMC5200 Zippy Drive - 5280 XMC5280 Storage Drive - fff0 ISP5200 Debugger -0b87 Plus-One I & T, Inc. -0b88 Sigma Koki Co., Ltd, Technology Center -0b89 Advanced Digital Broadcast, Ltd -0b8c SMART Technologies Inc. - 00c3 Sympodium ID350 -0b95 ASIX Electronics Corp. - 1720 10/100 Ethernet - 1780 AX88178 - 7720 AX88772 -0b96 Sewon Telecom -0b97 O2 Micro, Inc. - 7732 Smart Card Reader - 7761 Oz776 1.1 Hub - 7762 Oz776 SmartCard Reader - 7772 OZ776 CCID Smartcard Reader -0b98 Playmates Toys, Inc. -0b99 Audio International, Inc. -0b9b Dipl.-Ing. Stefan Kunde - 4012 Reflex RC-controller Interface -0b9d Softprotec Co. -0b9f Chippo Technologies -0baf U.S. Robotics - 00e5 USR6000 - 00eb USR1120 802.11b Adapter - 00ec 56K Faxmodem - 00f1 SureConnect ADSL ATM Adapter - 00f2 SureConnect ADSL Loader - 00f5 SureConnect ADSL ATM Adapter - 00f6 SureConnect ADSL Loader - 00f7 SureConnect ADSL ATM Adapter - 00f8 SureConnect ADSL Loader - 00f9 SureConnect ADSL ATM Adapter - 00fa SureConnect ADSL Loader - 00fb SureConnect ADSL Ethernet/USB Router - 0111 USR5420 802.11g Adapter [Broadcom 4320 USB] - 0118 U5 802.11g Adapter - 011b Wireless MAXg Adapter [Broadcom 4320] - 0121 USR5423 802.11bg - 6112 FaxModem Model 5633 -0bb0 Concord Camera Corp. - 0100 Sound Vision Stream - 5007 3340z/Rollei DC3100 -0bb1 Infinilink Corp. -0bb2 Ambit Microsystems Corp. - 0302 U10H010 802.11b Wireless Adapter [Intersil PRISM 3] - 6098 USB Cable Modem -0bb3 Ofuji Technology -0bb4 High Tech Computer Corp. - 00ce mmO2 XDA GSM/GPRS Pocket PC - 00cf SPV C500 Smart Phone - 0a01 PocketPC Sync - 0a02 Himalaya GSM/GPRS Pocket PC - 0a03 PocketPC Sync - 0a04 PocketPC Sync - 0a05 PocketPC Sync - 0a06 PocketPC Sync - 0a07 Magician PocketPC SmartPhone / O2 XDA - 0a08 PocketPC Sync - 0a09 PocketPC Sync - 0a0a PocketPC Sync - 0a0b PocketPC Sync - 0a0c PocketPC Sync - 0a0d PocketPC Sync - 0a0e PocketPC Sync - 0a0f PocketPC Sync - 0a10 PocketPC Sync - 0a11 PocketPC Sync - 0a12 PocketPC Sync - 0a13 PocketPC Sync - 0a14 PocketPC Sync - 0a15 PocketPC Sync - 0a16 PocketPC Sync - 0a17 PocketPC Sync - 0a18 PocketPC Sync - 0a19 PocketPC Sync - 0a1a PocketPC Sync - 0a1b PocketPC Sync - 0a1c PocketPC Sync - 0a1d PocketPC Sync - 0a1e PocketPC Sync - 0a1f PocketPC Sync - 0a20 PocketPC Sync - 0a21 PocketPC Sync - 0a22 PocketPC Sync - 0a23 PocketPC Sync - 0a24 PocketPC Sync - 0a25 PocketPC Sync - 0a26 PocketPC Sync - 0a27 PocketPC Sync - 0a28 PocketPC Sync - 0a29 PocketPC Sync - 0a2a PocketPC Sync - 0a2b PocketPC Sync - 0a2c PocketPC Sync - 0a2d PocketPC Sync - 0a2e PocketPC Sync - 0a2f PocketPC Sync - 0a30 PocketPC Sync - 0a31 PocketPC Sync - 0a32 PocketPC Sync - 0a33 PocketPC Sync - 0a34 PocketPC Sync - 0a35 PocketPC Sync - 0a36 PocketPC Sync - 0a37 PocketPC Sync - 0a38 PocketPC Sync - 0a39 PocketPC Sync - 0a3a PocketPC Sync - 0a3b PocketPC Sync - 0a3c PocketPC Sync - 0a3d PocketPC Sync - 0a3e PocketPC Sync - 0a3f PocketPC Sync - 0a40 PocketPC Sync - 0a41 PocketPC Sync - 0a42 PocketPC Sync - 0a43 PocketPC Sync - 0a44 PocketPC Sync - 0a45 PocketPC Sync - 0a46 PocketPC Sync - 0a47 PocketPC Sync - 0a48 PocketPC Sync - 0a49 PocketPC Sync - 0a4a PocketPC Sync - 0a4b PocketPC Sync - 0a4c PocketPC Sync - 0a4d PocketPC Sync - 0a4e PocketPC Sync - 0a4f PocketPC Sync - 0a50 HTC SmartPhone Sync - 0a51 SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC - 0a52 SmartPhone Sync - 0a53 SmartPhone Sync - 0a54 SmartPhone Sync - 0a55 SmartPhone Sync - 0a56 SmartPhone Sync - 0a57 SmartPhone Sync - 0a58 SmartPhone Sync - 0a59 SmartPhone Sync - 0a5a SmartPhone Sync - 0a5b SmartPhone Sync - 0a5c SmartPhone Sync - 0a5d SmartPhone Sync - 0a5e SmartPhone Sync - 0a5f SmartPhone Sync - 0a60 SmartPhone Sync - 0a61 SmartPhone Sync - 0a62 SmartPhone Sync - 0a63 SmartPhone Sync - 0a64 SmartPhone Sync - 0a65 SmartPhone Sync - 0a66 SmartPhone Sync - 0a67 SmartPhone Sync - 0a68 SmartPhone Sync - 0a69 SmartPhone Sync - 0a6a SmartPhone Sync - 0a6b SmartPhone Sync - 0a6c SmartPhone Sync - 0a6d SmartPhone Sync - 0a6e SmartPhone Sync - 0a6f SmartPhone Sync - 0a70 SmartPhone Sync - 0a71 SmartPhone Sync - 0a72 SmartPhone Sync - 0a73 SmartPhone Sync - 0a74 SmartPhone Sync - 0a75 SmartPhone Sync - 0a76 SmartPhone Sync - 0a77 SmartPhone Sync - 0a78 SmartPhone Sync - 0a79 SmartPhone Sync - 0a7a SmartPhone Sync - 0a7b SmartPhone Sync - 0a7c SmartPhone Sync - 0a7d SmartPhone Sync - 0a7e SmartPhone Sync - 0a7f SmartPhone Sync - 0a80 SmartPhone Sync - 0a81 SmartPhone Sync - 0a82 SmartPhone Sync - 0a83 SmartPhone Sync - 0a84 SmartPhone Sync - 0a85 SmartPhone Sync - 0a86 SmartPhone Sync - 0a87 SmartPhone Sync - 0a88 SmartPhone Sync - 0a89 SmartPhone Sync - 0a8a SmartPhone Sync - 0a8b SmartPhone Sync - 0a8c SmartPhone Sync - 0a8d SmartPhone Sync - 0a8e SmartPhone Sync - 0a8f SmartPhone Sync - 0a90 SmartPhone Sync - 0a91 SmartPhone Sync - 0a92 SmartPhone Sync - 0a93 SmartPhone Sync - 0a94 SmartPhone Sync - 0a95 SmartPhone Sync - 0a96 SmartPhone Sync - 0a97 SmartPhone Sync - 0a98 SmartPhone Sync - 0a99 SmartPhone Sync - 0a9a SmartPhone Sync - 0a9b SmartPhone Sync - 0a9c SmartPhone Sync - 0a9d SmartPhone Sync - 0a9e SmartPhone Sync - 0a9f SmartPhone Sync - 0b03 Ozone Mobile Broadband - 0b04 Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion - 0b05 P3600 - 0b06 Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO - 0b0c Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1 - 0b1f Sony Ericsson XPERIA X1 - 0b2f Rhodium - 0b51 Qtek 8310 mobile phone [Tornado Noble] - 0bce Vario MDA - 0c01 Dream / ADP1 / G1 / Magic / Tattoo - 0c02 Dream / ADP1 / G1 / Magic / Tattoo (Debug) - 0c13 Diamond - 0c1f Sony Ericsson XPERIA X1 - 0c5f Snap - 0c87 Desire (debug) - 0c8d EVO 4G (debug) - 0c91 Vision - 0c94 Vision - 0c97 Legend - 0c99 Desire (debug) - 0c9e Incredible - 0ca2 Desire HD (debug mode) - 0ff9 Desire / Desire HD / Hero - 0ffe Desire HD (modem mode) - 0fff Android Fastboot Bootloader -0bb5 Murata Manufacturing Co., Ltd -0bb6 Network Alchemy -0bb7 Joytech Computer Co., Ltd -0bb8 Hitachi Semiconductor and Devices Sales Co., Ltd -0bb9 Eiger M&C Co., Ltd -0bba ZAccess Systems -0bbb General Meters Corp. -0bbc Assistive Technology, Inc. -0bbd System Connection, Inc. -0bc0 Knilink Technology, Inc. -0bc1 Fuw Yng Electronics Co., Ltd -0bc2 Seagate RSS LLC - 2000 Storage Adapter V3 (TPP) - 2200 FreeAgent Go FW - 5021 FreeAgent GoFlex USB 2.0 - 5031 FreeAgent GoFlex USB 3.0 -0bc3 IPWireless, Inc. - 0001 UMTS-TDD (TD-CDMA) modem -0bc4 Microcube Corp. -0bc5 JCN Co., Ltd -0bc6 ExWAY, Inc. -0bc7 X10 Wireless Technology, Inc. - 0001 ActiveHome (ACPI-compliant) - 0002 Firecracker Interface (ACPI-compliant) - 0003 VGA Video Sender (ACPI-compliant) - 0004 X10 Receiver - 0005 Wireless Transceiver (ACPI-compliant) - 0006 Wireless Transceiver (ACPI-compliant) - 0007 Wireless Transceiver (ACPI-compliant) - 0008 Wireless Transceiver (ACPI-compliant) - 0009 Wireless Transceiver (ACPI-compliant) - 000a Wireless Transceiver (ACPI-compliant) - 000b Transceiver (ACPI-compliant) - 000c Transceiver (ACPI-compliant) - 000d Transceiver (ACPI-compliant) - 000e Transceiver (ACPI-compliant) - 000f Transceiver (ACPI-compliant) -0bc8 Telmax Communications -0bc9 ECI Telecom, Ltd -0bca Startek Engineering, Inc. -0bcb Perfect Technic Enterprise Co., Ltd -0bd7 Andrew Pargeter & Associates - a021 Amptek DP4 multichannel signal analyzer -0bda Realtek Semiconductor Corp. - 0103 USB 2.0 Card Reader - 0104 Mass Storage Device - 0106 Mass Storage Device - 0107 Mass Storage Device - 0108 Mass Storage Device - 0111 Card Reader - 0113 Mass Storage Device - 0115 Mass Storage Device (Multicard Reader) - 0116 Mass Storage Device - 0117 Mass Storage Device - 0118 Mass Storage Device - 0151 Mass Storage Device (Multicard Reader) - 0152 Mass Storage Device - 0153 Mass Storage Device - 0156 Mass Storage Device - 0157 Mass Storage Device - 0158 USB 2.0 multicard reader - 0159 Digital Media Card Reader - 0161 Mass Storage Device - 0168 Mass Storage Device - 0169 Mass Storage Device - 0171 Mass Storage Device - 0176 Mass Storage Device - 0178 Mass Storage Device - 2831 RTL2831U DVB-T - 2832 RTL2832U DVB-T - 8150 RTL8150 Fast Ethernet Adapter - 8151 RTL8151 Adapteon Business Mobile Networks BV - 8171 RTL8188SU 802.11n WLAN Adapter - 8172 RTL8191S WLAN Adapter - 8176 RTL8188CUS 802.11n WLAN - 8187 RTL8187 Wireless Adapter - 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter - 8192 RTL8192U 802.11n Wireless Adapter - 8197 RTL8187B Wireless Adapter - 8198 RTL8187B Wireless Adapter -0bdb Ericsson Business Mobile Networks BV - 1000 BV Bluetooth Device - 1002 Bluetooth Device 1.2 - 1049 C3607w Mobile Broadband Module - 1900 F3507g Mobile Broadband Module - 1902 F3507g v2 Mobile Broadband Module - 1904 F3607gw Mobile Broadband Module - 1905 F3607gw v2 Mobile Broadband Module - 1906 F3607gw v3 Mobile Broadband Module - 1909 F3307 v2 Mobile Broadband Module - 190a F3307 Mobile Broadband Module - 190b C3607w v2 Mobile Broadband Module -0bdc Y Media Corp. -0bdd Orange PCS -0be2 Kanda Tsushin Kogyo Co., Ltd -0be3 TOYO Corp. -0be4 Elka International, Ltd -0be5 DOME imaging systems, Inc. -0be6 Dong Guan Humen Wonderful Wire Cable Factory -0bed Silicon Labs - 1100 MEI (TM) Cashflow-SC Bill/Voucher Acceptor -0bee LTK Industries, Ltd -0bef Way2Call Communications -0bf0 Pace Micro Technology PLC -0bf1 Intracom S.A. - 0001 netMod Driver Ver 2.4.17 (CAPI) - 0002 netMod Driver Ver 2.4 (CAPI) - 0003 netMod Driver Ver 2.4 (CAPI) -0bf2 Konexx -0bf6 Addonics Technologies, Inc. - 0103 Storage Device - 1234 Storage Device - a000 Cable 205 (TPP) - a001 Cable 205 - a002 IDE Bridge -0bf7 Sunny Giken, Inc. -0bf8 Fujitsu Siemens Computers - 1001 Fujitsu Pocket Loox 600 PDA - 1006 SmartCard Reader 2A - 1007 Connect2Air E-5400 802.11g Wireless Adapter - 1009 Name: Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887] - 100f miniCard D2301 802.11bg Wireless Module [SiS 163U] -0c04 MOTO Development Group, Inc. -0c05 Appian Graphics -0c06 Hasbro Games, Inc. -0c07 Infinite Data Storage, Ltd -0c08 Agate - 0378 Q 16MB Storage Device -0c09 Comjet Information System - a5a5 Litto Version USB2.0 -0c0a Highpoint Technologies, Inc. -0c0b Dura Micro, Inc. (Acomdata) - 27cb 6-in-1 Flash Reader and Writer - 27d7 Multi Memory reader/writer MD-005 - 27da Multi Memory reader/writer MD-005 - 27dc Multi Memory reader/writer MD-005 - 27e7 3,5'' HDD case MD-231 - 27ee 3,5'' HDD case MD-231 - 2814 3,5'' HDD case MD-231 - 2815 3,5'' HDD case MD-231 - 281d 3,5'' HDD case MD-231 - 5fab Storage Adaptor - a109 CF/SM Reader and Writer - a10c SD/MS Reader and Writer - b001 USB 2.0 Mass Storage IDE adapter - b004 MMC/SD Reader and Writer -0c12 Zeroplus - 0005 PSX Vibration Feedback Converter - 0030 PSX Vibration Feedback Converter - 700e Logic Analyzer (LAP-C-16032) - 8801 Xbox Controller - 8802 Xbox Controller - 8809 Red Octane Ignition Xbox DDR Pad - 880a Pelican Eclipse PL-2023 - 8810 Xbox Controller - 9902 VibraX -0c15 Iris Graphics -0c16 Gyration, Inc. - 0002 RF Technology Receiver - 0003 RF Technology Receiver - 0008 RF Technology Receiver - 0080 eHome Infrared Receiver - 0081 eHome Infrared Receiver -0c17 Cyberboard A/S -0c18 SynerTek Korea, Inc. -0c19 cyberPIXIE, Inc. -0c1a Silicon Motion, Inc. -0c1b MIPS Technologies -0c1c Hang Zhou Silan Electronics Co., Ltd -0c22 Tally Printer Corp. -0c23 Lernout + Hauspie -0c24 Taiyo Yuden - 0001 Bluetooth Adaptor - 0002 Bluetooth Device2 - 0005 Bluetooth Device(BC04-External) - 000b Bluetooth Device(BC04-External) - 000c Bluetooth Adaptor - 000e Bluetooth Device(BC04-External) - 000f Bluetooth Device (V2.0+EDR) - 0010 Bluetooth Device(BC04-External) - 0012 Bluetooth Device(BC04-External) - 0018 Bluetooth Device(BC04-External) - 0019 Bluetooth Device - 0c24 Bluetooth Device(SAMPLE) - ffff Bluetooth module with BlueCore in DFU mode -0c25 Sampo Corp. - 0310 Scream Cam -0c26 Prolific Technology Inc. - 0018 USB-Serial Controller [Icom Inc. OPC-478UC] -0c27 RFIDeas, Inc - 3bfa pcProx Card Reader -0c2e Metro - 0007 Metrologic MS7120 Barcode Scanner (IBM SurePOS mode) - 0200 Metrologic Scanner - 0204 Metrologic MS7120 Barcode Scanner (keyboard mode) - 0700 Metrologic MS7120 Barcode Scanner (uni-directional serial mode) - 0720 Metrologic MS7120 Barcode Scanner (bi-directional serial mode) -0c35 Eagletron, Inc. -0c36 E Ink Corp. -0c37 e.Digital -0c38 Der An Electric Wire & Cable Co., Ltd -0c39 IFR -0c3a Furui Precise Component (Kunshan) Co., Ltd -0c3b Komatsu, Ltd -0c3c Radius Co., Ltd -0c3d Innocom, Inc. -0c3e Nextcell, Inc. -0c44 Motorola iDEN - 0021 iDEN P2k0 Device - 0022 iDEN P2k1 Device - 03a2 iDEN Smartphone - 41d9 i1 phone -0c45 Microdia - 0011 EBUDDY - 1020 Mass Storage Reader - 1028 Mass Storage Reader - 1030 Mass Storage Reader - 1031 Sonix Mass Storage Device - 1032 Mass Storage Reader - 1033 Sonix Mass Storage Device - 1034 Mass Storage Reader - 1035 Mass Storage Reader - 1036 Mass Storage Reader - 1037 Sonix Mass Storage Device - 1050 CF Card Reader - 1058 HDD Reader - 1060 iFlash SM-Direct Card Reader - 1061 Mass Storage Reader - 1062 Mass Storage Reader - 1063 Sonix Mass Storage Device - 1064 Mass Storage Reader - 1065 Mass Storage Reader - 1066 Mass Storage Reader - 1067 Mass Storage Reader - 1158 A56AK - 184c VoIP Phone - 6001 Genius VideoCAM NB - 6005 Sweex Mini Webcam - 6007 VideoCAM Eye - 6009 VideoCAM ExpressII - 600d TwinkleCam USB camera - 6011 PC Camera (SN9C102) - 6019 PC Camera (SN9C102) - 6024 VideoCAM ExpressII - 6025 VideoCAM ExpressII - 6028 Typhoon Easycam USB 330K (older) - 6029 Triplex i-mini PC Camera - 602a Meade ETX-105EC Camera - 602b VideoCAM NB 300 - 602c Clas Ohlson TWC-30XOP Webcam - 602d VideoCAM ExpressII - 602e VideoCAM Messenger - 6030 VideoCAM ExpressII - 603f VideoCAM ExpressII - 6040 CCD PC Camera (PC390A) - 606a CCD PC Camera (PC390A) - 607a CCD PC Camera (PC390A) - 607b Win2 PC Camera - 607c CCD PC Camera (PC390A) - 607e CCD PC Camera (PC390A) - 6080 Audio (Microphone) - 6082 VideoCAM Look - 6083 VideoCAM Look - 608c VideoCAM Look - 608e VideoCAM Look - 608f PC Camera (SN9C103 + OV7630) - 60a8 VideoCAM Look - 60aa VideoCAM Look - 60ab PC Camera - 60af VideoCAM Look - 60b0 Genius VideoCam Look - 60c0 PC Camera with Mic (SN9C105) - 60c8 Win2 PC Camera - 60cc PC Camera with Mic (SN9C105) - 60ec PC Camera with Mic (SN9C105) - 60ef Win2 PC Camera - 60fa PC Camera with Mic (SN9C105) - 60fb Composite Device - 60fc PC Camera with Mic (SN9C105) - 60fe Audio (Microphone) - 6108 Win2 PC Camera - 6122 PC Camera (SN9C110) - 6123 PC Camera (SN9C110) - 6128 PC Camera (SN9C325 + OM6802) - 612a PC Camera (SN9C325) - 612c PC Camera (SN9C110) - 612e PC Camera (SN9C110) - 612f PC Camera (SN9C110) - 6130 PC Camera (SN9C120) - 6138 Win2 PC Camera - 613a PC Camera (SN9C120) - 613b Win2 PC Camera - 613c PC Camera (SN9C120) - 613e PC Camera (SN9C120) - 6143 PC Camera (SN9C120 + SP80708) - 6240 PC Camera (SN9C201 + MI1300) - 6242 PC Camera (SN9C201 + MI1310) - 6243 PC Camera (SN9C201 + S5K4AAFX) - 6248 PC Camera (SN9C201 + OV9655) - 624b PC Camera (SN9C201 + CX1332) - 624c PC Camera (SN9C201 + MI1320) - 624e PC Camera (SN9C201 + SOI968) - 624f PC Camera (SN9C201 + OV9650) - 6251 PC Camera (SN9C201 + OV9650) - 6253 PC Camera (SN9C201 + OV9650) - 6260 PC Camera (SN9C201 + OV7670ISP) - 6262 PC Camera (SN9C201 + OM6802) - 6270 PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ... - 627a PC Camera (SN9C201 + S5K53BEB) - 627b PC Camera (SN9C201 + OV7660) - 627c PC Camera (SN9C201 + HV7131R) - 627f PC Camera (SN9C201 + OV965x + EEPROM) - 6280 PC Camera with Microphone (SN9C202 + MI1300) - 6282 PC Camera with Microphone (SN9C202 + MI1310) - 6283 PC Camera with Microphone (SN9C202 + S5K4AAFX) - 6288 PC Camera with Microphone (SN9C202 + OV9655) - 628a PC Camera with Microphone (SN9C202 + ICM107) - 628b PC Camera with Microphone (SN9C202 + CX1332) - 628c PC Camera with Microphone (SN9C202 + MI1320) - 628e PC Camera with Microphone (SN9C202 + SOI968) - 628f PC Camera with Microphone (SN9C202 + OV9650) - 62a0 PC Camera with Microphone (SN9C202 + OV7670ISP) - 62a2 PC Camera with Microphone (SN9C202 + OM6802) - 62b0 PC Camera with Microphone (SN9C202 + MI0360/MT9V011 or MI0360SOC/MT9V111) - 62b3 PC Camera with Microphone (SN9C202 + OV9655) - 62ba PC Camera with Microphone (SN9C202 + S5K53BEB) - 62bb PC Camera with Microphone (SN9C202 + OV7660) - 62bc PC Camera with Microphone (SN9C202 + HV7131R) - 62be PC Camera with Microphone (SN9C202 + OV7663) - 62c0 Sonix USB 2.0 Camera - 62e0 MSI Starcam Racer - 6310 Sonix USB 2.0 Camera - 63e0 Sonix Integrated Webcam - 63f1 Integrated Webcam - 63f8 Sonix Integrated Webcam - 6409 Webcam - 6417 Integrated Webcam - 8000 DC31VC - 8006 Dual Mode Camera (8006 VGA) - 800a Vivitar Vivicam3350B -0c46 WaveRider Communications, Inc. -0c4b Reiner SCT Kartensysteme GmbH - 0100 cyberJack e-com/pinpad - 0300 cyberJack pinpad(a) - 9102 cyberJack RFID basis contactless smartcard reader -0c52 Sealevel Systems, Inc. - 2101 Serial Converter -0c53 ViewPLUS, Inc. -0c54 Glory, Ltd -0c55 Spectrum Digital, Inc. - 0510 Spectrum Digital XDS510 JTAG Debugger - 0540 SPI540 - 5416 TMS320C5416 DSK - 6416 TMS320C6416 DDB -0c56 Billion Bright, Ltd -0c57 Imaginative Design Operation Co., Ltd -0c58 Vidar Systems Corp. -0c59 Dong Guan Shinko Wire Co., Ltd -0c5a TRS International Mfg., Inc. -0c5e Xytronix Research & Design -0c60 Apogee Electronics Corp. -0c62 Chant Sincere Co., Ltd -0c63 Toko, Inc. -0c64 Signality System Engineering Co., Ltd -0c65 Eminence Enterprise Co., Ltd -0c66 Rexon Electronics Corp. -0c67 Concept Telecom, Ltd -0c70 MCT Elektronikladen - 0000 USB08 Development board -0c74 Optronic Laboratories Inc. - 0002 OL 700-30 Goniometer -0c76 JMTek, LLC. - 0001 Mass Storage Controller - 0002 Mass Storage Controller - 0003 USBdisk - 0004 Mass Storage Controller - 0005 Transcend Flash disk - 0006 Transcend JetFlash - 0007 Mass Storage Device - 1605 SSS Headphone Set - 1607 audio controller -0c77 Sipix Group, Ltd - 1001 SiPix Web2 - 1002 SiPix SC2100 - 1010 SiPix Snap - 1011 SiPix Blink 2 - 1015 SiPix CAMeleon -0c78 Detto Corp. -0c79 NuConnex Technologies Pte., Ltd -0c7a Wing-Span Enterprise Co., Ltd -0c86 NDA Technologies, Inc. -0c88 Kyocera Wireless Corp. - 0021 Handheld - 17da Qualcomm Kyocera CDMA Technologies MSM -0c89 Honda Tsushin Kogyo Co., Ltd -0c8a Pathway Connectivity, Inc. -0c8b Wavefly Corp. -0c8c Coactive Networks -0c8d Tempo -0c8e Cesscom Co., Ltd - 6000 Luxian Series -0c8f Applied Microsystems -0c98 Berkshire Products, Inc. - 1140 USB PC Watchdog -0c99 Innochips Co., Ltd -0c9a Hanwool Robotics Corp. -0c9b Jobin Yvon, Inc. -0c9d SemTek - 0170 3873 Manual Insert card reader -0ca2 Zyfer -0ca3 Sega Corp. -0ca4 ST&T Instrument Corp. -0ca5 BAE Systems Canada, Inc. -0ca6 Castles Technology Co., Ltd - 0010 EZUSB PC/SC Smart Card Reader - 0050 EZ220PU Reader Controller - 1077 Bludrive Family Smart Card Reader - 107e Reader Controller - 2010 myPad110 PC/SC Smart Card Reader - 3050 EZ710 Smart Card Reader -0ca7 Information Systems Laboratories -0cad Motorola CGISS - 9001 PowerPad Pocket PC Device -0cae Ascom Business Systems, Ltd -0caf Buslink - 2507 Hi-Speed USB-to-IDE Bridge Controller - 2515 Flash Disk Embedded Hub - 2516 Flash Disk Security Device - 2517 Flash Disk Mass Storage Device - 25c7 Hi-Speed USB-to-IDE Bridge Controller - 3a00 Hard Drive - 3a20 Mass Storage Device - 3acd Mass Storage Device -0cb0 Flying Pig Systems -0cb1 Innovonics, Inc. -0cb6 Celestix Networks, Pte., Ltd -0cb7 Singatron Enterprise Co., Ltd -0cb8 Opticis Co., Ltd -0cba Trust Electronic (Shanghai) Co., Ltd -0cbb Shanghai Darong Electronics Co., Ltd -0cbc Palmax Technology Co., Ltd - 0101 Pocket PC P6C - 0201 Personal Digital Assistant - 0301 Personal Digital Assistant P6M+ - 0401 Pocket PC -0cbd Pentel Co., Ltd (Electronics Equipment Div.) -0cbe Keryx Technologies, Inc. -0cbf Union Genius Computer Co., Ltd -0cc0 Kuon Yi Industrial Corp. -0cc1 Given Imaging, Ltd -0cc2 Timex Corp. -0cc3 Rimage Corp. -0cc4 emsys GmbH -0cc5 Sendo -0cc6 Intermagic Corp. -0cc7 Kontron Medical AG -0cc8 Technotools Corp. -0cc9 BroadMAX Technologies, Inc. -0cca Amphenol -0ccb SKNet Co., Ltd -0ccc Domex Technology Corp. -0ccd TerraTec Electronic GmbH - 0012 PHASE 26 - 0013 PHASE 26 - 0014 PHASE 26 - 0015 Flash Update for TerraTec PHASE 26 - 0021 Cameo Grabster 200 - 0023 Mystify Claw - 0028 Aureon 5.1 MkII - 0032 MIDI HUBBLE - 0035 Miditech Play'n Roll - 0036 Cinergy 250 Audio - 0037 Cinergy 250 Audio - 0038 Cinergy T² DVB-T Receiver - 0039 Grabster AV 400 - 003b Cinergy 400 - 003c Grabster AV 250 - 0042 Cinergy Hybrid T XS - 0043 Cinergy T XS - 004e Cinergy T XS - 004f Cinergy Analog XS - 0055 Cinergy T XE (Version 1, AF9005) - 005c Cinergy T² - 0069 Cinergy T XE (Version 2, AF9015) - 0072 Cinergy Hybrid T - 0077 Aureon Dual USB - 0086 Cinergy Hybrid XE - 0097 Cinergy T RC MKII - 00a5 Cinergy Hybrid Stick - 00a9 RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black] -0cd4 Bang Olufsen - 0101 BeolinkPC2 -0cd5 LabJack Corporation - 0003 U3 - 0009 UE9 -0cd7 NewChip S.r.l. -0cd8 JS Digitech, Inc. - 2007 Smart Card Reader/JSTU-9700 -0cd9 Hitachi Shin Din Cable, Ltd -0cde Z-Com - 0001 XI-750 802.11b Wireless Adapter [Atmel AT76C503A] - 0002 XI-725/726 Prism2.5 802.11b Adapter - 0003 Sagem 802.11b Dongle - 0004 Sagem 802.11b Dongle - 0005 XI-735 Prism3 802.11b Adapter - 0006 XG-300 802.11b Adapter - 0008 XG-703A 802.11g Wireless Adapter [Intersil ISL3887] - 0009 (ZD1211)IEEE 802.11b+g Adapter - 0011 ZD1211 - 0012 AR5523 - 0013 AR5523 driver (no firmware) - 0014 NB 802.11g Wireless LAN Adapter(3887A) - 0015 XG-705A 802.11g Wireless Adapter [Intersil ISL3887] - 0016 NB 802.11g Wireless LAN Adapter(3887A) - 0018 NB 802.11a/b/g Wireless LAN Adapter(3887A) - 001a 802.11bg - 001c 802.11b/g Wireless Network Adapter - 0020 AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B] - 0022 802.11b/g/n Wireless Network Adapter - 0023 UB81 802.11bgn - 0025 802.11b/g/n USB Wireless Network Adapter - 0026 UB82 802.11abgn -0ce5 Validation Technologies International - 0003 Matrix -0ce9 pico Technology - 1001 PicoScope3204 -0cf1 e-Conn Electronic Co., Ltd -0cf2 ENE Technology, Inc. - 6220 SD Card Reader (SG361) - 6225 SD card reader (UB6225) - 6250 SD card reader (UB6250) -0cf3 Atheros Communications, Inc. - 0001 AR5523 - 0002 AR5523 (no firmware) - 0003 AR5523 - 0004 AR5523 (no firmware) - 0005 AR5523 - 0006 AR5523 (no firmware) - 1001 Thomson TG121N [Atheros AR9001U-(2)NG] - 1002 TP-Link TL-WN821N v2 [Atheros AR9001U-(2)NG] - 1006 TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271] - 1010 3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170] - 3000 AR3011 - 7015 TP-Link TL-WN821N - 9170 AR9170 802.11n - 9271 AR9271 802.11n - b002 Ubiquiti WiFiStation 802.11n [Atheros AR9271] - b003 Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271] -0cf4 Fomtex Corp. -0cf5 Cellink Co., Ltd -0cf6 Compucable Corp. -0cf7 ishoni Networks -0cf8 Clarisys, Inc. - 0750 Claritel-i750 - vp -0cf9 Central System Research Co., Ltd -0cfa Inviso, Inc. -0cfc Minolta-QMS, Inc. - 2301 Magicolor 2300 DL - 2350 Magicolor 2350EN/3300 - 3100 Magicolor 3100 - 7300 Magicolor 5450/5550 -0cff SAFA MEDIA Co., Ltd. - 0320 SR-380N -0d06 telos EDV Systementwicklung GmbH -0d08 UTStarcom - 0602 DV007 [serial] - 0603 DV007 [storage] -0d0b Contemporary Controls -0d0c Astron Electronics Co., Ltd -0d0d MKNet Corp. -0d0e Hybrid Networks, Inc. -0d0f Feng Shin Cable Co., Ltd -0d10 Elastic Networks - 0001 StormPort (WDM) -0d11 Maspro Denkoh Corp. -0d12 Hansol Electronics, Inc. -0d13 BMF Corp. -0d14 Array Comm, Inc. -0d15 OnStream b.v. -0d16 Hi-Touch Imaging Technologies Co., Ltd - 0001 PhotoShuttle - 0002 Photo Printer 730 series - 0004 Photo Printer 63xPL/PS - 0100 Photo Printer 63xPL/PS - 0102 Photo Printer 64xPS - 0103 Photo Printer 730 series - 0104 Photo Printer 63xPL/PS - 0105 Photo Printer 64xPS - 0200 Photo Printer 64xDL -0d17 NALTEC, Inc. -0d18 coaXmedia -0d19 Hank Connection Industrial Co., Ltd -0d28 NXP - 0204 LPC1768 -0d32 Leo Hui Electric Wire & Cable Co., Ltd -0d33 AirSpeak, Inc. -0d34 Rearden Steel Technologies -0d35 Dah Kun Co., Ltd -0d3a Posiflex Technologies, Inc. -0d3c Sri Cable Technology, Ltd -0d3d Tangtop Technology Co., Ltd - 0001 HID Keyboard -0d3e Fitcom, inc. -0d3f MTS Systems Corp. -0d40 Ascor, Inc. -0d41 Ta Yun Terminals Industrial Co., Ltd -0d42 Full Der Co., Ltd -0d46 Kobil Systems GmbH - 2012 KAAN Standard Plus (Smartcard reader) - 3003 mIDentity Light / KAAN SIM III - 4000 mIDentity (mass storage) - 4001 mIDentity Basic/Classic (composite device) - 4081 mIDentity Basic/Classic (installationless) -0d49 Maxtor - 3000 Drive - 3010 3000LE Drive - 3100 Hi-Speed USB-IDE Bridge Controller - 3200 Personal Storage 3200 - 5000 5000XT Drive - 5010 5000LE Drive - 5020 Mobile Hard Disk Drive - 7000 OneTouch - 7010 OneTouch - 7410 Mobile Hard Disk Drive (1TB) - 7450 Basics Portable USB Device -0d4a NF Corp. -0d4b Grape Systems, Inc. -0d4c Tedas AG -0d4d Coherent, Inc. -0d4e Agere Systems Netherland BV - 047a WLAN Card - 1000 Wireless Card Model 0801 - 1001 Wireless Card Model 0802 -0d4f EADS Airbus France -0d50 Cleware GmbH - 0011 USB-Temp2 Thermometer -0d51 Volex (Asia) Pte., Ltd -0d53 HMI Co., Ltd -0d54 Holon Corp. -0d55 ASKA Technologies, Inc. -0d56 AVLAB Technology, Inc. -0d57 Solomon Microtech, Ltd -0d5c SMC Networks, Inc. - a001 SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A] - a002 SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a] -0d5e Myacom, Ltd - 2346 BT Digital Access adapter -0d5f CSI, Inc. -0d60 IVL Technologies, Ltd -0d61 Meilu Electronics (Shenzhen) Co., Ltd -0d62 Darfon Electronics Corp. - 0003 Smartcard Reader - 0004 Filter Driver - 001c Benq X120 Internet Keyboard Pro - 0306 M530 Mouse - 0800 Magic Wheel - 2021 AM805 Keyboard - 2026 TECOM Bluetooth Device - 2050 Mouse - 2106 Dell L20U Multimedia Keyboard - a100 Optical Mouse -0d63 Fritz Gegauf AG -0d64 DXG Technology Corp. - 0105 Dual Mode Digital Camera 1.3M - 0107 Horus MT-409 Camera - 0108 Dual Mode Digital Camera - 0202 Dual Mode Video Camera Device - 0303 DXG-305V Camera - 1001 SiPix Stylecam/UMAX AstraPix 320s - 1002 Fashion Cam 01 Dual-Mode DSC (Video Camera) - 1003 Fashion Cam Dual-Mode DSC (Controller) - 1021 D-Link DSC 350F - 1208 Dual Mode Still Camera Device - 2208 Mass Storage - 3105 Dual Mode Digital Camera Disk - 3108 Digicam Mass Storage Device -0d65 KMJP Co., Ltd -0d66 TMT -0d67 Advanet, Inc. -0d68 Super Link Electronics Co., Ltd -0d69 NSI -0d6a Megapower International Corp. -0d6b And-Or Logic -0d70 Try Computer Co., Ltd -0d71 Hirakawa Hewtech Corp. -0d72 Winmate Communication, Inc. -0d73 Hit's Communications, Inc. -0d76 MFP Korea, Inc. -0d77 Power Sentry/Newpoint -0d78 Japan Distributor Corp. -0d7a MARX Datentechnik GmbH -0d7b Wellco Technology Co., Ltd -0d7c Taiwan Line Tek Electronic Co., Ltd -0d7d Phison Electronics Corp. - 0100 PS1001/1011/1006/1026 Flash Disk - 0110 Gigabyte FlexDrive - 0120 Disk Pro 64MB - 0124 GIGABYTE Disk - 0240 I/O-Magic/Transcend 6-in-1 Card Reader - 110e NEC uPD720121/130 USB-ATA/ATAPI Bridge - 1240 Apacer 6-in-1 Card Reader 2.0 - 1270 Wolverine SixPac 6000 - 1300 Flash Disk - 1320 PS2031 Flash Disk - 1400 Attache 256MB USB 2.0 Flash Drive - 1420 PS2044 Pen Drive - 1470 Vosonic X's-Drive II+ VP2160 - 1620 USB Disk Pro - 1900 USB Thumb Drive -0d7e American Computer & Digital Components - 2507 Hi-Speed USB-to-IDE Bridge Controller - 2517 Hi-Speed Mass Storage Device - 25c7 Hi-Speed USB-to-IDE Bridge Controller -0d7f Essential Reality LLC - 0100 P5 Glove glove controller -0d80 H.R. Silvine Electronics, Inc. -0d81 TechnoVision -0d83 Think Outside, Inc. -0d87 Dolby Laboratories Inc. -0d89 Oz Software -0d8a King Jim Co., Ltd - 0101 TEPRA PRO -0d8b Ascom Telecommunications, Ltd -0d8c C-Media Electronics, Inc. - 0001 Audio Device - 0002 Composite Device - 0003 Sound Device - 0006 Storm HP-USB500 5.1 Headset - 000c Audio Adapter - 000d Composite Device - 000e Audio Adapter (Planet UP-100, Genius G-Talk) - 001f CM108 Audio Controller - 0102 CM106 Like Sound Device - 0103 CM102-A+/102S+ Audio Controller - 0104 CM103+ Audio Controller - 0105 CM108 Audio Controller - 0107 CM108 Audio Controller - 010f CM108 Audio Controller - 0115 CM108 Audio Controller - 0201 CM6501 - 5000 Mass Storage Controller - 5200 Mass Storage Controller(0D8C,5200) - b213 USB Phone CM109 (aka CT2000,VPT1000) -0d8d Promotion & Display Technology, Ltd - 0234 V-234 Composite Device - 0550 V-550 Composite Device - 0551 V-551 Composite Device - 0552 V-552 Composite Device - 0651 V-651 Composite Device - 0652 V-652 Composite Device - 0653 V-653 Composite Device - 0654 V-654 Composite Device - 0655 V-655 Composite Device - 0656 V-656 Composite Device - 0657 V-657 Composite Device - 0658 V-658 Composite Device - 0659 V-659 Composite Device - 0660 V-660 Composite Device - 0661 V-661 Composite Device - 0662 V-662 Composite Device - 0850 V-850 Composite Device - 0851 V-851 Composite Device - 0852 V-852 Composite Device - 0901 V-901 Composite Device - 0902 V-902 Composite Device - 0903 V-903 Composite Device - 4754 Voyager DMP Composite Device - bb00 Bloomberg Composite Device - bb01 Bloomberg Composite Device - bb02 Bloomberg Composite Device - bb03 Bloomberg Composite Device - bb04 Bloomberg Composite Device - bb05 Bloomberg Composite Device - fffe Global Tuner Composite Device - ffff Voyager DMP Composite Device -0d8e Global Sun Technology, Inc. - 0163 802.11g 54 Mbps Wireless Dongle - 1621 802.11b Wireless Adapter - 3762 Cohiba 802.11g Wireless Mini adapter [Intersil ISL3887] - 3763 802.11g Wireless dongle - 7100 802.11b Adapter - 7110 WL-210 / WU210P 802.11b Wireless Adapter [Atmel AT76C503A] - 7605 TRENDnet TEW-224UB 802.11b Wireless Adapter [Atmel AT76C503A] - 7801 AR5523 - 7802 AR5523 (no firmware) - 7811 AR5523 - 7812 AR5523 (no firmware) - 7a01 PRISM25 802.11b Adapter -0d8f Pitney Bowes -0d90 Sure-Fire Electrical Corp. -0d96 Skanhex Technology, Inc. - 0000 Jenoptik JD350 video - 3300 SX330z Camera - 4100 SX410z Camera - 4102 MD 9700 Camera - 4104 Jenoptik JD-4100z3s - 410a Medion 9801/Novatech SX-410z - 5200 SX-520z Camera -0d97 Santa Barbara Instrument Group - 0001 SBIG Astronomy Camera (without firmware) - 0101 SBIG Astronomy Camera (with firmware) -0d98 Mars Semiconductor Corp. - 0300 Avaya Wireless Card -0d99 Trazer Technologies, Inc. -0d9a RTX Telecom AS - 0001 Bluetooth Device -0d9b Tat Shing Electrical Co. -0d9c Chee Chen Hi-Technology Co., Ltd -0d9d Sanwa Supply, Inc. -0d9e Avaya - 0300 Wireless Card -0d9f Powercom Co., Ltd - 0001 Uninterruptible Power Supply - 0002 Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232) - 00a2 Imperial Uninterruptible Power Supply (HID PDC) - 00a3 Smart King PRO Uninterruptible Power Supply (HID PDC) - 00a4 WOW Uninterruptible Power Supply (HID PDC) - 00a5 Vanguard Uninterruptible Power Supply (HID PDC) - 00a6 Black Knight PRO Uninterruptible Power Supply (HID PDC) -0da0 Danger Research -0da1 Suzhou Peter's Precise Industrial Co., Ltd -0da2 Land Instruments International, Ltd -0da3 Nippon Electro-Sensory Devices Corp. -0da4 Polar Electro OY - 0001 Interface -0da7 IOGear, Inc. -0da8 softDSP Co., Ltd - 0001 SDS 200A Oscilloscope -0dab Cubig Group - 0100 DVR/CVR-M140 MP3 Player -0dad Westover Scientific -0db0 Micro Star International - 1020 PC2PC WLAN Card - 1967 Bluetooth Dongle - 3801 Motorola Bluetooth 2.1+EDR Device - 4011 Medion Flash XL V2.0 Card Reader - 4600 802.11b/g Turbo Wireless Adapter - 5501 Mass Storage Device - 5502 Mass Storage Device - 5513 MP3 Player - 5515 MP3 Player - 5516 MP3 Player - 5580 Mega Sky 580 DVB-T Tuner [M902x] - 5581 Mega Sky 580 DVB-T Tuner [GL861] - 6823 UB11B/MS-6823 802.11b Wi-Fi adapter - 6826 IEEE 802.11g Wireless Network Adapter - 6855 Bluetooth Device - 6861 MSI-6861 802.11g WiFi adapter - 6865 RT2570 - 6869 RT2570 - 6874 RT2573 - 6877 RT2573 - 6881 Bluetooth Class I EDR Device - 688a Bluetooth Class I EDR Device - 6899 802.11bgn 1T1R Mini Card Wireless Adapter - 6970 MS-6970 BToes Bluetooth adapter - 697a Bluetooth Dongle - 6982 Medion Flash XL Card Reader - a861 RT2573 - a874 RT2573 - a970 Bluetooth dongle - a97a Bluetooth EDR Device - b970 Bluetooth EDR Device - b97a Bluetooth EDR Device -0db1 Wen Te Electronics Co., Ltd -0db2 Shian Hwi Plug Parts, Plastic Factory -0db3 Tekram Technology Co., Ltd -0db4 Chung Fu Chen Yeh Enterprise Corp. -0db7 ELCON Systemtechnik - 0002 Goldpfeil P-LAN -0dbc A&D Medical - 0003 AND Serial Cable [AND Smart Cable] -0dbe Jiuh Shiuh Precision Industry Co., Ltd -0dbf Quik Tech Solutions - 0002 SmartDongle Security Key - 0200 HDD Storage Solution - 021b USB-2.0 IDE Adapter - 0300 Storage Adapter - 0333 Storage Adapter - 0707 ZIV Drive -0dc0 G7 Solutions (formerly Great Notions) -0dc1 Tamagawa Seiki Co., Ltd -0dc3 Athena Smartcard Solutions, Inc. - 0801 ASEDrive III - 0802 ASEDrive IIIe - 1104 ASEDrive IIIe KB - 1701 ASEKey - 1702 ASEKey -0dc4 Macpower Peripherals, Ltd - 0040 Mass Storage Device - 0041 Mass Storage Device - 0042 Mass Storage Device - 0101 Hi-Speed Mass Storage Device -0dc5 SDK Co., Ltd -0dc6 Precision Squared Technology Corp. - 2301 Wireless Touchpad Keyboard -0dc7 First Cable Line, Inc. -0dcd NetworkFab Corp. - 0001 Remote Interface Adapter - 0002 High Bandwidth Codec -0dd0 Access Solutions - 1002 Triple Talk Speech Synthesizer -0dd1 Contek Electronics Co., Ltd -0dd2 Power Quotient International Co., Ltd - 0003 Mass Storage (P) -0dd3 MediaQ -0dd4 Custom Engineering SPA -0dd5 California Micro Devices -0dd7 Kocom Co., Ltd -0dd8 Netac Technology Co., Ltd - 1060 USB-CF-Card - e007 OnlyDisk U222 Pendrive - f607 OnlyDisk U208 1G flash drive [U-SAFE] -0dd9 HighSpeed Surfing -0dda Integrated Circuit Solution, Inc. - 0001 Multi-Card Reader 6in1 - 0002 Multi-Card Reader 7in1 - 0003 Flash Disk - 0005 Internal Multi-Card Reader 6in1 - 0008 SD single card reader - 0009 MS single card reader - 000a MS+SD Dual Card Reader - 000b SM single card reader - 0101 All-In-One Card Reader - 0102 All-In-One Card Reader - 0301 MP3 Player - 0302 Multi-Card MP3 Player - 1001 Multi-Flash Disk - 2001 Multi-Card Reader - 2002 Q018 default PID - 2003 Multi-Card Reader - 2005 Datalux DLX-1611 16in1 Card Reader - 2006 All-In-One Card Reader - 2007 USB to ATAPI bridge - 2008 All-In-One Card Reader - 2013 SD/MS Combo Card Reader - 2014 SD/MS Single Card Reader - 2023 card reader SD/MS DEMO board with ICSI brand name (MaskROM version) - 2024 card reader SD/MS DEMO board with Generic brand name (MaskROM version) - 2026 USB2.0 Card Reader - 2027 USB 2.0 Card Reader - 2315 UFD MP3 player (model 2) - 2318 UFD MP3 player (model 1) - 2321 UFD MP3 player -0ddb Tamarack, Inc. -0ddd Datelink Technology Co., Ltd -0dde Ubicom, Inc. -0de0 BD Consumer Healthcare -0dea UTECH Electronic (D.G.) Co., Ltd. -0ded Novasonics -0dee Lifetime Memory Products - 4010 Storage Adapter -0def Full Rise Electronic Co., Ltd -0df4 NET&SYS - 0201 MNG-2005 -0df6 Sitecom Europe B.V. - 0001 C-Media VOIP Device - 0004 Bluetooth 2.0 Adapter 100m - 0007 Bluetooth 2.0 Adapter 10m - 000b Bluetooth 2.0 Adapter DFU - 000d WL-168 Wireless Network Adapter 54g - 0017 WL-182 Wireless-N Network USB Card - 0019 Bluetooth 2.0 adapter 10m CN-512v2 001 - 001a Bluetooth 2.0 adapter 100m CN-521v2 001 - 002b WL-188 Wireless Network 300N USB Adapter - 002c WL-301 Wireless Network 300N USB Adapter - 002d WL-302 Wireless Network 300N USB dongle - 0036 WL-603 Wireless Adapter - 0039 WL-315 Wireless-N USB Adapter - 003b WL-321 Wireless USB Gaming Adapter 300N - 003c WL-323 Wireless-N USB Adapter - 003d WL-324 Wireless USB Adapter 300N - 003e WL-343 Wireless USB Adapter 150N X1 - 003f WL-608 Wireless USB Adapter 54g - 0040 WL-344 Wireless USB Adapter 300N X2 - 0041 WL-329 Wireless Dualband USB adapter 300N - 0042 WL-345 Wireless USB adapter 300N X3 - 0045 WL-353 Wireless USB Adapter 150N Nano - 0047 WL-352v1 Wireless USB Adapter 300N 002 - 0048 WL-349v1 Wireless USB Adapter 150N 002 - 004a WL-358v1 Wireless Micro USB Adapter 300N X3 002 - 004b WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU] - 004c WL-352 802.11n Adapter [realtek rtl8191s] - 0050 WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370] - 061c LN-028 Network USB 2.0 Adapter - 21f4 44 St Bluetooth Device - 2200 Sitecom bluetooth2.0 class 2 dongle CN-512 - 2208 Sitecom bluetooth2.0 class 2 dongle CN-520 - 2209 Sitecom bluetooth2.0 class 1 dongle CN-521 - 9071 WL-113 rev 1 Wireless Network USB Adapter - 9075 WL-117 Hi-Speed USB Adapter - 90ac WL-172 Wireless Network USB Adapter 54g Turbo - 9712 WL-113 rev 2 Wireless Network USB Adapter -0df7 Mobile Action Technology, Inc. - 0620 MA-620 Infrared Adapter - 0700 MA-700 Bluetooth Adapter - 0720 MA-720 Bluetooth Adapter - 0722 Bluetooth Dongle - 0730 MA-730/MA-730G Bluetooth Adapter - 0800 Data Cable - 0820 Data Cable - 0900 MA i-gotU Travel Logger GPS - 1800 Generic Card Reader - 1802 Card Reader -0dfa Toyo Communication Equipment Co., Ltd -0dfc GeneralTouch Technology Co., Ltd - 0001 Touchscreen -0e03 Nippon Systemware Co., Ltd -0e08 Winbest Technology Co., Ltd -0e0b Amigo Technology Inc. - 9031 802.11n Wireless USB Card - 9041 802.11n Wireless USB Card -0e0c Gesytec - 0101 LonUSB LonTalk Network Adapter -0e0f VMware, Inc. - 0001 Device - 0002 Virtual USB Hub - 0003 Virtual Mouse - 0004 Virtual CCID - 0005 Virtual Mass Storage - 0006 Virtual Keyboard - f80a Smoker FX2 -0e16 JMTek, LLC -0e17 Walex Electronic, Ltd -0e1b Crewave -0e20 Pegasus Technologies Ltd. - 0101 NoteTaker -0e21 Cowon Systems, Inc. - 0300 iAudio CW200 - 0400 MP3 Player - 0500 iAudio M3 - 0510 iAudio X5, subpack USB port - 0513 iAudio X5, side USB port - 0520 iAudio M5, side USB port - 0601 iAudio G3 - 0700 iAudio U3 - 0751 iAudio 7 - 0760 iAUDIO U5 / iAUDIO G2 - 0800 Cowon D2 (UMS mode) - 0801 Cowon D2 (MTP mode) - 0910 iAUDIO 9 - 0920 J3 -0e22 Symbian Ltd. -0e23 Liou Yuane Enterprise Co., Ltd -0e25 VinChip Systems, Inc. -0e26 J-Phone East Co., Ltd -0e30 HeartMath LLC -0e34 Micro Computer Control Corp. -0e35 3Pea Technologies, Inc. -0e36 TiePie engineering - 0008 Handyscope HS3 - 0009 Handyscope HS3 (br) - 000a Handyscope HS4 - 000b Handyscope HS4 (br) - 000e Handyscope HS4-DIFF - 000f Handyscope HS4-DIFF (br) - 0010 Handyscope HS2 - 0011 TiePieSCOPE HS805 (br) - 0012 TiePieSCOPE HS805 - 0018 Handyprobe HP2 - 0042 TiePieSCOPE HS801 - 00fd USB To Parallel adapter - 00fe USB To Parallel adapter -0e38 Stratitec, Inc. -0e39 Smart Modular Technologies, Inc. - 0137 Bluetooth Device -0e3a Neostar Technology Co., Ltd - 1100 CW-1100 Wireless Network Adapter -0e3b Mansella, Ltd -0e41 Line6, Inc. - 4147 TonePort GX - 4250 BassPODxt - 4252 BassPODxt Pro - 4642 BassPODxt Live - 4650 PODxt Live - 4750 GuitarPort - 5044 PODxt - 5050 PODxt Pro - 534d SeaMonkey -0e44 Sun-Riseful Technology Co., Ltd. -0e48 Julia Corp., Ltd - 0100 CardPro SmartCard Reader -0e4a Shenzhen Bao Hing Electric Wire & Cable Mfr. Co. -0e4c Radica Games, Ltd - 1097 Gamester Controller - 2390 Games Jtech Controller - 7288 funkey reader -0e55 Speed Dragon Multimedia, Ltd - 110a Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter] - 110b MS3303H USB-to-Serial Bridge -0e56 Kingston Technology Company, Inc. - 6021 K-PEX 100 -0e5a Active Co., Ltd -0e5b Union Power Information Industrial Co., Ltd -0e5c Bitland Information Technology Co., Ltd - 6118 LCD Device - 6119 remote receive and control device - 6441 C-Media Sound Device -0e5d Neltron Industrial Co., Ltd -0e5e Conwise Technology Co., Ltd. - 6622 CW6622 -0e66 Hawking Technologies - 0001 HWUN1 Hi-Gain Wireless-300N Adapter w/ Upgradable Antenna [Ralink RT2870] - 0003 HWDN1 Hi-Gain Wireless-300N Dish Adapter [Ralink RT2870] - 0009 HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770] - 000b HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770] - 0013 HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070] - 0017 HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070] - 0018 Wireless-N Network Adapter [Ralink RT2870] - 400b UF100 10/100 Network Adapter - 400c UF100 Ethernet [pegasus2] -0e67 Fossil, Inc. - 0002 Wrist PDA -0e6a Megawin Technology Co., Ltd - 0101 MA100 [USB-UART Bridge IC] - 6001 GEMBIRD Flexible keyboard KB-109F-B-DE -0e6f Logic3 - 0003 Freebird wireless Controller - 0005 Eclipse wireless Controller - 0006 Edge wireless Controller -0e70 Tokyo Electronic Industry Co., Ltd -0e72 Hsi-Chin Electronics Co., Ltd -0e75 TVS Electronics, Ltd -0e79 Archos, Inc. - 1106 Pocket Media Assistant - PMA400 - 1204 Gmini XS 200 - 1306 504 Portable Multimedia Player - 1330 5 Tablet - 1332 5 IMT - 1416 32 IT -0e7b On-Tech Industry Co., Ltd -0e7e Gmate, Inc. - 0001 Yopy 3000 PDA - 1001 YP3X00 PDA -0e82 Ching Tai Electric Wire & Cable Co., Ltd -0e83 Shin An Wire & Cable Co. -0e8c Well Force Electronic Co., Ltd -0e8d MediaTek Inc. - 0003 MT6227 phone - 0004 MT6227 phone -0e8f GreenAsia Inc. - 0003 MaxFire Blaze2 - 0012 USB Wireless 2.4GHz Gamepad - 0016 4 port USB 1.1 hub UH-174 - 0020 USB to PS/2 Adapter - 0021 Multimedia Keyboard Controller - 0201 SmartJoy Frag Xpad/PS2 adaptor -0e90 WiebeTech, LLC - 0100 Storage Adapter V1 -0e91 VTech Engineering Canada, Ltd -0e92 C's Glory Enterprise Co., Ltd -0e93 eM Technics Co., Ltd -0e95 Future Technology Co., Ltd -0e96 Aplux Communications, Ltd - c001 TRUST 380 USB2 SPACEC@M -0e97 Fingerworks, Inc. - 0908 Composite HID (Keyboard and Mouse) -0e98 Advanced Analogic Technologies, Inc. -0e99 Parallel Dice Co., Ltd -0e9a TA HSING Industries, Ltd -0e9b ADTEC Corp. -0e9c Streamzap, Inc. - 0000 Streamzap Remote Control -0e9f Tamura Corp. -0ea0 Ours Technology, Inc. - 2126 7-in-1 Card Reader - 2153 SD Card Reader Key - 2168 Transcend JetFlash 2.0 / Astone USB Drive - 6803 OTI-6803 Flash Disk - 6808 OTI-6808 Flash Disk - 6828 OTI-6828 Flash Disk -0ea6 Nihon Computer Co., Ltd -0ea7 MSL Enterprises Corp. -0ea8 CenDyne, Inc. -0ead Humax Co., Ltd -0eb0 NovaTech - 9020 NovaTech NV-902W - 9021 RT2573 -0eb1 WIS Technologies, Inc. - 6666 WinFast WalkieTV TV Loader - 6668 WinFast WalkieTV TV Loader - 7007 WinFast WalkieTV WDM Capture -0eb2 Y-S Electronic Co., Ltd -0eb3 Saint Technology Corp. -0eb7 Endor AG -0ebe VWeb Corp. -0ebf Omega Technology of Taiwan, Inc. -0ec0 LHI Technology (China) Co., Ltd -0ec1 Abit Computer Corp. -0ec2 Sweetray Industrial, Ltd -0ec3 Axell Co., Ltd -0ec4 Ballracing Developments, Ltd -0ec5 GT Information System Co., Ltd -0ec6 InnoVISION Multimedia, Ltd -0ec7 Theta Link Corp. - 1008 So., Show 301 Digital Camera -0ecd Lite-On IT Corp. - 1400 CD\RW 40X - a100 LDW-411SX DVD/CD Rewritable Drive -0ece TaiSol Electronics Co., Ltd -0ecf Phogenix Imaging, LLC -0ed1 WinMaxGroup - 6660 Flash Disk 64M-C - 6680 Flash Disk 64M-B - 7634 MP3 Player -0ed2 Kyoto Micro Computer Co., Ltd -0ed3 Wing-Tech Enterprise Co., Ltd -0ed5 Fiberbyte - e000 USB-inSync Device - f000 Fiberbyte USB-inSync Device - f201 Fiberbyte USB-inSync DAQ-2500X -0eda Noriake Itron Corp. -0edf e-MDT Co., Ltd - 2060 FID irock! 100 Series -0ee0 Shima Seiki Mfg., Ltd -0ee1 Sarotech Co., Ltd -0ee2 AMI Semiconductor, Inc. -0ee3 ComTrue Technology Corp. - 1000 Image Tank 1.5 -0ee4 Sunrich Technology, Ltd -0eee Digital Stream Technology, Inc. - 8810 Mass Storage Drive -0eef D-WAV Scientific Co., Ltd - 0001 eGalax TouchScreen - 0002 Touchscreen Controller(Professional) -0ef0 Hitachi Cable, Ltd -0ef1 Aichi Micro Intelligent Corp. -0ef2 I/O Magic Corp. -0ef3 Lynn Products, Inc. -0ef4 DSI Datotech -0ef5 PointChips - 2202 Flash Disk - 2366 Flash Disk -0ef6 Yield Microelectronics Corp. -0ef7 SM Tech Co., Ltd (Tulip) -0efd Oasis Semiconductor -0efe Wem Technology, Inc. -0f06 Visual Frontier Enterprise Co., Ltd -0f08 CSL Wire & Plug (Shen Zhen) Co. -0f0c CAS Corp. -0f0d Hori Co., Ltd - 0011 Real Arcade Pro 3 -0f0e Energy Full Corp. -0f11 LD Didactic GmbH - 1000 CASSY-S - 1010 Pocket-CASSY - 1020 Mobile-CASSY - 1080 Joule and Wattmeter - 1081 Digital Multimeter P - 1090 UMI P - 1100 X-Ray Apparatus - 1101 X-Ray Apparatus - 1200 VideoCom - 2000 COM3LAB - 2010 Terminal Adapter - 2020 Network Analyser - 2030 Converter Control Unit - 2040 Machine Test System -0f12 Mars Engineering Corp. -0f13 Acetek Technology Co., Ltd -0f18 Finger Lakes Instrumentation - 0002 CCD - 0006 Focuser - 0007 Filter Wheel - 000a ProLine CCD - 000b Color Filter Wheel 4 - 000c PDF2 - 000d Guider -0f19 Oracom Co., Ltd -0f1b Onset Computer Corp. -0f1c Funai Electric Co., Ltd -0f1d Iwill Corp. -0f21 IOI Technology Corp. -0f22 Senior Industries, Inc. -0f23 Leader Tech Manufacturer Co., Ltd -0f24 Flex-P Industries, Snd., Bhd. -0f2d ViPower, Inc. -0f2e Geniality Maple Technology Co., Ltd -0f2f Priva Design Services -0f30 Jess Technology Co., Ltd - 001c PS3 Guitar Controller Dongle - 0110 Dual Analog Rumble Pad - 0111 Colour Rumble Pad - 0208 Xbox & PC Gamepad -0f31 Chrysalis Development -0f32 YFC-BonEagle Electric Co., Ltd -0f37 Kokuyo Co., Ltd -0f38 Nien-Yi Industrial Corp. -0f3d Airprime, Incorporated - 0112 CDMA 1xEVDO PC Card, PC 5220 -0f41 RDC Semiconductor Co., Ltd -0f42 Nital Consulting Services, Inc. -0f44 Polhemus - ef11 Patriot (firmware not loaded) - ef12 Patriot - ff11 Liberty (firmware not loaded) - ff12 Liberty -0f4b St. John Technology Co., Ltd -0f4c WorldWide Cable Opto Corp. -0f4d Microtune, Inc. - 1000 Bluetooth Dongle -0f4e Freedom Scientific -0f52 Wing Key Electrical Co., Ltd -0f53 Dongguan White Horse Cable Factory, Ltd -0f54 Kawai Musical Instruments Mfg. Co., Ltd -0f55 AmbiCom, Inc. -0f5c Prairiecomm, Inc. -0f5d NewAge International, LLC - 9455 Compact Drive -0f5f Key Technology Corp. -0f60 NTK, Ltd -0f61 Varian, Inc. -0f62 Acrox Technologies Co., Ltd - 1001 Targus Mini Trackball Optical Mouse -0f63 LeapFrog Enterprises - 0010 Leapster Explorer - 0500 Fly Fusion - 0600 Leap Port Turbo - 0700 POGO - 0800 Didj - 0900 TAGSchool - 0a00 Leapster 2 - 0b00 Crammer - 0c00 Tag Jr - 0d00 My Pal Scout - 0e00 Tag32 - 0f00 Tag64 - 1000 Kiwi16 - 1100 Leapster L2x - 1111 Fly Fusion - 1300 Didj UK/France (Leapster Advance) -0f68 Kobe Steel, Ltd -0f69 Dionex Corp. -0f6a Vibren Technologies, Inc. -0f6e INTELLIGENT SYSTEMS - 0100 GameBoy Color Emulator - 0201 GameBoy Advance Flash Gang Writer - 0202 GameBoy Advance Capture - 0300 Gamecube DOL Viewer - 0400 NDS Emulator - 0401 NDS UIC - 0402 NDS Writer - 0403 NDS Capture - 0404 NDS Emulator (Lite) -0f73 DFI -0f7c DQ Technology, Inc. -0f7d NetBotz, Inc. -0f7e Fluke Corp. -0f88 VTech Holdings, Ltd - 3012 RT2570 - 3014 ZD1211B -0f8b Yazaki Corp. -0f8c Young Generation International Corp. -0f8d Uniwill Computer Corp. -0f8e Kingnet Technology Co., Ltd -0f8f Soma Networks -0f97 CviLux Corp. -0f98 CyberBank Corp. -0f9c Hyun Won, Inc. - 0301 M-Any Premium DAH-610 MP3/WMA Player - 0332 mobiBLU DAH-1200 MP3/Ogg Player -0f9e Lucent Technologies -0fa3 Starconn Electronic Co., Ltd -0fa4 ATL Technology -0fa5 Sotec Co., Ltd -0fa7 Epox Computer Co., Ltd -0fa8 Logic Controls, Inc. -0faf Winpoint Electronic Corp. -0fb0 Haurtian Wire & Cable Co., Ltd -0fb1 Inclose Design, Inc. -0fb2 Juan-Chern Industrial Co., Ltd -0fb8 Wistron Corp. - 0002 eHome Infrared Receiver -0fb9 AACom Corp. -0fba San Shing Electronics Co., Ltd -0fbb Bitwise Systems, Inc. -0fc1 Mitac Internatinal Corp. -0fc2 Plug and Jack Industrial, Inc. -0fc5 Delcom Engineering - 1222 I/O Development Board -0fc6 Dataplus Supplies, Inc. -0fca Research In Motion, Ltd. - 0001 Blackberry Handheld - 0004 Blackberry Handheld - 0006 Blackberry Pearl - 0008 Blackberry Pearl - 8001 Blackberry Handheld - 8004 Blackberry Handheld - 8007 Blackberry Handheld -0fce Sony Ericsson Mobile Communications AB - 0076 W910i (Multimedia mode) - 00af V640i Phone [PTP Camera] - 00d4 C902 [MTP] - 00d9 C702 Phone - 0112 W995 Walkman Phone - 1010 WMC Modem - 10af V640i Phone [PictBridge] - 10d4 C902 Phone [PictBridge] - 2105 W715 Phone - 2137 Xperia X10 mini (USB debug) - 2138 Xperia X10 mini pro (Debug) - 2149 Xperia X8 (debug) - 3137 Xperia X10 mini - 3138 Xperia X10 mini pro - 3149 Xperia X8 - 8004 9000 Phone [Mass Storage] - d008 V800-Vodafone 802SE Phone - d016 K750i Phone - d017 K608i Phone - d019 VDC EGPRS Modem - d025 520 WMC Data Modem - d028 W800i - d038 W850i Phone - d039 K800i (phone mode) - d041 K510i Phone - d042 W810i Phone - d043 V630i Phone - d046 K610i Phone - d065 W960i Phone (PC Suite) - d076 W910i (Phone mode) - d089 W580i Phone (mass storage) - d0af V640i Phone - d0cf MD300 Mobile Broadband Modem - d0d4 C902 Phone [Modem] - d0e1 MD400 Mobile Broadband Modem - d12e Xperia X10 - e039 K800i (msc mode) - e042 W810i Phone - e043 V630i Phone [Mass Storage] - e075 K850i - e076 W910i (Mass storage) - e089 W580i Phone - e090 W200 Phone (Mass Storage) - e0a3 W660i - e0af V640i Phone [Mass Storage] - e0d4 C902 Phone [Mass Storage] - e0ef C905 Phone [Mass Storage] - e0f3 W595 - e112 W995 Phone (Mass Storage) - e12e X10i Phone -0fcf Dynastream Innovations, Inc. -0fd0 Tulip Computers B.V. -0fd1 Giant Electronics Ltd. -0fd4 Tenovis GmbH & Co., KG -0fd5 Direct Access Technology, Inc. -0fdc Micro Plus -0fe4 IN-Tech Electronics, Ltd -0fe5 Greenconn (U.S.A.), Inc. -0fe6 Kontron (Industrial Computer Source / ICS Advent) - 8101 DM9601 Fast Ethernet Adapter - 811e Parallel Adapter - 9700 DM9601 Fast Ethernet Adapter -0fe9 DVICO - 4020 TViX M-6500 - db00 FusionHDTV DVB-T (MT352+LgZ201) (uninitialized) - db01 FusionHDTV DVB-T (MT352+LgZ201) (initialized) - db10 FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized) - db11 FusionHDTV DVB-T (MT352+Thomson7579) (initialized) - db78 FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized) -0fea United Computer Accessories -0feb CRS Electronic Co., Ltd -0fec UMC Electronics Co., Ltd -0fed Access Co., Ltd -0fee Xsido Corp. -0fef MJ Research, Inc. -0ff6 Core Valley Co., Ltd -0ff7 CHI SHING Computer Accessories Co., Ltd -0fff Aopen, Inc. -1000 Speed Tech Corp. -1001 Ritronics Components (S) Pte., Ltd -1003 Sigma Corp. - 0100 Sigma SD10 -1004 LG Electronics, Inc. - 1fae U8120 3G Cellphone - 6000 KU330/KU990/VX4400/VX6000 - 6005 T5100 - 6018 GM360/GD510/GW520/KP501 - 618e Ally/Optimus One/Vortex (debug mode) - 618f Ally/Optimus One - 61c6 Vortex (msc) - 6800 CDMA Modem - 7000 LG LDP-7024D(LD)USB - a400 Renoir (KC910) -1005 Apacer Technology, Inc. - 1001 MP3 Player - 1004 MP3 Player - 1006 MP3 Player - b113 Handy Steno 2.0/HT203 - b223 CD-RW + 6in1 Card Reader Digital Storage / Converter -1006 iRiver, Ltd. - 3001 iHP-100 - 3002 iHP-120/140 MP3 Player - 3003 H320/H340 - 3004 H340 (mtp) -1009 Emuzed, Inc. - 000e eHome Infrared Receiver - 0013 Angel MPEG Device - 0015 Lumanate Wave PAL SECAM DVBT Device - 0016 Lumanate Wave NTSC/ATSC Combo Device -100a AV Chaseway, Ltd - 2402 MP3 Player - 2404 MP3 Player - 2405 MP3 Player - 2406 MP3 Player - a0c0 MP3 Player -100b Chou Chin Industrial Co., Ltd -100d Netopia, Inc. - 3342 Cayman 3352 DSL Modem - 3382 3380 Series Network Interface - 6072 DSL Modem - 9031 Motorola 802.11n Dualband USB Wireless Adapter - 9032 Motorola 802.11n 5G USB Wireless Adapter - cb01 Cayman 3341 Ethernet DSL Router -1010 Fukuda Denshi Co., Ltd -1011 Mobile Media Tech. - 0001 AccFast Mp3 -1012 SDKM Fibres, Wires & Cables Berhad -1013 TST-Touchless Sensor Technology AG -1014 Densitron Technologies PLC -1015 Softronics Pty., Ltd -1016 Xiamen Hung's Enterprise Co., Ltd -1017 Speedy Industrial Supplies, Pte., Ltd -1019 Elitegroup Computer Systems (ECS) - 0c55 Flash Reader, Desknote UCR-61S2B - 0f38 Infrared Receiver -1020 Labtec - 0006 Wireless Keyboard - 000a Wireless Optical Mouse - 0106 Wireless Optical Mouse -1022 Shinko Shoji Co., Ltd -1025 Hyper-Paltek - 005e USB DVB-T device - 005f USB DVB-T device - 0300 MP3 Player - 0350 MP3 Player -1026 Newly Corp. -1027 Time Domain -1028 Inovys Corp. -1029 Atlantic Coast Telesys -102a Ramos Technology Co., Ltd -102b Infotronic America, Inc. -102c Etoms Electronics Corp. - 6151 Q-Cam Sangha CIF - 6251 Q-Cam VGA -102d Winic Corp. -1031 Comax Technology, Inc. -1032 C-One Technology Corp. -1033 Nucam Corp. - 0068 3,5'' HDD case MD-231 -1038 Ideazon, Inc. - 0100 Zboard -1039 devolo AG - 2140 dsl+ 1100 duo -103d Stanton - 0100 ScratchAmp - 0101 ScratchAmp -1043 iCreate Technologies Corp. - 160f Wireless Network Adapter - 4901 AV-836 Video Capture Device - 8006 Flash Disk 32-256 MB - 8012 Flash Disk 256 MB -1044 Chu Yuen Enterprise Co., Ltd - 7001 Gigabyte U7000 DVB-T tuner - 7002 Gigabyte U8000 DVB-T tuner - 7004 Gigabyte U7100 DVB-T tuner - 7005 Gigabyte U7200 DVB-T tuner [AF9035] - 7006 Gigabyte U6000 DVB-T tuner [em2863] - 8001 GN-54G - 8002 GN-BR402W - 8003 GN-WLBM101 - 8004 GN-WLBZ101 802.11b Adapter - 8005 GN-WLBZ201 802.11b Adapter - 8006 GN-WBZB-M 802.11b Adapter - 8007 GN-WBKG - 8008 GN-WB01GS - 800a GN-WI05GS - 800b GN-WB30N 802.11n WLAN Card - 800c GN-WB31N 802.11n USB WLAN Card - 800d GN-WB32L 802.11n USB WLAN Card -1046 Winbond Electronics Corp. [hex] - 6694 Generic W6694 USB - 8901 Bluetooth Device - 9967 W9967CF/W9968CF Webcam IC -1048 Targus Group International -104b Mylex / Buslogic -104c AMCO TEC International, Inc. -104d Newport Corporation - 1003 Model-52 LED Light Source Power Supply and Driver -104f WB Electronics - 0001 Infinity Phoenix - 0002 Smartmouse - 0003 FunProgrammer - 0004 Infinity Unlimited - 0006 Infinity Smart - 0007 Infinity Smart module - 0008 Infinity CryptoKey - 0009 RE-BL PlayStation 3 IR-to-Bluetooth converter -1050 Yubico.com - 0010 Yubikey -1053 Immanuel Electronics Co., Ltd -1054 BMS International Beheer N.V. - 5004 DSL 7420 Loader - 5005 DSL 7420 LAN Modem -1055 Complex Micro Interconnection Co., Ltd -1056 Hsin Chen Ent Co., Ltd -1057 ON Semiconductor -1058 Western Digital Technologies, Inc. - 0200 Firewire USB Combo - 0400 External HDD - 0500 hub - 0702 Passport External HDD - 0704 Passport External HDD - 070a My Passport Essential SE - 071a My Passport 1TB - 0900 MyBook Essential External HDD - 0901 MyBook External HDD - 0910 MyBook Essential External HDD - 1001 External Hard Disk [Elements] - 1021 Elements 2TB - 1104 MyBook Mirror Edition External HDD - 1123 My Book 3.0 -1059 Giesecke & Devrient GmbH - 000b StarSign Bio Token 3.0 -105c Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd -105d Delkin Devices, Inc. -105e Valence Semiconductor Design, Ltd -105f Chin Shong Enterprise Co., Ltd -1060 Easthome Industrial Co., Ltd -1063 Motorola Electronics Taiwan, Ltd [hex] - 1555 MC141555 Hub - 4100 SB4100 USB Cable Modem -1065 CCYU Technology - 0020 USB-DVR2 Dev Board - 2136 EasyDisk ED1064 -106a Loyal Legend, Ltd -106c Curitel Communications, Inc. - 1101 CDMA 2000 1xRTT USB modem (HX-550C) - 1102 Packet Service - 1103 Packet Service Diagnostic Serial Port (WDM) - 1104 Packet Service Diagnostic Serial Port (WDM) - 1105 Composite Device - 1106 Packet Service Diagnostic Serial Port (WDM) - 1301 Composite Device - 1302 Packet Service Diagnostic Serial Port (WDM) - 1303 Packet Service - 1304 Packet Service - 1401 Composite Device - 1402 Packet Service - 1403 Packet Service Diagnostic Serial Port (WDM) - 1501 Packet Service - 1502 Packet Service Diagnostic Serial Port (WDM) - 1503 Packet Service - 1601 Packet Service - 1602 Packet Service Diagnostic Serial Port (WDM) - 1603 Packet Service - 2101 AudioVox 8900 Cell Phone - 2102 Packet Service - 2103 Packet Service Diagnostic Serial Port (WDM) - 2301 Packet Service - 2302 Packet Service Diagnostic Serial Port (WDM) - 2303 Packet Service - 2401 Packet Service Diagnostic Serial Port (WDM) - 2402 Packet Service - 2403 Packet Service Diagnostic Serial Port (WDM) - 2501 Packet Service - 2502 Packet Service Diagnostic Serial Port (WDM) - 2503 Packet Service - 2601 Packet Service - 2602 Packet Service Diagnostic Serial Port (WDM) - 2603 Packet Service - 3701 Broadband Wireless modem - 3702 Pantech PX-500 - 3714 PANTECH USB MODEM [UM175] - 3eb4 Packet Service Diagnostic Serial Port (WDM) - 4101 Packet Service Diagnostic Serial Port (WDM) - 4102 Packet Service - 4301 Composite Device - 4302 Packet Service Diagnostic Serial Port (WDM) - 4401 Composite Device - 4402 Packet Service - 4501 Packet Service - 4502 Packet Service Diagnostic Serial Port (WDM) - 4601 Composite Device - 4602 Packet Service Diagnostic Serial Port (WDM) - 5101 Packet Service - 5102 Packet Service Diagnostic Serial Port (WDM) - 5301 Packet Service Diagnostic Serial Port (WDM) - 5302 Packet Service - 5401 Packet Service - 5402 Packet Service Diagnostic Serial Port (WDM) - 5501 Packet Service Diagnostic Serial Port (WDM) - 5502 Packet Service - 5601 Packet Service Diagnostic Serial Port (WDM) - 5602 Packet Service - 7101 Composite Device - 7102 Packet Service - a000 Packet Service - a001 Packet Service Diagnostic Serial Port (WDM) - c100 Packet Service - c200 Packet Service - c500 Packet Service Diagnostic Serial Port (WDM) - e200 Packet Service -106d San Chieh Manufacturing, Ltd -106e ConectL -106f Money Controls -1076 GCT Semiconductor, Inc. - 0031 Bluetooth Device - 0032 Bluetooth Device -107b Gateway, Inc. - 3009 eHome Infrared Transceiver - 55b2 WBU-110 802.11b Wireless Adapter [Intersil PRISM 3] - 55f2 WGU-210 802.11g Adapter [Intersil ISL3886] -107d Arlec Australia, Ltd -107e Midoriya Electric Co., Ltd -107f KidzMouse, Inc. -1082 Shin-Etsukaken Co., Ltd -1083 Canon Electronics, Inc. - 162c P-150 Scanner -1084 Pantech Co., Ltd -108a Chloride Power Protection -108b Grand-tek Technology Co., Ltd -108c Robert Bosch GmbH -108e Lotes Co., Ltd. -1099 Surface Optics Corp. -109a DATASOFT Systems GmbH -109f eSOL Co., Ltd - 3163 Trigem Mobile SmartDisplay84 - 3164 Trigem Mobile SmartDisplay121 -10a0 Hirotech, Inc. -10a3 Mitsubishi Materials Corp. -10a9 SK Teletech Co., Ltd - 1102 Sky Love Actually IM-U460K - 1104 Sky Vega IM-A650S - 6021 SIRIUS alpha -10aa Cables To Go -10ab USI Co., Ltd - 1002 Bluetooth Device - 1003 BC02-EXT in DFU - 1005 Bluetooth Adptr - 1006 BC04-EXT in DFU - 10c5 Sony-Ericsson / Samsung DataCable -10ac Honeywell, Inc. -10ae Princeton Technology Corp. -10af Liebert Corp. - 0000 UPS - 0001 PowerSure PSA UPS - 0002 PowerSure PST UPS - 0003 PowerSure PSP UPS - 0004 PowerSure PSI UPS - 0005 UPStation GXT 2U UPS - 0006 UPStation GXT UPS - 0007 Nfinity Power Systems UPS - 0008 PowerSure Interactive UPS -10b5 Comodo (PLX?) - 9060 Test Board -10b8 DiBcom - 0bb8 DiBcom USB DVB-T reference design (MOD300) (cold) - 0bb9 DiBcom USB DVB-T reference design (MOD300) (warm) - 0bc6 DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold) - 0bc7 DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm) -10bb TM Technology, Inc. -10bc Dinging Technology Co., Ltd -10bd TMT Technology, Inc. - 1427 Ethernet -10bf SmartHome - 0001 SmartHome PowerLinc -10c4 Cygnal Integrated Products, Inc. - 0002 F32x USBXpress Device - 0003 CommandIR - 8044 USB Debug Adapter - 804e Software Bisque Paramount ME - 80a9 CP210x to UART Bridge Controller - 80ca ATM2400 Sensor Device - 818a Silicon Labs FM Radio Reference Design - 8461 Sangoma U100 - ea60 CP210x Composite Device -10c5 Sanei Electric, Inc. - 819a FM Radio -10c6 Intec, Inc. -10cb Eratech -10cc GBM Connector Co., Ltd - 1101 MP3 Player -10cd Kycon, Inc. -10ce Silicon Labs - ea6a MobiData EDGE USB Modem -10cf Velleman Components, Inc. - 2011 R-Engine MPEG2 encoder/decoder - 5500 8055 Experiment Interface Board (address=0) - 5501 8055 Experiment Interface Board (address=1) - 5502 8055 Experiment Interface Board (address=2) - 5503 8055 Experiment Interface Board (address=3) -10d1 Hottinger Baldwin Measurement - 0101 USB-Module for Spider8, CP32 - 0202 CP22 - Communication Processor - 0301 CP42 - Communication Processor -10d4 Man Boon Manufactory, Ltd -10d5 Uni Class Technology Co., Ltd - 5552 KVM Human Interface Composite Device (Keyboard/Mouse ports) - 55a2 2Port KVMSwitcher -10d6 Actions Semiconductor Co., Ltd - 1000 MP3 Player - 1100 MPMan MP-Ki 128 MP3 Player/Recorder - 1101 D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player - 2200 Acer MP-120 MP3 player - 8888 ADFU Device - ff51 ADFU Device - ff61 MP4 Player - ff66 Craig 2GB MP3/Video Player -10de Authenex, Inc. -10df In-Win Development, Inc. - 0500 iAPP CR-e500 Card reader -10e0 Post-Op Video, Inc. -10e1 CablePlus, Ltd -10e2 Nada Electronics, Ltd -10ec Vast Technologies, Inc. -10f0 Nexio Co., Ltd - 2002 iNexio Touchscreen controller -10f1 Importek - 1a08 Internal Webcam - 1a1e Laptop Integrated Webcam 1.3M -10f5 Turtle Beach - 0200 Audio Advantage Roadie -10fb Pictos Technologies, Inc. -10fd Anubis Electronics, Ltd - 7e50 FlyCam Usb 100 - 804d Typhoon Webshot II Webcam [zc0301] - 8050 FlyCAM-USB 300 XP2 - de00 WinFast WalkieTV WDM Capture Driver. -1100 VirTouch, Ltd - 0001 VTPlayer VTP-1 Braille Mouse -1101 EasyPass Industrial Co., Ltd - 0001 FSK Electronics Super GSM Reader -1108 Brightcom Technologies, Ltd -110a Moxa Technologies Co., Ltd. - 1250 UPort 1250 2-Port RS-232/422/485 - 1251 UPort 1250I 2-Port RS-232/422/485 with Isolation - 1410 UPort 1410 4-Port RS-232 - 1450 UPort 1450 4-Port RS-232/422/485 - 1451 UPort 1450I 4-Port RS-232/422/485 with Isolation - 1613 UPort 1610-16 16-Port RS-232 - 1618 UPort 1610-8 8-Port RS-232 - 1653 UPort 1650-16 16-Port RS-232/422/485 - 1658 UPort 1650-8 8-Port RS-232/422/485 -1110 Analog Devices Canada, Ltd (Allied Telesyn) - 5c01 Huawei MT-882 Remote NDIS Network Device - 6489 ADSL ETH/USB RTR - 9000 ADSL LAN Adapter - 9001 ADSL Loader - 900f AT-AR215 DSL Modem - 9010 AT-AR215 DSL Modem - 9021 ADSL WAN Adapter - 9022 ADSL Loader - 9023 ADSL WAN Adapter - 9024 ADSL Loader - 9031 ADSL LAN Adapter - 9032 ADSL Loader -1111 Pandora International Ltd. - 8888 Evolution Device -1112 YM ELECTRIC CO., Ltd -1113 Medion AG - a0a2 Active Sync device -111e VSO Electric Co., Ltd -112a RedRat - 0001 RedRat3 IR Transceiver - 0005 RedRat3II IR Transceiver -112e Master Hill Electric Wire and Cable Co., Ltd -112f Cellon International, Inc. -1130 Tenx Technology, Inc. - 0002 iBuddy - 6604 MCE IR-Receiver - 660c Foot Pedal/Thermometer - 6806 Keychain photo frame - f211 TP6911 Audio Headset -1131 Integrated System Solution Corp. - 1001 KY-BT100 Bluetooth Adapter - 1002 Bluetooth Device - 1003 Bluetooth Device - 1004 Bluetooth Device -1132 Toshiba Corp., Digital Media Equipment [hex] - 4331 PDR-M4/M5/M70 Digital Camera - 4332 PDR-M60 Digital Camera - 4333 PDR-M2300/PDR-M700 - 4334 PDR-M65 - 4335 PDR-M61 - 4337 PDR-M11 - 4338 PDR-M25 -1136 CTS Electronincs - 3131 CTS LS515 -113c Arin Tech Co., Ltd -113d Mapower Electronics Co., Ltd -1141 V One Multimedia, Pte., Ltd -1142 CyberScan Technologies, Inc. -1145 Japan Radio Company - 0001 AirH PHONE AH-J3001V/J3002V -1146 Shimane SANYO Electric Co., Ltd. -1147 Ever Great Electric Wire and Cable Co., Ltd -114b Sphairon Access Systems GmbH - 0110 Turbolink UB801R WLAN Adapter - 0150 Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187] -114c Tinius Olsen Testing Machine Co., Inc. -114d Alpha Imaging Technology Corp. -114f Wavecom -115b Salix Technology Co., Ltd. -1162 Secugen Corp. -1163 DeLorme Publishing, Inc. - 0100 Earthmate GPS (orig) - 0200 Earthmate GPS (LT-20, LT-40) - 2020 Earthmate GPS (PN-40) -1164 YUAN High-Tech Development Co., Ltd - 0300 ELSAVISION 460D - 0601 Analog TV Tuner - 0900 TigerBird BMP837 USB2.0 WDM Encoder - 0bc7 Digital TV Tuner - 521b MC521A mini Card ATSC Tuner - 6601 Digital TV Tuner Card [RTL2832U] -1165 Telson Electronics Co., Ltd -1166 Bantam Interactive Technologies -1167 Salient Systems Corp. -1168 BizConn International Corp. -116e Gigastorage Corp. -116f Silicon 10 Technology Corp. - 0005 Flash Card Reader - c108 Flash Card Reader - c109 Flash Card Reader -1175 Shengyih Steel Mold Co., Ltd -117d Santa Electronic, Inc. -117e JNC, Inc. -1182 Venture Corp., Ltd -1183 Compaq Computer Corp. [hex] (Digital Dream ??) - 0001 DigitalDream l'espion XS - 19c7 ISDN TA - 4008 56k FaxModem - 504a PJB-100 Personal Jukebox -1184 Kyocera Elco Corp. -1188 Bloomberg L.P. -1189 Acer Communications & Multimedia - 0893 EP-1427X-2 Ethernet Adapter -118f You Yang Technology Co., Ltd -1190 Tripace -1191 Loyalty Founder Enterprise Co., Ltd -1196 Yankee Robotics, LLC - 0010 Trifid Camera without code - 0011 Trifid Camera -1197 Technoimagia Co., Ltd -1198 StarShine Technology Corp. -1199 Sierra Wireless, Inc. - 0019 AC595U - 0021 AC597E - 0024 MC5727 CDMA modem - 0110 Composite Device - 0112 CDMA 1xEVDO PC Card, AirCard 580 - 0120 AC595U - 0218 MC5720 Wireless Modem - 6467 MP Series Network Adapter - 6468 MP Series Network Adapter - 6469 MP Series Network Adapter - 6802 MC8755 Device - 6803 MC8765 Device - 6804 MC8755 Device - 6805 MC8765 Device - 6812 MC8775 Device - 6820 AC875 Device - 6832 MC8780 Device - 6833 MC8781 Device - 683a MC8785 Device - 6850 AirCard 880 Device - 6851 AirCard 881 Device - 6852 AirCard 880E Device - 6853 AirCard 881E Device - 6854 AirCard 885 Device - 6856 ATT "USB Connect 881" - 6870 MC8780 Device - 6871 MC8781 Device - 6893 MC8777 Device - 9000 Gobi 2000 Wireless Modem (QDL mode) - 9001 Gobi 2000 Wireless Modem - 9002 Gobi 2000 Wireless Modem - 9003 Gobi 2000 Wireless Modem - 9004 Gobi 2000 Wireless Modem - 9005 Gobi 2000 Wireless Modem - 9006 Gobi 2000 Wireless Modem - 9007 Gobi 2000 Wireless Modem - 9008 Gobi 2000 Wireless Modem - 9009 Gobi 2000 Wireless Modem - 900a Gobi 2000 Wireless Modem -119a ZHAN QI Technology Co., Ltd -119b ruwido austria GmbH - 0400 Infrared Keyboard V2.01 -11a0 Chipcon AS - eb11 CC2400EB 2.0 ZigBee Sniffer -11a3 Technovas Co., Ltd - 8031 MP3 Player - 8032 MP3 Player -11aa GlobalMedia Group, LLC - 1518 iREZ K2 -11ab Exito Electronics Co., Ltd -11b0 ATECH FLASH TECHNOLOGY -11c5 Inmax - 0521 IMT-0521 Smartcard Reader -11db Topfield Co., Ltd. - 1000 PVR - 1100 PVR -11e6 K.I. Technology Co. Ltd. -11f5 Siemens AG - 0001 SX1 - 0003 Mobile phone USB cable - 0004 X75 - 0005 SXG75/EF81 - 0008 UMTS/HSDPA Data Card -11f6 Prolific - 2001 Willcom WSIM -11f7 Alcatel (?) - 02df TD10 Mobile phone USB cable -1203 TSC Auto ID Technology Co., Ltd - 0140 TTP-245C -1209 InterBiometrics - 1001 USB Hub - 1002 USB Relais - 1003 IBSecureCam-P - 1004 IBSecureCam-O - 1005 IBSecureCam-N -120e Hudson Soft Co., Ltd -120f Magellan - 5260 Triton Handheld GPS Receiver (300/400/500/1500/2000) -1210 DigiTech - 001b RP155 Guitar Multi-Effects Processor - 001c RP255 Guitar Multi-Effects Processor -121e Jungsoft Co., Ltd - 3403 Muzio JM250 Audio Player -1223 SKYCABLE ENTERPRISE. CO., LTD. -1230 Chipidea-Microelectronica, S.A. -1233 Denver Electronics - 5677 FUSB200 mp3 player -1234 Unknown - ed02 Emotiv EPOC Developer Headset Wireless Dongle -1235 Novation EMS - 0001 ReMOTE Audio/XStation - 0002 Speedio - 0003 ReMOTE ZeRO SL - 4661 ReMOTE25 -1241 Belkin - 1111 Mouse - 1122 Typhoon Stream Optical Mouse USB+PS/2 - 1155 PS2/USB Browser Combo Mouse - 1166 MI-2150 Trust Mouse - 1177 F8E842-DL Mouse - 1503 Keyboard - 1603 Keyboard -124a AirVast - 168b PRISM3 WLAN Adapter - 4017 PC-Chips 802.11b Adapter -124b Nyko (Honey Bee) - 4d01 Airflo EX Joystick -124c MXI - Memory Experts International, Inc. - 3200 Stealth MXP 1GB -125c Apogee Inc. - 0010 Alta series CCD -125f A-DATA Technology Co., Ltd. - c81a Flash drive -1260 Standard Microsystems Corp. - ee22 SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887] -1264 Covidien Energy-based Devices -1266 Pirelli Broadband Solutions - 6302 Fastweb DRG A226M ADSL Router -1267 Logic3 / SpectraVideo plc - 0103 G-720 Keyboard - 0201 A4Tech SWOP-3 Mouse - a001 JP260 PC Game Pad - c002 Wireless Optical Mouse -126c Aristocrat Technologies -126d Bel Stewart -126e Strobe Data, Inc. -126f TwinMOS - 1325 Mobile Disk - 2168 Mobile Disk III - a006 G240 802.11bg -1274 Ensoniq -1275 Xaxero Marine Software Engineering, Ltd. - 0002 WeatherFax 2000 Demodulator - 0080 SkyEye Weather Satellite Receiver -1283 zebris Medical GmbH - 0100 USB-RS232 Adaptor - 0110 CMS20 - 0111 CMS 10 - 0112 CMS 05 - 0114 ARCUS digma PC-Interface - 0115 SAM Axioquick recorder - 0116 SAM Axioquick recorder - 0120 emed-X - 0121 emed-AT - 0130 PDM - 0150 CMS10GI (Golf) -1286 Marvell Semiconductor, Inc. - 1fab 88W8338 [Libertas] 802.11g - 2001 88W8388 802.11a/b/g WLAN - 2006 88W8360 802.11n WLAN - 8001 BLOB boot loader firmware -1291 Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc. - 0010 FDM 2xxx Flash-OFDM modem - 0011 LR7F06/LR7F14 Flash-OFDM modem -1292 Innomedia - 0258 Creative Labs VoIP Blaster -1293 Belkin Components [hex] - 0002 F5U002 Parallel Port [uss720] - 2101 104-key keyboard -1294 RISO KAGAKU CORP. -129b CyberTAN Technology - 160b Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523] - 160c Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523] - 1666 TG54USB 802.11bg - 1667 802.11bg - 1828 Gigaset USB Adapter 300 -12a7 Trendchip Technologies Corp. -12ab Honey Bee Electronic International Ltd. -12b8 Zhejiang Xinya Electronic Technology Co., Ltd. -12ba Licensed by Sony Computer Entertainment America - 0100 RedOctane Guitar for PlayStation(R)3 - 0120 RedOctane Drum Kit for PlayStation(R)3 - 0200 Harmonix Guitar for PlayStation(R)3 - 0210 Harmonix Drum Kit for PlayStation(R)3 -12c4 Autocue Group Ltd - 0006 Teleprompter Two-button Hand Control (v1) - 0008 Teleprompter Foot Control (v1) -12d1 Huawei Technologies Co., Ltd. - 1001 E620 USB Modem - 1003 E220 HSDPA Modem / E230/E270 HSDPA/HSUPA Modem - 1009 U120 - 1010 ETS2252+ CDMA Fixed Wireless Terminal - 1037 Ideos - 1038 Ideos (debug mode) - 1406 E1750 - 140b EC1260 Wireless Data Modem HSD USB Card - 1446 E1552 (HSPA modem) - 1501 Pulse - 380b WiMAX USB modem(s) -12d2 LINE TECH INDUSTRIAL CO., LTD. -12d6 EMS Dr. Thomas Wuensche - 0444 CPC-USB/ARM7 - 0888 CPC-USB/M16C -12d7 BETTER WIRE FACTORY CO., LTD. -12e6 Waldorf Music GmbH - 0013 Blofeld -12ef Tapwave, Inc. - 0100 Tapwave Handheld [Tapwave Zodiac] -12f5 Dynamic System Electronics Corp. -12f7 Memorex Products, Inc. - 1a00 TD Classic 003B - 1e23 TravelDrive 2007 Flash Drive -12fd AIN Comm. Technology Co., Ltd - 1001 AWU2000b 802.11b Stick -12ff Fascinating Electronics, Inc. - 0101 Advanced RC Servo Controller -1307 Transcend Information, Inc. - 0163 256MB/512MB/1GB Flash Drive - 0165 2GB/4GB Flash Drive - 0361 CR-75: 51-in-1 Card Reader/Writer - 1169 TS2GJF210 JetFlash 210 2GB - 1171 Fingerprint Reader -1308 Shuttle, Inc. - 0003 VFD Module - c001 eHome Infrared Transceiver -1310 Roper - 0001 Class 1 Bluetooth Dongle -1312 ICS Electronics -131d Natural Point - 0155 TrackIR 3 Pro Head Tracker - 0156 TrackIR 4 Pro Head Tracker -132a Envara Inc. - 1502 WiND 802.11abg / 802.11bg WLAN -132b Konica Minolta - 0000 Dimage A2 Camera - 0001 Minolta DiMAGE A2 (ptp) - 0003 Dimage Xg Camera - 0006 Dimage Z2 Camera - 0007 Minolta DiMAGE Z2 (PictBridge mode) - 0008 Dimage X21 Camera - 000a Dimage Scan Dual IV - 000b Dimage Z10 Camera - 000d Dimage X50 Camera [storage?] - 000f Dimage X50 Camera [p2p?] - 0010 Dimage G600 Camera - 0012 Dimage Scan Elite5400 2 - 0013 Dimage X31 Camera - 0015 Dimage G530 Camera - 0017 Dimage Z3 Camera - 0018 Minolta DiMAGE Z3 (PictBridge mode) - 0019 Dimage A200 Camera - 0021 Dimage Z5 Camera - 0022 Minolta DiMAGE Z5 (PictBridge mode) - 002c Dynax 5D camera - 2001 Magicolor 2400w - 2004 Magicolor 5430DL - 2005 Magicolor 2430 DL - 2029 Magicolor 5440DL - 2030 PagePro 1350E(N) - 2033 PagePro 1400W - 2043 Magicolor 2530DL - 2045 Magicolor 2500W - 2049 Magicolor 2490MF -1342 Mobility - 0200 EasiDock 200 Hub - 0201 EasiDock 200 Keyboard and Mouse Port - 0202 EasiDock 200 Serial Port - 0203 EasiDock 200 Printer Port - 0204 Ethernet - 0304 EasiDock Ethernet -1345 Sino Lite Technology Corp. - 001c Xbox Controller Hub -1347 Moravian Instruments - 0400 G2CCD USB 1.1 obsolete - 0401 G2CCD-S with Sony ICX285 CCD - 0402 G2CCD2 - 0403 G2/G3CCD-I KAI CCD - 0404 G2/G3CCD-F KAF CCD - 0410 G1-0400 CCD - 0411 G1-0800 CCD - 0412 G1-0300 CCD - 0413 G1-2000 CCD - 0414 G1-1400 CCD -1348 Katsuragawa Electric Co., Ltd. -134c PanJit International Inc. - 0001 Touch Panel Controller - 0002 Touch Panel Controller - 0003 Touch Panel Controller - 0004 Touch Panel Controller -134e Digby's Bitpile, Inc. DBA D Bit -1357 P&E Microcomputer Systems - 0503 USB-ML-12 HCS08/HCS12 Multilink - 0504 DEMOJM -1366 SEGGER - 0101 J-Link ARM -136b STEC -1370 Swissbit - 0323 Swissmemory cirrusWHITE - 6828 Victorinox Flash Drive -1371 CNet Technology Inc. - 0001 CNUSB-611AR Wireless Adapter-G [AT76C503] - 0002 CNUSB-611AR Wireless Adapter-G [AT76C503] (FiberLine WL-240U) - 0013 CNUSB-611 Wireless Adapter [AT76C505] - 0014 CNUSB-611 Wireless Adapter [AT76C505] (FiberLine WL-240U) - 5743 CNUSB-611 (D) Wireless Adapter [AT76C503] - 9022 CWD-854 [RT2573] - 9032 CWD-854 rev F - 9401 CWD-854 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -1376 Vimtron Electronics Co., Ltd. -137b SCAPS GmbH - 0002 SCAPS USC-2 Scanner Controller -1385 Netgear, Inc - 4250 WG111T - 4251 WG111T (no firmware) - 5f00 WPN111 RangeMax(TM) Wireless USB 2.0 Adapter - 5f01 WPN111 (no firmware) - 6e00 WPNT121 802.11g 240Mbps Wireless Adapter [Airgo AGN300] -138a Validity Sensors, Inc. - 0001 VFS101 Fingeprint Reader - 0005 VFS301 Fingerprint Reader - 0007 VFS451 Fingeprint Reader - 0008 VFS300 Fingeprint Reader -138e Jungo LTD - 9000 Raisonance S.A. STM32 ARM evaluation board -1390 TOMTOM B.V. - 0001 GO 520 T -1391 IdealTEK, Inc. - 1000 URTC-1000 -1395 Sennheiser Communications - 3556 USB Headset -1397 BEHRINGER International GmbH - 00bc BCF2000 -1398 Q-tec - 2103 USB 2.0 Storage Device -13ad Baltech - 9999 Card reader -13b0 PerkinElmer Optoelectronics - 000a Alesis Photon X25 MIDI Controller -13b1 Linksys - 000a WUSB54G v2 802.11g Adapter [Intersil ISL3887] - 000b WUSB11 v4.0 802.11b Adapter [ALi M4301] - 000c WUSB54AG 802.11a/g Adapter [Intersil ISL3887] - 000d WUSB54G v4 802.11g Adapter [Ralink RT2500USB] - 000e WUSB54GS v1 802.11g Adapter [Broadcom 4320 USB] - 0011 WUSB54GP v4.0 802.11g Adapter [Ralink RT2500USB] - 0014 WUSB54GS v2 802.11g Adapter [Broadcom 4320 USB] - 0018 USB200M 10/100 Ethernet Adapter - 001a HU200TS Wireless Adapter - 001e WUSBF54G 802.11bg - 0020 WUSB54GC v1 802.11g Adapter [Ralink RT73] - 0022 WUSB54GX4 802.11g 240Mbps Wireless Adapter [Airgo AGN300] - 0023 WUSB54GR - 0024 WUSBF54G v1.1 802.11bg - 0026 WUSB54GSC v1 802.11g Adapter [Broadcom 4320 USB] - 002f AE1000 v1 802.11n [Ralink RT2870] - 0031 AM10 v1 802.11n [Ralink RT2870] - 13b1 WUSB200: Wireless-G Business Network Adapter with Rangebooster -13b2 Alesis - 0030 Multimix 8 -13b3 Nippon Dics Co., Ltd. -13ba Unknown - 0017 PS/2 Keyboard+Mouse Adapter -13be Ricoh Printing Systems, Ltd. -13ca JyeTai Precision Industrial Co., Ltd. -13cf Wisair Ltd. - 1200 Olidata Wireless Multimedia Adapter -13d0 Techsan Electronics Co., Ltd. - 2282 TechniSat DVB-PC TV Star 2 -13d1 A-Max Technology Macao Commercial Offshore Co. Ltd. - 7019 MD 82288 - abe6 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -13d2 Shark Multimedia - 0400 Pocket Ethernet [klsi] -13d3 IMC Networks - 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold - 3202 VisionDTV USB-Ter/HAMA USB DVB-T device warm - 3203 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3204 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3205 DNTV Live! Tiny USB2 BDA (No Remote) - 3206 DNTV Live! Tiny USB2 BDA (No Remote) - 3207 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3208 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3209 DTV-DVB UDST7022BDA DVB-S Box(Without HID) - 3211 DTV-DVB Hybrid Analog/Capture / Pinnacle PCTV 310e - 3212 DTV-DVB UDTT704C - DVBT/NTSC/PAL Driver(PCM4) - 3213 DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver (PCM4) - 3214 DTV-DVB UDTT704F -(MiniCard) DVBT/NTSC/PAL Driver(Without HID) - 3215 DTV-DVB UDAT7240 - ATSC/NTSC/PAL Driver(PCM4) - 3216 DTV-DVB UDTT 7047-USB 2.0 DVB-T Driver - 3217 Digital-TV Receiver. - 3219 DTV-DVB UDTT7049 - DVB-T Driver(Without HID) - 3220 DTV-DVB UDTT 7047M-USB 2.0 DVB-T Driver - 3223 DNTV Live! Tiny USB2 BDA (No Remote) - 3224 DNTV Live! Tiny USB2 BDA (No Remote) - 3226 DigitalNow TinyTwin DVB-T Receiver - 3234 DVB-T FTA Half Minicard [RTL2832U] - 3236 DTV-DVB UDTT 7047A-USB 2.0 DVB-T Driver - 3237 DTV-DVB UDTT 704J - dual DVB-T Driver - 3239 DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver(Without HID) - 3240 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3241 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3242 DTV-DVB UDAT7240LP - ATSC/NTSC/PAL Driver(Without HID) - 3243 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3244 DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver - 3247 802.11 n/g/b Wireless LAN Adapter - 3249 Internal Bluetooth - 3262 802.11 n/g/b Wireless LAN USB Adapter - 3273 802.11 n/g/b Wireless LAN USB Mini-Card - 3274 DVB-T Dongle [RTL2832U] - 3282 DVB-T + GPS Minicard [RTL2832U] - 3284 Wireless LAN USB Mini-Card - 3306 WLAN [RTL8191S] - 5070 Webcam - 5111 Integrated Webcam - 5115 Integrated Webcam - 5116 Integrated Webcam - 7020 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 7022 DTV-DVB UDST7022BDA DVB-S Box(Without HID) -13dc ALEREON, INC. -13dd i.Tech Dynamic Limited -13e1 Kaibo Wire & Cable (Shenzhen) Co., Ltd. -13e5 Rane - 0001 SL-1 -13e6 TechnoScope Co., Ltd. -13ec Zydacron - 0006 HID Remote Control -13ee MosArt - 0003 Optical Mouse -13fd Initio Corporation - 0841 Samsung SE-T084M DVD-RW - 1340 Hi-Speed USB to SATA Bridge - 160f RocketFish SATA Bridge [INIC-1611] - 1640 ASUS SDRW-08D1S-U DVD-RW - 1840 Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L] -13fe Kingston Technology Company Inc. - 1a00 512MB/1GB Flash Drive - 1a23 512MB Flash Drive - 1d00 DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive - 1e00 Flash Drive 2 GB [ICIDU 2 GB] - 1f00 DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive - 2240 microSD card reader - 3100 2/4 GB stick -1400 Axxion Group Corp. -1402 Bowe Bell & Howell -1403 Sitronix - 0001 Digital Photo Frame -140e Telechips, Inc. - b011 TCC780X-based player (USB Boot mode) - b021 TCC77X-based players (USB Boot mode) -1410 Novatel Wireless - 1110 Merlin S620 - 1120 Merlin EX720 - 1130 Merlin S720 - 1400 Merlin U730/U740 (Vodafone) - 1410 Merlin U740 (non-Vodafone) - 1430 Merlin XU870 - 1450 Merlin X950D - 2110 Ovation U720/MCD3000 - 2410 Expedite EU740 - 2420 Expedite EU850D/EU860D/EU870D - 4100 U727 - 4400 Ovation MC930D/MC950D - a001 Gobi Wireless Modem - a008 Gobi Wireless Modem (QDL mode) -1415 Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc. - 0000 Sony SingStar USBMIC - 0020 Sony Wireless SingStar - 2000 Sony Playstation Eye -1419 ABILITY ENTERPRISE CO., LTD. -1429 Vega Technologies Industrial (Austria) Co. -142a Thales E-Transactions - 0003 Artema Hybrid - 0005 Artema Modular - 0043 medCompact -142b Arbiter Systems, Inc. - 03a5 933A Portable Power Sentinel -1430 RedOctane - 4734 Guitar Hero4 hub - 474b Guitar Hero MIDI interface -1431 Pertech Resources, Inc. -1435 Wistron NeWeb - 0427 UR054g 802.11g Wireless Adapter [Intersil ISL3887] - 0711 UR055G 802.11bg - 0804 AR9170+AR9104 802.11abgn Wireless Adapter - 0826 AR5523 - 0827 AR5523 (no firmware) - 0828 AR5523 - 0829 AR5523 (no firmware) -1436 Denali Software, Inc. -143c Altek Corporation -1443 Digilent - 0007 CoolRunner-II CPLD Starter Kit -1453 Radio Shack - 4026 26-183 Serial Cable -1456 Extending Wire & Cable Co., Ltd. -1457 First International Computer, Inc. - 5117 OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode - 5118 OpenMoko Neo1973 Debug board (V2+) - 5119 OpenMoko Neo1973 u-boot cdc_acm serial port - 5120 OpenMoko Neo1973 u-boot usbtty generic serial - 5121 OpenMoko Neo1973 kernel mass storage (g_storage) mode - 5122 OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network - 5123 OpenMoko Neo1973 internal USB CSR4 module - 5124 OpenMoko Neo1973 Bluetooth Device ID service -145f Trust - 0106 Trust K56 V92 USB Modem - 013d PC Camera (SN9C201 + OV7660) - 013f Megapixel Auto Focus Webcam - 0142 WB-6250X Webcam - 015a WB-8300X 2MP Webcam -1460 Tatung Co. - 9150 eHome Infrared Transceiver -1461 Staccato Communications -1462 Micro Star International - 5512 MegaStick-1 Flash Stick - 8807 DIGIVOX mini III [af9015] -1472 Huawei-3Com - 0007 Aolynk WUB300g [ZyDAS ZD1211] - 0009 Aolynk WUB320g -147a Formosa Industrial Computing, Inc. - e015 eHome Infrared Receiver - e016 eHome Infrared Receiver - e017 eHome Infrared Receiver - e018 eHome Infrared Receiver - e03a eHome Infrared Receiver - e03c eHome Infrared Receiver - e03e Infrared Receiver [IR605A/Q] -147e Upek - 1000 Biometric Touchchip/Touchstrip Fingerprint Sensor - 2016 Biometric Touchchip/Touchstrip Fingerprint Sensor -147f Hama GmbH & Co., KG -1482 Vaillant - 1005 VRD PC-Interface -1484 Elsa AG [hex] - 1746 Ecomo 19H99 Monitor - 7616 Elsa Hub -1485 Silicom - 0001 U2E - 0002 Psion Gold Port Ethernet -1487 DSP Group, Ltd. -148e EVATRONIX SA -148f Ralink Technology, Corp. - 1706 RT2500USB Wireless Adapter - 2070 RT2070 Wireless Adapter - 2570 RT2570 Wireless Adapter - 2573 RT2501/RT2573 Wireless Adapter - 2671 RT2601/RT2671 Wireless Adapter - 2770 RT2770 Wireless Adapter - 2870 RT2870 Wireless Adapter - 3070 RT2870/RT3070 Wireless Adapter - 3071 RT3071 Wireless Adapter - 3072 RT3072 Wireless Adapter - 3572 RT3572 Wireless Adapter - 9020 RT2500USB Wireless Adapter - 9021 RT2501USB Wireless Adapter -1497 Panstrong Company Ltd. -1498 Microtek International Inc. - a090 DVB-T Tuner -149a Imagination Technologies - 2107 DBX1 DSP core -14aa WideView Technology Inc. - 0001 Avermedia AverTV DVBT USB1.1 (cold) - 0002 Avermedia AverTV DVBT USB1.1 (warm) - 0201 AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold) - 0221 WT-220U DVB-T dongle - 022b WT-220U DVB-T dongle - 0301 AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm) -14ad CTK Corporation -14ae Printronix Inc. -14af ATP Electronics Inc. -14b0 StarTech.com Ltd. -14b2 Ralink Technology, Corp. - 3a95 Toshiba WUS-G06G-JT 802.11bg Wireless Adapter - 3a98 Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523] - 3c02 rt2500 802.11g WLAN - 3c05 rt2570 802.11g WLAN - 3c06 Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870] - 3c07 802.11n adapter - 3c09 802.11n adapter - 3c22 Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73] - 3c23 Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870] - 3c25 DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870] - 3c27 Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770] - 3c28 Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770] - 3c2c Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070] -14c0 Rockwell Automation, Inc. -14c2 Gemlight Computer, Ltd - 0250 Storage Adapter V2 - 0350 Storage Adapter V2 -14cd Super Top - 121c microSD card reader - 123a SD/MMC/RS-MMC Card Reader - 127b SDXC Reader - 6600 USB 2.0 IDE DEVICE - 6700 Card Reader - 6900 Card Reader - 8123 SD MMC Reader - 8125 SD MMC Reader -14d8 JAMER INDUSTRIES CO., LTD. -14dd Raritan Computer, Inc. -14e1 Dialogue Technology Corp. - 5000 PenMount 5000 Touch Controller -14e5 SAIN Information & Communications Co., Ltd. -14ea Planex Communications - ab10 GW-US54GZ - ab11 GU-1000T - ab13 GW-US54Mini 802.11bg -14ed Shure Inc. -14f7 TechniSat Digital GmbH - 0001 SkyStar 2 HD CI - 0002 SkyStar 2 HD CI - 0003 CableStar Combo HD CI - 0004 AirStar TeleStick 2 - 0500 DVB-PC TV Star HD -1500 Ellisys -1501 Pine-Tum Enterprise Co., Ltd. -1509 First International Computer, Inc. - 9242 eHome Infrared Transceiver -1513 medMobile - 0444 medMobile -1514 Actel - 2003 FlashPro3 Programmer - 2004 FlashPro3 Programmer - 2005 FlashPro3 Programmer -1516 CompUSA - 1603 Flash Drive - 8628 Pen Drive -1518 Cheshire Engineering Corp. - 0001 HDReye High Dynamic Range Camera - 0002 HDReye (before firmware loads) -1520 Bitwire Corp. -1524 ENE Technology Inc - 6680 UTS 6680 -1527 Silicon Portals - 0200 YAP Phone (no firmware) - 0201 YAP Phone -1529 UBIQUAM Co., Ltd. - 3100 CDMA 1xRTT USB Modem (U-100/105/200/300/520) -152d JMicron Technology Corp. / JMicron USA Technology Corp. - 2329 JM20329 SATA Bridge - 2335 ATA/ATAPI Bridge - 2336 Hard Disk Drive - 2337 ATA/ATAPI Bridge - 2338 JM20337 Hi-Speed USB to SATA & PATA Combo Bridge - 2352 ATA/ATAPI Bridge - 2509 JMS539 SuperSpeed SATA II 3.0G Bridge -152e LG (HLDS) - 2507 PL-2507 IDE Controller - e001 GSA-5120D DVD-RW -1532 Razer USA, Ltd - 0001 RZ01-020300 Optical Mouse [Diamondback] - 0003 Krait Mouse - 0007 DeathAdder Mouse - 001c RZ01-0036 Optical Gaming Mouse [Abyssus] - 0101 Copperhead Mouse - 0102 Tarantula Keyboard - 0109 Lycosa Keyboard -1546 U-Blox AG -154a Celectronic GmbH - 8180 CARD STAR/medic2 -154b PNY - 0010 USB 2.0 Flash Drive - 6545 FD Device -154d ConnectCounty Holdings Berhad -154e D&M Holdings, Inc. (Denon/Marantz) - 3000 Marantz RC9001 Remote Control -1554 Prolink Microsystems Corp. -1557 OQO - 0002 model 01 WiFi interface - 0003 model 01 Bluetooth interface - 0a80 Gobi Wireless Modem (QDL mode) - 7720 model 01+ Ethernet - 8150 model 01 Ethernet interface -1568 Sunf Pu Technology Co., Ltd -156f Quantum Corporation -1570 ALLTOP TECHNOLOGY CO., LTD. -157b Ketron SRL -157e TRENDnet - 3006 TEW-444UB EU - 3007 TEW-444UB EU (no firmware) - 300a TEW-429UB 802.11bg - 300b TEW-429UB 802.11bg - 300d TEW-429UB C1 802.11bg - 3204 Allnet ALL0298 v2 802.11bg - 3205 Allnet ALL0283 [AR5523] - 3206 Allnet ALL0283 [AR5523](no firmware) -1582 Fiberline - 6003 WL-430U 802.11bg -1587 SMA Technologie AG -158d Oakley Inc. -158e JDS Uniphase Corporation (JDSU) - 0820 SmartPocket Class Device -1598 Kunshan Guoji Electronics Co., Ltd. -15a2 Freescale Semiconductor, Inc. -15a4 Afatech Technologies, Inc. - 1000 AF9015/AF9035 DVB-T stick - 1001 AF9015/AF9035 DVB-T stick - 1336 SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader - 9015 AF9015 DVB-T USB2.0 stick - 9016 AF9015 DVB-T USB2.0 stick -15a8 Teams Power Limited -15a9 Gemtek - 0004 WUBR177G - 0006 Wireless 11n USB Adapter - 0010 802.11n USB Wireless Card - 0012 WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870] -15aa Gearway Electronics (Dong Guan) Co., Ltd. -15ad VMware Inc. -15ba Olimex Ltd. - 0003 OpenOCD JTAG - 0004 OpenOCD JTAG TINY -15c0 XL Imaging - 0001 2M pixel Microscope Camera - 0002 3M pixel Microscope Camera - 0003 1.3M pixel Microscope Camera (mono) - 0004 1.3M pixel Microscope Camera (colour) - 0005 3M pixel Microscope Camera (Mk 2) - 0006 2M pixel Microscope Camera (with capture button) - 0007 3M pixel Microscope Camera (with capture button) - 0008 1.3M pixel Microscope Camera (colour, with capture button) - 0009 1.3M pixel Microscope Camera (colour, with capture button) - 000a 2M pixel Microscope Camera (Mk 2) - 0010 1.3M pixel "Tinycam" - 0101 3M pixel Microscope Camera -15c2 SoundGraph Inc. - 0036 LC16M VFD Display/IR Receiver - 0038 GD01 MX VFD Display/IR Receiver - ffda iMON PAD Remote Controller - ffdc iMON PAD Remote Controller -15c5 Advance Multimedia Internet Technology Inc. (AMIT) - 0008 WL532U 802.11g Adapter -15c6 Laboratoires MXM - 1000 DigistimSP (cold) - 1001 DigistimSP (warm) - 1002 DigimapSP USB (cold) - 1003 DigimapSP USB (warm) -15c8 KTF Technologies - 3201 EVER EV-W100/EV-W250 -15c9 D-Box Technologies -15ca Textech International Ltd. - 00c3 Mini Optical Mouse - 0101 MIDI Interface cable - 1806 MIDI Interface cable -15d5 Coulomb Electronics Ltd. -15d9 Trust International B.V. - 0a33 Optical Mouse - 0a37 Mouse - 0a41 MI-2540D [Optical mouse] - 0a4c USB+PS/2 Optical Mouse -15dc Hynix Semiconductor Inc. -15e0 Seong Ji Industrial Co., Ltd. -15e1 RSA - 2007 RSA SecurID (R) Authenticator -15e8 SohoWare - 9100 NUB100 Ethernet [pegasus] - 9110 10/100 USB Ethernet -15e9 Pacific Digital Corp. - 04ce MemoryFrame MF-570 - 1968 MemoryFrame MF-570 - 1969 Digital Frame -15ec Belcarra Technologies Corp. -15f4 HanfTek - 0001 HanfTek UMT-010 USB2.0 DVB-T (cold) - 0025 HanfTek UMT-010 USB2.0 DVB-T (warm) -1604 Tascam - 8000 US-428 Audio/Midi Controller (without fw) - 8001 US-428 Audio/Midi Controller - 8004 US-224 Audio/Midi Controller (without fw) - 8005 US-224 Audio/Midi Controller - 8006 US-122 Audio/Midi Interface (without fw) - 8007 US-122 Audio/Midi Interface -1606 Umax - 0002 Astra 1236U Scanner - 0010 Astra 1220U - 0030 Astra 1600U/2000U - 0050 Scanner - 0060 Astra 3400/3450 - 0070 Astra 4400/4450 - 0130 Astra 2100U - 0160 Astra 5400U - 0170 Uniscan D50 - 0230 Astra 2200/2200SU - 0350 Astra 4800/4850 Scanner - 1030 Astra 4000U - 1220 Genesys Logic Scanner Controller NT5.0 - 2010 AstraCam Digital Camera - 2020 AstraCam 1000 - 2030 AstraCam 1800 Digital Camera -1608 Inside Out Networks [hex] - 0001 EdgePort/4 Serial Port - 0002 Edgeport/8 - 0003 Rapidport/4 - 0004 Edgeport/4 - 0005 Edgeport/2 - 0006 Edgeport/4i - 0007 Edgeport/2i - 0008 Edgeport/8 - 000c Edgeport/421 - 000d Edgeport/21 - 000e Edgeport/4 - 000f Edgeport/8 - 0010 Edgeport/2 - 0011 Edgeport/4 - 0012 Edgeport/416 - 0014 Edgeport/8i - 0018 Edgeport/412 - 0019 Edgeport/412 - 001a Edgeport/2+2i - 0101 Edgeport/4 - 0105 Edgeport/2 - 0106 Edgeport/4i - 0107 Edgeport/2i - 010c Edgeport/421 - 010d Edgeport/21 - 0110 Edgeport/2 - 0111 Edgeport/4 - 0112 Edgeport/416 - 0114 Edgeport/8i - 0201 Edgeport/4 - 0203 Rapidport/4 - 0204 Edgeport/4 - 0205 Edgeport/2 - 0206 Edgeport/4i - 0207 Edgeport/2i - 020c Edgeport/421 - 020d Edgeport/21 - 020e Edgeport/4 - 020f Edgeport/8 - 0210 Edgeport/2 - 0211 Edgeport/4 - 0212 Edgeport/416 - 0214 Edgeport/8i - 0215 Edgeport/1 - 0216 EPOS/44 - 0217 Edgeport/42 - 021a Edgeport/2+2i - 021b Edgeport/2c - 021c Edgeport/221c - 021d Edgeport/22c - 021e Edgeport/21c - 021f Edgeport/62 - 0240 Edgeport/1 - 0241 Edgeport/1i - 0242 Edgeport/4s - 0243 Edgeport/8s - 0244 Edgeport/8 - 0245 Edgeport/22c - 0301 Watchport/P - 0302 Watchport/M - 0303 Watchport/W - 0304 Watchport/T - 0305 Watchport/H - 0306 Watchport/E - 0307 Watchport/L - 0308 Watchport/R - 0309 Watchport/A - 030a Watchport/D - 030b Watchport/D - 030c Power Management Port - 030e Power Management Port - 030f Watchport/G - 0310 Watchport/Tc - 0311 Watchport/Hc - 1403 MultiTech Systems MT4X56 Modem - 1a17 Agilent Technologies (E6473) -160a VIA Technologies, Inc. - 3184 VIA VNT-6656 [WiFi 802.11b/g USB Dongle] -1614 Amoi Electronics - 0404 WMA9109 UMTS Phone - 0600 Vodafone VDA GPS / Toschiba Protege G710 - 0804 WP-S1 Phone -1619 L & K Precision Technology Co., Ltd. -1621 Wionics Research -1628 Stonestreet One, Inc. -162a Airgo Networks Inc. -162f WiQuest Communications, Inc. -1630 2Wire, Inc. - 0005 802.11g Wireless Adapter [Intersil ISL3886] - ff81 802.11b Wireless Adapter [Lucent/Agere Hermes I] -1631 Good Way Technology - 6200 GWUSB2E - c019 RT2573 -1645 Cross Match Technologies GmbH - 0001 1S Serial Port - 0002 2S Serial Port - 0003 1S25 Serial Port - 0004 4S Serial Port - 0005 E45 Ethernet [klsi] - 0006 Parallel Port - 0007 U1-SC25 SCSI - 0008 Ethernet - 0016 Bi-directional to Parallel Printer Converter - 0080 1 port to Serial Converter - 0081 1 port to Serial Converter - 0093 1S9 Serial Port - 8000 EZ-USB - 8001 1 port to Serial - 8002 2x Serial Port - 8003 1 port to Serial - 8004 2U4S serial/usb hub - 8005 Ethernet - 8080 1 port to Serial - 8081 1 port to Serial - 8093 PortGear Serial Port -1649 SofTec Microsystems - 0102 uDART In-Circuit Debugger - 0200 SpYder USBSPYDER08 -164a ChipX -164c Matrix Vision GmbH - 0101 mvBlueFOX camera (no firmware) - 0103 mvBlueFOX camera -1657 Struck Innovative Systeme GmbH - 3150 SIS3150 USB2.0 to VME interface -165b Frontier Design Group - 8101 Tranzport Control Surface - fad1 Alphatrack Control Surface -1660 Creatix Polymedia GmbH -1668 Actiontec Electronics, Inc. [hex] - 0009 Gateway - 0333 Modem - 0358 InternetPhoneWizard - 0405 Gateway - 0408 Prism2.5 802.11b Adapter - 0413 Gateway - 0421 Prism2.5 802.11b Adapter - 0441 IBM Integrated Bluetooth II - 0500 BTM200B BlueTooth Adapter - 1050 802UIG-1 802.11g Wireless Mini Adapter [Intersil ISL3887] - 1200 802AIN Wireless N Network Adapter [Atheros AR9001U] - 1441 IBM Integrated Bluetooth II - 2441 BMDC-2 IBM Bluetooth III w.56k - 3441 IBM Integrated Bluetooth III - 6010 Gateway - 6097 802.11b Wireless Adapter - 6106 ROPEX FreeLan 802.11b - 7605 UAT1 Wireless Ethernet Adapter -1669 PiKRON Ltd. [hex] - 1001 uLan2USB Converter - PS1 protocol -1677 China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group) - 0103 Token -1679 Total Phase - 2001 Beagle Protocol Analyzer - 2002 Cheetah SPI Host Adapter -1680 Golden Bridge Electech Inc. - a332 DVB-T Dongle [RTL2832U] -1681 Prevo Technologies, Inc. - 0001 Tuner's Dashboard -1682 Maxwise Production Enterprise Ltd. -1684 Godspeed Computer Corp. -1685 Delock - 0200 Infrared adapter -1686 ZOOM Corporation - 0045 H4 Digital Recorder -1687 Kingmax Digital Inc. - 5289 FlashDisk - 6211 FlashDisk -1688 Saab AB -168c Atheros Communications - 0001 AR5523 - 0002 AR5523 (no firmware) -1690 Askey Computer Corp. [hex] - 0101 Creative Modem Blaster DE5670 - 0102 V1456 VQE-R2 Modem [conexant] - 0103 1456 VQE-R3 Modem [conexant] - 0104 HCF V90 Data Fax RTAD Modem - 0107 HCF V.90 Data,Fax,RTAD Modem - 0109 MagicXpress V.90 Pocket Modem [conexant] - 0203 Voyager ADSL Modem Loader - 0204 Voyager ADSL Modem - 0205 DSL Modem - 0206 GlobeSpan ADSL WAN Modem - 0208 DSL Modem - 0209 Voyager 100 ADSL Modem - 0211 Globespan Virata ADSL LAN Modem - 0212 DSL Modem - 0213 HM121d DSL Modem - 0214 HM121d DSL Modem - 0215 Voyager 105 ADSL Modem - 0701 WLAN - 0710 SMCWUSBT-G - 0711 SMCWUSBT-G (no firmware) - 0712 AR5523 - 0713 AR5523 (no firmware) - 0715 Name: Voyager 1055 Laptop 802.11g Adapter [Broadcom 4320] - 0722 RT2573 - 0726 Wi-Fi Wireless LAN Adapter - 0740 802.11n Wireless LAN Card - 0901 Voyager 205 ADSL Router -1696 Hitachi Video and Information System, Inc. -1697 VTec Test, Inc. -16a5 Shenzhen Zhengerya Cable Co., Ltd. -16a6 Unigraf - 3000 VTG-3xxx Video Test Generator family - 4000 VTG-4xxx Video Test Generator family - 5000 VTG-5xxx Video Test Generator family - 5001 VTG-5xxx Special (update) mode of VTG-5xxx family -16ab Global Sun Technology - 7801 AR5523 - 7802 AR5523 (no firmware) - 7811 AR5523 - 7812 AR5523 (no firmware) -16ac Dongguan ChingLung Wire & Cable Co., Ltd. -16b4 iStation - 0801 U43 -16b5 Persentec, Inc. - 0002 Otto driving companion -16c0 VOTI - 03e8 free for internal lab use 1000 - 03e9 free for internal lab use 1001 - 03ea free for internal lab use 1002 - 03eb free for internal lab use 1003 - 03ec free for internal lab use 1004 - 03ed free for internal lab use 1005 - 03ee free for internal lab use 1006 - 03ef free for internal lab use 1007 - 03f0 free for internal lab use 1008 - 03f1 free for internal lab use 1009 - 05dc shared ID for use with libusb - 05dd BlackcatUSB2 - 05e1 CDC-ACM class devices (modems) - 05e4 MIDI class devices - 076b OpenPCD 13.56MHz RFID Reader - 076c OpenPICC 13.56MHz RFID Simulator (native) - 08ac OpenBeacon USB stick - 08ca Alpermann+Velte Universal Display - 08cb Alpermann+Velte Studio Clock - 08cc Alpermann+Velte SAM7S MT Boot Loader - 08cd Alpermann+Velte SAM7X MT Boot Loader - 27da Mouse - 27db Keyboard - 27dc Joystick - 27dd CDC-ACM class devices (modems) - 27de MIDI class devices -16ca Wireless Cables, Inc. - 1502 Bluetooth Dongle -16cc silex technology, Inc. -16d0 GrauTec - 054b ReelBox OLED Display (external) -16d3 Frontline Test Equipment, Inc. -16d5 AnyDATA Corporation - 6202 CDMA/UMTS/GPRS modem - 6501 CDMA 2000 1xRTT/EV-DO Modem - 6502 CDMA/UMTS/GPRS modem -16d6 JABLOCOM s.r.o. - 8000 GDP-04 desktop phone - 8001 EYE-02 - 8003 GDP-04 modem - 8004 Bootloader - 8005 GDP-04i - 8007 BTP-06 modem -16d8 CMOTECH Co., Ltd. - 5141 CMOTECH CDMA Technologies modem - 5533 CCU-550 CDMA EV-DO modem - 5543 CDMA 2000 1xRTT/1xEVDO modem - 6280 CMOTECH CDMA Technologies modem - 6803 CNU-680 CDMA EV-DO modem - 8001 Gobi 2000 Wireless Modem (QDL mode) - 8002 Gobi 2000 Wireless Modem -16dc Wiener, Plein & Baus - 0001 CC - 000b VM -16df King Billion Electronics Co., Ltd. -16f0 GN ReSound A/S - 0003 Airlink Wireless Programming Interface -16f5 Futurelogic Inc. -1706 BlueView Technologies, Inc. -1707 ARTIMI -170b Swissonic - 0011 MIDI-USB 1x1 -170d Avnera -1725 Vitesse Semiconductor -1726 Axesstel, Inc. - 1000 wireless modem - 2000 wireless modem - 3000 wireless modem -172f Waltop International Corp. - 0022 Tablet - 0024 Tablet - 0025 Tablet - 0026 Tablet - 0031 Slim Tablet 12.1" - 0032 Slim Tablet 5.8" - 0034 Slim Tablet 12.1" - 0038 Genius G-Pen F509 - 0500 Media Tablet 14.1" - 0501 Media Tablet 10.6" - 0502 Sirius Battery Free Tablet -1733 Cellink Technology Co., Ltd - 0101 RF Wireless Optical Mouse OP-701 -1736 CANON IMAGING SYSTEM TECHNOLOGIES INC. -1737 Linksys - 0039 USB1000 - 0070 WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870] - 0071 WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870] - 0073 WUSB54GC v2 802.11g Adapter [Realtek RTL8187B] - 0075 WUSB54GSC v2 802.11g Adapter - 0077 WUSB54GC v3 802.11g Adapter [Ralink RT2070L] - 0078 WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070] - 0079 WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572] -1740 Senao - 0605 LevelOne WUA-0605 N_Max Wireless USB Adapter - 0615 LevelOne WUA-0615 N_Max Wireless USB Adapter - 2000 NUB-8301 802.11bg - 3701 EUB-3701 EXT 802.11g Wireless Adapter [Ralink RT2571W] - 9701 EnGenius 802.11n Wireless USB Adapter - 9702 EnGenius 802.11n Wireless USB Adapter - 9703 EnGenius 802.11n Wireless USB Adapter - 9705 EnGenius 802.11n Wireless USB Adapter - 9706 EUB9706 802.11n Wireless Adapter [Ralink RT3072] - 9801 EUB9801 802.11abgn Wireless Adapter [Ralink RT3572] -1743 General Atomics -174c ASMedia Technology Inc. -174f Syntek - 1105 SM-MS/Pro-MMC-XD Card Reader - 1403 Integrated Webcam - 1404 USB Camera device, 1.3 MPixel Web Cam - 5212 USB 2.0 UVC PC Camera - 5a11 PC Camera - 5a31 Sonix USB 2.0 Camera - 5a35 Sonix 1.3MPixel USB 2.0 Camera - 6a31 Web Cam - Asus A8J, F3S, F5R, VX2S, V1S - 6a33 Web Cam - Asus F3SA, F9J, F9S - 6a51 2.0MPixel Web Cam - Asus Z96J, Z96S, S96S - 6a54 Web Cam - 6d51 2.0Mpixel Web Cam - Eurocom D900C - 8a12 Syntek 0.3MPixel USB 2.0 UVC PC Camera - 8a33 Syntek USB 2.0 UVC PC Camera - a311 1.3MPixel Web Cam - Asus A3A, A6J, A6K, A6M, A6R, A6T, A6V, A7T, A7sv, A7U - a312 1.3MPixel Web Cam - a821 Web Cam - Packard Bell BU45, PB Easynote MX66-208W - aa11 Web Cam -1753 GERTEC Telecomunicacoes Ltda. - c901 PPC900 Pinpad Terminal -1759 LucidPort Technology, Inc. -1761 ASUSTek Computer, Inc. (wrong ID) - 0b05 802.11n Network Adapter (wrong ID - swapped vendor and device) -1772 System Level Solutions, Inc. -1776 Arowana - 501c 300K CMOS Camera -177f Sweex - 0153 LW153 802.11n Adapter [ralink rt3070] - 0313 LW313 802.11n Adapter [ralink rt2770 + rt2720] -1781 Multiple Vendors - 083e MetaGeek Wi-Spy - 083f MetaGeek Wi-Spy 2.4x - 0938 Iguanaworks USB IR Transceiver - 0c9f USBtiny -1782 Spreadtrum Communications Inc. -1784 TopSeed Technology Corp. - 0001 eHome Infrared Transceiver - 0004 RF Combo Device - 0006 eHome Infrared Transceiver - 0007 eHome Infrared Transceiver - 0008 eHome Infrared Transceiver - 000a eHome Infrared Transceiver -1787 ATI AIB -1788 ShenZhen Litkconn Technology Co., Ltd. -1796 Printrex, Inc. -1797 JALCO CO., LTD. -1799 Belkin Components - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320] -179d Ricavision International, Inc. - 0010 Internal Infrared Transceiver -17a0 Samson Technologies Corp. - 0001 C01U condenser microphone - 0002 Q1U dynamic microphone - 0100 C03U multi-pattern microphone - 0101 UB1 boundary microphone - 0200 StudioDock monitors (internal hub) - 0201 StudioDock monitors (audio) - 0301 Q2U handheld microphone with XLR - 0302 GoMic compact condenser microphone -17a4 Concept2 - 0001 Performance Monitor 3 - 0002 Performance Monitor 4 -17a5 Advanced Connection Technology Inc. -17a7 MICOMSOFT CO., LTD. -17b3 Grey Innovation - 0004 Linux-USB Midi Gadget -17c3 Singim International Corp. -17cc Native Instruments - 041c Audio 2 DJ - 0808 Maschine Controller - 0815 Audio Kontrol 1 - 0839 Audio 4 DJ - 0d8d Guitarrig Mobile - 1915 Session I/O - 1940 RigKontrol3 - 1969 RigKontrol2 - 1978 Audio 8 DJ - 2305 Traktor Kontrol X1 - 4711 Kore Controller - 4712 Kore Controller 2 - baff Traktor Kontrol S4 -17cf Hip Hing Cable & Plug Mfy. Ltd. -17d0 Sanford L.P. -17d3 Korea Techtron Co., Ltd. -17e9 Newnham Research - 0051 USB VGA Adaptor -17eb Cornice, Inc. -17ef Lenovo - 1003 Integrated Smart Card Reader - 1004 Integrated Webcam - 100a ThinkPad Mini Dock Plus Series 3 - 3815 ChipsBnk 2GB USB Stick - 4802 Lenovo Vc0323+MI1310_SOC Camera - 4807 UVC Camera - 480c Integrated Webcam - 480d Integrated Webcam [R5U877] - 480e Integrated Webcam [R5U877] - 480f Integrated Webcam [R5U877] - 4810 Integrated Webcam [R5U877] - 4811 Integrated Webcam [R5U877] - 4812 Integrated Webcam [R5U877] - 4813 Integrated Webcam [R5U877] - 4814 Integrated Webcam [R5U877] - 4815 Integrated Webcam [R5U877] - 481c Integrated Webcam - 6009 ThinkPad Keyboard with TrackPoint -17f5 K.K. Rocky -17f6 Unicomp, Inc - 0709 Model M Keyboard -1809 Advantech - 4761 USB-4761 Portable Data Acquisition Module -1822 Twinhan - 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold - 3202 VisionDTV USB-Ter/HAMA USB DVB-T device warm -1831 Gwo Jinn Industries Co., Ltd. -1832 Huizhou Shenghua Industrial Co., Ltd. -183d VIVOphone - 0010 VoiceKey -1843 Vaisala -1849 ASRock Incorporation -1852 GYROCOM C&C Co., LTD - 7922 Audiotrak DR.DAC2 DX -1854 Memory Devices Ltd. -185b Compro - 3020 K100 Infrared Receiver - 3082 K100 Infrared Receiver v2 - d000 Compro Videomate DVB-U2000 - DVB-T USB cold - d001 Compro Videomate DVB-U2000 - DVB-T USB warm -1861 Tech Technology Industrial Company -1862 Teridian Semiconductor Corp. -1870 Nexio Co., Ltd - 0001 iNexio Touchscreen controller -1871 Aveo Technology Corp. - 0d01 USB2.0 Camera -187c Alienware Corporation - 0600 Dual Compatible Game Pad -187f Siano Mobile Silicon - 0010 Stallar Board - 0100 Stallar Board - 0200 Nova A - 0201 Nova B - 0202 Nice - 0300 Vega - 0301 VeNice -1892 Vast Technologies, Inc. -1894 Topseed - 5632 Atek Tote Remote - 5641 TSAM-004 Presentation Remote -1897 Evertop Wire Cable Co. -18a5 Verbatim, Ltd - 0214 Portable Hard Drive - 0216 External Hard Drive - 0218 External Hard Drive -18b1 Petalynx - 0037 Maxter Remote Control -18b4 e3C Technologies - 1001 DUTV007 - 1002 EC168 (v5) based USB DVB-T receiver - 1689 DUTV009 - fffa EC168 (v2) based USB DVB-T receiver - fffb EC168 (v3) based USB DVB-T receiver -18b6 Mikkon Technology Limited -18b7 Zotek Electronic Co., Ltd. -18c5 AMIT Technology, Inc. - 0002 CG-WLUSB2GO - 0008 CG-WLUSB2GNR Corega Wireless USB Adapter - 0012 CG-WLUSB10 Corega Wireless USB Adapter -18cd Ecamm - cafe Pico iMage -18d1 Google Inc. - 4e11 Nexus One - 4e12 Nexus One (debug) - 4e13 Nexus One (tether) - 4e21 Nexus S - 4e22 Nexus S (debug) -18d5 Starline International Group Limited -18d9 Kaba - 01a0 B-Net 91 07 -18dd Planon System Solutions Inc. - 1000 DocuPen RC800 -18e3 Fitipower Integrated Technology Inc - 7102 Multi Card Reader (Internal) - 9101 All-in-1 Card Reader - 9102 Multi Card Reader - 9512 Webcam -18e8 Qcom - 6196 RT2573 - 6229 RT2573 - 6232 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -18ea Matrox Graphics, Inc. - 0002 DualHead2Go [Analog Edition] - 0004 TripleHead2Go [Digital Edition] -18ec Arkmicro Technologies Inc. - 3118 USB to IrDA adapter [ARK3116T] - 3188 ARK3188 UVC Webcam -18fd FineArch Inc. -1908 GEMBIRD - 1320 PhotoFrame PF-15-1 -190d Motorola GSG -1914 Alco Digital Devices Limited -1915 Nordic Semiconductor ASA - 2233 Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505] - 2234 Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886] - 2235 Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886] - 2236 Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3] -1926 NextWindow - 0003 1900 HID Touchscreen - 0006 1950 HID Touchscreen - 0064 1950 HID Touchscreen - 0065 1950 HID Touchscreen - 0066 1950 HID Touchscreen - 0067 1950 HID Touchscreen - 0068 1950 HID Touchscreen - 0069 1950 HID Touchscreen - 0071 1950 HID Touchscreen - 0072 1950 HID Touchscreen - 0073 1950 HID Touchscreen - 0074 1950 HID Touchscreen - 0075 1950 HID Touchscreen - 0076 1950 HID Touchscreen - 0077 1950 HID Touchscreen - 0078 1950 HID Touchscreen - 0079 1950 HID Touchscreen - 007a 1950 HID Touchscreen - 007e 1950 HID Touchscreen - 007f 1950 HID Touchscreen - 0080 1950 HID Touchscreen - 0081 1950 HID Touchscreen - 0082 1950 HID Touchscreen - 0083 1950 HID Touchscreen - 0084 1950 HID Touchscreen - 0085 1950 HID Touchscreen - 0086 1950 HID Touchscreen - 0087 1950 HID Touchscreen -192f Avago Technologies, Pte. - 0000 Mouse -1930 Shenzhen Xianhe Technology Co., Ltd. -1931 Ningbo Broad Telecommunication Co., Ltd. -1934 Feature Integration Technology Inc. (Fintek) - 0602 F71610 or F71612 Consumer Infrared Receiver/Transceiver - 0702 Integrated Consumer Infrared Receiver/Transceiver - 5168 F71610A or F71612A Consumer Infrared Receiver/Transceiver -1941 Dream Link - 8021 WH1080 Weather Station / USB Missile Launcher -1943 Sensoray Co., Inc. - 2250 Model 2250 MPEG and JPEG Capture Card - 2253 Model 2253 Audio/Video Codec Card - 2255 Model 2255 4 Channel Capture Card - 2257 Model 2257 4 Channel Capture Card - a250 Model 2250 MPEG and JPEG Capture Card (cold) - a253 Model 2253 Audio/Video Codec Card (cold) -1949 Lab126 - 0002 Amazon Kindle - 0004 Amazon Kindle 3 -1951 Hyperstone AG -1953 Ironkey Inc. -1954 Radiient Technologies -195d Itron Technology iONE - 7002 Libra-Q11 IR remote - 7006 Libra-Q26 / 1.0 Remote - 7777 Scorpius wireless keyboard - 7779 Scorpius-P20MT -1967 CASIO HITACHI Mobile Communications Co., Ltd. -196b Wispro Technology Inc. -1970 Dane-Elec Corp. USA -1975 Dongguan Guneetal Wire & Cable Co., Ltd. -1976 Chipsbrand Microelectronics (HK) Co., Ltd. -1977 T-Logic - 0111 TL203 MP3 Player and Voice Recorder -1989 Nuconn Technology Corp. -198f Beceem Communications Inc. - 0210 BCS200 WiMAX Adapter -1990 Acron Precision Industrial Co., Ltd. -1995 Trillium Technology Pty. Ltd. - 3202 REC-ADPT-USB (recorder) - 3203 REC-A-ADPT-USB (recorder) -199e The Imaging Source Europe GmbH - 8101 DFx 21BU04 Camera -199f Benica Corporation -19a8 Biforst Technology Inc. -19ab Bodelin - 1000 ProScope HR -19af S Life - 6611 Celestia VoIP Phone -19b2 Batronix - 0010 BX32 Batupo - 0011 BX32P Barlino - 0012 BX40 Bagero - 0013 BX48 Batego -19b4 Celestron - 0002 SkyScout Personal Planetarium - 0101 Handheld Digital Microscope 44302 -19b5 B & W Group -19b6 Infotech Logistic, LLC -19b9 Data Robotics - 8d20 Drobo Elite -19ca Mindtribe - 0001 Sandio 3D HID Mouse -19cf Parrot SA -19d2 ONDA Communication S.p.A. - 0002 ET502HS/MT505UP ZTE MF632 - 0007 ZTE TU25 WiMAX Adapter [Beceem BCS200] - 0031 ZTE MF110/MF636 - 0063 ZTE K3565-Z HSDPA - 0064 ZTE MF627 AU - 0083 ZTE MF190 - 0103 ZTE MF112 - 2000 ZTE MF627/MF628/MF628+/MF636+ HSDPA/HSUPA - fff2 Gobi Wireless Modem (QDL mode) - fff3 Gobi Wireless Modem -19e1 WeiDuan Electronic Accessory (S.Z.) Co., Ltd. -19e8 Industrial Technology Research Institute -19ef Pak Heng Technology (Shenzhen) Co., Ltd. -19f7 RODE Microphones - 0001 Podcaster -19fa Gampaq Co.Ltd - 0703 Steering Wheel -19ff Dynex - 0102 1.3MP Webcam - 0201 Rocketfish Wireless 2.4G Laser Mouse -1a08 Bellwood International, Inc. -1a0a USB-IF non-workshop - badd USB OTG Compliance test device -1a12 KES Co., Ltd. -1a25 Amphenol East Asia Ltd. -1a2a Seagate Branded Solutions -1a32 Quanta Microsystems, Inc. - 0304 802.11n Wireless LAN Card -1a36 Biwin Technology Ltd. -1a40 TERMINUS TECHNOLOGY INC. - 0101 USB-2.0 4-Port HUB -1a41 Action Electronics Co., Ltd. -1a44 VASCO Data Security International - 0001 Digipass 905 SmartCard Reader -1a4a Silicon Image -1a4b SafeBoot International B.V. -1a61 Abbott Diabetes Care -1a6a Spansion Inc. -1a6d SamYoung Electronics Co., Ltd -1a6e Global Unichip Corp. -1a6f Sagem Orga GmbH -1a79 Bayer Health Care LLC -1a7b Lumberg Connect GmbH & Co. KG -1a7c Evoluent - 0068 VerticalMouse 3 - 0168 VerticalMouse 3 Wireless - 0191 VerticalMouse 4 -1a86 QinHeng Electronics - 5523 CH341 in serial mode, usb to serial port converter - 5584 CH341 in parallel mode, usb to printer port converter - 7523 HL-340 USB-Serial adapter - 752d CH345 MIDI adapter - 7584 CH340S - e008 HID-based USB-serial converter, full-speed, similar to HE2325U -1a89 Dynalith Systems Co., Ltd. -1a8b SGS Taiwan Ltd. -1a8d BandRich, Inc. - 1002 BandLuxe 3.5G HSDPA Adapter - 1009 BandLuxe 3.5G HSPA Adapter -1a90 Corsair Voyager GT 16GB -1a98 Leica Camera AG -1aa4 Data Drive Thru, Inc. -1aa5 UBeacon Technologies, Inc. -1aa6 eFortune Technology Corp. -1acb Salcomp Plc -1ad1 Desay Wire Co., Ltd. -1ae4 ic-design Reinhard Gottinger GmbH -1ae7 X-TENSIONS - 0381 VS-DVB-T 380U (af9015 based) - 2001 SpeedLink SL-6825 -1aed High Top Precision Electronic Co., Ltd. -1aef Conntech Electronic (Suzhou) Corporation -1b04 Meilhaus Electronic GmBH - 0630 ME-630 - 0940 ME-94 - 0950 ME-95 - 0960 ME-96 - 1000 ME-1000 - 100a ME-1000 - 100b ME-1000 - 1400 ME-1400 - 140a ME-1400A - 140b ME-1400B - 140c ME-1400C - 140d ME-1400D - 140e ME-1400E - 14ea ME-1400EA - 14eb ME-1400EB - 1604 ME-1600/4U - 1608 ME-1600/8U - 160c ME-1600/12U - 160f ME-1600/16U - 168f ME-1600/16U8I - 4610 ME-4610 - 4650 ME-4650 - 4660 ME-4660 - 4661 ME-4660I - 4662 ME-4660 - 4663 ME-4660I - 4670 ME-4670 - 4671 ME-4670I - 4672 ME-4670S - 4673 ME-4670IS - 4680 ME-4680 - 4681 ME-4680I - 4682 ME-4680S - 4683 ME-4680IS - 6004 ME-6000/4 - 6008 ME-6000/8 - 600f ME-6000/16 - 6014 ME-6000I/4 - 6018 ME-6000I/8 - 601f ME-6000I/16 - 6034 ME-6000ISLE/4 - 6038 ME-6000ISLE/8 - 603f ME-6000ISLE/16 - 6044 ME-6000/4/DIO - 6048 ME-6000/8/DIO - 604f ME-6000/16/DIO - 6054 ME-6000I/4/DIO - 6058 ME-6000I/8/DIO - 605f ME-6000I/16/DIO - 6074 ME-6000ISLE/4/DIO - 6078 ME-6000ISLE/8/DIO - 607f ME-6000ISLE/16/DIO - 6104 ME-6100/4 - 6108 ME-6100/8 - 610f ME-6100/16 - 6114 ME-6100I/4 - 6118 ME-6100I/8 - 611f ME-6100I/16 - 6134 ME-6100ISLE/4 - 6138 ME-6100ISLE/8 - 613f ME-6100ISLE/16 - 6144 ME-6100/4/DIO - 6148 ME-6100/8/DIO - 614f ME-6100/16/DIO - 6154 ME-6100I/4/DIO - 6158 ME-6100I/8/DIO - 615f ME-6100I/16/DIO - 6174 ME-6100ISLE/4/DIO - 6178 ME-6100ISLE/8/DIO - 617f ME-6100ISLE/16/DIO - 6259 ME-6200I/9/DIO - 6359 ME-6300I/9/DIO - 810a ME-8100A - 810b ME-8100B - 820a ME-8200A - 820b ME-8200B -1b20 MStar Semiconductor, Inc. -1b22 WiLinx Corp. -1b26 Cellex Power Products, Inc. -1b27 Current Electronics Inc. -1b28 NAVIsis Inc. -1b32 Ugobe Life Forms, Inc. - 0064 Pleo robotic dinosaur -1b36 ViXS Systems, Inc. -1b3b iPassion Technology Inc. - 2933 PC Camera/Webcam controller - 2935 PC Camera/Webcam controller - 2936 PC Camera/Webcam controller - 2937 PC Camera/Webcam controller - 2938 PC Camera/Webcam controller - 2939 PC Camera/Webcam controller - 2950 PC Camera/Webcam controller - 2951 PC Camera/Webcam controller - 2952 PC Camera/Webcam controller - 2953 PC Camera/Webcam controller - 2955 PC Camera/Webcam controller - 2956 PC Camera/Webcam controller - 2957 PC Camera/Webcam controller - 2958 PC Camera/Webcam controller - 2959 PC Camera/Webcam controller - 2960 PC Camera/Webcam controller - 2961 PC Camera/Webcam controller - 2962 PC Camera/Webcam controller - 2963 PC Camera/Webcam controller - 2965 PC Camera/Webcam controller - 2966 PC Camera/Webcam controller - 2967 PC Camera/Webcam controller - 2968 PC Camera/Webcam controller - 2969 PC Camera/Webcam controller -1b3f Generalplus Technology Inc. -1b47 Energizer Holdings, Inc. - 0001 CHUSB Duo Charger (NiMH AA/AAA USB smart charger) -1b48 Plastron Precision Co., Ltd. -1b59 K.S. Terminals Inc. -1b5a Chao Zhou Kai Yuan Electric Co., Ltd. -1b65 The Hong Kong Standards and Testing Centre Ltd. -1b72 ATERGI TECHNOLOGY CO., LTD. -1b73 Fresco Logic - 1000 xHC1 Controller -1b75 Ovislink Corp. - 3072 AirLive WN-360USB adapter -1b76 Legend Silicon Corp. -1b80 Afatech - c810 MC810 [af9015] - d393 DVB-T receiver [RTL2832U] - d396 UB396-T [RTL2832U] - d397 DVB-T receiver [RTL2832U] - d398 DVB-T receiver [RTL2832U] - d700 FM Radio SnapMusic Mobile 700 (FM700) - e383 DVB-T UB383-T [af9015] - e385 DVB-T UB385-T [af9015] - e386 DVB-T UB385-T [af9015] - e39a DVB-T395U [af9015] - e39b DVB-T395U [af9015] - e409 IT9137FN Dual DVB-T [KWorld UB499-2T] -1b86 Dongguan Guanshang Electronics Co., Ltd. -1b88 ShenMing Electron (Dong Guan) Co., Ltd. -1b8c Altium Limited -1b8d e-MOVE Technology Co., Ltd. -1b8e Amlogic, Inc. -1b8f MA LABS, Inc. -1b96 N-Trig - 0001 Duosense Transparent Electromagnetic Digitizer -1b98 YMax Communications Corp. -1b99 Shenzhen Yuanchuan Electronic -1ba1 JINQ CHERN ENTERPRISE CO., LTD. -1ba2 Lite Metals & Plastic (Shenzhen) Co., Ltd. -1ba4 Ember Corporation - 0001 InSight USB Link -1ba6 Abilis Systems -1ba8 China Telecommunication Technology Labs -1bad Harmonix Music - 0002 Guitar for Xbox 360 - 0003 Drum Kit for Xbox 360 -1bae Vuzix Corporation - 0002 VR920 Immersive Eyewear -1bbb T & A Mobile Phones -1bc4 Ford Motor Co. -1bc5 AVIXE Technology (China) Ltd. -1bce Contac Cable Industrial Limited -1bcf Sunplus Innovation Technology Inc. - 0007 Optical Mouse - 05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver] - 05cf Micro keyboard & mouse receiver -1bd0 Hangzhou Riyue Electronic Co., Ltd. -1bde P-TWO INDUSTRIES, INC. -1bef Shenzhen Tongyuan Network-Communication Cables Co., Ltd -1bf0 RealVision Inc. -1bf5 Extranet Systems Inc. -1bf6 Orient Semiconductor Electronics, Ltd. -1bfd TouchPack - 1268 Touch Screen - 1368 Touch Screen - 1568 Capacitive Touch Screen - 1668 IR Touch Screen - 1688 Resistive Touch Screen - 2968 Touch Screen - 5968 Touch Screen - 6968 Touch Screen -1c02 Kreton Corporation -1c04 QNAP System Inc. -1c0d Relm Wireless -1c10 Lanterra Industrial Co., Ltd. -1c13 ALECTRONIC LIMITED -1c1a Datel Electronics Ltd. -1c1b Volkswagen of America, Inc. -1c1f Goldvish S.A. -1c20 Fuji Electric Device Technology Co., Ltd. -1c21 ADDMM LLC -1c22 ZHONGSHAN CHIANG YU ELECTRIC CO., LTD. -1c26 Shanghai Haiying Electronics Co., Ltd. -1c27 HuiYang D & S Cable Co., Ltd. -1c31 LS Cable Ltd. -1c34 SpringCard - 7241 Prox'N'Roll RFID Scanner -1c37 Authorizer Technologies, Inc. -1c3d NONIN MEDICAL INC. -1c3e Wep Peripherals -1c49 Cherng Weei Technology Corp. -1c4f SiGma Micro - 0003 HID controller - 3000 Micro USB Web Camera -1c6b Philips & Lite-ON Digital Solutions Corporation -1c6c Skydigital Inc. -1c73 AMT - 861f Anysee E30 USB 2.0 DVB-T Receiver -1c77 Kaetat Industrial Co., Ltd. -1c78 Datascope Corp. -1c79 Unigen Corporation -1c7a LighTuning Technology Inc. -1c7b LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD. -1c87 2N TELEKOMUNIKACE a.s. -1c88 Somagic, Inc. -1c89 HONGKONG WEIDIDA ELECTRON LIMITED -1c8e ASTRON INTERNATIONAL CORP. -1c98 ALPINE ELECTRONICS, INC. -1ca0 ACCARIO Inc. -1cac Kinstone - a332 C8 Webcam - b288 C18 Webcam -1cb3 Aces Electronic Co., Ltd. -1cb4 OPEX CORPORATION -1cbe Luminary Micro Inc. -1cbf FORTAT SKYMARK INDUSTRIAL COMPANY -1cc0 PlantSense -1cca NextWave Broadband Inc. -1ccd Bodatong Technology (Shenzhen) Co., Ltd. -1cd4 adp corporation -1cd5 Firecomms Ltd. -1cd6 Antonio Precise Products Manufactory Ltd. -1cde Telecommunications Technology Association (TTA) -1cdf WonTen Technology Co., Ltd. -1ce0 EDIMAX TECHNOLOGY CO., LTD. -1ce1 Amphenol KAE -1cfc ANDES TECHNOLOGY CORPORATION -1cfd Flextronics Digital Design Japan, LTD. -1d07 Solid-Motion -1d08 NINGBO HENTEK DRAGON ELECTRONICS CO., LTD. -1d09 TechFaith Wireless Technology Limited - 1026 HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel] -1d0a Johnson Controls, Inc. The Automotive Business Unit -1d0b HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD. -1d14 ALPHA-SAT TECHNOLOGY LIMITED -1d17 C-Thru Music Ltd. - 0001 AXiS-49 Harmonic Table MIDI Keyboard -1d19 Dexatek Technology Ltd. - 1101 DK DVB-T Dongle - 1102 DK mini DVB-T Dongle - 1103 DK 5217 DVB-T Dongle - 6105 Video grabber - 8202 DK DVBC/T DONGLE -1d1f Diostech Co., Ltd. -1d20 SAMTACK INC. -1d4d PEGATRON CORPORATION - 0002 Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device - 000c Ralink RT3070 802.11b/g/n Wireless Lan USB Device - 000e Ralink RT3070 802.11b/g/n Wireless Lan USB Device -1d50 OpenMoko, Inc. - 5119 GTA01/GTA02 U-Boot Bootloader -1d5b Smartronix, Inc. -1d6b Linux Foundation - 0001 1.1 root hub - 0002 2.0 root hub - 0003 3.0 root hub - 0100 PTP Gadget - 0101 Audio Gadget - 0102 EEM Gadget - 0103 NCM (Ethernet) Gadget - 0104 Multifunction Composite Gadget - 0105 FunctionFS Gadget - 0200 Qemu Audio Device -1e0e Qualcomm / Option -1e10 Point Grey Research, Inc. - 2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon] -1e1d Lumension Security - 0165 Secure Pen drive -1e1f INVIA -1e29 Festo AG & Co. KG - 0101 CPX Adapter - 0102 CPX Adapter >=HW10.09 [CP2102] - 0401 iL3-TP [AT90USB646] - 0402 FTDI232 [EasyPort] - 0403 FTDI232 [EasyPort Mini] - 0404 FTDI232 [Netzteil-GL] - 0405 FTDI232 [MotorPrüfstand] - 0406 STM32F103 [EasyKit] - 0407 LPC2378 [Robotino] - 0408 LPC2378 [Robotino-Arm] - 0409 LPC2378 [Robotino-Arm Bootloader] - 040a LPC2378 [Robotino Bootloader] - 0501 CP2102 [CMSP] - 0601 CMMP-AS -1e41 Cleverscope - 0001 CS328A PC Oscilloscope -1e54 TypeMatrix - 2030 2030 USB Keyboard -1e68 TrekStor GmbH & Co. KG - 001b DataStation maxi g.u -1e71 NZXT - 0001 Avatar Optical Mouse -1e74 Coby Electronics Corporation - 6511 MP705-8G MP3 player - 6512 MP705-4G -1e7d ROCCAT - 2c24 Pyra Mouse (wired) - 2ced Kone Mouse - 2d51 Kone+ Mouse - 30d4 Arvo Keyboard -1ebb NuCORE Technology, Inc. -1eda AirTies Wireless Networks - 2310 802.11n USB Wireless LAN Card -1ef6 EADS Deutschland GmbH -1f28 Cal-Comp - 0020 CDMA USB Modem A600 - 0021 CD INSTALLER USB Device -1f4d G-Tek Electronics Group - b803 Lifeview LV5TDLX DVB-T [RTL2832U] -1f82 TANDBERG - 0001 PrecisionHD Camera -1f84 Alere, Inc. -1f87 Stantum - 0002 Multi-touch HID Controller -1fbd Delphin Technology AG - 0001 Expert Key - Data aquisition system -1fc9 NXP Semiconductors -1fe7 Vertex Wireless Co., Ltd. - 1000 VW100 series CDMA EV-DO Rev.A modem -2001 D-Link Corp. - 0001 DWL-120 WIRELESS ADAPTER - 0201 DHN-120 10Mb Home Phoneline Adapter - 1a00 10/100 Ethernet - 200c 10/100 Ethernet - 3200 DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a] - 3301 DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U] - 3500 Elitegroup Computer Systems WLAN card WL-162 - 3700 DWL-122 802.11b [Intersil Prism 3] - 3701 DWL-G120 Spinnaker 802.11g [Intersil ISL3886] - 3702 DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871] - 3703 AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886] - 3704 AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887] - 3705 AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887] - 3761 IEEE 802.11g USB2.0 Wireless Network Adapter-PN - 3a00 DWL-AG132 [Atheros AR5523] - 3a01 DWL-AG132 (no firmware) [Atheros AR5523] - 3a02 DWL-G132 [Atheros AR5523] - 3a03 DWL-G132 (no firmware) [Atheros AR5523] - 3a04 DWL-AG122 [Atheros AR5523] - 3a05 DWL-AG122 (no firmware) [Atheros AR5523] - 3a80 AirPlus Xtreme G DWL-G132 Wireless Adapter - 3a81 predator Bootloader Download - 3a82 AirPremier AG DWL-AG132 Wireless Adapter - 3a83 predator Bootloader Download - 3b00 AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB] - 3b01 WLAN Boot Device - 3c00 AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB] - 3c01 AirPlus AG DWL-AG122 Wireless Adapter - 3c02 AirPlus G DWL-G122 Wireless Adapter - 3c05 DUB-E100 Fast Ethernet [asix] - 4000 DSB-650C Ethernet [klsi] - 4001 DSB-650TX Ethernet [pegasus] - 4002 DSB-650TX Ethernet [pegasus] - 4003 DSB-650TX-PNA Ethernet [pegasus] - 400b 10/100 Ethernet - 4102 10/100 Ethernet - 5100 DSL-200 ADSL ATM Modem - 5102 DSL-200 ADSL Loader - 5b00 Remote NDIS Network Device - 9414 Cable Modem - 9b00 Broadband Cable Modem Remote NDIS Device - abc1 DSB-650 Ethernet [pegasus] - f013 DLink 7 port USB2.0 Hub - f103 DUB-H7 7-port USB 2.0 hub - f10d Accent Communications Modem - f110 DUB-AV300 A/V Capture - f111 DBT-122 Bluetooth adapter - f112 DUB-T210 Audio Device - f116 Formosa 2 - f117 Formosa 3 - f118 Formosa 4 -2013 Unknown (Pinnacle?) - 0245 PCTV 73ESE - 0246 PCTV 74E - 0248 PCTV 282E -2019 PLANEX - 3220 GW-US11S WLAN [Atmel AT76C503A] - 5303 GW-US54GXS 802.11bg - 5304 GWUS300 802.11n - ab01 GW-US54HP - ab24 GW-US300MiniS - ab25 GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870] - ab28 GW-USNano - ab29 GW-USMicro300 - ab50 GW-US54Mini2 - c002 GW-US54SG - c007 GW-US54GZL - ed02 GW-USMM - ed06 802.11n Wireless LAN Adapter - ed10 GW-US300Mini2 - ed14 GW-USMicroN - ed17 GW-USValue-EZ -2040 Hauppauge - 0c80 Windham - 0c90 Windham - 1700 CataMount - 1800 Okemo A - 1801 Okemo B - 2000 Tiger Minicard - 2009 Tiger Minicard R2 - 200a Tiger Minicard - 2010 Tiger Minicard - 2011 WinTV MiniCard [Dell Digital TV Receiver] - 2019 Tiger Minicard - 2400 WinTV PVR USB2 (Model 24019) - 4700 WinTV Nova-S-USB2 - 4902 HD PVR - 4982 HD PVR - 5500 Windham - 5510 Windham - 5520 Windham - 5530 Windham - 5580 Windham - 5590 Windham - 6500 WinTV HVR-900 - 6502 WinTV HVR-900 - 6503 WinTV HVR-930 - 6513 WinTV HVR-980 - 7050 Nova-T Stick - 7060 Nova-T Stick 2 - 7070 Nova-T Stick 3 - 7240 WinTV HVR-850 - 8400 WinTV Nova-T-500 - 9300 WinTV NOVA-T USB2 (cold) - 9301 WinTV NOVA-T USB2 (warm) - 9941 WinTV Nova-T-500 - 9950 WinTV Nova-T-500 - b910 Windham - b980 Windham - b990 Windham - c000 Windham - c010 Windham -2047 Texas Instruments - 0200 MSP430 USB HID Bootstrap Loader -2080 Barnes & Noble - 0001 nook - 0002 NOOKcolor -2087 Cando - 0a01 Multi Touch Panel - 0a02 Multi Touch Panel - 0b03 Multi Touch Panel -20a0 Clay Logic - 414a MDE SPI Interface -20b1 XMOS Ltd - 10ad XUSB Loader - f7d1 XTAG2 - JTAG Adapter -20b3 Hanvon - 0a18 10.1 Touch screen overlay -20b7 Qi Hardware - 0713 Milkymist JTAG/serial - 1540 ben-wpan, AT86RF230-based - 1db5 IDBG in DFU mode - 1db6 IDBG in normal mode - c25b C2 Dongle - cb72 ben-wpan, cntr -20df Simtec Electronics - 0001 Entropy Key [UDEKEY01] -2101 ActionStar - 0201 SIIG 4-to-2 Printer Switch -2162 Creative (?) - 2031 Network Blaster Wireless Adapter - 500c DE5771 Modem Blaster - 8001 Broadxent BritePort DSL Bridge 8010U -2184 GW Instek - 0005 GDS-3000 Oscilloscope - 0006 GDS-3000 Oscilloscope - 0011 AFG Function Generator (CDC) -21a1 Emotiv Systems Pty. Ltd. - 0001 EPOC Consumer Headset Wireless Dongle -21d6 Agecodagis SARL - 0002 Seismic recorder [Tellus] -2222 MacAlly - 0004 iWebKey Keyboard - 2520 Mini Tablet - 4050 AirStick joystick -2227 SAMWOO Enterprise - 3105 SKYDATA SKD-U100 -2233 RadioShack Corporation - 6323 USB Electronic Scale -2237 Kobo Inc. - 4161 eReader White -22a6 Pie Digital, Inc. - ffff PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB) -22b8 Motorola PCS - 0001 Wally 2.2 chipset - 0002 Wally 2.4 chipset - 0005 V.60c/V.60i GSM Phone - 0830 2386C-HT820 - 0833 2386C-HT820 [Flash Mode] - 0850 Bluetooth Device - 1001 Patriot 1.0 (GSM) chipset - 1002 Patriot 2.0 chipset - 1005 T280e GSM/GPRS Phone - 1101 Patriot 1.0 (TDMA) chipset - 1801 Rainbow chipset flash - 2035 Bluetooth Device - 2805 GSM Modem - 2821 T720 GSM Phone - 2822 V.120e GSM Phone - 2823 Flash Interface - 2a01 MSM6050 chipset - 2a02 CDMA modem - 2a03 MSM6050 chipset flash - 2a21 V710 GSM Phone (P2K) - 2a22 V710 GSM Phone (AT) - 2a23 MSM6100 chipset flash - 2a41 MSM6300 chipset - 2a42 Usb Modem - 2a43 MSM6300 chipset flash - 2a61 E815 GSM Phone (P2K) - 2a62 E815 GSM Phone (AT) - 2a63 MSM6500 chipset flash - 2a81 MSM6025 chipset - 2a83 MSM6025 chipset flash - 2ac1 MSM6100 chipset - 2ac3 MSM6100 chipset flash - 2d78 XT300[SPICE] - 3001 A835/E1000 GSM Phone (P2K) - 3002 A835/E1000 GSM Phone (AT) - 3801 C350L/C450 (P2K) - 3802 C330/C350L/C450/EZX GSM Phone (AT) - 3803 Neptune LT chipset flash - 4001 OMAP 1.0 chipset - 4002 A920/A925 UMTS Phone - 4003 OMAP 1.0 chipset flash - 4008 OMAP 1.0 chipset RDL - 41d6 Droid X (Windows media mode) - 41d9 Droid/Milestone - 41db Droid/Milestone (Debug mode) - 41de Droid X (PC mode) - 4204 MPx200 Smartphone - 4214 MPc GSM - 4224 MPx220 Smartphone - 4234 MPc CDMA - 4244 MPx100 Smartphone - 4285 Droid X (Mass storage) - 4801 Neptune LTS chipset - 4803 Neptune LTS chipset flash - 4810 Triplet GSM Phone (storage) - 4901 Triplet GSM Phone (P2K) - 4902 Triplet GSM Phone (AT) - 4903 Neptune LTE chipset flash - 4a01 Neptune LTX chipset - 4a03 Neptune LTX chipset flash - 4a32 L6-imode Phone - 5801 Neptune ULS chipset - 5803 Neptune ULS chipset flash - 5901 Neptune VLT chipset - 5903 Neptune VLT chipset flash - 6001 Dalhart EZX - 6003 Dalhart flash - 6004 EZX GSM Phone (CDC Net) - 6006 MOTOROKR E6 - 6008 Dalhart RDL - 6009 EZX GSM Phone (P2K) - 600a Dalhart EZX config 17 - 600b Dalhart EZX config 18 - 600c EZX GSM Phone (USBLAN) - 6021 JUIX chipset - 6023 JUIX chipset flash - 6026 Flash RAM Downloader/miniOS - 6027 USBLAN - 604c EZX GSM Phone (Storage) - 6101 Talon integrated chipset - 6401 Argon chipset - 6403 Argon chipset flash - 6415 ROKR Z6 (MTP mode) - 6604 Washington CDMA Phone - 6631 CDC Modem - 7001 Q Smartphone - fe01 StarTAC III MS900 -22b9 eTurboTouch Technology, Inc. - 0006 Touch Screen -22ba Technology Innovation Holdings, Ltd -2304 Pinnacle Systems, Inc. - 0109 Studio PCTV USB (SECAM) - 0110 Studio PCTV USB (PAL) - 0111 Miro PCTV USB - 0112 Studio PCTV USB (NTSC) with FM radio - 0201 Systems MovieBox Device - 0204 MovieBox USB_B - 0205 DVC 150B - 0206 Systems MovieBox Deluxe Device - 0207 Dazzle DVC90 Video Device - 0208 Studio PCTV USB2 - 020e PCTV 200e - 020f PCTV 400e BDA Device - 0210 Studio PCTV USB (PAL) with FM radio - 0212 Studio PCTV USB (NTSC) - 0213 500-USB Device - 0214 Studio PCTV USB (PAL) with FM radio - 0216 PCTV 60e - 0219 PCTV 260e - 021a Dazzle DVC100 Audio Device - 021b Dazzle DVC130/DVC170 - 021d Dazzle DVC130 - 021e Dazzle DVC170 - 021f PCTV Sat HDTV Pro BDA Device - 0222 PCTV Sat Pro BDA Device - 0223 DazzleTV Sat BDA Device - 0225 Remote Kit Infrared Transceiver - 0226 PCTV 330e - 0227 PCTV for Mac, HD Stick - 0228 PCTV DVB-T Flash Stick - 0229 PCTV Dual DVB-T 2001e - 022a PCTV 160e - 022b PCTV 71e [Afatech AF9015] - 0232 PCTV 170e - 0236 PCTV 72e [DiBcom DiB7000PC] - 0237 PCTV 73e [DiBcom DiB7000PC] - 023a PCTV 801e - 023b PCTV 801e SE - 023d PCTV 340e - 023e PCTV 340e SE - 0300 Studio Linx Video input cable (NTSC) - 0301 Studio Linx Video input cable (PAL) - 0302 Dazzle DVC120 - 0419 PCTV Bungee USB (PAL) with FM radio - 061d PCTV Deluxe (NTSC) Device - 061e PCTV Deluxe (PAL) Device -2318 Shining Technologies, Inc. [hex] - 0011 CitiDISK Jr. IDE Enclosure -2373 Pumatronix Ltda - 0001 5 MegaPixel Digital Still Camera [DSC5M] -2375 Digit@lway, Inc. - 0001 Digital Audio Player -2406 SANHO Digital Electronics Co., Ltd. - 6688 PD7X Portable Storage -2478 Tripp-Lite - 2008 U209-000-R Serial Port -2632 TwinMOS - 3209 7-in-1 Card Reader -2650 Electronics For Imaging, Inc. [hex] -2730 Citizen - 200f CT-S310 Label printer -2735 DigitalWay - 0003 MPIO HS100 - 1001 MPIO FY200 - 1002 MPIO FL100 - 1003 MPIO FD100 - 1004 MPIO HD200 - 1005 MPIO HD300 - 1006 MPIO FG100 - 1007 MPIO FG130 - 1008 MPIO FY300 - 1009 MPIO FY400 - 100a MPIO FL300 - 100b MPIO HS200 - 100c MPIO FL350 - 100d MPIO FY500 - 100e MPIO FY500 - 100f MPIO FY600 - 1012 MPIO FL400 - 1013 MPIO HD400 - 1014 MPIO HD400 - 1016 MPIO FY700 - 1017 MPIO FY700 - 1018 MPIO FY800 - 1019 MPIO FY800 - 101a MPIO FY900 - 101b MPIO FY900 - 102b MPIO FL500 - 102c MPIO FL500 - 103f MPIO FY570 - 1040 MPIO FY570 - 1041 MPIO FY670 - 1042 MPIO FY670 - 1043 HCT HMD-180A - 1044 HCT HMD-180A -2770 NHJ, Ltd - 0a01 ScanJet 4600 series - 905c Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35 - 9060 A130 - 9120 Che-ez! Snap / iClick Tiny VGA Digital Camera - 9130 TCG 501 - 913c Argus DC-1730 - 9150 Mini Cam - 9153 iClick 5X - 915d Cyberpix S-210S / Little Tikes My Real Digital Camera - 930b CCD Webcam(PC370R) - 930c CCD Webcam(PC370R) -2821 ASUSTek Computer Inc. - 0161 WL-161 802.11b Wireless Adapter [SiS 162U] - 160f WL-160g 802.11g Wireless Adapter [Envara WiND512] - 3300 WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3] -2899 Toptronic Industrial Co., Ltd - 012c Camera Device -2c02 Planex Communications - 14ea GW-US11H WLAN -2c1a Dolphin Peripherals - 0000 Wireless Optical Mouse -2fb2 Fujitsu, Ltd -3125 Eagletron - 0001 TrackerPod Camera Stand -3176 Whanam Electronics Co., Ltd -3275 VidzMedia Pte Ltd - 4fb1 MonsterTV P2H -3334 AEI - 1701 Fast Ethernet -3340 Yakumo - 043a Mio A701 DigiWalker PPCPhone - 0e3a Pocket PC 300 GPS SL / Typhoon MyGuide 3500 - a0a3 deltaX 5 BT (D) PDA -3504 Micro Star - f110 Security Key -3538 Power Quotient International Co., Ltd - 0001 Travel Flash - 0015 Mass Storge Device - 0022 Hi-Speed Mass Storage Device - 0042 Cool Drive U339 Flash Disk - 0054 Flash Drive (2GB) -3579 DIVA - 6901 Media Reader -3636 InVibro -3838 WEM - 0001 5-in-1 Card Reader -3923 National Instruments Corp. - 12c0 DAQPad-6020E - 12d0 DAQPad-6507 - 12e0 NI 4350 - 12f0 NI 5102 - 1750 DAQPad-6508 - 17b0 USB-ISA-Bridge - 1820 DAQPad-6020E (68 pin I/O) - 1830 DAQPad-6020E (BNC) - 1f00 DAQPad-6024E - 1f10 DAQPad-6024E - 1f20 DAQPad-6025E - 1f30 DAQPad-6025E - 1f40 DAQPad-6036E - 1f50 DAQPad-6036E - 2f80 DAQPad-6052E - 2f90 DAQPad-6052E - 702b GPIB-USB-B - 703c USB-485 RS485 Cable - 709b GPIB-USB-HS - 7254 NI MIO (data acquisition card) firmware updater - 729e USB-6251 (OEM) data acquisition card -40bb I-O Data - 0a09 USB2.0-SCSI Bridge USB2-SC -4101 i-rocks - 1301 IR-2510 usb phone -4102 iRiver, Ltd. - 1001 iFP-100 series mp3 player - 1003 iFP-300 series mp3 player - 1005 iFP-500 series mp3 player - 1007 iFP-700 series mp3/ogg vorbis player - 1008 iFP-800 series mp3/ogg vorbis player - 100a iFP-1000 series mp3/ogg vorbis player - 1014 T20 series mp3/ogg vorbis player (ums firmware) - 1019 T30 - 1034 T60 - 1040 M1Player - 1041 E100 (ums) - 1101 iFP-100 series mp3 player (ums firmware) - 1103 iFP-300 series mp3 player (ums firmware) - 1105 iFP-500 series mp3 player (ums firmware) - 1113 T10 (alternate) - 1117 T10 - 1119 T30 series mp3/ogg/wma player - 1141 E100 (mtp) - 2002 H10 6GB - 2101 H10 20GB (mtp) - 2102 H10 5GB (mtp) - 2105 H10 5/6GB (mtp) -413c Dell Computer Corp. - 0000 DRAC 5 Virtual Keyboard and Mouse - 0001 DRAC 5 Virtual Media - 0058 Port Replicator - 1001 Keyboard Hub - 1002 Keyboard Hub - 1003 Keyboard Hub - 1005 Multimedia Pro Keyboard Hub - 2001 Keyboard HID Support - 2002 SK-8125 Keyboard - 2003 Keyboard - 2005 RT7D50 Keyboard - 2010 Keyboard - 2011 Multimedia Pro Keyboard - 2100 SK-3106 Keyboard - 2101 SmartCard Reader Keyboard - 2105 Model L100 Keyboard - 2106 Dell QuietKey Keyboard - 2500 DRAC4 Remote Access Card - 2513 internal USB Hub of E-Port Replicator - 3010 Optical Wheel Mouse - 3012 Optical Wheel Mouse - 3016 Optical 5-Button Wheel Mouse - 3200 Mouse - 4001 Axim X5 - 4002 Axim X3 - 4003 Axim X30 - 4004 Axim Sync - 4005 Axim Sync - 4006 Axim Sync - 4007 Axim Sync - 4008 Axim Sync - 4009 Axim Sync - 4011 Axim X51v - 5103 AIO Printer A940 - 5105 AIO Printer A920 - 5107 AIO Printer A960 - 5109 Photo AIO Printer 922 - 5110 Photo AIO Printer 962 - 5111 Photo AIO Printer 942 - 5112 Photo AIO Printer 924 - 5113 Photo AIO Printer 944 - 5114 Photo AIO Printer 964 - 5115 Photo AIO Printer 926 - 5116 AIO Printer 946 - 5117 Photo AIO Printer 966 - 5118 AIO 810 - 5124 Laser MFP 1815 - 5128 Photo AIO 928 - 5200 Laser Printer - 5202 Printing Support - 5203 Printing Support - 5210 Printing Support - 5211 1110 Laser Printer - 5220 Laser MFP 1600n - 5225 Printing Support - 5226 Printing Support - 5300 Laser Printer - 5400 Laser Printer - 5401 Laser Printer - 5513 WLA3310 Wireless Adapter [Intersil ISL3887] - 5601 Laser Printer 3100cn - 5602 Laser Printer 3000cn - 5631 Laser Printer 5100cn - 5905 Printing Support - 8000 BC02 Bluetooth Adapter - 8010 TrueMobile Bluetooth Module in - 8100 TrueMobile 1180 802.11b Adapter [Intersil PRISM 3] - 8102 TrueMobile 1300 802.11g Wireless Adapter [Intersil ISL3880] - 8103 Wireless 350 Bluetooth - 8104 Wireless 1450 Dual-band (802.11a/b/g) Adapter [Intersil ISL3887] - 8105 U2 in HID - Driver - 8106 Wireless 350 Bluetooth Internal Card in - 8110 Wireless 3xx Bluetooth Internal Card - 8111 Wireless 3xx Bluetooth Internal Card in - 8114 Wireless 5700 Mobile Broadband (CDMA EV-DO) Minicard Modem - 8115 Wireless 5500 Mobile Broadband (3G HSDPA) Minicard Modem - 8116 Wireless 5505 Mobile Broadband (3G HSDPA) Minicard Modem - 8117 Wireless 5700 Mobile Broadband (CDMA EV-DO) Expresscard Modem - 8118 Wireless 5510 Mobile Broadband (3G HSDPA) Expresscard Status Port - 8120 Bluetooth adapter - 8121 Eastfold in HID - 8122 Eastfold in DFU - 8123 eHome Infrared Receiver - 8124 eHome Infrared Receiver - 8126 Wireless 355 Bluetooth - 8127 Wireless 355 Module with Bluetooth 2.0 + EDR Technology. - 8128 Wireless 5700-Sprint Mobile Broadband (CDMA EV-DO) Mini-Card Status Port - 8129 Wireless 5700-Telus Mobile Broadband (CDMA EV-DO) Mini-Card Status Port - 8131 Wireless 360 Bluetooth 2.0 + EDR module. - 8133 Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port - 8134 Wireless 5720 Sprint Mobile Broadband (EVDO Rev-A) Minicard Status Port - 8135 Wireless 5720 TELUS Mobile Broadband (EVDO Rev-A) Minicard Diagnostics Port - 8136 Wireless 5520 Cingular Mobile Broadband (3G HSDPA) Minicard Diagnostics Port - 8137 Wireless 5520 Voda L Mobile Broadband (3G HSDPA) Minicard Status Port - 8138 Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port - 8140 Wireless 360 Bluetooth - 8142 Mobile 360 in DFU - 8147 F3507g Mobile Broadband Module - 8156 Wireless 370 Bluetooth Mini-card - 8157 Integrated Keyboard - 8158 Integrated Touchpad / Trackstick - 8160 Wireless 365 Bluetooth - 8161 Integrated Keyboard - 8162 Integrated Touchpad [Synaptics] - 8171 Gobi Wireless Modem (QDL mode) - 8172 Gobi Wireless Modem - 8183 F3607gw Mobile Broadband Module - 8184 F3607gw v2 Mobile Broadband Module - 8185 Gobi 2000 Wireless Modem (QDL mode) - 8186 Gobi 2000 Wireless Modem - 8187 DW375 Bluetooth Module - 8501 Bluetooth Adapter - 9500 USB CP210x UART Bridge Controller [DW700] - a001 Hub - a005 Internal 2.0 Hub - a700 Hub (in 1905FP LCD Monitor) -4146 USBest Technology - 9281 Iomega Micro Mini 128MB Flash Drive - ba01 Intuix Flash Drive -4242 USB Design by Example - 4201 Buttons and Lights HID device - 4220 Echo 1 Camera -4317 Broadcom Corp. - 0700 U.S. Robotics USR5426 802.11g Adapter - 0701 U.S. Robotics USR5425 Wireless MAXg Adapter - 0711 Belkin F5D7051 v3000 802.11g - 0720 Dynex DX-BUSB -4348 WinChipHead - 5523 USB->RS 232 adapter with Prolifec PL 2303 chipset - 5537 13.56Mhz RFID Card Reader and Writer - 5584 CH34x printer adapter cable -4572 Shuttle, Inc. - 4572 Shuttle PN31 Remote -4586 Panram - 1026 Crystal Bar Flash Drive -4670 EMS Production - 9394 Game Cube USB Memory Adaptor 64M -4752 Miditech - 0011 Midistart-2 -4757 GW Instek - 2009 PEL-2000 Series Electronic Load (CDC) - 2010 PEL-2000 Series Electronic Load (CDC) -4766 Aceeca - 0001 MEZ1000 RDA -4855 Memorex - 7288 Ultra Traveldrive 160G 2.5" HDD -4971 SimpleTech - cb01 SP-U25/120G - ce17 1TB SimpleDrive II USB External Hard Drive -5032 Grandtec - 0bb8 Grandtec USB1.1 DVB-T (cold) - 0bb9 Grandtec USB1.1 DVB-T (warm) - 0fa0 Grandtec USB1.1 DVB-T (cold) - 0fa1 Grandtec USB1.1 DVB-T (warm) -5041 Linksys (?) - 2234 WUSB54G v1 802.11g Adapter [Intersil ISL3886] - 2235 WUSB54GP v1 802.11g Adapter [Intersil ISL3886] -50c2 Averatec (?) - 4013 WLAN Adapter -5173 Sweex - 1809 ZD1211 -5219 I-Tetra - 1001 Cetus CDC Device -5345 Owon - 1234 PDS6062T Oscilloscope -544d Transmeta Corp. -5543 UC-Logic Technology Corp. - 0002 SuperPen WP3325U Tablet - 0003 Tablet WP4030U - 0004 Tablet WP5540U - 0005 Tablet WP8060U - 0041 Genius PenSketch 6x8 Tablet - 0042 Tablet PF1209 - 0064 Aiptek HyperPen 10000U -5555 Epiphan Systems Inc. - 1110 VGA2USB - 1120 KVM2USB - 2222 DVI2USB - 3333 VGA2USB Pro - 3337 KVM2USB Pro - 3340 VGA2USB LR - 3344 KVM2USB LR - 3411 DVI2USB Solo - 3422 DVI2USB Duo -55aa OnSpec Electronic, Inc. - 0015 Hard Drive - 0102 SuperDisk - 0103 IDE Hard Drive - 0201 DDI to Reader-19 - 1234 ATAPI Bridge - a103 Sandisk SDDR-55 SmartMedia Card Reader - b000 USB to CompactFlash Card Reader - b004 OnSpec MMC/SD Reader/Writer - b00b USB to Memory Stick Card Reader - b00c USB to SmartMedia Card Reader - b012 Mitsumi FA402M 8-in-2 Card Reader - b200 Compact Flash Reader - b204 MMC/ SD Reader - b207 Memory Stick Reader -5656 Uni-Trend Group Limited - 0832 UT2000/UT3000 Digital Storage Oscilloscope -595a IRTOUCHSYSTEMS Co. Ltd. - 0001 Touchscreen -5986 Acer, Inc - 0100 Orbicam - 0101 USB2.0 Camera - 0102 Crystal Eye Webcam - 01a6 Lenovo Integrated Webcam - 01a7 Lenovo Integrated Webcam - 01a9 Lenovo Integrated Webcam - 0200 OrbiCam - 0203 BisonCam NB Pro 1300 - 0241 BisonCam, NB Pro - 02d0 Lenovo Integrated Webcam [R5U877] - 03d0 Lenovo Integrated Webcam [R5U877] -5a57 Zinwell - 0260 RT2570 - 0280 802.11a/b/g/n USB Wireless LAN Card - 0282 802.11b/g/n USB Wireless LAN Card - 0283 802.11b/g/n USB Wireless LAN Card - 0284 802.11a/b/g/n USB Wireless LAN Card - 0290 ZW-N290 802.11n [Realtek RTL8192SU] - 5257 Metronic 495257 wifi 802.11ng -6000 Beholder International Ltd. - dec0 TV Wander - dec1 TV Voyage -601a Ingenic Semiconductor Ltd. - 4740 XBurst Jz4740 boot mode -6189 Sitecom - 182d USB 2.0 Ethernet - 2068 USB to serial cable (v2) -6253 TwinHan Technology Co., Ltd - 0100 Ir reciver f. remote control -636c CoreLogic, Inc. -6472 Unknown (Sony?) - 01c8 PlayStation Portable [Mass Storage] -6547 Arkmicro Technologies Inc. - 0232 ARK3116 Serial -6615 IRTOUCHSYSTEMS Co. Ltd. - 0001 Touchscreen -6666 Prototype product Vendor ID - 0667 WiseGroup Smart Joy PSX, PS-PC Smart JoyPad - 2667 JCOP BlueZ Smartcard reader - 8802 SmartJoy Dual Plus PS2 converter - 8804 WiseGroup SuperJoy Box 5 -6677 WiseGroup, Ltd. - 8802 SmartJoy Dual Plus PS2 converter - 8811 Deluxe Dance Mat -6891 3Com - a727 3CRUSB10075 802.11bg [ZyDAS ZD1211] -695c Opera1 - 3829 Opera1 DVB-S (warm state) -6993 Yealink Network Technology Co., Ltd. - b001 VoIP Phone -6a75 Shanghai Jujo Electronics Co., Ltd -7104 CME (Central Music Co.) - 2202 UF5/UF6/UF7/UF8 MIDI Master Keyboard -726c StackFoundry LLC - 2149 EntropyKing Random Number Generator -734c TBS Technologies China - 5920 Q-Box II DVB-S2 HD - 5928 Q-Box II DVB-S2 HD -7392 Edimax Technology Co., Ltd - 7711 EW-7711UTn nLite Wireless Adapter [Ralink RT2870] - 7717 EW-7717UN 802.11n Wireless Adapter [Ralink RT2870] - 7718 EW-7718UN 802.11n Wireless Adapter [Ralink RT2870] - 7722 EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x] - 7811 EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS] -8086 Intel Corp. - 0001 AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter - 0044 CPU DRAM Controller - 0046 HD Graphics - 0100 Personal Audio Player 3000 - 0101 Personal Audio Player 3000 - 0110 Easy PC Camera - 0120 PC Camera CS120 - 0180 WiMAX Connection 2400m - 0181 WiMAX Connection 2400m - 0182 WiMAX Connection 2400m - 0186 WiMAX Connection 2400m - 0188 WiMAX Connection 2400m - 0200 AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A] - 0431 Intel Pro Video PC Camera - 0510 Digital Movie Creator - 0630 Pocket PC Camera - 0780 CS780 Microphone Input - 07d3 BLOB boot loader firmware - 0dad Cherry MiniatureCard Keyboard - 1010 AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter - 110a Bluetooth Controller from (Ericsson P4A) - 110b Bluetooth Controller from (Intel/CSR) - 1110 PRO/Wireless LAN Module - 1111 PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5] - 1134 Hollister Mobile Monitor - 1139 In-Target Probe (ITP) - 1234 Prototype Reader/Writer - 1403 WiMAX Connection 2400m - 1405 WiMAX Connection 2400m - 1406 WiMAX Connection 2400m - 2448 82801 PCI Bridge - 3100 PRO/DSL 3220 Modem - WAN - 3101 PRO/DSL 3220 Modem - 3240 AnyPoint® 3240 Modem - WAN - 3241 AnyPoint® 3240 Modem - 8602 Miniature Card Slot - 9303 Intel 8x930Hx Hub - 9500 CE 9500 DVB-T - 9890 82930 Test Board - beef SCM Miniature Card Reader/Writer - c013 Wireless HID Station - f001 XScale PXA27x Bulverde flash - f1a5 Z-U130 [Value Solid State Drive] -8087 Intel Corp. - 0020 Integrated Rate Matching Hub - 0024 Integrated Rate Matching Hub -80ee VirtualBox - 0021 USB Tablet -8282 Keio - 3201 Retro Adapter - 3301 Retro Adapter Mouse -8341 EGO Systems, Inc. - 2000 Flashdisk -9016 Sitecom - 182d WL-022 802.11b Adapter -9022 TeVii Technology Ltd. - d630 DVB-S S630 - d650 DVB-S2 S650 - d660 DVB-S2 S660 -9148 GeoLab, Ltd -# All of GeoLab's devices share the same ID 0004. - 0004 R3 Compatible Device -9710 MosChip Semiconductor - 7703 MCS7703 Serial Port Adapter - 7705 MCS7705 Parallel port adapter - 7715 MCS7715 Parallel and serial port adapter - 7717 MCS7717 3-port hub with serial and parallel adapter - 7720 MCS7720 Dual serial port adapter - 7730 MCS7730 10/100 Mbps Ethernet adapter - 7780 MCS7780 4Mbps Fast IrDA Adapter - 7830 MCS7830 10/100 Mbps Ethernet adapter - 7832 MCS7832 10/100 Mbps Ethernet adapter - 7840 MCS7820/MCS7840 2/4 port serial adapter -99fa Grandtec - 8988 V.cap Camera Device -9ac4 J. Westhues - 4b8f ProxMark-3 RFID Instrument -a128 AnMo Electronics Corp. / Dino-Lite (?) - 0610 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0611 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0612 Dino-Lite Digital Microscope (SN9C120 + HV7131R) - 0613 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0614 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0615 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0616 Dino-Lite Digital Microscope (SN9C120 + HV7131R) - 0617 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0618 Dino-Lite Digital Microscope (SN9C201 + HV7131R) -a168 AnMo Electronics Corporation - 0610 Dino-Lite Digital Microscope - 0611 Dino-Lite Digital Microscope - 0613 Dino-Lite Digital Microscope - 0614 Dino-Lite Pro Digital Microscope - 0615 Dino-Lite Pro Digital Microscope - 0617 Dino-Lite Pro Digital Microscope - 0618 Dino-Lite Digital Microscope -a600 Asix - e110 OK1ZIA Davac 4.x -a727 3Com - 6893 3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523] - 6895 AR5523 - 6897 AR5523 -abcd Unknown - cdee Petcam -c251 Keil Software, Inc. - 2710 ULink -cace CACE Technologies Inc. - 0002 AirPCAP Classic 802.11 packet capture adapter - 0300 AirPcap NX [Atheros AR9001U-(2)NG] -d209 Ultimarc - 0301 I-PAC Arcade Control Interface - 0501 Ultra-Stik Ultimarc Ultra-Stik Player 1 -e4e4 Xorcom Ltd. - 1130 Astribank series - 1131 Astribank series - 1132 Astribank series - 1140 Astribank series - 1141 Astribank series - 1142 Astribank series - 1150 Astribank series - 1151 Astribank series - 1152 Astribank series - 1160 Astribank 2 series - 1161 Astribank 2 series - 1162 Astribank 2 series -eb03 MakingThings - 0920 Make Controller Kit -eb1a eMPIA Technology, Inc. - 17de KWorld V-Stream XPERT DTV - DVB-T USB cold - 17df KWorld V-Stream XPERT DTV - DVB-T USB warm - 2571 M035 Compact Web Cam - 2710 SilverCrest Webcam - 2750 ECS Elitegroup G220 integrated Webcam - 2761 EeePC 701 integrated Webcam - 2776 Combined audio and video input device - 2800 Terratec Cinergy 200 - 2801 GrabBeeX+ Video Encoder - 2863 Video Grabber - 2870 Pinnacle PCTV Stick - 2881 EM2881 Video Controller - 50a3 Gadmei UTV380 TV Box - 50a6 Gadmei UTV330 TV Box - e355 KWorld DVB-T 355U Digital TV Dongle -eb2a KWorld -f003 Hewlett Packard - 6002 PhotoSmart C500 -f4ec Atten Electronics / Siglent Technologies - ee38 Digital Storage Oscilloscope - -# List of known device classes, subclasses and protocols - -# Syntax: -# C class class_name -# subclass subclass_name <-- single tab -# protocol protocol_name <-- two tabs - -C 00 (Defined at Interface level) -C 01 Audio - 01 Control Device - 02 Streaming - 03 MIDI Streaming -C 02 Communications - 01 Direct Line - 02 Abstract (modem) - 00 None - 01 AT-commands (v.25ter) - 02 AT-commands (PCCA101) - 03 AT-commands (PCCA101 + wakeup) - 04 AT-commands (GSM) - 05 AT-commands (3G) - 06 AT-commands (CDMA) - fe Defined by command set descriptor - ff Vendor Specific (MSFT RNDIS?) - 03 Telephone - 04 Multi-Channel - 05 CAPI Control - 06 Ethernet Networking - 07 ATM Networking - 08 Wireless Handset Control - 09 Device Management - 0a Mobile Direct Line - 0b OBEX - 0c Ethernet Emulation - 07 Ethernet Emulation (EEM) -C 03 Human Interface Device - 00 No Subclass - 00 None - 01 Keyboard - 02 Mouse - 01 Boot Interface Subclass - 00 None - 01 Keyboard - 02 Mouse -C 05 Physical Interface Device -C 06 Imaging - 01 Still Image Capture - 01 Picture Transfer Protocol (PIMA 15470) -C 07 Printer - 01 Printer - 00 Reserved/Undefined - 01 Unidirectional - 02 Bidirectional - 03 IEEE 1284.4 compatible bidirectional - ff Vendor Specific -C 08 Mass Storage - 01 RBC (typically Flash) - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) - 02 SFF-8020i, MMC-2 (ATAPI) - 03 QIC-157 - 04 Floppy (UFI) - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) - 05 SFF-8070i - 06 SCSI - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) -C 09 Hub - 00 Unused - 00 Full speed (or root) hub - 01 Single TT - 02 TT per port -C 0a CDC Data - 00 Unused - 30 I.430 ISDN BRI - 31 HDLC - 32 Transparent - 50 Q.921M - 51 Q.921 - 52 Q.921TM - 90 V.42bis - 91 Q.932 EuroISDN - 92 V.120 V.24 rate ISDN - 93 CAPI 2.0 - fd Host Based Driver - fe CDC PUF - ff Vendor specific -C 0b Chip/SmartCard -C 0d Content Security -C 0e Video - 00 Undefined - 01 Video Control - 02 Video Streaming - 03 Video Interface Collection -C 58 Xbox - 42 Controller -C dc Diagnostic - 01 Reprogrammable Diagnostics - 01 USB2 Compliance -C e0 Wireless - 01 Radio Frequency - 01 Bluetooth - 02 Ultra WideBand Radio Control - 03 RNDIS - 02 Wireless USB Wire Adapter - 01 Host Wire Adapter Control/Data Streaming - 02 Device Wire Adapter Control/Data Streaming - 03 Device Wire Adapter Isochronous Streaming -C ef Miscellaneous Device - 01 ? - 01 Microsoft ActiveSync - 02 Palm Sync - 02 ? - 01 Interface Association - 02 Wire Adapter Multifunction Peripheral - 03 ? - 01 Cable Based Association -C fe Application Specific Interface - 01 Device Firmware Update - 02 IRDA Bridge - 03 Test and Measurement - 01 TMC - 02 USB488 -C ff Vendor Specific Class - ff Vendor Specific Subclass - ff Vendor Specific Protocol - -# List of Audio Class Terminal Types - -# Syntax: -# AT terminal_type terminal_type_name - -AT 0100 USB Undefined -AT 0101 USB Streaming -AT 01ff USB Vendor Specific -AT 0200 Input Undefined -AT 0201 Microphone -AT 0202 Desktop Microphone -AT 0203 Personal Microphone -AT 0204 Omni-directional Microphone -AT 0205 Microphone Array -AT 0206 Processing Microphone Array -AT 0300 Output Undefined -AT 0301 Speaker -AT 0302 Headphones -AT 0303 Head Mounted Display Audio -AT 0304 Desktop Speaker -AT 0305 Room Speaker -AT 0306 Communication Speaker -AT 0307 Low Frequency Effects Speaker -AT 0400 Bidirectional Undefined -AT 0401 Handset -AT 0402 Headset -AT 0403 Speakerphone, no echo reduction -AT 0404 Echo-suppressing speakerphone -AT 0405 Echo-canceling speakerphone -AT 0500 Telephony Undefined -AT 0501 Phone line -AT 0502 Telephone -AT 0503 Down Line Phone -AT 0600 External Undefined -AT 0601 Analog Connector -AT 0602 Digital Audio Interface -AT 0603 Line Connector -AT 0604 Legacy Audio Connector -AT 0605 SPDIF interface -AT 0606 1394 DA stream -AT 0607 1394 DV stream soundtrack -AT 0700 Embedded Undefined -AT 0701 Level Calibration Noise Source -AT 0702 Equalization Noise -AT 0703 CD Player -AT 0704 DAT -AT 0705 DCC -AT 0706 MiniDisc -AT 0707 Analog Tape -AT 0708 Phonograph -AT 0709 VCR Audio -AT 070a Video Disc Audio -AT 070b DVD Audio -AT 070c TV Tuner Audio -AT 070d Satellite Receiver Audio -AT 070e Cable Tuner Audio -AT 070f DSS Audio -AT 0710 Radio Receiver -AT 0711 Radio Transmitter -AT 0712 Multitrack Recorder -AT 0713 Synthesizer - -# List of HID Descriptor Types - -# Syntax: -# HID descriptor_type descriptor_type_name - -HID 21 HID -HID 22 Report -HID 23 Physical - -# List of HID Descriptor Item Types -# Note: 2 bits LSB encode data length following - -# Syntax: -# R item_type item_type_name - -R 04 Usage Page -R 08 Usage -R 14 Logical Minimum -R 18 Usage Minimum -R 24 Logical Maximum -R 28 Usage Maximum -R 34 Physical Minimum -R 38 Designator Index -R 44 Physical Maximum -R 48 Designator Minimum -R 54 Unit Exponent -R 58 Designator Maximum -R 64 Unit -R 74 Report Size -R 78 String Index -R 80 Input -R 84 Report ID -R 88 String Minimum -R 90 Output -R 94 Report Count -R 98 String Maximum -R a0 Collection -R a4 Push -R a8 Delimiter -R b0 Feature -R b4 Pop -R c0 End Collection - -# List of Physical Descriptor Bias Types - -# Syntax: -# BIAS item_type item_type_name - -BIAS 0 Not Applicable -BIAS 1 Right Hand -BIAS 2 Left Hand -BIAS 3 Both Hands -BIAS 4 Either Hand - -# List of Physical Descriptor Item Types - -# Syntax: -# PHY item_type item_type_name - -PHY 00 None -PHY 01 Hand -PHY 02 Eyeball -PHY 03 Eyebrow -PHY 04 Eyelid -PHY 05 Ear -PHY 06 Nose -PHY 07 Mouth -PHY 08 Upper Lip -PHY 09 Lower Lip -PHY 0a Jaw -PHY 0b Neck -PHY 0c Upper Arm -PHY 0d Elbow -PHY 0e Forearm -PHY 0f Wrist -PHY 10 Palm -PHY 11 Thumb -PHY 12 Index Finger -PHY 13 Middle Finger -PHY 14 Ring Finger -PHY 15 Little Finger -PHY 16 Head -PHY 17 Shoulder -PHY 18 Hip -PHY 19 Waist -PHY 1a Thigh -PHY 1b Knee -PHY 1c calf -PHY 1d Ankle -PHY 1e Foot -PHY 1f Heel -PHY 20 Ball of Foot -PHY 21 Big Toe -PHY 22 Second Toe -PHY 23 Third Toe -PHY 24 Fourth Toe -PHY 25 Fifth Toe -PHY 26 Brow -PHY 27 Cheek - -# List of HID Usages - -# Syntax: -# HUT hi _usage_page hid_usage_page_name -# hid_usage hid_usage_name - -HUT 00 Undefined -HUT 01 Generic Desktop Controls - 000 Undefined - 001 Pointer - 002 Mouse - 004 Joystick - 005 Gamepad - 006 Keyboard - 007 Keypad - 008 Multi-Axis Controller - 030 Direction-X - 031 Direction-Y - 032 Direction-Z - 033 Rotate-X - 034 Rotate-Y - 035 Rotate-Z - 036 Slider - 037 Dial - 038 Wheel - 039 Hat Switch - 03a Counted Buffer - 03b Byte Count - 03c Motion Wakeup - 03d Start - 03e Select - 040 Vector-X - 041 Vector-Y - 042 Vector-Z - 043 Vector-X relative Body - 044 Vector-Y relative Body - 045 Vector-Z relative Body - 046 Vector - 080 System Control - 081 System Power Down - 082 System Sleep - 083 System Wake Up - 084 System Context Menu - 085 System Main Menu - 086 System App Menu - 087 System Menu Help - 088 System Menu Exit - 089 System Menu Select - 08a System Menu Right - 08b System Menu Left - 08c System Menu Up - 08d System Menu Down - 090 Direction Pad Up - 091 Direction Pad Down - 092 Direction Pad Right - 093 Direction Pad Left -HUT 02 Simulation Controls - 000 Undefined - 001 Flight Simulation Device - 002 Automobile Simulation Device - 003 Tank Simulation Device - 004 Spaceship Simulation Device - 005 Submarine Simulation Device - 006 Sailing Simulation Device - 007 Motorcycle Simulation Device - 008 Sports Simulation Device - 009 Airplane Simualtion Device - 00a Helicopter Simulation Device - 00b Magic Carpet Simulation Device - 00c Bicycle Simulation Device - 020 Flight Control Stick - 021 Flight Stick - 022 Cyclic Control - 023 Cyclic Trim - 024 Flight Yoke - 025 Track Control - 0b0 Aileron - 0b1 Aileron Trim - 0b2 Anti-Torque Control - 0b3 Autopilot Enable - 0b4 Chaff Release - 0b5 Collective Control - 0b6 Dive Break - 0b7 Electronic Countermeasures - 0b8 Elevator - 0b9 Elevator Trim - 0ba Rudder - 0bb Throttle - 0bc Flight COmmunications - 0bd Flare Release - 0be Landing Gear - 0bf Toe Break - 0c0 Trigger - 0c1 Weapon Arm - 0c2 Weapons Select - 0c3 Wing Flaps - 0c4 Accelerator - 0c5 Brake - 0c6 Clutch - 0c7 Shifter - 0c8 Steering - 0c9 Turret Direction - 0ca Barrel Elevation - 0cb Drive Plane - 0cc Ballast - 0cd Bicylce Crank - 0ce Handle Bars - 0cf Front Brake - 0d0 Rear Brake -HUT 03 VR Controls - 000 Unidentified - 001 Belt - 002 Body Suit - 003 Flexor - 004 Glove - 005 Head Tracker - 006 Head Mounted Display - 007 Hand Tracker - 008 Oculometer - 009 Vest - 00a Animatronic Device - 020 Stereo Enable - 021 Display Enable -HUT 04 Sport Controls - 000 Unidentified - 001 Baseball Bat - 002 Golf Club - 003 Rowing Machine - 004 Treadmill - 030 Oar - 031 Slope - 032 Rate - 033 Stick Speed - 034 Stick Face Angle - 035 Stick Heel/Toe - 036 Stick Follow Through - 038 Stick Type - 039 Stick Height - 047 Stick Temp - 050 Putter - 051 1 Iron - 052 2 Iron - 053 3 Iron - 054 4 Iron - 055 5 Iron - 056 6 Iron - 057 7 Iron - 058 8 Iron - 059 9 Iron - 05a 10 Iron - 05b 11 Iron - 05c Sand Wedge - 05d Loft Wedge - 05e Power Wedge - 05f 1 Wood - 060 3 Wood - 061 5 Wood - 062 7 Wood - 063 9 Wood -HUT 05 Game Controls - 000 Undefined - 001 3D Game Controller - 002 Pinball Device - 003 Gun Device - 020 Point Of View - 021 Turn Right/Left - 022 Pitch Right/Left - 023 Roll Forward/Backward - 024 Move Right/Left - 025 Move Forward/Backward - 026 Move Up/Down - 027 Lean Right/Left - 028 Lean Forward/Backward - 029 Height of POV - 02a Flipper - 02b Secondary Flipper - 02c Bump - 02d New Game - 02e Shoot Ball - 02f Player - 030 Gun Bolt - 031 Gun Clip - 032 Gun Selector - 033 Gun Single Shot - 034 Gun Burst - 035 Gun Automatic - 036 Gun Safety - 037 Gamepad Fire/Jump - 038 Gamepad Fun - 039 Gamepad Trigger -HUT 07 Keyboard - 000 No Event - 001 Keyboard ErrorRollOver - 002 Keyboard POSTfail - 003 Keyboard Error Undefined - 004 A - 005 B - 006 C - 007 D - 008 E - 009 F - 00a G - 00b H - 00c I - 00d J - 00e K - 00f L - 010 M - 011 N - 012 O - 013 P - 014 Q - 015 R - 016 S - 017 T - 018 U - 019 V - 01a W - 01b X - 01c Y - 01d Z - 01e 1 and ! (One and Exclamation) - 01f 2 and @ (2 and at) - 020 3 and # (3 and Hash) - 021 4 and $ (4 and Dollar Sign) - 022 5 and % (5 and Percent Sign) - 023 6 and ^ (6 and circumflex) - 024 7 and & (Seven and Ampersand) - 025 8 and * (Eight and asterisk) - 026 9 and ( (Nine and Parenthesis Left) - 027 0 and ) (Zero and Parenthesis Right) - 028 Return (Enter) - 029 Escape - 02a Delete (Backspace) - 02b Tab - 02c Space Bar - 02d - and _ (Minus and underscore) - 02e = and + (Equal and Plus) - 02f [ and { (Bracket and Braces Left) - 030 ] and } (Bracket and Braces Right) - 031 \ and | (Backslash and Bar) - 032 # and ~ (Hash and Tilde, Non-US Keyboard near right shift) - 033 ; and : (Semicolon and Colon) - 034 and " (Accent Acute and Double Quotes) - 035 ` and ~ (Accent Grace and Tilde) - 036 , and < (Comma and Less) - 037 . and > (Period and Greater) - 038 / and ? (Slash and Question Mark) - 039 Caps Lock - 03a F1 - 03b F2 - 03c F3 - 03d F4 - 03e F5 - 03f F6 - 040 F7 - 041 F8 - 042 F9 - 043 F10 - 044 F11 - 045 F12 - 046 Print Screen - 047 Scroll Lock - 048 Pause - 049 Insert - 04a Home - 04b Page Up - 04c Delete Forward (without Changing Position) - 04d End - 04e Page Down - 04f Right Arrow - 050 Left Arrow - 051 Down Arrow - 052 Up Arrow - 053 Num Lock and Clear - 054 Keypad / (Division Sign) - 055 Keypad * (Multiplication Sign) - 056 Keypad - (Subtraction Sign) - 057 Keypad + (Addition Sign) - 058 Keypad Enter - 059 Keypad 1 and END - 05a Keypad 2 and Down Arrow - 05b Keypad 3 and Page Down - 05c Keypad 4 and Left Arrow - 05d Keypad 5 (Tactilei Raised) - 05f Keypad 6 and Right Arrow - 060 Keypad 7 and Home - 061 Keypad 8 and Up Arrow - 062 Keypad 8 and Page Up - 063 Keypad . (decimal delimiter) and Delete - 064 \ and | (Backslash and Bar, UK and Non-US Keyboard near left shift) - 065 Keyboard Application (Windows Key for Win95 or Compose) - 066 Power (not a key) - 067 Keypad = (Equal Sign) - 068 F13 - 069 F14 - 06a F15 - 06b F16 - 06c F17 - 06d F18 - 06e F19 - 06f F20 - 070 F21 - 071 F22 - 072 F23 - 073 F24 - 074 Execute - 075 Help - 076 Menu - 077 Select - 078 Stop - 079 Again - 07a Undo - 07b Cut - 07c Copy - 07d Paste - 07e Find - 07f Mute - 080 Volume Up - 081 Volume Down - 082 Locking Caps Lock - 083 Locking Num Lock - 084 Locking Scroll Lock - 085 Keypad Comma - 086 Keypad Equal Sign (AS/400) - 087 International 1 (PC98) - 088 International 2 (PC98) - 089 International 3 (PC98) - 08a International 4 (PC98) - 08b International 5 (PC98) - 08c International 6 (PC98) - 08d International 7 (Toggle Single/Double Byte Mode) - 08e International 8 - 08f International 9 - 090 LANG 1 (Hangul/English Toggle, Korea) - 091 LANG 2 (Hanja Conversion, Korea) - 092 LANG 3 (Katakana, Japan) - 093 LANG 4 (Hiragana, Japan) - 094 LANG 5 (Zenkaku/Hankaku, Japan) - 095 LANG 6 - 096 LANG 7 - 097 LANG 8 - 098 LANG 9 - 099 Alternate Erase - 09a SysReq/Attention - 09b Cancel - 09c Clear - 09d Prior - 09e Return - 09f Separator - 0a0 Out - 0a1 Open - 0a2 Clear/Again - 0a3 CrSel/Props - 0a4 ExSel - 0e0 Control Left - 0e1 Shift Left - 0e2 Alt Left - 0e3 GUI Left - 0e4 Control Right - 0e5 Shift Right - 0e6 Alt Rigth - 0e7 GUI Right -HUT 08 LEDs - 000 Undefined - 001 NumLock - 002 CapsLock - 003 Scroll Lock - 004 Compose - 005 Kana - 006 Power - 007 Shift - 008 Do not disturb - 009 Mute - 00a Tone Enabke - 00b High Cut Filter - 00c Low Cut Filter - 00d Equalizer Enable - 00e Sound Field ON - 00f Surround On - 010 Repeat - 011 Stereo - 012 Sampling Rate Detect - 013 Spinning - 014 CAV - 015 CLV - 016 Recording Format Detect - 017 Off-Hook - 018 Ring - 019 Message Waiting - 01a Data Mode - 01b Battery Operation - 01c Battery OK - 01d Battery Low - 01e Speaker - 01f Head Set - 020 Hold - 021 Microphone - 022 Coverage - 023 Night Mode - 024 Send Calls - 025 Call Pickup - 026 Conference - 027 Stand-by - 028 Camera On - 029 Camera Off - 02a On-Line - 02b Off-Line - 02c Busy - 02d Ready - 02e Paper-Out - 02f Paper-Jam - 030 Remote - 031 Forward - 032 Reverse - 033 Stop - 034 Rewind - 035 Fast Forward - 036 Play - 037 Pause - 038 Record - 039 Error - 03a Usage Selected Indicator - 03b Usage In Use Indicator - 03c Usage Multi Indicator - 03d Indicator On - 03e Indicator Flash - 03f Indicator Slow Blink - 040 Indicator Fast Blink - 041 Indicator Off - 042 Flash On Time - 043 Slow Blink On Time - 044 Slow Blink Off Time - 045 Fast Blink On Time - 046 Fast Blink Off Time - 047 Usage Color Indicator - 048 Indicator Red - 049 Indicator Green - 04a Indicator Amber - 04b Generic Indicator - 04c System Suspend - 04d External Power Connected -HUT 09 Buttons - 000 No Button Pressed - 001 Button 1 (Primary) - 002 Button 2 (Secondary) - 003 Button 3 (Tertiary) - 004 Button 4 - 005 Button 5 -HUT 0a Ordinal - 001 Instance 1 - 002 Instance 2 - 003 Instance 3 -HUT 0b Telephony - 000 Unassigned - 001 Phone - 002 Answering Machine - 003 Message Controls - 004 Handset - 005 Headset - 006 Telephony Key Pad - 007 Programmable Button - 020 Hook Switch - 021 Flash - 022 Feature - 023 Hold - 024 Redial - 025 Transfer - 026 Drop - 027 Park - 028 Forward Calls - 029 Alternate Function - 02a Line - 02b Speaker Phone - 02c Conference - 02d Ring Enable - 02e Ring Select - 02f Phone Mute - 030 Caller ID - 050 Speed Dial - 051 Store Number - 052 Recall Number - 053 Phone Directory - 070 Voice Mail - 071 Screen Calls - 072 Do Not Disturb - 073 Message - 074 Answer On/Offf - 090 Inside Dial Tone - 091 Outside Dial Tone - 092 Inside Ring Tone - 093 Outside Ring Tone - 094 Priority Ring Tone - 095 Inside Ringback - 096 Priority Ringback - 097 Line Busy Tone - 098 Recorder Tone - 099 Call Waiting Tone - 09a Confirmation Tone 1 - 09b Confirmation Tone 2 - 09c Tones Off - 09d Outside Ringback - 0b0 Key 1 - 0b1 Key 2 - 0b3 Key 3 - 0b4 Key 4 - 0b5 Key 5 - 0b6 Key 6 - 0b7 Key 7 - 0b8 Key 8 - 0b9 Key 9 - 0ba Key Star - 0bb Key Pound - 0bc Key A - 0bd Key B - 0be Key C - 0bf Key D -HUT 0c Consumer - 000 Unassigned - 001 Consumer Control - 002 Numeric Key Pad - 003 Programmable Buttons - 020 +10 - 021 +100 - 022 AM/PM - 030 Power - 031 Reset - 032 Sleep - 033 Sleep After - 034 Sleep Mode - 035 Illumination - 036 Function Buttons - 040 Menu - 041 Menu Pick - 042 Menu Up - 043 Menu Down - 044 Menu Left - 045 Menu Right - 046 Menu Escape - 047 Menu Value Increase - 048 Menu Value Decrease - 060 Data on Screen - 061 Closed Caption - 062 Closed Caption Select - 063 VCR/TV - 064 Broadcast Mode - 065 Snapshot - 066 Still - 080 Selection - 081 Assign Selection - 082 Mode Step - 083 Recall Last - 084 Enter Channel - 085 Order Movie - 086 Channel - 087 Media Selection - 088 Media Select Computer - 089 Media Select TV - 08a Media Select WWW - 08b Media Select DVD - 08c Media Select Telephone - 08d Media Select Program Guide - 08e Media Select Video Phone - 08f Media Select Games - 090 Media Select Messages - 091 Media Select CD - 092 Media Select VCR - 093 Media Select Tuner - 094 Quit - 095 Help - 096 Media Select Tape - 097 Media Select Cable - 098 Media Select Satellite - 099 Media Select Security - 09a Media Select Home - 09b Media Select Call - 09c Channel Increment - 09d Channel Decrement - 09e Media Select SAP - 0a0 VCR Plus - 0a1 Once - 0a2 Daily - 0a3 Weekly - 0a4 Monthly - 0b0 Play - 0b1 Pause - 0b2 Record - 0b3 Fast Forward - 0b4 Rewind - 0b5 Scan Next Track - 0b6 Scan Previous Track - 0b7 Stop - 0b8 Eject - 0b9 Random Play - 0ba Select Disc - 0bb Enter Disc - 0bc Repeat - 0bd Tracking - 0be Track Normal - 0bf Slow Tracking - 0c0 Frame Forward - 0c1 Frame Back - 0c2 Mark - 0c3 Clear Mark - 0c4 Repeat from Mark - 0c5 Return to Mark - 0c6 Search Mark Forward - 0c7 Search Mark Backward - 0c8 Counter Reset - 0c9 Show Counter - 0ca Tracking Increment - 0cb Tracking Decrement - 0cc Stop/Eject - 0cd Play/Pause - 0ce Play/Skip - 0e0 Volume - 0e1 Balance - 0e2 Mute - 0e3 Bass - 0e4 Treble - 0e5 Bass Boost - 0e6 Surround Mode - 0e7 Loudness - 0e8 MPX - 0e9 Volume Increment - 0ea Volume Decrement - 0f0 Speed Select - 0f1 Playback Speed - 0f2 Standard Play - 0f3 Long Play - 0f4 Extended Play - 0f5 Slow - 100 Fan Enable - 101 Fan Speed - 102 Light Enable - 103 Light Illumination Level - 104 Climate Control Enable - 105 Room Temperature - 106 Security Enable - 107 Fire Alarm - 108 Police Alarm - 150 Balance Right - 151 Balance Left - 152 Bass Increment - 153 Bass Decrement - 154 Treble Increment - 155 Treble Decrement - 160 Speaker System - 161 Channel Left - 162 Channel Right - 163 Channel Center - 164 Channel Front - 165 Channel Center Front - 166 Channel Side - 167 Channel Surround - 168 Channel Low Frequency Enhancement - 169 Channel Top - 16a Channel Unknown - 170 Sub-Channel - 171 Sub-Channel Increment - 172 Sub-Channel Decrement - 173 Alternative Audio Increment - 174 Alternative Audio Decrement - 180 Application Launch Buttons - 181 AL Launch Button Configuration Tool - 182 AL Launch Button Configuration - 183 AL Consumer Control Configuration - 184 AL Word Processor - 185 AL Text Editor - 186 AL Spreadsheet - 187 AL Graphics Editor - 188 AL Presentation App - 189 AL Database App - 18a AL Email Reader - 18b AL Newsreader - 18c AL Voicemail - 18d AL Contacts/Address Book - 18e AL Calendar/Schedule - 18f AL Task/Project Manager - 190 AL Log/Jounal/Timecard - 191 AL Checkbook/Finance - 192 AL Calculator - 193 AL A/V Capture/Playback - 194 AL Local Machine Browser - 195 AL LAN/Wan Browser - 196 AL Internet Browser - 197 AL Remote Networking/ISP Connect - 198 AL Network Conference - 199 AL Network Chat - 19a AL Telephony/Dialer - 19b AL Logon - 19c AL Logoff - 19d AL Logon/Logoff - 19e AL Terminal Local/Screensaver - 19f AL Control Panel - 1a0 AL Command Line Processor/Run - 1a1 AL Process/Task Manager - 1a2 AL Select Task/Application - 1a3 AL Next Task/Application - 1a4 AL Previous Task/Application - 1a5 AL Preemptive Halt Task/Application - 200 Generic GUI Application Controls - 201 AC New - 202 AC Open - 203 AC CLose - 204 AC Exit - 205 AC Maximize - 206 AC Minimize - 207 AC Save - 208 AC Print - 209 AC Properties - 21a AC Undo - 21b AC Copy - 21c AC Cut - 21d AC Paste - 21e AC Select All - 21f AC Find - 220 AC Find and Replace - 221 AC Search - 222 AC Go To - 223 AC Home - 224 AC Back - 225 AC Forward - 226 AC Stop - 227 AC Refresh - 228 AC Previous Link - 229 AC Next Link - 22b AC History - 22c AC Subscriptions - 22d AC Zoom In - 22e AC Zoom Out - 22f AC Zoom - 230 AC Full Screen View - 231 AC Normal View - 232 AC View Toggle - 233 AC Scroll Up - 234 AC Scroll Down - 235 AC Scroll - 236 AC Pan Left - 237 AC Pan Right - 238 AC Pan - 239 AC New Window - 23a AC Tile Horizontally - 23b AC Tile Vertically - 23c AC Format -HUT 0d Digitizer - 000 Undefined - 001 Digitizer - 002 Pen - 003 Light Pen - 004 Touch Screen - 005 Touch Pad - 006 White Board - 007 Coordinate Measuring Machine - 008 3D Digitizer - 009 Stereo Plotter - 00a Articulated Arm - 00b Armature - 00c Multiple Point Digitizer - 00d Free Space Wand - 020 Stylus - 021 Puck - 022 Finger - 030 Tip Pressure - 031 Barrel Pressure - 032 In Range - 033 Touch - 034 Untouch - 035 Tap - 036 Quality - 037 Data Valid - 038 Transducer Index - 039 Tablet Function Keys - 03a Program Change Keys - 03b Battery Strength - 03c Invert - 03d X Tilt - 03e Y Tilt - 03f Azimuth - 040 Altitude - 041 Twist - 042 Tip Switch - 043 Secondary Tip Switch - 044 Barrel Switch - 045 Eraser - 046 Tablet Pick - 047 Confidence - 048 Width - 049 Height - 051 Contact ID - 052 Input Mode - 053 Device Index - 054 Contact Count - 055 Maximum Contact Number -HUT 0f PID Page - 000 Undefined - 001 Physical Interface Device - 020 Normal - 021 Set Effect Report - 022 Effect Block Index - 023 Parameter Block Offset - 024 ROM Flag - 025 Effect Type - 026 ET Constant Force - 027 ET Ramp - 028 ET Custom Force Data - 030 ET Square - 031 ET Sine - 032 ET Triangle - 033 ET Sawtooth Up - 034 ET Sawtooth Down - 040 ET Spring - 041 ET Damper - 042 ET Inertia - 043 ET Friction - 050 Duration - 051 Sample Period - 052 Gain - 053 Trigger Button - 054 Trigger Repeat Interval - 055 Axes Enable - 056 Direction Enable - 057 Direction - 058 Type Specific Block Offset - 059 Block Type - 05A Set Envelope Report - 05B Attack Level - 05C Attack Time - 05D Fade Level - 05E Fade Time - 05F Set Condition Report - 060 CP Offset - 061 Positive Coefficient - 062 Negative Coefficient - 063 Positive Saturation - 064 Negative Saturation - 065 Dead Band - 066 Download Force Sample - 067 Isoch Custom Force Enable - 068 Custom Force Data Report - 069 Custom Force Data - 06A Custom Force Vendor Defined Data - 06B Set Custom Force Report - 06C Custom Force Data Offset - 06D Sample Count - 06E Set Periodic Report - 06F Offset - 070 Magnitude - 071 Phase - 072 Period - 073 Set Constant Force Report - 074 Set Ramp Force Report - 075 Ramp Start - 076 Ramp End - 077 Effect Operation Report - 078 Effect Operation - 079 Op Effect Start - 07A Op Effect Start Solo - 07B Op Effect Stop - 07C Loop Count - 07D Device Gain Report - 07E Device Gain - 07F PID Pool Report - 080 RAM Pool Size - 081 ROM Pool Size - 082 ROM Effect Block Count - 083 Simultaneous Effects Max - 084 Pool Alignment - 085 PID Pool Move Report - 086 Move Source - 087 Move Destination - 088 Move Length - 089 PID Block Load Report - 08B Block Load Status - 08C Block Load Success - 08D Block Load Full - 08E Block Load Error - 08F Block Handle - 090 PID Block Free Report - 091 Type Specific Block Handle - 092 PID State Report - 094 Effect Playing - 095 PID Device Control Report - 096 PID Device Control - 097 DC Enable Actuators - 098 DC Disable Actuators - 099 DC Stop All Effects - 09A DC Device Reset - 09B DC Device Pause - 09C DC Device Continue - 09F Device Paused - 0A0 Actuators Enabled - 0A4 Safety Switch - 0A5 Actuator Override Switch - 0A6 Actuator Power - 0A7 Start Delay - 0A8 Parameter Block Size - 0A9 Device Managed Pool - 0AA Shared Parameter Blocks - 0AB Create New Effect Report - 0AC RAM Pool Available -HUT 10 Unicode -HUT 14 Alphanumeric Display - 000 Undefined - 001 Alphanumeric Display - 020 Display Attributes Report - 021 ASCII Character Set - 022 Data Read Back - 023 Font Read Back - 024 Display Control Report - 025 Clear Display - 026 Display Enable - 027 Screen Saver Delay - 028 Screen Saver Enable - 029 Vertical Scroll - 02a Horizontal Scroll - 02b Character Report - 02c Display Data - 02d Display Status - 02e Stat Not Ready - 02f Stat Ready - 030 Err Not a loadable Character - 031 Err Font Data Cannot Be Read - 032 Cursur Position Report - 033 Row - 034 Column - 035 Rows - 036 Columns - 037 Cursor Pixel Positioning - 038 Cursor Mode - 039 Cursor Enable - 03a Cursor Blink - 03b Font Report - 03c Font Data - 03d Character Width - 03e Character Height - 03f Character Spacing Horizontal - 040 Character Spacing Vertical - 041 Unicode Character Set -HUT 80 USB Monitor - 001 Monitor Control - 002 EDID Information - 003 VDIF Information - 004 VESA Version -HUT 81 USB Monitor Enumerated Values -HUT 82 Monitor VESA Virtual Controls - 001 Degauss - 010 Brightness - 012 Contrast - 016 Red Video Gain - 018 Green Video Gain - 01a Blue Video Gain - 01c Focus - 020 Horizontal Position - 022 Horizontal Size - 024 Horizontal Pincushion - 026 Horizontal Pincushion Balance - 028 Horizontal Misconvergence - 02a Horizontal Linearity - 02c Horizontal Linearity Balance - 030 Vertical Position - 032 Vertical Size - 034 Vertical Pincushion - 036 Vertical Pincushion Balance - 038 Vertical Misconvergence - 03a Vertical Linearity - 03c Vertical Linearity Balance - 040 Parallelogram Balance (Key Distortion) - 042 Trapezoidal Distortion (Key) - 044 Tilt (Rotation) - 046 Top Corner Distortion Control - 048 Top Corner Distortion Balance - 04a Bottom Corner Distortion Control - 04c Bottom Corner Distortion Balance - 056 Horizontal Moire - 058 Vertical Moire - 05e Input Level Select - 060 Input Source Select - 06c Red Video Black Level - 06e Green Video Black Level - 070 Blue Video Black Level - 0a2 Auto Size Center - 0a4 Polarity Horizontal Sychronization - 0a6 Polarity Vertical Synchronization - 0aa Screen Orientation - 0ac Horizontal Frequency in Hz - 0ae Vertical Frequency in 0.1 Hz - 0b0 Settings - 0ca On Screen Display (OSD) - 0d4 Stereo Mode -HUT 84 Power Device Page - 000 Undefined - 001 iName - 002 Present Status - 003 Changed Status - 004 UPS - 005 Power Supply - 010 Battery System - 011 Battery System ID - 012 Battery - 013 Battery ID - 014 Charger - 015 Charger ID - 016 Power Converter - 017 Power Converter ID - 018 Outlet System - 019 Outlet System ID - 01a Input - 01b Input ID - 01c Output - 01d Output ID - 01e Flow - 01f Flow ID - 020 Outlet - 021 Outlet ID - 022 Gang - 023 Gang ID - 024 Power Summary - 025 Power Summary ID - 030 Voltage - 031 Current - 032 Frequency - 033 Apparent Power - 034 Active Power - 035 Percent Load - 036 Temperature - 037 Humidity - 038 Bad Count - 040 Config Voltage - 041 Config Current - 042 Config Frequency - 043 Config Apparent Power - 044 Config Active Power - 045 Config Percent Load - 046 Config Temperature - 047 Config Humidity - 050 Switch On Control - 051 Switch Off Control - 052 Toggle Control - 053 Low Voltage Transfer - 054 High Voltage Transfer - 055 Delay Before Reboot - 056 Delay Before Startup - 057 Delay Before Shutdown - 058 Test - 059 Module Reset - 05a Audible Alarm Control - 060 Present - 061 Good - 062 Internal Failure - 063 Voltage out of range - 064 Frequency out of range - 065 Overload - 066 Over Charged - 067 Over Temperature - 068 Shutdown Requested - 069 Shutdown Imminent - 06a Reserved - 06b Switch On/Off - 06c Switchable - 06d Used - 06e Boost - 06f Buck - 070 Initialized - 071 Tested - 072 Awaiting Power - 073 Communication Lost - 0fd iManufacturer - 0fe iProduct - 0ff iSerialNumber -HUT 85 Battery System Page - 000 Undefined - 001 SMB Battery Mode - 002 SMB Battery Status - 003 SMB Alarm Warning - 004 SMB Charger Mode - 005 SMB Charger Status - 006 SMB Charger Spec Info - 007 SMB Selector State - 008 SMB Selector Presets - 009 SMB Selector Info - 010 Optional Mfg. Function 1 - 011 Optional Mfg. Function 2 - 012 Optional Mfg. Function 3 - 013 Optional Mfg. Function 4 - 014 Optional Mfg. Function 5 - 015 Connection to SMBus - 016 Output Connection - 017 Charger Connection - 018 Battery Insertion - 019 Use Next - 01a OK to use - 01b Battery Supported - 01c SelectorRevision - 01d Charging Indicator - 028 Manufacturer Access - 029 Remaining Capacity Limit - 02a Remaining Time Limit - 02b At Rate - 02c Capacity Mode - 02d Broadcast To Charger - 02e Primary Battery - 02f Charge Controller - 040 Terminate Charge - 041 Terminate Discharge - 042 Below Remaining Capacity Limit - 043 Remaining Time Limit Expired - 044 Charging - 045 Discharging - 046 Fully Charged - 047 Fully Discharged - 048 Conditioning Flag - 049 At Rate OK - 04a SMB Error Code - 04b Need Replacement - 060 At Rate Time To Full - 061 At Rate Time To Empty - 062 Average Current - 063 Max Error - 064 Relative State Of Charge - 065 Absolute State Of Charge - 066 Remaining Capacity - 067 Full Charge Capacity - 068 Run Time To Empty - 069 Average Time To Empty - 06a Average Time To Full - 06b Cycle Count - 080 Batt. Pack Model Level - 081 Internal Charge Controller - 082 Primary Battery Support - 083 Design Capacity - 084 Specification Info - 085 Manufacturer Date - 086 Serial Number - 087 iManufacturerName - 088 iDeviceName - 089 iDeviceChemistry - 08a Manufacturer Data - 08b Rechargeable - 08c Warning Capacity Limit - 08d Capacity Granularity 1 - 08e Capacity Granularity 2 - 08f iOEMInformation - 0c0 Inhibit Charge - 0c1 Enable Polling - 0c2 Reset To Zero - 0d0 AC Present - 0d1 Battery Present - 0d2 Power Fail - 0d3 Alarm Inhibited - 0d4 Thermistor Under Range - 0d5 Thermistor Hot - 0d6 Thermistor Cold - 0d7 Thermistor Over Range - 0d8 Voltage Out Of Range - 0d9 Current Out Of Range - 0da Current Not Regulated - 0db Voltage Not Regulated - 0dc Master Mode - 0f0 Charger Selector Support - 0f1 Charger Spec - 0f2 Level 2 - 0f3 Level 3 -HUT 86 Power Pages -HUT 87 Power Pages -HUT 8c Bar Code Scanner Page (POS) -HUT 8d Scale Page (POS) -HUT 90 Camera Control Page -HUT 91 Arcade Control Page -HUT f0 Cash Device - 0f1 Cash Drawer - 0f2 Cash Drawer Number - 0f3 Cash Drawer Set - 0f4 Cash Drawer Status -HUT ff Vendor Specific - -# List of Languages - -# Syntax: -# L language_id language_name -# dialect_id dialect_name - -L 0001 Arabic - 01 Saudi Arabia - 02 Iraq - 03 Egypt - 04 Libya - 05 Algeria - 06 Morocco - 07 Tunesia - 08 Oman - 09 Yemen - 0a Syria - 0b Jordan - 0c Lebanon - 0d Kuwait - 0e U.A.E - 0f Bahrain - 10 Qatar -L 0002 Bulgarian -L 0003 Catalan -L 0004 Chinese - 01 Traditional - 02 Simplified - 03 Hongkong SAR, PRC - 04 Singapore - 05 Macau SAR -L 0005 Czech -L 0006 Danish -L 0007 German - 01 German - 02 Swiss - 03 Austrian - 04 Luxembourg - 05 Liechtenstein -L 0008 Greek -L 0009 English - 01 US - 02 UK - 03 Australian - 04 Canadian - 05 New Zealand - 06 Ireland - 07 South Africa - 08 Jamaica - 09 Carribean - 0a Belize - 0b Trinidad - 0c Zimbabwe - 0d Philippines -L 000a Spanish - 01 Castilian - 02 Mexican - 03 Modern - 04 Guatemala - 05 Costa Rica - 06 Panama - 07 Dominican Republic - 08 Venzuela - 09 Colombia - 0a Peru - 0b Argentina - 0c Ecuador - 0d Chile - 0e Uruguay - 0f Paraguay - 10 Bolivia - 11 El Salvador - 12 Honduras - 13 Nicaragua - 14 Puerto Rico -L 000b Finnish -L 000c French - 01 French - 02 Belgian - 03 Canadian - 04 Swiss - 05 Luxembourg - 06 Monaco -L 000d Hebrew -L 000e Hungarian -L 000f Idelandic -L 0010 Italian - 01 Italian - 02 Swiss -L 0011 Japanese -L 0012 Korean - 01 Korean -L 0013 Dutch - 01 Dutch - 02 Belgian -L 0014 Norwegian - 01 Bokmal - 02 Nynorsk -L 0015 Polish -L 0016 Portuguese - 01 Portuguese - 02 Brazilian -L 0017 forgotten -L 0018 Romanian -L 0019 Russian -L 001a Serbian - 01 Croatian - 02 Latin - 03 Cyrillic -L 001b Slovak -L 001c Albanian -L 001d Swedish - 01 Swedish - 02 Finland -L 001e Thai -L 001f Turkish -L 0020 Urdu - 01 Pakistan - 02 India -L 0021 Indonesian -L 0022 Ukrainian -L 0023 Belarusian -L 0024 Slovenian -L 0025 Estonian -L 0026 Latvian -L 0027 Lithuanian - 01 Lithuanian -L 0028 forgotten -L 0029 Farsi -L 002a Vietnamese -L 002b Armenian -L 002c Azeri - 01 Cyrillic - 02 Latin -L 002d Basque -L 002e forgotten -L 002f Macedonian -L 0036 Afrikaans -L 0037 Georgian -L 0038 Faeroese -L 0039 Hindi -L 003e Malay - 01 Malaysia - 02 Brunei Darassalam -L 003f Kazak -L 0041 Awahili -L 0043 Uzbek - 01 Latin - 02 Cyrillic -L 0044 Tatar -L 0045 Bengali -L 0046 Punjabi -L 0047 Gujarati -L 0048 Oriya -L 0049 Tamil -L 004a Telugu -L 004b Kannada -L 004c Malayalam -L 004d Assamese -L 004e Marathi -L 004f Sanskrit -L 0057 Konkani -L 0058 Manipuri -L 0059 Sindhi -L 0060 Kashmiri - 02 India -L 0061 Nepali - 02 India - -# HID Descriptor bCountryCode -# HID Specification 1.11 (2001-06-27) page 23 -# -# Syntax: -# HCC country_code keymap_type - -HCC 00 Not supported -HCC 01 Arabic -HCC 02 Belgian -HCC 03 Canadian-Bilingual -HCC 04 Canadian-French -HCC 05 Czech Republic -HCC 06 Danish -HCC 07 Finnish -HCC 08 French -HCC 09 German -HCC 10 Greek -HCC 11 Hebrew -HCC 12 Hungary -HCC 13 International (ISO) -HCC 14 Italian -HCC 15 Japan (Katakana) -HCC 16 Korean -HCC 17 Latin American -HCC 18 Netherlands/Dutch -HCC 19 Norwegian -HCC 20 Persian (Farsi) -HCC 21 Poland -HCC 22 Portuguese -HCC 23 Russia -HCC 24 Slovakia -HCC 25 Spanish -HCC 26 Swedish -HCC 27 Swiss/French -HCC 28 Swiss/German -HCC 29 Switzerland -HCC 30 Taiwan -HCC 31 Turkish-Q -HCC 32 UK -HCC 33 US -HCC 34 Yugoslavia -HCC 35 Turkish-F - -# List of Video Class Terminal Types - -# Syntax: -# VT terminal_type terminal_type_name - -VT 0100 USB Vendor Specific -VT 0101 USB Streaming -VT 0200 Input Vendor Specific -VT 0201 Camera Sensor -VT 0202 Sequential Media -VT 0300 Output Vendor Specific -VT 0301 Generic Display -VT 0302 Sequential Media -VT 0400 External Vendor Specific -VT 0401 Composite Video -VT 0402 S-Video -VT 0403 Component Video diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD deleted file mode 100644 index 13140997a..000000000 --- a/testing/util-linux/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 123152 2011-05-09 00:21:36Z allan $ -# Maintainer: -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=util-linux -pkgver=2.19.1 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://userweb.kernel.org/~kzak/util-linux-ng/" -arch=('i686' 'x86_64') -groups=('base') -depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') -replaces=('linux32' 'util-linux-ng') -conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') -provides=('linux32' "util-linux-ng=${pkgver}") -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2) -optdepends=('perl: for chkdupexe support') -md5sums=('3eab06f05163dfa65479c44e5231932c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c - ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -dm755 "${pkgdir}/var/lib/hwclock" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/vigra/PKGBUILD b/testing/vigra/PKGBUILD new file mode 100644 index 000000000..400bd5898 --- /dev/null +++ b/testing/vigra/PKGBUILD @@ -0,0 +1,36 @@ +# $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 new file mode 100644 index 000000000..46f194dbc --- /dev/null +++ b/testing/vigra/vigra-1.7.1.gcc460.patch @@ -0,0 +1,33 @@ +diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx +--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 +@@ -43,6 +43,7 @@ + #include <set> + #include <list> + #include <numeric> ++#include <stddef.h> + #include "mathutil.hxx" + #include "array_vector.hxx" + #include "sized_int.hxx" +diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx +--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -57,6 +57,7 @@ + #include <fstream> + #include <cstring> + #include <vector> ++#include <stddef.h> + #include "vigra/multi_array.hxx" + + namespace vigra { +diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx +--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + diff --git a/testing/wireshark/PKGBUILD b/testing/wireshark/PKGBUILD deleted file mode 100644 index a83355164..000000000 --- a/testing/wireshark/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 121168 2011-04-29 06:39:53Z stephane $ -# Maintainer: Guillaume ALAUX <guillaume at alaux dot net> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=(wireshark-cli wireshark-gtk) -pkgbase=wireshark -pkgver=1.4.6 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap') -url="http://www.wireshark.org/" -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('fd301004ebc5fac8e56c2f0d4ef6173f') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - export CFLAGS="-fno-unit-at-a-time ${CFLAGS}" - - ./configure --prefix=/usr --with-ssl --with-zlib=no - make all -} - -package_wireshark-cli() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" - depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2') - install=wireshark.install - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - #wireshark uid group is 150 - chgrp 150 "${pkgdir}/usr/bin/dumpcap" - chmod 754 "${pkgdir}/usr/bin/dumpcap" - rm "$pkgdir/usr/bin/wireshark" -} - -package_wireshark-gtk() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend" - depends=('gtk2' 'wireshark-cli') - install=wireshark-gtk.install - replaces=(wireshark) - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark" - for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png - done - install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop -} diff --git a/testing/wireshark/wireshark-gtk.install b/testing/wireshark/wireshark-gtk.install deleted file mode 100644 index 6b1b64bdd..000000000 --- a/testing/wireshark/wireshark-gtk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/wireshark/wireshark.install b/testing/wireshark/wireshark.install deleted file mode 100644 index 6585ba272..000000000 --- a/testing/wireshark/wireshark.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap - echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" -} - -post_upgrade() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap -} - -post_remove() { - if getent group wireshark >/dev/null 2>&1; then - groupdel wireshark - fi -} diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules new file mode 100644 index 000000000..67e5580cc --- /dev/null +++ b/testing/xf86-input-wacom/70-wacom.rules @@ -0,0 +1,8 @@ +ACTION!="add|change", GOTO="wacom_end" + +# Match all wacom tablets with a serial ID starting with WACf +ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" +ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" + +LABEL="wacom_end" + diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD new file mode 100644 index 000000000..f1bf57b06 --- /dev/null +++ b/testing/xf86-input-wacom/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124965 2011-05-25 13:01:43Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: M Rawash <mrawash@gmail.com> + +pkgname=xf86-input-wacom +pkgver=0.11.0 +pkgrel=1 +pkgdesc="X.Org Wacom tablet driver" +arch=('i686' 'x86_64') +url="http://linuxwacom.sourceforge.net/" +license=('GPL') +backup=('etc/X11/xorg.conf.d/50-wacom.conf') +depends=('libxi' 'libxrandr') +makedepends=('xorg-server-devel' 'libxext' 'libxi') +conflicts=('xorg-server<1.10.0') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + 70-wacom.rules) +md5sums=('e0f6182cf7fba19c13f3db7e0da1baf3' + '4d3665bb2ef8a8190734640dffa4c6f7') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d + make + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/lib/udev/rules.d" + install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" +} diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD new file mode 100644 index 000000000..c10416455 --- /dev/null +++ b/testing/xf86-video-ati/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=xf86-video-ati +pkgver=6.14.2 +pkgrel=1 +pkgdesc="X.org ati video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(libpciaccess libdrm udev pixman ati-dri) +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') +conflicts=('xorg-server<1.10.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +md5sums=('111ec4aef32a4298df7e38afa8bef373') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-dri + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make "DESTDIR=${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/xf86-video-ati/ati-fix-build-1.10.patch b/testing/xf86-video-ati/ati-fix-build-1.10.patch new file mode 100644 index 000000000..75980cbf3 --- /dev/null +++ b/testing/xf86-video-ati/ati-fix-build-1.10.patch @@ -0,0 +1,38 @@ +From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 +From: Sedat Dilek <sedat.dilek@googlemail.com> +Date: Fri, 25 Feb 2011 21:48:14 +0100 +Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3 + +This issue was introduced due to last minute backout of RandR-1.4 +in xserver 1.10-rc3. + +Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. +See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>. + +Note: +The ddx needs a rebuild as the X video driver ABI changed to version 10.0. + +Reported-by: Alex Deucher <alexdeucher@gmail.com> +CC: Keith Packard <keithp@keithp.com> +Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> +--- + src/radeon_output.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/radeon_output.c b/src/radeon_output.c +index 15cef06..ccde346 100644 +--- a/src/radeon_output.c ++++ b/src/radeon_output.c +@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) + xf86CrtcPtr crtc = output->crtc; + + if (crtc->enabled) { +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) ++#ifdef RANDR_14_INTERFACE + xf86CrtcSetRec crtc_set_rec; + + crtc_set_rec.flags = (XF86CrtcSetMode | +-- +1.7.1 + + diff --git a/testing/xfprint/PKGBUILD b/testing/xfprint/PKGBUILD deleted file mode 100644 index 1d622e190..000000000 --- a/testing/xfprint/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 122851 2011-05-06 14:01:10Z stephane $ -# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> - -pkgname=xfprint -pkgver=4.6.1 -pkgrel=5 -pkgdesc="A print dialog and a printer manager for Xfce" -arch=(i686 x86_64) -license=('GPL2') -url="http://www.xfce.org/" -groups=('xfce4') -depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'krb5' - 'gnutls>=2.6.5' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool') -options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/xfce/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 - xfprint-manager-fix.diff) -md5sums=('d92fca97a42816085080baf07a99a62e' - '69b3619a285e94d602a1d0ac08f4ca06') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - # fix xfprint-manager not showing cups printers - # see http://bugs.archlinux.org/task/19965, http://bugs.gentoo.org/278047, http://bugzilla.xfce.org/show_bug.cgi?id=6089 - patch -Np0 -i ${srcdir}/xfprint-manager-fix.diff - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/xfprint/xfprint-manager-fix.diff b/testing/xfprint/xfprint-manager-fix.diff deleted file mode 100644 index 1bf0725f8..000000000 --- a/testing/xfprint/xfprint-manager-fix.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- xfprint-manager/main.c 2009-02-24 21:34:16.000000000 +0000 -+++ xfprint-manager/main.c.new 2010-07-15 21:30:51.098745852 +0000 -@@ -41,6 +41,7 @@ - #include <libxfprint/printer-list-window.h> - - #define CHANNEL "xfprint" -+#define PROP_PRINTING_SYSTEM "/printing-system" - - extern void mainwin_setup (void); - -@@ -66,15 +67,15 @@ - channel = xfconf_channel_new (CHANNEL); - if (channel) { - -- if (xfconf_channel_has_property (channel, "/XfPrint/system")) { -- const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none"); -+ if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) { -+ const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none"); - if (g_ascii_strcasecmp (system_name, "none") != 0) { - ps = printing_system_new (system_name); - if (ps == NULL); - g_warning ("Unable to load printing system module %s", system_name); - } - } else { -- g_warning ("%s: XfPrint/system is not set", PACKAGE); -+ g_warning ("%s: XfPrint/printing-system is not set", PACKAGE); - } - } - diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD new file mode 100644 index 000000000..e2c47b128 --- /dev/null +++ b/testing/xz/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# Contributor: François Charette <firmicus@gmx.net> + +pkgname=xz +pkgver=5.0.3 +pkgrel=1 +pkgdesc='Library and command line tools for XZ and LZMA compressed files' +arch=('i686' 'x86_64') +url='http://tukaani.org/xz/' +license=('GPL' 'LGPL' 'custom') +depends=('sh') +provides=('lzma' 'lzma-utils' 'xz-utils') +replaces=('lzma' 'lzma-utils' 'xz-utils') +conflicts=('lzma' 'lzma-utils' 'xz-utils') +options=('!libtool') +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('fefe52f9ecd521de2a8ce38c21a27574') + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-werror + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 +} diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD deleted file mode 100644 index ddb807725..000000000 --- a/testing/ypbind-mt/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 123631 2011-05-11 23:05:30Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ypbind-mt -pkgver=1.33 -pkgrel=1 -pkgdesc='Linux NIS daemon' -arch=('i686' 'x86_64') -url='http://www.linux-nis.org/nis/ypbind-mt/' -license=('GPL2') -depends=('rpcbind' 'openslp') -backup=('etc/yp.conf' 'etc/conf.d/ypbind') -source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" - 'ypbind.conf' - 'ypbind') -sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' - '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' - '66f6ea2f622e0724e6017bf835d4f7f4a5bf9534') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-dbus-nm - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m644 etc/yp.conf "$pkgdir"/etc/yp.conf - install -D -m755 ../ypbind "$pkgdir"/etc/rc.d/ypbind - install -D -m644 ../ypbind.conf "$pkgdir"/etc/conf.d/ypbind - install -d -m755 "$pkgdir"/var/yp/binding -} diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind deleted file mode 100755 index 5ef5cf5b3..000000000 --- a/testing/ypbind-mt/ypbind +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ypbind - -case "$1" in - start) - stat_busy "Starting NIS Bind Daemon" - [ -f /etc/defaultdomain ] && /bin/domainname -F /etc/defaultdomain - /usr/sbin/ypbind $YPBIND_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ypbind - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Bind Daemon" - killall -q /usr/sbin/ypbind - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ypbind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf deleted file mode 100644 index fd0ebd491..000000000 --- a/testing/ypbind-mt/ypbind.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ypbind -# -YPBIND_ARGS="" diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD deleted file mode 100644 index 4c6e2333b..000000000 --- a/testing/ypserv/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 123628 2011-05-11 23:04:51Z bisson $ -# Maintainer: judd <jvinet@zeroflux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ypserv -pkgver=2.25 -pkgrel=1 -pkgdesc='Linux NIS Server' -arch=('i686' 'x86_64') -url='http://www.linux-nis.org/nis/ypserv/' -license=('GPL2') -depends=('gdbm' 'openslp') -backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') -source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" \ - 'yppasswd' - 'ypserv') -sha1sums=('ab997022d25b6374ae21d39f7ff564be028d8736' - '96192b628afe36709496e4801d016c4bff343f0e' - 'b625381bfa6cf62345377a7df30b8f45935206c5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m644 etc/netgroup "$pkgdir"/etc/netgroup - install -D -m644 etc/ypserv.conf "$pkgdir"/etc/ypserv.conf - install -D -m644 etc/securenets "$pkgdir"/var/yp/securenets - install -D -m755 ../ypserv "$pkgdir"/etc/rc.d/ypserv - install -D -m755 ../yppasswd "$pkgdir"/etc/rc.d/yppasswd -} |
