From 22b22c6e016b2a86a0d25e68eeb3fdec286f5352 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Sep 2011 23:14:37 +0000 Subject: Fri Sep 30 23:14:37 UTC 2011 --- community-staging/collectd/PKGBUILD | 86 ++++++++++++++++++++++++++ community-staging/collectd/install | 8 +++ community-staging/collectd/libnotify-0.7.patch | 12 ++++ community-staging/collectd/libperl.patch | 30 +++++++++ community-staging/collectd/rc.d | 39 ++++++++++++ community-staging/collectd/yajl-2.x.patch | 57 +++++++++++++++++ community-staging/rsyslog/PKGBUILD | 52 ++++++++++++++++ community-staging/rsyslog/rsyslog | 39 ++++++++++++ community-staging/rsyslog/rsyslog.conf.d | 6 ++ community-staging/rsyslog/rsyslog.logrotate | 7 +++ 10 files changed, 336 insertions(+) create mode 100644 community-staging/collectd/PKGBUILD create mode 100644 community-staging/collectd/install create mode 100644 community-staging/collectd/libnotify-0.7.patch create mode 100644 community-staging/collectd/libperl.patch create mode 100644 community-staging/collectd/rc.d create mode 100644 community-staging/collectd/yajl-2.x.patch create mode 100644 community-staging/rsyslog/PKGBUILD create mode 100755 community-staging/rsyslog/rsyslog create mode 100644 community-staging/rsyslog/rsyslog.conf.d create mode 100644 community-staging/rsyslog/rsyslog.logrotate (limited to 'community-staging') diff --git a/community-staging/collectd/PKGBUILD b/community-staging/collectd/PKGBUILD new file mode 100644 index 000000000..91b138629 --- /dev/null +++ b/community-staging/collectd/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 56061 2011-09-29 21:08:43Z ebelanger $ +# Maintainer: Gaetan Bisson +# Contributor: Gerhard Brauer + +pkgname=collectd +pkgver=5.0.0 +pkgrel=7 +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' + 'libperl.patch' + 'rc.d') +sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7' + 'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337' + 'd3854c39c9596b4f6dcf67a9eb8decea4d17120d' + 'b221352447b2d42cade4a65ced322bcff8a40366' + '0f441718d5519cb043b1130e5a1d0379078adbcc') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../libperl.patch + autoconf + + sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c + patch -p1 -i ../libnotify-0.7.patch + patch -p1 -i ../yajl-2.x.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --with-python=/usr/bin/python2 + + sed -i 's/ -Werror//g' */Makefile* */*/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 < 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/community-staging/collectd/libperl.patch b/community-staging/collectd/libperl.patch new file mode 100644 index 000000000..d6184f29d --- /dev/null +++ b/community-staging/collectd/libperl.patch @@ -0,0 +1,30 @@ +diff -aur old/configure.in new/configure.in +--- old/configure.in 2011-09-29 20:38:56.725672831 +1000 ++++ new/configure.in 2011-09-29 20:39:07.975658829 +1000 +@@ -2810,11 +2810,13 @@ + then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" ++ SAVE_LIBS="$LIBS" + dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) + PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` + PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` + CFLAGS="$CFLAGS $PERL_CFLAGS" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" ++ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" + + AC_CACHE_CHECK([for libperl], + [c_cv_have_libperl], +@@ -2833,7 +2835,10 @@ + Nullsv); + ]]), + [c_cv_have_libperl="yes"], +- [c_cv_have_libperl="no"] ++ [ ++ c_cv_have_libperl="no" ++ LIBS="$SAVE_LIBS" ++ ] + ) + ) + +Only in new: configure.in.orig diff --git a/community-staging/collectd/rc.d b/community-staging/collectd/rc.d new file mode 100644 index 000000000..442f2324a --- /dev/null +++ b/community-staging/collectd/rc.d @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=collectd +prog="/usr/sbin/collectdmon" + +PID=$(pidof -o %PPID $prog) + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && $prog \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 2 + $0 start + ;; +reload) + stat_busy "Sending SIGHUP to $name daemon" + [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac diff --git a/community-staging/collectd/yajl-2.x.patch b/community-staging/collectd/yajl-2.x.patch 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/rsyslog/PKGBUILD b/community-staging/rsyslog/PKGBUILD new file mode 100644 index 000000000..7872d5f52 --- /dev/null +++ b/community-staging/rsyslog/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 56032 2011-09-29 09:45:52Z spupykin $ +# Maintainer: Sergej Pupykin + +pkgname=rsyslog +pkgver=5.8.5 +pkgrel=2 +pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" +url="http://www.rsyslog.com/" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('zlib') +makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') +optdepends=('postgresql-libs: PostgreSQL Database Support' + 'libmysqlclient: MySQL Database Support' + 'net-snmp' + 'gnutls') +backup=('etc/rsyslog.conf' \ + 'etc/logrotate.d/rsyslog' + 'etc/conf.d/rsyslog') +options=('strip' 'zipman' '!libtool') +source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" + 'rsyslog' + 'rsyslog.logrotate' + 'rsyslog.conf.d') +md5sums=('a73cb577cb4bc5b9c8f0d217eb054ad2' + 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' + '8065db4bef3061a4f000ba58779f6829' + '1a0cd4530dd5d1439456d5ae230574d9') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-mysql \ + --enable-pgsql \ + --enable-mail \ + --enable-imfile \ + --enable-imtemplate \ + --enable-snmp \ + --enable-gnutls \ + --enable-inet \ + --with-systemdsystemunitdir=/lib/systemd/system + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + # Install Daemons and Configuration Files + install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d + install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf + install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} +} diff --git a/community-staging/rsyslog/rsyslog b/community-staging/rsyslog/rsyslog new file mode 100755 index 000000000..ee0145418 --- /dev/null +++ b/community-staging/rsyslog/rsyslog @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rsyslog + +PID=`pidof -o %PPID /usr/sbin/rsyslogd` +case "$1" in + start) + stat_busy "Starting RSyslogd" + [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon rsyslogd + stat_done + fi + ;; + stop) + stat_busy "Stopping RSyslogd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/rsyslogd.pid + rm -f /var/rsyslogd.persist + rm_daemon rsyslogd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/rsyslog/rsyslog.conf.d b/community-staging/rsyslog/rsyslog.conf.d new file mode 100644 index 000000000..e39f8c3b9 --- /dev/null +++ b/community-staging/rsyslog/rsyslog.conf.d @@ -0,0 +1,6 @@ +# +# Parameters to be passed to rsyslogd +# This should almost certainly include at least the current compatability +# level, e.g. -c4 +# +RSYSLOGD_ARGS="-c4" diff --git a/community-staging/rsyslog/rsyslog.logrotate b/community-staging/rsyslog/rsyslog.logrotate new file mode 100644 index 000000000..76306c560 --- /dev/null +++ b/community-staging/rsyslog/rsyslog.logrotate @@ -0,0 +1,7 @@ +/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { + missingok + sharedscripts + postrotate + /usr/bin/killall -HUP /usr/sbin/rsyslogd + endscript +} -- cgit v1.2.3-54-g00ecf From 57d05f7209f022aa99a8850aafbeec4cb85c3b5b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Oct 2011 23:14:36 +0000 Subject: Mon Oct 3 23:14:36 UTC 2011 --- community-staging/darktable/PKGBUILD | 43 ++++ community-staging/darktable/darktable.install | 22 ++ community-staging/kphotoalbum/PKGBUILD | 47 ++++ .../kphotoalbum/fix-docbook-build.patch | 236 +++++++++++++++++++++ .../kphotoalbum/fix-with-exiv2-0.21.patch | 47 ++++ community-staging/kphotoalbum/kphotoalbum.install | 11 + community-staging/krename/PKGBUILD | 31 +++ community-staging/krename/krename.install | 11 + community-staging/libextractor/PKGBUILD | 33 +++ .../libextractor/libextractor.install | 20 ++ community-staging/rawstudio/PKGBUILD | 33 +++ community-staging/rawstudio/rawstudio.install | 11 + community/bacula/PKGBUILD | 2 +- community/bacula/bacula.install | 4 +- community/cairo-compmgr/PKGBUILD | 12 +- community/fotoxx/PKGBUILD | 4 +- community/glom/PKGBUILD | 23 +- community/goocanvas/PKGBUILD | 16 +- community/goocanvas1/PKGBUILD | 26 +++ community/goocanvasmm/PKGBUILD | 10 +- community/gtksourceviewmm/PKGBUILD | 27 +++ community/ibus-chewing/PKGBUILD | 17 +- community/ibus-hangul/PKGBUILD | 11 +- community/ibus-hangul/ibus-1.4.0.patch | 58 +++++ community/ibus-pinyin/PKGBUILD | 24 +-- community/ibus-pinyin/ibus-pinyin.install | 2 +- community/libgda4/PKGBUILD | 36 ++++ community/libgda4/libgda.install | 12 ++ community/libgdamm/PKGBUILD | 13 +- community/pygoocanvas/PKGBUILD | 12 +- community/synfig/PKGBUILD | 6 +- community/synfigstudio/PKGBUILD | 6 +- community/tasks/PKGBUILD | 6 +- community/wt/PKGBUILD | 13 +- extra/claws-mail-extra-plugins/PKGBUILD | 22 +- extra/claws-mail-extra-plugins/webkit1.6.1.patch | 106 +++++++++ extra/gnome-python-extras/PKGBUILD | 18 +- extra/liboauth/PKGBUILD | 29 +++ extra/mercurial/PKGBUILD | 10 +- extra/vte/PKGBUILD | 51 +---- staging/exiv2/PKGBUILD | 26 +++ staging/geeqie/PKGBUILD | 30 +++ staging/geeqie/geeqie.install | 11 + staging/gimp-ufraw/PKGBUILD | 35 +++ staging/gimp-ufraw/gimp-ufraw.install | 11 + testing/krb5/PKGBUILD | 85 ++++++++ .../krb5/krb5-1.9.1-canonicalize-fallback.patch | 58 +++++ testing/krb5/krb5-1.9.1-config-script.patch | 27 +++ testing/krb5/krb5-kadmind | 40 ++++ testing/krb5/krb5-kdc | 40 ++++ 50 files changed, 1329 insertions(+), 155 deletions(-) create mode 100644 community-staging/darktable/PKGBUILD create mode 100644 community-staging/darktable/darktable.install create mode 100644 community-staging/kphotoalbum/PKGBUILD create mode 100644 community-staging/kphotoalbum/fix-docbook-build.patch create mode 100644 community-staging/kphotoalbum/fix-with-exiv2-0.21.patch create mode 100644 community-staging/kphotoalbum/kphotoalbum.install create mode 100644 community-staging/krename/PKGBUILD create mode 100644 community-staging/krename/krename.install create mode 100644 community-staging/libextractor/PKGBUILD create mode 100644 community-staging/libextractor/libextractor.install create mode 100644 community-staging/rawstudio/PKGBUILD create mode 100644 community-staging/rawstudio/rawstudio.install create mode 100644 community/goocanvas1/PKGBUILD create mode 100644 community/gtksourceviewmm/PKGBUILD create mode 100644 community/ibus-hangul/ibus-1.4.0.patch create mode 100644 community/libgda4/PKGBUILD create mode 100644 community/libgda4/libgda.install create mode 100644 extra/claws-mail-extra-plugins/webkit1.6.1.patch create mode 100644 extra/liboauth/PKGBUILD create mode 100644 staging/exiv2/PKGBUILD create mode 100644 staging/geeqie/PKGBUILD create mode 100644 staging/geeqie/geeqie.install create mode 100644 staging/gimp-ufraw/PKGBUILD create mode 100644 staging/gimp-ufraw/gimp-ufraw.install create mode 100644 testing/krb5/PKGBUILD create mode 100644 testing/krb5/krb5-1.9.1-canonicalize-fallback.patch create mode 100644 testing/krb5/krb5-1.9.1-config-script.patch create mode 100644 testing/krb5/krb5-kadmind create mode 100644 testing/krb5/krb5-kdc (limited to 'community-staging') diff --git a/community-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD new file mode 100644 index 000000000..5b81d0475 --- /dev/null +++ b/community-staging/darktable/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 56175 2011-10-02 21:04:18Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Christian Himpel +# Contributor: Johannes Hanika + +pkgname=darktable +pkgver=0.9.2 +_pkgver=0.9 +pkgrel=2 +pkgdesc="Utility to organize and develop raw images" +arch=('i686' 'x86_64') +url=http://darktable.sf.net/ +license=('GPL3') +depends=('exiv2>=0.18' 'gconf>=2.26' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') +makedepends=('intltool>=0.40' 'cmake' 'sqlite3') +optdepends=( 'librsvg') +install=darktable.install +options=(!libtool) +source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) +md5sums=('08377e80ad77c7b11f742f26fddb80f1') + +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_USERMANUAL=False \ + -DDONT_INSTALL_GCONF_SCHEMAS=True \ + -DBINARY_PACKAGE_BUILD=1 \ + .. + make +} + +package() { + cd $srcdir/$pkgname-$pkgver/build + make DESTDIR=$pkgdir install + mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" + mkdir -p "${pkgdir}/usr/share/gconf/schemas/" + mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" +} diff --git a/community-staging/darktable/darktable.install b/community-staging/darktable/darktable.install new file mode 100644 index 000000000..b92aab488 --- /dev/null +++ b/community-staging/darktable/darktable.install @@ -0,0 +1,22 @@ +pkgname=darktable + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + [ -x `which update-desktop-database` ] && update-desktop-database -q +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + [ -x `which update-desktop-database` ] && update-desktop-database -q +} diff --git a/community-staging/kphotoalbum/PKGBUILD b/community-staging/kphotoalbum/PKGBUILD new file mode 100644 index 000000000..1ce076b79 --- /dev/null +++ b/community-staging/kphotoalbum/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 56162 2011-10-02 13:52:02Z lcarlier $ +# Maintainer: Laurent Carlier +# Contributor: Andrea Scarpino +# Contributor: Gilles CHAUVIN +# Contributor: Jonathan Schaeffer +# Contributor: chfoxli + +pkgname=kphotoalbum +pkgver=4.1.1 +pkgrel=10 +pkgdesc="KDE Photo Album, picture collection manager" +url="http://www.kphotoalbum.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs') +optdepends=('kdeedu-marble: integration with Marble' + 'kipi-plugins: add extra functionality' + 'kdemultimedia-mplayerthumbs: video thumbnails') +install=${pkgname}.install +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'fix-docbook-build.patch' + 'fix-with-exiv2-0.21.patch') +md5sums=('c00a5f179e487ac89fccf8dfb3cd6ef0' + '1b48553af74f0488fdad55758e911e3a' + '9238101a2d7450e6dd822778807dd7bd') + +build() { + cd ${srcdir} + + patch -Np0 -i ${srcdir}/fix-docbook-build.patch + patch -Np0 -i ${srcdir}/fix-with-exiv2-0.21.patch + + 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/community-staging/kphotoalbum/fix-docbook-build.patch b/community-staging/kphotoalbum/fix-docbook-build.patch new file mode 100644 index 000000000..575a4271e --- /dev/null +++ b/community-staging/kphotoalbum/fix-docbook-build.patch @@ -0,0 +1,236 @@ +diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook +--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix 2009-11-15 15:16:29.000000000 -0600 ++++ kphotoalbum-4.1.1/doc/index.docbook 2010-06-13 13:03:02.815174744 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> + + +@@ -41,12 +41,6 @@ + 2004-08-06 + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Image Database +- + + This is the user manual for &kphotoalbum;. If you are + not the type who likes reading documentation, but rather just want to try +@@ -64,6 +58,12 @@ menu and select Run &kphoto + on long HTML document at &kphotoalbum;'s Homepage + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Image Database ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:07.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:10:06.145165665 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Bilddatenbank +- + Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: +@@ -102,6 +92,12 @@ + >HTML-Dokument zum Herunterladen. + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Bilddatenbank ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:20.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:11:18.860165964 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Piltide andmebaas +- + See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: +@@ -100,6 +90,12 @@ + >&kphotoalbum;i koduleheküljelt. + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Piltide andmebaas ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:57.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:00.978165382 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- Banca dati immagini +- + Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: +@@ -100,6 +90,12 @@ + >homepage di &kphotoalbum; + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ Banca dati immagini ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:13.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:45.765165840 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- Kfotoalbum +- Bilddatabas +- + Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: +@@ -100,6 +90,12 @@ + >Kfotoalbums hemsida + ++ ++ KDE ++ kdeextragear-2 ++ Kfotoalbum ++ Bilddatabas ++ + + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:26.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:13:28.217166055 -0500 +@@ -1,5 +1,5 @@ + +-KPhotoAlbum"> +@@ -65,16 +65,6 @@ + 2.0 + +- +- KDE +- kdeextragear-2 +- KPhotoAlbum +- База даних зображень +- + Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: +@@ -100,6 +90,12 @@ + >домашній сторінці &kphotoalbum; + ++ ++ KDE ++ kdeextragear-2 ++ KPhotoAlbum ++ База даних зображень ++ + + + &introduction; diff --git a/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch new file mode 100644 index 000000000..65baf235d --- /dev/null +++ b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch @@ -0,0 +1,47 @@ +--- kphotoalbum-4.1.1/Exif/Info.cpp.orig 2010/08/16 08:04:32 1164187 ++++ kphotoalbum-4.1.1/Exif/Info.cpp 2011/01/09 06:50:40 1213128 +@@ -106,6 +106,28 @@ + return res; + + QList tags; ++ std::ostringstream s; ++ ++#if (EXIV2_TEST_VERSION(0,21,0)) ++ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList(); ++ while (gi->tagList_ != 0) { ++ Exiv2::TagListFct tl = gi->tagList_; ++ const Exiv2::TagInfo* ti = tl(); ++ ++ while (ti->tag_ != 0xFFFF) { ++ tags << ti; ++ ++ti; ++ } ++ ++gi; ++ } ++ ++ for (QList::iterator it = tags.begin(); it != tags.end(); ++it) { ++ while ( (*it)->tag_ != 0xffff ) { ++ res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str())); ++ ++(*it); ++ } ++ } ++#else + tags << + Exiv2::ExifTags::ifdTagList() << + Exiv2::ExifTags::exifTagList() << +@@ -121,7 +143,6 @@ + // Now the ugly part -- exiv2 doesn't have any way to get a list of + // MakerNote tags in a reasonable form, so we have to parse it from strings + +- std::ostringstream s; + for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId; + kind = static_cast( kind + 1 ) ) { + #if EXIV2_TEST_VERSION(0,17,0) +@@ -130,6 +151,7 @@ + Exiv2::ExifTags::makerTaglist( s, kind ); + #endif + } ++#endif + + // IPTC tags use yet another format... + Exiv2::IptcDataSets::dataSetList( s ); diff --git a/community-staging/kphotoalbum/kphotoalbum.install b/community-staging/kphotoalbum/kphotoalbum.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-staging/kphotoalbum/kphotoalbum.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-staging/krename/PKGBUILD b/community-staging/krename/PKGBUILD new file mode 100644 index 000000000..8a3bf3de2 --- /dev/null +++ b/community-staging/krename/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 56158 2011-10-02 13:17:47Z ebelanger $ +# Maintainer: Eric Bélanger + +pkgname=krename +pkgver=4.0.7 +pkgrel=2 +pkgdesc="A very powerfull batch file renamer for KDE" +arch=('i686' 'x86_64') +url="http://www.krename.net" +license=('GPL') +depends=('kdelibs' 'taglib' 'xdg-utils') +makedepends=('cmake' 'automoc4') +options=('libtool') +install=krename.install +source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('c53d1819247a88bc4f49d52936f1e2bc7fa9850d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/krename/krename.install b/community-staging/krename/krename.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/community-staging/krename/krename.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-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD new file mode 100644 index 000000000..b37685dbc --- /dev/null +++ b/community-staging/libextractor/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 56177 2011-10-02 21:05:24Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: damir + +pkgname=libextractor +pkgver=0.6.2 +pkgrel=3 +pkgdesc="A library used to extract meta-data from files of arbitrary type" +arch=("i686" "x86_64") +license=('GPL') +url="http://gnunet.org/libextractor/" +depends=('libvorbis' 'libtool' 'gtk2' 'libgsf' 'libmpeg2' 'texinfo') +makedepends=('flac' 'poppler' 'exiv2' 'qt') +optdepends=('flac' + 'poppler' + 'exiv2' + 'qt') +options=('!libtool' '!makeflags') +install=libextractor.install +source=(http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('4b2af1167061430d58a101d5dfc6b4c7') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/share/info/dir +} diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install new file mode 100644 index 000000000..24d668af5 --- /dev/null +++ b/community-staging/libextractor/libextractor.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(extractor.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 +} + +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/community-staging/rawstudio/PKGBUILD b/community-staging/rawstudio/PKGBUILD new file mode 100644 index 000000000..3dd543393 --- /dev/null +++ b/community-staging/rawstudio/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 56179 2011-10-02 21:06:25Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Daniel J Griffiths +# Contributor: Roman Kyrylych +# Contributor: cdhotfire + +pkgname=rawstudio +pkgver=2.0 +pkgrel=3 +pkgdesc="An open source raw-image converter written in GTK+" +arch=('i686' 'x86_64') +license=('GPL') +url="http://rawstudio.org/" +depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' + 'raptor1' 'lcms' 'gtk2') +install=${pkgname}.install +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins +} diff --git a/community-staging/rawstudio/rawstudio.install b/community-staging/rawstudio/rawstudio.install new file mode 100644 index 000000000..261adb7b4 --- /dev/null +++ b/community-staging/rawstudio/rawstudio.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q || true +} + +post_upgrade() { + update-desktop-database -q || true +} + +post_remove() { + update-desktop-database -q || true +} diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD index b48447f75..4093fe1a7 100644 --- a/community/bacula/PKGBUILD +++ b/community/bacula/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bacula pkgver=5.0.3 -pkgrel=5 +pkgrel=6 pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)" arch=("i686" "x86_64") url="http://www.${pkgname}.org" diff --git a/community/bacula/bacula.install b/community/bacula/bacula.install index 9b8a3669a..4d061ddfa 100644 --- a/community/bacula/bacula.install +++ b/community/bacula/bacula.install @@ -1,12 +1,12 @@ post_install() { if [ -z "`grep '^bacula::' /etc/group`" ]; then echo "Adding bacula system group... " - groupadd -g 73 bacula >& /dev/null + groupadd -g 77 bacula >& /dev/null fi if [ -z "`grep '^bacula::' /etc/passwd`" ]; then echo "Adding bacula system user... " - useradd -u 73 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula + useradd -u 77 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula fi echo "Locking Bacula User Account..." diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD index a023590bf..30c08cec2 100644 --- a/community/cairo-compmgr/PKGBUILD +++ b/community/cairo-compmgr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45705 2011-04-27 13:34:55Z bluewind $ +# $Id: PKGBUILD 56166 2011-10-02 15:46:05Z bluewind $ # Maintainer: Florian Pritz # Contributor: Adam Hani Schakaki (krzd) # Contributor: Det @@ -8,16 +8,16 @@ # Contributor: Gianni Vialetto pkgname=cairo-compmgr -pkgver=git20110320 -_commit=711fc7275b79cc802dc69658eb714ddc50666c06 -pkgrel=2 +pkgver=git2011102 +_commit=348f149af30bc829c2100d0e622c5dcaf43925b7 +pkgrel=3 epoch=1 pkgdesc="A Cairo based composite manager" arch=(i686 x86_64) url="http://cairo-compmgr.tuxfamily.org/" license=(GPL) makedepends=(gettext gtk-doc "intltool>=0.41" git) -depends=("gtk2>=2.16.0" "vala>=0.11.6" libsm gconf) +depends=("gtk2>=2.16.0" "vala>=0.14" libsm gconf) install=cairo-compmgr.install options=(!libtool) #source=(http://download.tuxfamily.org/ccm/$pkgname/$pkgname-$pkgver.tar.gz) @@ -49,7 +49,7 @@ build() { cd "$srcdir/$__gitname-build" git checkout "$_commit" - sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac +# sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac ./autogen.sh --prefix=/usr make -j1 } diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index 65ee90593..efa4b5a35 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann pkgname=fotoxx -pkgver=11.09.1 +pkgver=11.10 pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" @@ -9,7 +9,7 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('a532c4ef6b00e682319a68416c9c0eeb') +md5sums=('c312f980dab199f50fc76374d062135a') install=fotoxx.install build() { diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 408a8d87d..0ceeb4893 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,38 +1,31 @@ -# $Id: PKGBUILD 52545 2011-07-26 04:39:23Z svenstaro $ +# $Id: PKGBUILD 56168 2011-10-02 16:56:39Z ibiru $ # Maintainer: Roman Kyrylych # Contributor: William Rea # Contributor: Jaroslav Lichtblau pkgname=glom -pkgver=1.16.1 -pkgrel=7 +pkgver=1.19.11 +pkgrel=2 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') +depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') +makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9') +source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c28ead8b37d31550c295004de50e0dc09debd3af665691b852737330bf68514d') 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 + --disable-static make } diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD index 1ab22f842..2fdcb31d8 100644 --- a/community/goocanvas/PKGBUILD +++ b/community/goocanvas/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 41063 2011-03-03 15:31:20Z spupykin $ +# $Id: PKGBUILD 56140 2011-10-02 09:45:13Z ibiru $ # Maintainer: Sergej Pupykin # Contributor: William Rea pkgname=goocanvas -pkgver=1.0.0 +pkgver=2.0.0 pkgrel=1 pkgdesc="A cairo canvas widget for GTK+" arch=(i686 x86_64) url="http://live.gnome.org/GooCanvas" options=('!libtool' 'docs') license=("LGPL") -depends=('gtk2') -source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/1.0/goocanvas-$pkgver.tar.bz2) -md5sums=('4858a22239e45cf374195bae520021c2') +depends=('gtk3') +source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.bz2) +sha256sums=('9f8d7f700ad9617adef37e63f58cb2d038d799443e3756040f368ceea7f01331') build() { cd $srcdir/goocanvas-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make +} + +package() { + cd $srcdir/goocanvas-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/goocanvas1/PKGBUILD b/community/goocanvas1/PKGBUILD new file mode 100644 index 000000000..f0124333e --- /dev/null +++ b/community/goocanvas1/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 56150 2011-10-02 11:40:26Z ibiru $ +# Maintainer: Sergej Pupykin +# Contributor: William Rea + +pkgname=goocanvas1 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="A cairo canvas widget for GTK+" +arch=(i686 x86_64) +url="http://live.gnome.org/GooCanvas" +options=('!libtool' 'docs') +license=("LGPL") +depends=('gtk2') +source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/1.0/goocanvas-$pkgver.tar.bz2) +sha256sums=('1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e') + +build() { + cd $srcdir/goocanvas-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $srcdir/goocanvas-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD index 536c2d7e0..b7476844b 100755 --- a/community/goocanvasmm/PKGBUILD +++ b/community/goocanvasmm/PKGBUILD @@ -3,21 +3,23 @@ # Contributor: Laurent Meunier pkgname=goocanvasmm -pkgver=0.15.4 +pkgver=1.90.5 pkgrel=1 pkgdesc='C++ wrappers for goocanvas' arch=('i686' 'x86_64') url='http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/' license=('GPL') -depends=('gegl' 'goocanvas' 'glibmm' 'gtkmm') -source=("http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/${pkgver:0:4}/goocanvasmm-${pkgver}.tar.bz2") -md5sums=('cf462e8d2f36f4e02387eb094773b3e9') +depends=('goocanvas' 'gtkmm3') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz) +sha256sums=('9648e6fc6c41fceea348571b7db4421748bab7fbd7799700245890b63ae1b4b6') build() { cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ + --disable-static \ --disable-documentation make diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD new file mode 100644 index 000000000..ad2c08025 --- /dev/null +++ b/community/gtksourceviewmm/PKGBUILD @@ -0,0 +1,27 @@ +#$Id: PKGBUILD 56144 2011-10-02 10:45:47Z ibiru $ +# Maintainer: Ionut Biru + +pkgname=gtksourceviewmm +pkgver=3.2.0 +pkgrel=1 +pkgdesc="provides C++ bindings for gtksourceview library" +arch=(i686 x86_64) +url="http://gnome.org" +license=('LGPL2.1') +depends=('gtkmm3' 'gtksourceview3') +options=(!libtool) +source=("http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz") +sha256sums=('9dc0c44f00627e434a36ac7c3a34d9c30ebe45eb6dc682dc733a85dcead2ba66') + +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/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index 9fda24ce7..cbec4f962 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 56125 2011-10-02 04:43:30Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy # Contributor: Lee.MaRS @@ -5,35 +6,31 @@ pkgname=ibus-chewing pkgver=1.3.9.2 -pkgrel=3 +pkgrel=4 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64') license=('GPL') url='http://ibus.googlecode.com' depends=('ibus' 'libchewing' 'libxtst' 'gconf') makedepends=('swig' 'cmake' 'gob2') -install="${pkgname}.install" +install=ibus-chewing.install source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") md5sums=('8d177d67647944f5d1f9cca0654eaccb') build() { - cd ${pkgname}-${pkgver}-Source + cd "${srcdir}/${pkgname}-${pkgver}-Source" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/usr/share \ + -DLIBEXEC_DIR=/usr/lib/ibus \ . make } package() { - cd ${pkgname}-${pkgver}-Source + cd "${srcdir}/${pkgname}-${pkgver}-Source" - make DESTDIR=${pkgdir} install - - # check up on http://code.google.com/p/ibus/issues/detail?id=1172 to fix nonstandard path - install -d ${pkgdir}/usr/lib/ibus - mv ${pkgdir}/usr/libexec/ibus-engine-chewing ${pkgdir}/usr/lib/ibus/ibus-engine-chewing - sed -i 's#/usr/libexec/ibus-engine-chewing#/usr/lib/ibus/ibus-engine-chewing#' ${pkgdir}/usr/share/ibus/component/chewing.xml + make DESTDIR="${pkgdir}" install } diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index 6191465bf..c9385ed9b 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 53477 2011-08-03 21:36:31Z ebelanger $ +# $Id: PKGBUILD 56129 2011-10-02 08:05:56Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák pkgname=ibus-hangul pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64') url='http://ibus.googlecode.com' license=('GPL') depends=('ibus' 'libhangul') makedepends=('intltool') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('b71565bba3a1439a47212611b774ecf7') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1.4.0.patch) +md5sums=('b71565bba3a1439a47212611b774ecf7' + 'edf93824ab2eead1307088d3edc24dbc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + patch -p1 -i "${srcdir}/ibus-1.4.0.patch" ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/ibus diff --git a/community/ibus-hangul/ibus-1.4.0.patch b/community/ibus-hangul/ibus-1.4.0.patch new file mode 100644 index 000000000..0c043d374 --- /dev/null +++ b/community/ibus-hangul/ibus-1.4.0.patch @@ -0,0 +1,58 @@ +diff -Naur ibus-hangul-1.3.1-orig/configure.ac ibus-hangul-1.3.1/configure.ac +--- ibus-hangul-1.3.1-orig/configure.ac 2011-10-02 03:36:02.000000000 -0400 ++++ ibus-hangul-1.3.1/configure.ac 2011-10-02 03:37:01.000000000 -0400 +@@ -52,7 +52,7 @@ + + # check ibus + PKG_CHECK_MODULES(IBUS, [ +- ibus-1.0 >= 1.2.99 ++ ibus-1.0 >= 1.3.99 + ]) + + # check libhangul +diff -Naur ibus-hangul-1.3.1-orig/src/engine.c ibus-hangul-1.3.1/src/engine.c +--- ibus-hangul-1.3.1-orig/src/engine.c 2011-10-02 03:36:02.000000000 -0400 ++++ ibus-hangul-1.3.1/src/engine.c 2011-10-02 03:37:51.000000000 -0400 +@@ -175,8 +194,7 @@ + void + ibus_hangul_init (IBusBus *bus) + { +- gboolean res; +- GValue value = { 0, }; ++ GVariant* value; + + hanja_table = hanja_table_load (NULL); + +@@ -187,22 +205,22 @@ + g_object_ref_sink (config); + + hangul_keyboard = g_string_new_len ("2", 8); +- res = ibus_config_get_value (config, "engine/Hangul", +- "HangulKeyboard", &value); +- if (res) { +- const gchar* str = g_value_get_string (&value); ++ value = ibus_config_get_value (config, "engine/Hangul", ++ "HangulKeyboard"); ++ if (value != NULL) { ++ const gchar* str = g_variant_get_string (value, NULL); + g_string_assign (hangul_keyboard, str); +- g_value_unset(&value); ++ g_variant_unref(value); + } + + hanja_key_list_init(&hanja_keys); + +- res = ibus_config_get_value (config, "engine/Hangul", +- "HanjaKeys", &value); +- if (res) { +- const gchar* str = g_value_get_string (&value); ++ value = ibus_config_get_value (config, "engine/Hangul", ++ "HanjaKeys"); ++ if (value != NULL) { ++ const gchar* str = g_variant_get_string (value, NULL); + hanja_key_list_set_from_string(&hanja_keys, str); +- g_value_unset(&value); ++ g_variant_unref(value); + } else { + hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0); + hanja_key_list_append(&hanja_keys, IBUS_F9, 0); diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD index 199e4534d..c410dc245 100644 --- a/community/ibus-pinyin/PKGBUILD +++ b/community/ibus-pinyin/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 31706 2010-11-04 13:42:40Z ibiru $ +# $Id: PKGBUILD 56127 2011-10-02 07:12:20Z ebelanger $ # Contributor: Rainy # Contributor: Lee.maRS # Maintainer: Daniel J Griffiths pkgname=ibus-pinyin -pkgver=1.3.11 -pkgrel=2 +pkgver=1.3.99.20110706 +pkgrel=1 pkgdesc='The PinYin Engine for IBus Input Framework.' arch=('i686' 'x86_64') license=('LGPL') url='http://ibus.googlecode.com' -depends=('ibus' 'libsigc++2.0' 'boost-libs') -makedepends=('intltool' 'boost') -install="${pkgname}.install" +depends=('ibus') +makedepends=('intltool') +install=ibus-pinyin.install source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2") -md5sums=('c49b2ccaae1f4e3c5cfbd25af6bea51a' +md5sums=('0d9d5d78106c2d36c28a00b74aa9a6c3' 'd0951b8daa7f56a2cbd3b6b4e42532e0') build() { - ln -sf ${srcdir}/pinyin-database-1.2.99.tar.bz2 \ - ${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase + cd "${srcdir}/${pkgname}-${pkgver}" - cd ${pkgname}-${pkgver} + ln -sf "${srcdir}/pinyin-database-1.2.99.tar.bz2" \ + "${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase" sed -i -e "s|python|python2|" data/db/android/create_db.py \ setup/ibus-setup-pinyin.in @@ -36,7 +36,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make NO_INDEX=true DESTDIR=${pkgdir} install + make NO_INDEX=true DESTDIR="${pkgdir}" install } diff --git a/community/ibus-pinyin/ibus-pinyin.install b/community/ibus-pinyin/ibus-pinyin.install index d9ad92426..3771d9bec 100644 --- a/community/ibus-pinyin/ibus-pinyin.install +++ b/community/ibus-pinyin/ibus-pinyin.install @@ -1,6 +1,6 @@ post_install() { echo "Creating INDEX. Please wait..." - cd /usr/share/ibus-pinyin/db + cd usr/share/ibus-pinyin/db echo "Creating index for android.db..." sqlite3 android.db '.read create_index.sql' echo "Creating index for open-phrase.db..." diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD new file mode 100644 index 000000000..9c2580c99 --- /dev/null +++ b/community/libgda4/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 56164 2011-10-02 14:06:33Z jelle $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +pkgname=libgda4 +pkgver=4.2.9 +pkgrel=1 +pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" +arch=(i686 x86_64) +license=('GPL') +depends=('gtksourceview2' 'libunique' 'libxslt' 'db' 'ncurses' 'libsoup' + 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' + 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('intltool' 'gobject-introspection' ) +options=('!libtool') +url="http://www.gnome-db.org" +install=libgda.install +source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz) +sha256sums=('bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814') + +build() { + cd "${srcdir}/libgda-${pkgver}" + sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-bdb=/usr --with-bdb-libdir-name=lib \ + --disable-static \ + --disable-gtk-doc + make +} + +package() { + cd "${srcdir}/libgda-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf $pkgdir/usr/share/icons + rm -rf $pkgdir/usr/share/gtk-doc +} diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community/libgda4/libgda.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/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD index cf58ad50a..1bca39c24 100644 --- a/community/libgdamm/PKGBUILD +++ b/community/libgdamm/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 33284 2010-11-23 19:29:36Z heftig $ +# $Id: PKGBUILD 56138 2011-10-02 09:24:08Z ibiru $ +# Maintainer : Ionut Biru # Contributor: Jan de Groot pkgbase=libgdamm pkgname=(libgdamm libgdamm-docs) -pkgver=4.1.1 +pkgver=4.99.4 pkgrel=1 arch=('i686' 'x86_64') -makedepends=('libgda>=4.2.1' 'libsigc++' 'glibmm>=2.24.2' 'glibmm-docs>=2.24.2') +makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs') url="http://gtkmm.sourceforge.net/" license=('LGPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('6f57b0362698420cd855539cf61be388') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('08431875745abf85d0a1f0bde5ca273f400395b209fb6c4a5ca87fb87a5f67f0') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -21,7 +22,7 @@ build() { package_libgdamm() { pkgdesc="C++ bindings for libgda" - depends=('libgda>=4.2.1' 'glibmm>=2.24.2' 'libsigc++') + depends=('libgda' 'glibmm' 'libsigc++') cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD index e37d43881..3f5affbc8 100644 --- a/community/pygoocanvas/PKGBUILD +++ b/community/pygoocanvas/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 27121 2010-09-17 15:17:17Z schuay $ +# $Id: PKGBUILD 56152 2011-10-02 11:46:05Z ibiru $ # Maintainer: Douglas Soares de Andrade # Contributor: William Rea pkgname=pygoocanvas pkgver=0.14.1 -pkgrel=3 +pkgrel=4 pkgdesc="GooCanvas python bindings" arch=('i686' 'x86_64') url="http://developer.berlios.de/projects/pygoocanvas" license=('LGPL') -depends=('python2' 'goocanvas' 'pygtk') +depends=('python2' 'goocanvas1' 'pygtk') makedepends=('pkgconfig') -options=('!libtool' 'docs' 'force') +options=('!libtool' 'docs') source=(http://ftp.gnome.org/pub/GNOME/sources/pygoocanvas/0.14/pygoocanvas-$pkgver.tar.bz2) md5sums=('e0e7b694af2f81a78b0838555d150252') @@ -19,5 +19,9 @@ build() { cd "$srcdir/pygoocanvas-$pkgver" ./configure --prefix=/usr --disable-docs make +} + +package() { + cd "$srcdir/pygoocanvas-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 4a0b6d1b9..d720c5fa5 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55936 2011-09-26 09:39:06Z spupykin $ +# $Id: PKGBUILD 56131 2011-10-02 08:08:49Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Franco Iacomella pkgname=synfig -pkgver=0.63.01 +pkgver=0.63.02 pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) @@ -17,7 +17,7 @@ replaces=('synfig-core') options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch) -md5sums=('2ff9271324c322266be048c4a0a22b5b' +md5sums=('4286d5e1887275107d760d1b678aec24' '2de5e74159a38e4b1788c20d4c4b6f68') build() { diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index b10b44c2d..cd9990a7d 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55938 2011-09-26 09:40:28Z spupykin $ +# $Id: PKGBUILD 56133 2011-10-02 08:10:11Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Franco Iacomella pkgname=synfigstudio -pkgver=0.63.01 +pkgver=0.63.02 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' 'xorg-fonts-misc' 'xorg-fonts-type1') install=synfigstudio.install source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('b77e3e8f449753dab07425d1d4460b72') +md5sums=('939595974cc56551fa89ae4f4dddbfb0') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD index 2d9e4f2e2..3204bd603 100644 --- a/community/tasks/PKGBUILD +++ b/community/tasks/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 45229 2011-04-18 13:02:11Z spupykin $ +# $Id: PKGBUILD 56135 2011-10-02 08:11:48Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Geoffroy Carrier # Contributor: lp76 pkgname=tasks pkgver=0.19 -pkgrel=1 +pkgrel=2 pkgdesc="A simple to do list application that uses libecal" arch=(i686 x86_64) url="http://pimlico-project.org/tasks.html" license=('GPL') -depends=('evolution-data-server>=2.32.0' 'xdg-utils' 'gtk2') +depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2') makedepends=('intltool') install=tasks.install source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index d0024d3f5..0ca32716f 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52510 2011-07-25 22:14:25Z spupykin $ +# $Id: PKGBUILD 56173 2011-10-02 20:43:18Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Denis Martinez pkgname=wt -pkgver=3.1.10 -pkgrel=3 +pkgver=3.1.11 +pkgrel=1 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" @@ -23,14 +23,11 @@ optdepends=('openssl: for SSL support in built-in webserver' 'mysql++: for the hangman example' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') -source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz - wt-boost-1.47.patch) -md5sums=('535945f48f479e74b893adf5b1a857b7' - '9374ca2e0af1e951d585872ffface805') +source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz) +md5sums=('0e1701db78a899d1f7e943098678cc7a') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Rp1 <$srcdir/wt-boost-1.47.patch mkdir -p build cd build cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index b263ff58b..e252bbe96 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136389 2011-08-28 17:30:33Z andyrtr $ +# $Id: PKGBUILD 139484 2011-10-02 07:11:06Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Mildred pkgname=claws-mail-extra-plugins pkgver=3.7.10 -pkgrel=1 +pkgrel=2 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.10') 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' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' 'perl: for perl plugin' @@ -32,15 +32,27 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-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) -md5sums=('fe782b2d4762c9727e22c1bb7979f7d6') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 + webkit1.6.1.patch) +md5sums=('fe782b2d4762c9727e22c1bb7979f7d6' + '8b94fa44072331b9c3926607eb42ba26') +sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf' + '8efd800617406dfe58a14422f243a678c582a90d') build() { cd "$srcdir/claws-mail-extra-plugins-$pkgver" + # fix for new webkit api + pushd fancy* + patch -Np0 -i ${srcdir}/webkit1.6.1.patch + popd + # fix for python2 export PYTHON="/usr/bin/python2" + # fix gdata plugin build + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure + for dir in */; do [[ $dir != geolocation_plugin-* ]] && ( cd $dir diff --git a/extra/claws-mail-extra-plugins/webkit1.6.1.patch b/extra/claws-mail-extra-plugins/webkit1.6.1.patch new file mode 100644 index 000000000..82bc5d062 --- /dev/null +++ b/extra/claws-mail-extra-plugins/webkit1.6.1.patch @@ -0,0 +1,106 @@ +--- src/fancy_viewer.c 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.c 2011-09-30 06:02:45.000000000 +0200 +@@ -83,8 +83,10 @@ + static void download_file_cb(GtkWidget *widget, FancyViewer *viewer); + #endif + +-/*FIXME substitute webkitwebsettings.cpp functions with their API when available */ +-gchar* webkit_web_view_get_selected_text(WebKitWebView* webView); ++#if !WEBKIT_CHECK_VERSION (1,5,1) ++gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view); ++#endif ++ + /*------*/ + static GtkWidget *fancy_get_widget(MimeViewer *_viewer) + { +@@ -243,6 +245,8 @@ + + gtk_print_unix_dialog_set_manual_capabilities(print_dialog, + GTK_PRINT_CAPABILITY_GENERATE_PS); ++ gtk_print_unix_dialog_set_manual_capabilities(print_dialog, ++ GTK_PRINT_CAPABILITY_PREVIEW); + + result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_hide (dialog); +@@ -293,7 +297,19 @@ + { + debug_print("fancy_get_selection\n"); + FancyViewer *viewer = (FancyViewer *) _viewer; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ gchar *sel = webkit_dom_range_get_text (viewer->range); ++#else + gchar *sel = webkit_web_view_get_selected_text(viewer->view); ++#endif + if (!viewer->view || strlen(sel) == 0) { + g_free(sel); + return NULL; +@@ -686,7 +702,15 @@ + debug_print("Clicked on Search on Web\n"); + if (webkit_web_view_has_selection(viewer->view)) { + gchar *search; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ gchar *tmp = webkit_dom_range_get_text (viewer->range); ++#else + gchar *tmp = webkit_web_view_get_selected_text(viewer->view); ++#endif + search = g_strconcat(GOOGLE_SEARCH, tmp, NULL); + webkit_web_view_open(viewer->view, search); + g_free(search); +@@ -896,7 +920,6 @@ + static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, + FancyViewer *viewer) + { +- /*FIXME hack..until webkit does not give the proper way to handle it*/ + Plugin *plugin = plugin_get_loaded_by_name("RSSyl"); + gtk_container_foreach(GTK_CONTAINER(menu), + (GtkCallback)viewer_menu_handler, +@@ -941,7 +964,19 @@ + if (webkit_web_view_can_copy_clipboard(view)) { + GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); + const gchar *sel_text; +- sel_text = (const gchar*)webkit_web_view_get_selected_text(view); ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range); ++#else ++ sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view); ++#endif + gtk_clipboard_set_text(wv_clipboard, sel_text, -1); + } + return FALSE; +--- src/fancy_viewer.h 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.h 2011-09-30 06:02:45.000000000 +0200 +@@ -113,6 +113,14 @@ + gint tag; + gint loading; + gint stop_previous; ++ ++ /* DOM Objects */ ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ WebKitDOMDocument *doc; ++ WebKitDOMDOMWindow *window; ++ WebKitDOMDOMSelection *selection; ++ WebKitDOMRange *range; ++#endif + }; + #define OPEN_INTERNAL FALSE + #define OPEN_EXTERNAL TRUE diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index ed65bc42a..18d6b3de3 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 131702 2011-07-13 15:39:40Z ibiru $ +# $Id: PKGBUILD 139493 2011-10-02 11:50:40Z ibiru $ # Maintainer: Jan de Groot pkgbase=gnome-python-extras -pkgname=('gnome-python-extras' 'python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') +pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') -makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'libgda' 'python2' 'pygtk' 'gnome-python') +makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2 gnome-python-extras-2.25.3-update-for-2.27.2.patch) @@ -24,7 +24,7 @@ build() { package_gnome-python-extras() { pkgdesc="Gnome Python interfaces for libraries not part of the core platform" - depends=('python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') + depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') cd "${srcdir}/gnome-python-extras-${pkgver}" make install-pkgconfigDATA DESTDIR="${pkgdir}" @@ -38,14 +38,6 @@ package_python2-egg(){ make -C egg install DESTDIR="${pkgdir}" } -package_python2-gda(){ - pkgdesc="Python bindings for interacting with gda" - depends=('libgda' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gda install DESTDIR="${pkgdir}" -} - package_python2-gksu2() { pkgdesc="Python bindings for the gksu2" depends=('libgksu' 'pygtk') diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD new file mode 100644 index 000000000..1af7a2b70 --- /dev/null +++ b/extra/liboauth/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 139509 2011-10-02 17:00:45Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Kaiting Chen +# Contributor: Martin Häger + +pkgname=liboauth +pkgver=0.9.4 +pkgrel=2 +pkgdesc='C library implementing OAuth Core RFC 5849' +arch=('i686' 'x86_64') +url='http://liboauth.sourceforge.net' +license=('MIT') +depends=('curl') +options=('!libtool') +source=("$url/pool/$pkgname-$pkgver.tar.gz") +sha256sums=('77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make + +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING.MIT "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index ba793daa7..eb16fa797 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136368 2011-08-27 23:37:57Z giovanni $ +# $Id: PKGBUILD 139517 2011-10-02 23:55:56Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ license=('GPL') depends=('python2') optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') -source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz - mercurial.profile) -md5sums=('0bda8040e2626e70d3d1a0654b0b03f2' +source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" + 'mercurial.profile') +md5sums=('f309b084aaf58773e9f4f4d66c49622a' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 863215a31..5cd10f758 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,66 +1,35 @@ -# $Id: PKGBUILD 136406 2011-08-29 07:32:55Z ibiru $ +# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $ # Maintainer: Jan de Groot -pkgbase=vte -pkgname=(vte vte3 vte-common) +pkgname=vte pkgver=0.28.2 -pkgrel=1 -pkgdesc="Virtual Terminal Emulator widget for use with" +pkgrel=2 +pkgdesc="Virtual Terminal Emulator widget for use with GTK2" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') -makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc') +depends=('gtk2' 'vte-common') +makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz) sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" - mkdir build-gtk2 - pushd build-gtk2 - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ --enable-introspection --with-gtk=2.0 \ --enable-gtk-doc make - popd - - mkdir build-gtk3 - pushd build-gtk3 - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vte \ - --localstatedir=/var --disable-static \ - --enable-introspection --with-gtk=3.0 \ - --enable-gtk-doc - make - popd } -package_vte(){ - pkgdesc+=" GTK2" - depends=('gtk2' 'vte-common') - cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk2 +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper } - -package_vte3(){ - pkgdesc+=" GTK3" - depends=('gtk3' 'vte-common') - cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3 - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper -} - -package_vte-common() { - pkgdesc="Common files used by vte and vte3" - cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3 - - make -C gnome-pty-helper DESTDIR="${pkgdir}" install -} diff --git a/staging/exiv2/PKGBUILD b/staging/exiv2/PKGBUILD new file mode 100644 index 000000000..1e1b8eb3c --- /dev/null +++ b/staging/exiv2/PKGBUILD @@ -0,0 +1,26 @@ +#$Id: PKGBUILD 139500 2011-10-02 12:29:57Z eric $ +# Maintainer: tobias + +pkgname=exiv2 +pkgver=0.22 +pkgrel=1 +pkgdesc="Exif and Iptc metadata manipulation library and tools" +arch=('i686' 'x86_64') +url="http://exiv2.org" +license=('GPL') +depends=('gcc-libs' 'zlib' 'expat') +options=('!libtool') +source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz") +md5sums=('84d7d5b1802529efca8ac3d6e6a97e3a') +sha1sums=('35211d853a986fe1b008fca14db090726e8dcce3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/geeqie/PKGBUILD b/staging/geeqie/PKGBUILD new file mode 100644 index 000000000..4d866be76 --- /dev/null +++ b/staging/geeqie/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 139502 2011-10-02 12:43:42Z eric $ +# Maintainer: Eric Bélanger +# Contributor: Lukas Jirkovsky + +pkgname=geeqie +pkgver=1.0 +pkgrel=6 +pkgdesc="A lightweight image browser and viewer (fork of GQview)" +arch=('i686' 'x86_64') +url="http://geeqie.sourceforge.net/" +license=('GPL3') +depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils') +makedepends=('intltool' 'doxygen' 'gnome-doc-utils') +optdepends=('librsvg: SVG rendering') +replaces=('gqview-devel') +install=geeqie.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('1d67ef990390224c5052697d93bb49c0') +sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/geeqie/geeqie.install b/staging/geeqie/geeqie.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/staging/geeqie/geeqie.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD new file mode 100644 index 000000000..1f88b9839 --- /dev/null +++ b/staging/gimp-ufraw/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 139504 2011-10-02 13:50:06Z eric $ +# Maintainer: Tobias Kieslich + +pkgname=gimp-ufraw +pkgver=0.18 +pkgrel=2 +pkgdesc="Standalone or gimp plugin converter for raw files" +url="http://ufraw.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils') +makedepends=('gimp' 'cinepaint') +optdepends=('gimp: to use the gimp import plugin for raw images' + 'cinepaint: to use the cinepaint import plugin for raw images') +install=gimp-ufraw.install +source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz) +md5sums=('454f40a402928998a82e2645d9265d96') +sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2') + +build() { + cd "${srcdir}/ufraw-${pkgver}" + + ./configure --prefix=/usr \ + --enable-extras \ + --enable-mime \ + --enable-openmp + sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile + make +} + +package() { + cd "${srcdir}/ufraw-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/bin/dcraw" +} diff --git a/staging/gimp-ufraw/gimp-ufraw.install b/staging/gimp-ufraw/gimp-ufraw.install new file mode 100644 index 000000000..80312d4a6 --- /dev/null +++ b/staging/gimp-ufraw/gimp-ufraw.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..ade7ee1d7 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 139515 2011-10-02 20:46:35Z stephane $ +# Maintainer: Stéphane Gaudreault + +pkgname=krb5 +pkgver=1.9.1 +pkgrel=4 +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.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar + krb5-kadmind + krb5-kdc + krb5-1.9.1-config-script.patch + krb5-1.9.1-canonicalize-fallback.patch) +sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + '238c268fa6cb42fc7324ab54db9abda5cd77f833') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # - Make krb5-config suppress CFLAGS output when called with --libs + # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 + # + # - Omit extra libraries because their interfaces are not exposed to applications + # by libkrb5, unless do_deps is set to 1, which indicates that the caller + # wants the whole list. + # + # Patch from upstream : + # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 + patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + + # FS#25515 + patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --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 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch new file mode 100644 index 000000000..e5a38498f --- /dev/null +++ b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch @@ -0,0 +1,58 @@ +diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c +--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 ++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 +@@ -470,13 +470,10 @@ + + /***** STATE_REFERRALS *****/ + +-/* +- * Possibly retry a request in the fallback realm after a referral request +- * failure in the local realm. Expects ctx->reply_code to be set to the error +- * from a referral request. +- */ ++/* Possibly try a non-referral request after a referral request failure. ++ * Expects ctx->reply_code to be set to the error from a referral request. */ + static krb5_error_code +-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) ++try_fallback(krb5_context context, krb5_tkt_creds_context ctx) + { + krb5_error_code code; + char **hrealms; +@@ -485,9 +482,10 @@ + if (ctx->referral_count > 1) + return ctx->reply_code; + +- /* Only fall back if the original request used the referral realm. */ ++ /* If the request used a specified realm, make a non-referral request to ++ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ + if (!krb5_is_referral_realm(&ctx->req_server->realm)) +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + + if (ctx->server->length < 2) { + /* We need a type/host format principal to find a fallback realm. */ +@@ -500,10 +498,10 @@ + if (code != 0) + return code; + +- /* Give up if the fallback realm isn't any different. */ ++ /* If the fallback realm isn't any different, use the existing TGT. */ + if (data_eq_string(ctx->server->realm, hrealms[0])) { + krb5_free_host_realm(context, hrealms); +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + } + + /* Rewrite server->realm to be the fallback realm. */ +@@ -540,9 +538,9 @@ + krb5_error_code code; + const krb5_data *referral_realm; + +- /* Possibly retry with the fallback realm on error. */ ++ /* Possibly try a non-referral fallback request on error. */ + if (ctx->reply_code != 0) +- return try_fallback_realm(context, ctx); ++ return try_fallback(context, ctx); + + if (krb5_principal_compare(context, ctx->reply_creds->server, + ctx->server)) { diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch new file mode 100644 index 000000000..a72a75edf --- /dev/null +++ b/testing/krb5/krb5-1.9.1-config-script.patch @@ -0,0 +1,27 @@ +diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in +--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 ++++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 +@@ -186,7 +186,7 @@ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ +- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` ++ -e 's#\$(CFLAGS)##'` + + if test $library = 'kdb'; then + lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" +@@ -214,9 +214,13 @@ + fi + + if test $library = 'krb5'; then +- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" ++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" + fi + ++ # If we ever support a flag to generate output suitable for static ++ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" ++ # here. ++ + echo $lib_flags + fi + diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/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 krb5-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 krb5-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 b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/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 -- cgit v1.2.3-54-g00ecf From 3567a49f79d2dbf828b723ab54982fa6c7ea1c80 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Oct 2011 23:14:30 +0000 Subject: Tue Oct 4 23:14:30 UTC 2011 --- community-staging/libgexiv2/PKGBUILD | 27 +++ community-staging/luminancehdr/PKGBUILD | 37 ++++ .../luminancehdr/luminancehdr.changelog | 33 ++++ .../luminancehdr/luminancehdr.install | 12 ++ community-staging/shotwell/PKGBUILD | 37 ++++ community-staging/shotwell/shotwell.install | 17 ++ community/gnome-packagekit/PKGBUILD | 8 +- community/hubbub/PKGBUILD | 26 +-- community/ldns/PKGBUILD | 30 ++- community/libgda4/PKGBUILD | 2 +- community/libparserutils/PKGBUILD | 23 +-- community/libzen/PKGBUILD | 11 +- community/lout/PKGBUILD | 24 +++ community/lout/lout.install | 9 + community/lout/makefile.arch | 45 +++++ community/mingw32-binutils/PKGBUILD | 11 +- community/mingw32-gcc-base/PKGBUILD | 40 ++-- community/mingw32-gcc/PKGBUILD | 20 +- community/mtpaint/PKGBUILD | 32 ++-- community/mtpaint/mtpaint.install | 14 ++ community/netsurf/PKGBUILD | 37 +++- community/netsurf/netsurf.desktop | 127 +++++++++++++ community/netsurf/netsurf.install | 20 ++ community/nginx/PKGBUILD | 6 +- community/redis/PKGBUILD | 6 +- community/redis/redis.d | 68 ++++--- core/inetutils/PKGBUILD | 42 +++-- core/inetutils/dnsdomainname | 3 + core/inetutils/domainname | 3 + core/krb5/PKGBUILD | 24 ++- core/krb5/krb5-1.9.1-canonicalize-fallback.patch | 58 ++++++ core/krb5/krb5-1.9.1-config-script.patch | 18 +- core/net-tools/PKGBUILD | 37 ++-- core/net-tools/net-tools-1.60-miiioctl.patch | 14 +- core/net-tools/net-tools.patch | 22 --- extra/abiword/PKGBUILD | 4 +- extra/clutter-gst/PKGBUILD | 6 +- extra/cups-pdf/PKGBUILD | 7 +- extra/digikam/PKGBUILD | 6 +- extra/enchant/PKGBUILD | 8 +- extra/fakechroot/PKGBUILD | 16 +- extra/fcitx/PKGBUILD | 6 +- extra/gdl/PKGBUILD | 6 +- extra/git/PKGBUILD | 16 +- extra/gnome-media/PKGBUILD | 7 +- extra/gnome-settings-daemon/PKGBUILD | 11 +- extra/gnome-settings-daemon/fix_color_crash.patch | 186 +++++++++++++++++++ extra/gnucash/PKGBUILD | 4 +- extra/gnumeric/PKGBUILD | 10 +- extra/goffice/PKGBUILD | 14 +- extra/goffice/use-apiver-for-dirs.patch | 32 ++++ extra/grilo-plugins/PKGBUILD | 13 +- extra/gssdp/PKGBUILD | 8 +- extra/gtk3/PKGBUILD | 11 +- extra/gupnp-av/PKGBUILD | 8 +- extra/gupnp/PKGBUILD | 10 +- extra/liblrdf/PKGBUILD | 17 +- extra/liblrdf/pkgconfig-raptor.patch | 9 + extra/libmowgli/PKGBUILD | 6 +- extra/mail-notification/PKGBUILD | 14 +- ...il-notification-5.4-evolution-3-0-support.patch | 54 +++++- .../mail-notification-5.4-gtk3-support.patch | 60 ++++-- extra/midori/PKGBUILD | 16 +- extra/midori/webkit_search.diff | 59 ++++++ extra/upower/PKGBUILD | 8 +- libre/file-roller-libre/PKGBUILD | 6 +- libre/file-roller-libre/file-roller.install | 1 - libre/file-roller-libre/rePKGBUILD | 2 +- libre/icecat/PKGBUILD | 8 +- libre/icecat/firefox-version.patch | 2 +- multilib/lib32-gdk-pixbuf2/PKGBUILD | 10 +- multilib/lib32-glib2/PKGBUILD | 13 +- staging/gnome-color-manager/PKGBUILD | 34 ++++ .../gnome-color-manager.install | 19 ++ staging/gthumb/PKGBUILD | 34 ++++ staging/gthumb/gthumb.install | 24 +++ staging/kdebase-runtime/PKGBUILD | 38 ++++ staging/kdebase-runtime/kdebase-runtime.install | 12 ++ staging/kdegraphics-gwenview/PKGBUILD | 32 ++++ .../kdegraphics-gwenview.install | 12 ++ staging/libkexiv2/PKGBUILD | 31 ++++ staging/strigi/PKGBUILD | 48 +++++ testing/avidemux/PKGBUILD | 120 ++++++++++++ .../avidemux/avidemux-2.5.4-x264-build115.patch | 45 +++++ testing/avidemux/avidemux.install | 11 ++ testing/cyrus-sasl/0003_saslauthd_mdoc.patch | 35 ++++ testing/cyrus-sasl/0010_maintainer_mode.patch | 19 ++ .../0011_saslauthd_ac_prog_libtool.patch | 15 ++ .../cyrus-sasl/0012_xopen_crypt_prototype.patch | 20 ++ .../0016_pid_file_lock_creation_mask.patch | 27 +++ testing/cyrus-sasl/0018_auth_rimap_quotes.patch | 35 ++++ testing/cyrus-sasl/0019_ldap_deprecated.patch | 22 +++ .../0022_gcc4.4_preprocessor_syntax.patch | 26 +++ testing/cyrus-sasl/0025_ld_as_needed.patch | 27 +++ .../0026_drop_krb5support_dependency.patch | 14 ++ testing/cyrus-sasl/0027_db5_support.patch | 24 +++ ...030-dont_use_la_files_for_opening_plugins.patch | 134 ++++++++++++++ testing/cyrus-sasl/PKGBUILD | 202 +++++++++++++++++++++ .../cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 +++++++++++++++++ .../cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch | 11 ++ .../cyrus-sasl-2.1.22-automake-1.10.patch | 94 ++++++++++ testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch | 71 ++++++++ testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch | 22 +++ .../cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 +++ testing/cyrus-sasl/saslauthd | 49 +++++ testing/cyrus-sasl/saslauthd.conf.d | 1 + testing/fakeroot/PKGBUILD | 35 ++++ testing/fakeroot/fakeroot.install | 14 ++ testing/ffmpeg/PKGBUILD | 54 ++++++ testing/gstreamer0.10-ugly/PKGBUILD | 43 +++++ testing/libsasl/0003_saslauthd_mdoc.patch | 35 ++++ testing/libsasl/0010_maintainer_mode.patch | 19 ++ .../libsasl/0011_saslauthd_ac_prog_libtool.patch | 15 ++ testing/libsasl/0012_xopen_crypt_prototype.patch | 20 ++ .../libsasl/0016_pid_file_lock_creation_mask.patch | 27 +++ testing/libsasl/0018_auth_rimap_quotes.patch | 35 ++++ testing/libsasl/0019_ldap_deprecated.patch | 22 +++ .../libsasl/0022_gcc4.4_preprocessor_syntax.patch | 26 +++ testing/libsasl/0025_ld_as_needed.patch | 27 +++ .../libsasl/0026_drop_krb5support_dependency.patch | 14 ++ testing/libsasl/0027_db5_support.patch | 24 +++ ...030-dont_use_la_files_for_opening_plugins.patch | 134 ++++++++++++++ testing/libsasl/PKGBUILD | 202 +++++++++++++++++++++ testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 +++++++++++++++++ testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch | 11 ++ .../libsasl/cyrus-sasl-2.1.22-automake-1.10.patch | 94 ++++++++++ testing/libsasl/cyrus-sasl-2.1.22-crypt.patch | 71 ++++++++ testing/libsasl/cyrus-sasl-2.1.22-qa.patch | 22 +++ testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 +++ testing/libsasl/saslauthd | 49 +++++ testing/libsasl/saslauthd.conf.d | 1 + testing/mpfr/PKGBUILD | 36 ++++ testing/mpfr/mpfr.install | 20 ++ testing/opal/PKGBUILD | 27 +++ testing/rubberband/PKGBUILD | 41 +++++ testing/rubberband/gcc46.patch | 10 + testing/rubberband/vectorops.patch | 13 ++ testing/vlc/PKGBUILD | 73 ++++++++ testing/vlc/vlc.install | 18 ++ testing/x264/PKGBUILD | 31 ++++ 140 files changed, 4238 insertions(+), 346 deletions(-) create mode 100644 community-staging/libgexiv2/PKGBUILD create mode 100644 community-staging/luminancehdr/PKGBUILD create mode 100644 community-staging/luminancehdr/luminancehdr.changelog create mode 100644 community-staging/luminancehdr/luminancehdr.install create mode 100644 community-staging/shotwell/PKGBUILD create mode 100644 community-staging/shotwell/shotwell.install create mode 100644 community/lout/PKGBUILD create mode 100755 community/lout/lout.install create mode 100644 community/lout/makefile.arch create mode 100644 community/mtpaint/mtpaint.install create mode 100644 community/netsurf/netsurf.desktop create mode 100644 community/netsurf/netsurf.install create mode 100644 core/inetutils/dnsdomainname create mode 100644 core/inetutils/domainname create mode 100644 core/krb5/krb5-1.9.1-canonicalize-fallback.patch create mode 100644 extra/gnome-settings-daemon/fix_color_crash.patch create mode 100644 extra/goffice/use-apiver-for-dirs.patch create mode 100644 extra/liblrdf/pkgconfig-raptor.patch create mode 100644 extra/midori/webkit_search.diff create mode 100644 staging/gnome-color-manager/PKGBUILD create mode 100644 staging/gnome-color-manager/gnome-color-manager.install create mode 100644 staging/gthumb/PKGBUILD create mode 100644 staging/gthumb/gthumb.install create mode 100644 staging/kdebase-runtime/PKGBUILD create mode 100644 staging/kdebase-runtime/kdebase-runtime.install create mode 100644 staging/kdegraphics-gwenview/PKGBUILD create mode 100644 staging/kdegraphics-gwenview/kdegraphics-gwenview.install create mode 100644 staging/libkexiv2/PKGBUILD create mode 100644 staging/strigi/PKGBUILD create mode 100644 testing/avidemux/PKGBUILD create mode 100644 testing/avidemux/avidemux-2.5.4-x264-build115.patch create mode 100644 testing/avidemux/avidemux.install create mode 100644 testing/cyrus-sasl/0003_saslauthd_mdoc.patch create mode 100644 testing/cyrus-sasl/0010_maintainer_mode.patch create mode 100644 testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch create mode 100644 testing/cyrus-sasl/0012_xopen_crypt_prototype.patch create mode 100644 testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch create mode 100644 testing/cyrus-sasl/0018_auth_rimap_quotes.patch create mode 100644 testing/cyrus-sasl/0019_ldap_deprecated.patch create mode 100644 testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch create mode 100644 testing/cyrus-sasl/0025_ld_as_needed.patch create mode 100644 testing/cyrus-sasl/0026_drop_krb5support_dependency.patch create mode 100644 testing/cyrus-sasl/0027_db5_support.patch create mode 100644 testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch create mode 100644 testing/cyrus-sasl/PKGBUILD create mode 100644 testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch create mode 100644 testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch create mode 100644 testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch create mode 100644 testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch create mode 100644 testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch create mode 100644 testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 testing/cyrus-sasl/saslauthd create mode 100644 testing/cyrus-sasl/saslauthd.conf.d create mode 100644 testing/fakeroot/PKGBUILD create mode 100644 testing/fakeroot/fakeroot.install create mode 100644 testing/ffmpeg/PKGBUILD create mode 100644 testing/gstreamer0.10-ugly/PKGBUILD create mode 100644 testing/libsasl/0003_saslauthd_mdoc.patch create mode 100644 testing/libsasl/0010_maintainer_mode.patch create mode 100644 testing/libsasl/0011_saslauthd_ac_prog_libtool.patch create mode 100644 testing/libsasl/0012_xopen_crypt_prototype.patch create mode 100644 testing/libsasl/0016_pid_file_lock_creation_mask.patch create mode 100644 testing/libsasl/0018_auth_rimap_quotes.patch create mode 100644 testing/libsasl/0019_ldap_deprecated.patch create mode 100644 testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch create mode 100644 testing/libsasl/0025_ld_as_needed.patch create mode 100644 testing/libsasl/0026_drop_krb5support_dependency.patch create mode 100644 testing/libsasl/0027_db5_support.patch create mode 100644 testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch create mode 100644 testing/libsasl/PKGBUILD create mode 100644 testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch create mode 100644 testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch create mode 100644 testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch create mode 100644 testing/libsasl/cyrus-sasl-2.1.22-crypt.patch create mode 100644 testing/libsasl/cyrus-sasl-2.1.22-qa.patch create mode 100644 testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 testing/libsasl/saslauthd create mode 100644 testing/libsasl/saslauthd.conf.d create mode 100644 testing/mpfr/PKGBUILD create mode 100644 testing/mpfr/mpfr.install create mode 100644 testing/opal/PKGBUILD create mode 100644 testing/rubberband/PKGBUILD create mode 100644 testing/rubberband/gcc46.patch create mode 100644 testing/rubberband/vectorops.patch create mode 100644 testing/vlc/PKGBUILD create mode 100644 testing/vlc/vlc.install create mode 100644 testing/x264/PKGBUILD (limited to 'community-staging') diff --git a/community-staging/libgexiv2/PKGBUILD b/community-staging/libgexiv2/PKGBUILD new file mode 100644 index 000000000..e62d02948 --- /dev/null +++ b/community-staging/libgexiv2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 56205 2011-10-03 12:12:51Z ibiru $ +# Maintainer: Ionut Biru + +pkgname=libgexiv2 +pkgver=0.3.1 +pkgrel=1 +pkgdesc="GObject-based wrapper around the Exiv2 library." +arch=('i686' 'x86_64') +url="http://trac.yorba.org/wiki/gexiv2" +license=('GPL2') +depends=('exiv2' 'glib2') +options=('!libtool') +source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('828894bb4bcb4625820b8c0c468417e9cd8c5c2f') + +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/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD new file mode 100644 index 000000000..c0203a584 --- /dev/null +++ b/community-staging/luminancehdr/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 56253 2011-10-03 20:21:53Z ebelanger $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Lukas Jirkovsky +# Contributor: Dmitry N. Shilov + +pkgname=luminancehdr +pkgver=2.1.0 +pkgrel=2 +pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' +arch=('i686' 'x86_64') +url='http://qtpfsgui.sourceforge.net/' +license=('GPL') +depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt') +optdepends=('hugin: align image stack functionality') +install=$pkgname.install +changelog=$pkgname.changelog +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz) +sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac') + +build() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + if [ ${CARCH} = i686 ]; then + sed -i 's/ -msse2//' project.pro + fi + + lrelease project.pro + qmake PREFIX=/usr + make +} + +package() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog new file mode 100644 index 000000000..378053ef5 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.changelog @@ -0,0 +1,33 @@ +2011-08-21 Jaroslav Lichtblau + * luminancehdr 2.1.0-1 + +2011-05-01 Jaroslav Lichtblau + * luminancehdr 2.0.2-1 + +2010-10-19 Jaroslav Lichtblau + * exiv2 0.20 rebuild + +2010-10-17 Jaroslav Lichtblau + * Update to major release 2.0.1 + +2010-06-27 Jaroslav Lichtblau + * Package renamed to LuminanceHDR + * Update to major release 2.0.0 + +2010-03-09 Andrea Scarpino + * exiv2 0.19 rebuild + +2009-11-02 Biru Ionut + * add translation and fix segfault on old i686 procesors + +2009-04-29 Jaroslav Lichtblau + * Update to major release v1.9.3 + +2009-04-04 Jaroslav Lichtblau + * Minor version (v1.9.2-3) update caused by exiv2 upgrade. + +2008-11-04 Jaroslav Lichtblau + * Minor version (v1.9.2-2) update caused by openexr upgrade. + +2008-09-17 Jaroslav Lichtblau + * Package moved to [community] diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install new file mode 100644 index 000000000..279762804 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/shotwell/PKGBUILD b/community-staging/shotwell/PKGBUILD new file mode 100644 index 000000000..e24a323c7 --- /dev/null +++ b/community-staging/shotwell/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 56227 2011-10-03 15:36:43Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer : Ionut Biru +# Contributor: Joeny Ang + +pkgname=shotwell +pkgver=0.11.2 +pkgrel=2 +pkgdesc="A digital photo organizer designed for the GNOME desktop environment" +arch=('i686' 'x86_64') +url="http://yorba.org/shotwell/" +license=('LGPL2.1') +depends=('gconf' 'libgee' 'libgphoto2' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' + 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') +makedepends=('intltool' 'vala') +install=shotwell.install +source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" + "http://arch.p5n.pp.ru/~sergej/dl/shotwell-gtk3.patch.gz") +md5sums=('bbb479eaa4bbcf67d8ff454b406ed249' + 'e9ac0d9d818242220f0f788c493e453d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/shotwell-gtk3.patch + ./configure --prefix=/usr \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ + --disable-schemas-install \ + --disable-desktop-update \ + --disable-icon-update + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled +} diff --git a/community-staging/shotwell/shotwell.install b/community-staging/shotwell/shotwell.install new file mode 100644 index 000000000..bab8ecd29 --- /dev/null +++ b/community-staging/shotwell/shotwell.install @@ -0,0 +1,17 @@ +pkgname=shotwell + +post_install() { + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + update-desktop-database -q + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 935654838..d8346219c 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 56112 2011-10-01 19:02:07Z ibiru $ +# $Id: PKGBUILD 56182 2011-10-03 06:12:55Z jconder $ # Maintainer: Jonathan Conder pkgname=gnome-packagekit pkgver=3.2.0 -pkgrel=1 +pkgrel=2 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') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' + 'packagekit') makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') optdepends=('gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index 7036b3242..f7adf9934 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 52652 2011-07-26 19:12:51Z ebelanger $ +# $Id: PKGBUILD 56215 2011-10-03 14:01:41Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Daniel J Griffiths # Contributor: Paulo Matias -# Maintainer: Daniel J Griffiths - pkgname=hubbub -pkgver=0.1.0 +pkgver=0.1.1 pkgrel=1 pkgdesc="HTML5 compliant parsing library" -arch=('i686' 'x86_64') -url="http://www.netsurf-browser.org/projects/hubbub" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/projects/hubbub/" license=('MIT') -depends=('glibc' 'libparserutils') +depends=('libparserutils') source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('9d7bb287bd5f993902c577ce3503f6d5') +md5sums=('98f49be58e228010c88381bc39f39e19') build() { - cd "${srcdir}/${pkgname}-${pkgver}-src" - sed -i 's/-Werror//' Makefile + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's:-Werror::' Makefile make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "${srcdir}/${pkgname}-${pkgver}-src" + cd "${srcdir}/${pkgname}-${pkgver}" + make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD index df63e9f89..6e28bc429 100644 --- a/community/ldns/PKGBUILD +++ b/community/ldns/PKGBUILD @@ -1,9 +1,11 @@ +# $Id: PKGBUILD 56190 2011-10-03 10:19:02Z bisson $ + # Maintainer: Gaetan Bisson # Contributor: jiribb and # Contributor: mathieui pkgname=ldns -pkgver=1.6.10 +pkgver=1.6.11 pkgrel=1 pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill' arch=('i686' 'x86_64') @@ -14,24 +16,36 @@ makedepends=('libpcap') optdepends=('libpcap: ldns-dpa tool') options=('!libtool') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4') +sha1sums=('2c4537eee39a1af63e8dde4f35498ce78c968c1f') build() { + cd "${srcdir}/${pkgname}-${pkgver}" + _conf='--prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --disable-rpath' + _tmp="$(mktemp -d)" - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure $_conf + ./configure ${_conf} + make + make DESTDIR="${_tmp}" install + + cd drill + ./configure ${_conf} --with-ldns="${_tmp}" + make + + cd ../examples + ./configure ${_conf} --with-ldns="${_tmp}" make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" cd drill - ./configure $_conf --with-ldns="${pkgdir}" - make make DESTDIR="${pkgdir}" install cd ../examples - ./configure $_conf --with-ldns="${pkgdir}" - make make DESTDIR="${pkgdir}" install } diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD index 9c2580c99..eabda7cc4 100644 --- a/community/libgda4/PKGBUILD +++ b/community/libgda4/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56164 2011-10-02 14:06:33Z jelle $ +# $Id: PKGBUILD 56183 2011-10-03 07:07:15Z jelle $ # Maintainer: tobias # Contributor: Tobias Kieslich diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD index 9c7f3358e..e9cd85e1b 100644 --- a/community/libparserutils/PKGBUILD +++ b/community/libparserutils/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 52548 2011-07-26 04:43:08Z bfanella $ +# $Id: PKGBUILD 56213 2011-10-03 13:57:53Z arodseth $ # Maintainer: Brad Fanella # Contributor: Paulo Matias # Contributor: Daniel J Griffiths - pkgname=libparserutils -pkgver=0.1.0 -pkgrel=2 +pkgver=0.1.1 +pkgrel=1 pkgdesc="Library for building efficient parsers" -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') url="http://www.netsurf-browser.org/projects/libparserutils" license=('MIT') source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('eb415317925a0fb12a4ff8f849d2fe92') +depends=('glibc') +md5sums=('4f228516863de33f33f7f4258315867e') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/-Wall/ /' -i Makefile + sed 's:-Wall::' -i Makefile make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "${srcdir}/${pkgname}-${pkgver}" make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING - + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 26c4a07da..39097ffc6 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 50993 2011-07-04 11:24:03Z spupykin $ +# $Id: PKGBUILD 56229 2011-10-03 15:41:17Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: hydro pkgname=libzen -pkgver=0.4.20 +pkgver=0.4.22 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64') @@ -13,14 +13,13 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('8211cc2ca8500c6af14600363be064d5') +md5sums=('f44a39e783ceafe71cd3e7dde8a81e22') build() { cd $srcdir/ZenLib/Project/GNU/Library - sh ./autogen - ./configure --prefix=/usr --enable-shared + [ -x configure ] || sh ./autogen + [ -f Makefile ] || ./configure --prefix=/usr --enable-shared make clean - sed -i '1,1i#include ' ../../../Source/ZenLib/Thread.h make } diff --git a/community/lout/PKGBUILD b/community/lout/PKGBUILD new file mode 100644 index 000000000..71aa6f957 --- /dev/null +++ b/community/lout/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 56257 2011-10-04 00:41:28Z kkeen $ +# Maintainer: Kyle Keen +# Contributor: catwell + +pkgname=lout +pkgver=3.39 +pkgrel=1 +pkgdesc="A lightweight document formatting system." +arch=('i686' 'x86_64') +url="http://lout.wiki.sourceforge.net/" +license=('GPL') +depends=('glibc') +install=lout.install +source=(http://mirrors.ctan.org/support/$pkgname/$pkgname-$pkgver.tar.gz makefile.arch lout.install) +md5sums=('151e1fba676c7052936ccc1bcd9663a9' + '088a29ca16477a9a30da9fafc9391de8' + 'bc6c8df650fe75dd3c51d0c047c56f30') + +build() { + cd "$srcdir/$pkgname-$pkgver" + cp ../makefile.arch . + make -f makefile.arch PKGDIR="$pkgdir" install +} + diff --git a/community/lout/lout.install b/community/lout/lout.install new file mode 100755 index 000000000..f05b4b601 --- /dev/null +++ b/community/lout/lout.install @@ -0,0 +1,9 @@ +post_install() +{ + /usr/bin/lout -x -s /usr/lib/lout/include/init +} + +post_upgrade() +{ + post_install $1 +} diff --git a/community/lout/makefile.arch b/community/lout/makefile.arch new file mode 100644 index 000000000..e0cb63322 --- /dev/null +++ b/community/lout/makefile.arch @@ -0,0 +1,45 @@ +# Makefile for lout 3.38 on Arch Linux. +# catwell + +PKGDIR = / +COPTS = -ansi -pedantic -O3 + +CFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 \ + -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"/usr/lib/lout\" -DFONT_DIR=\"font\" \ + -DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" -DHYPH_DIR=\"hyph\" \ + -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=0 \ + -DASSERT_ON=1 $(COPTS) -DDEBUG_ON=0 -DPDF_COMPRESSION=1 -I/usr/lib/ + +OBJS = z01.o z02.o z03.o z04.o z05.o z06.o z07.o z08.o \ + z09.o z10.o z11.o z12.o z13.o z14.o z15.o z16.o \ + z17.o z18.o z19.o z20.o z21.o z22.o z23.o z24.o \ + z25.o z26.o z27.o z28.o z29.o z30.o z31.o z32.o \ + z33.o z34.o z35.o z36.o z37.o z38.o z39.o z40.o \ + z41.o z42.o z43.o z44.o z45.o z46.o z47.o z48.o \ + z49.o z50.o z51.o z52.o + +arch: $(OBJS) + gcc -o lout $(OBJS) /usr/lib/libz.a -lm + gcc -o prg2lout prg2lout.c + +$(OBJS): externs.h + +externs.h: + +install: arch + # lout + install -Dm0755 lout $(PKGDIR)/usr/bin/lout + set include data hyph font maps; \ + for i; do \ + install -d $(PKGDIR)/usr/lib/lout/$$i; \ + install -m0644 -t $(PKGDIR)/usr/lib/lout/$$i/ $$i/*; \ + done + # prg2lout + install -Dm0755 prg2lout $(PKGDIR)/usr/bin/prg2lout + # man + sed -i -e "s@@/usr/bin@" -e "s@@/usr/lib/lout@" \ + -e "s@@/usr/doc/lout@" -e "s@@/usr/share/man/man1@" \ + man/lout.1 + install -Dm0644 man/lout.1 $(PKGDIR)/usr/share/man/man1/lout.1 + install -Dm0644 man/prg2lout.1 $(PKGDIR)/usr/share/man/man1/prg2lout.1 + diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD index 2ead06c5e..579c48920 100644 --- a/community/mingw32-binutils/PKGBUILD +++ b/community/mingw32-binutils/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 36142 2010-12-27 16:21:38Z spupykin $ +# $Id: PKGBUILD 56192 2011-10-03 10:54:36Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Ondrej Jirman # Contributor: mosra pkgname=mingw32-binutils -pkgver=2.21 +pkgver=2.21.53 pkgrel=1 +_uprel=1 arch=(i686 x86_64) url="https://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GNU-Binutils/" pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)" depends=('glibc' 'zlib') license=(GPL) -source=(https://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-$pkgver/binutils-$pkgver-2-mingw32-src.tar.lzma) -md5sums=('f75122b3d253cc9054dc82d90c10455a') +source=(https://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma) +md5sums=('e7f6602056f594acc9a4a559909d4649') build() { - tar --lzma -xf binutils-$pkgver-2-mingw32-src.tar.lzma + tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma cd $srcdir/binutils-$pkgver ./configure \ --target=i486-mingw32 \ diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 43ef4c491..4cfca514e 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,40 +1,43 @@ -# $Id: PKGBUILD 23584 2010-08-13 11:57:37Z spupykin $ +# $Id: PKGBUILD 56196 2011-10-03 10:57:31Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Ondrej Jirman pkgname=mingw32-gcc-base -pkgver=4.5.0 -_w32apiver=3.14 -_runtimever=3.18 -pkgrel=3 +pkgver=4.6.1 +_w32apiver=3.17 +_runtimever=3.20 +_uprel=2 +_upw32rel=1 +pkgrel=1 arch=(i686 x86_64) pkgdesc="A C cross-compiler for building Windows executables on Linux" depends=(mingw32-binutils) makedepends=(p7zip mingw32-runtime mingw32-w32api) conflicts=(mingw32-gcc) -options=(!strip force) +options=(!strip) license=(GPL LGPL) url="http://mingw.sf.net" -source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma - http://switch.dl.sf.net/sourceforge/mingw/w32api-${_w32apiver}-mingw32-src.tar.gz - http://switch.dl.sf.net/sourceforge/mingw/mingwrt-${_runtimever}-mingw32-src.tar.gz) -md5sums=('f279430018dc379b8184c0a18b280298' - 'c31baedaf2a8d38874e056a112a4fbc8' - '34b54cb3379f871f0dcd5c20b69b0350') +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz) +md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' + '89e5800096aa334009f98e7c1743d825' + '26c0886cc60729b94956cc6d81cd076c') build() { if [ $NOEXTRACT -ne 1 ]; then # prepare headers mkdir -p $srcdir/mingw/include/ - cp -r $srcdir/w32api-${_w32apiver}-mingw32/include/* \ + cp -r $srcdir/w32api-${_w32apiver}-${_upw32rel}-mingw32/include/* \ $srcdir/mingwrt-${_runtimever}-mingw32/include/* \ $srcdir/mingw/include/ unset CFLAGS CXXFLAGS - tar xJf gcc-$pkgver-1-mingw32-src.tar.xz - tar xjf gcc-$pkgver.tar.bz2 +# tar xJf gcc-$pkgver-${_uprel}-mingw32-src.tar.xz + cd $srcdir + tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 mkdir -p $srcdir/build cd $srcdir/build @@ -55,14 +58,13 @@ build() --disable-libssp \ --disable-libgomp \ --with-build-sysroot=$srcdir \ - --with-headers=$srcdir/include \ - || return 1 + --with-headers=$srcdir/include else cd $srcdir/build fi - make || return 1 - make install DESTDIR=$pkgdir || return 1 + make + make install DESTDIR=$pkgdir cd $pkgdir rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index da32ebb86..ba58fdddd 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 50734 2011-06-30 10:31:04Z spupykin $ +# $Id: PKGBUILD 56194 2011-10-03 10:55:24Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Ondrej Jirman pkgname=mingw32-gcc -pkgver=4.5.2 -pkgrel=4 +pkgver=4.6.1 +pkgrel=1 +_uprel=2 arch=(i686 x86_64) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api' @@ -14,13 +15,12 @@ provides=('mingw32-gcc-base') options=(!strip) url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" license=(GPL LGPL) -source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma) -md5sums=('6df4174d78285ec58910f86217b8acb1') +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma) +md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e') build() { - [ $NOEXTRACT -eq 1 ] || tar xJf gcc-$pkgver-1-mingw32-src.tar.xz - [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver.tar.bz2 + [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 mkdir -p $srcdir/build cd $srcdir/build @@ -56,9 +56,11 @@ build() make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install msg "fixes" + cd $pkgdir/usr/i486-mingw32/lib mkdir -p $pkgdir/usr/i486-mingw32/bin/ - mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/ - mv $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/ + for i in `ls -1 *.dll`; do + ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i + done cd $pkgdir rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index bebd0c820..12a07818c 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 55362 2011-09-10 10:56:06Z pschmitz $ -# Maintainer: +# $Id: PKGBUILD 56207 2011-10-03 12:32:35Z arodseth $ +# Maintainer: Alexander Rødseth # Contributor: Roman Kyrylych # Contributor: yosh64 - - pkgname=mtpaint pkgver=3.31 -pkgrel=5 -pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork." -arch=('i686' 'x86_64') -url="http://mtpaint.sourceforge.net" -license=('GPL') -depends=('gtk2' 'giflib' 'openjpeg') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - libpng14.patch) +pkgrel=6 +pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork" +arch=('x86_64' 'i686') +url="http://mtpaint.sourceforge.net/" +license=('GPL3') +depends=('gtk2' 'giflib' 'openjpeg' 'bzip2' 'desktop-file-utils' 'glib2' 'freetype2') +install=mtpaint.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + "libpng14.patch" + "mtpaint.install") md5sums=('fbe34eb25f96b6092403115f1f6ab387' - 'f84245ae1e26bd734740306b09024bb8') + 'f84245ae1e26bd734740306b09024bb8' + '1bd546a8efeae01e8fd8a5c7f213012e') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -29,4 +30,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + install -Dm644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } + +# vim:set ts=2 sw=2 et: + diff --git a/community/mtpaint/mtpaint.install b/community/mtpaint/mtpaint.install new file mode 100644 index 000000000..b44de11aa --- /dev/null +++ b/community/mtpaint/mtpaint.install @@ -0,0 +1,14 @@ +post_install() { + post_upgrade +} + +post_upgrade() { + echo "Updating desktop database" + update-desktop-database -q +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index 18fa5992a..3b9e35c4f 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,26 +1,45 @@ -# $Id: PKGBUILD 52915 2011-07-29 20:04:25Z ebelanger $ +# $Id: PKGBUILD 56237 2011-10-03 16:13:35Z arodseth $ +# Maintainer: Alexander Rødseth # Contributor: Paulo Matias # Contributor: Georgij Kondratjev -# Maintainer: Daniel J Griffiths - +# Contributor: Daniel J Griffiths pkgname=netsurf -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc="Lightweight, fast web browser" -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') url="http://www.netsurf-browser.org/" license=('GPL') -depends=('libmng' 'librsvg' 'curl' 'libglade' 'libcss' 'libnsgif' 'libnsbmp' 'hubbub') -makedepends=('lcms') -source=("http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('52939f2e2319269d7d758ec665f6cb8e') +depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub') +makedepends=('re2c' 'lcms') +provides=('netsurf') +conflicts=('netsurf') +install=("${pkgname}.install") +source=("${pkgname}.desktop" + "${pkgname}.install" + "http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz") +md5sums=('85e0af265e77607596fd90db9ac707ad' + '69445d7ccf7df8c7ff134f04f36342b0' + '4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a') build() { cd "${srcdir}/${pkgname}" + make PREFIX=/usr TARGET=gtk } package() { cd "${srcdir}/${pkgname}" + make install PREFIX=/usr DESTDIR="${pkgdir}" + install -Dm644 "../icon_48x48_netsurf.png" \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "../${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/community/netsurf/netsurf.desktop b/community/netsurf/netsurf.desktop new file mode 100644 index 000000000..aca4deefc --- /dev/null +++ b/community/netsurf/netsurf.desktop @@ -0,0 +1,127 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Netsurf +Name[ar]=صافي تصفح +Name[ast]=Netsurf +Name[ca]=Netsurf +Name[cs]=Netsurf +Name[da]=Netsurf +Name[de]=Netsurf +Name[el]=καθαρού σερφ +Name[en_GB]=Netsurf +Name[es]=Netsurf +Name[et]=Netsurf +Name[fi]=Netsurf +Name[fr]=Netsurf +Name[gl]=Netsurf +Name[he]=Netsurf +Name[hr]=Netsurf +Name[hu]=Netsurf +Name[id]=Netsurf +Name[it]=Netsurf +Name[ja]=Netsurf +Name[ko]=인터넷 서핑 +Name[lt]=Netsurf +Name[nl]=Netsurf +Name[no]=Netsurf +Name[pl]=Netsurf +Name[pt]=Netsurf +Name[pt_BR]=Netsurf +Name[ro]=Netsurf +Name[ru]=Netsurf +Name[sk]=Netsurf +Name[sr]=нетсурф +Name[sr@latin]=Netsurf +Name[sv]=Netsurf +Name[tr]=Netsurf +Name[ug]=Netsurf +Name[uk]=Інтернет серфінгу +Name[zh_CN]=Netsurf 网冲浪 +Name[zh_TW]=Netsurf 網衝浪 +GenericName=Web Browser +GenericName[ar]=متصفح الوب +GenericName[ast]=Restolador +GenericName[ca]=Navegador web +GenericName[cs]=Internetový prohlížeč +GenericName[da]=Webbrowser +GenericName[de]=Internetbetrachter +GenericName[el]=Περιηγητής Ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=Verkkoselain +GenericName[fr]=Navigateur Internet +GenericName[gl]=Navegador web +GenericName[he]=דפדפן +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[id]=Peramban Web +GenericName[it]=Browser web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Interneto naršyklė +GenericName[nl]=Webbrowser +GenericName[no]=Nettleser +GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ +GenericName[pl]=Przeglądarka internetowa +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador web +GenericName[ro]=Navigator web +GenericName[ru]=Интернет-обозреватель +GenericName[sk]=Internetový prehliadač +GenericName[sr]=Интернет прегледник +GenericName[sr@latin]=Internet preglednik +GenericName[sv]=Webbläsare +GenericName[tr]=Web Tarayıcı +GenericName[ug]=توركۆرگۈ +GenericName[uk]=Переглядач Веб +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +Comment=Lightweight web browser +Comment[ar]=منصفح الوب الخفيف +Comment[ast]=Restolador llixeru +Comment[ca]=Navegador web lleuger +Comment[cs]=Odlehčený prohlížeč +Comment[da]=Letvægtig webbrowser +Comment[de]=Schlanker Internetbetrachter +Comment[el]=Ελαφρύς περιηγητής ιστού +Comment[en_GB]=Lightweight web browser +Comment[es]=Navegador web ligero +Comment[et]=Kergekaaluline veebibrauser +Comment[fi]=Kevyt verkkoselain +Comment[fr]=Navigateur Internet léger +Comment[gl]=Navegador web lixeiro +Comment[he]=דפדפן קל משקל +Comment[hr]=Lagani web preglednik +Comment[hu]=Könnyűsúlyú webböngésző +Comment[id]=Peramban web ringan +Comment[it]=Browser web leggero +Comment[ja]=軽量級ウェブブラウザ +Comment[ko]=가벼운 웹 브라우저 +Comment[lt]=Paprasta interneto naršyklė +Comment[nl]=Lichtgewicht webbrowser +Comment[no]=Lettvektig nettleser +Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ +Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej +Comment[pt]=Navegador Web rápido +Comment[pt_BR]=Navegador web leve +Comment[ro]=Mic navigator web +Comment[ru]=Легковесный Интернет-обозреватель +Comment[sk]=Ľahký internetový prehliadač +Comment[sr]=Једноставан Интернет прегледник +Comment[sr@latin]=Jednostavan Internet preglednik +Comment[sv]=Resurssnål webbläsare +Comment[tr]=Hafif web tarayıcı +Comment[ug]=يېنىك توركۆرگۈ +Comment[uk]=Легкий переглядач Веб +Comment[zh_CN]=轻量级网页浏览器 +Comment[zh_TW]=輕量級網頁瀏覽器 +Categories=GTK;Network;WebBrowser; +MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; +Exec=netsurf %U +Icon=netsurf +Terminal=false +StartupNotify=true +X-Osso-Type=application/x-executable +X-Osso-Service=netsurf diff --git a/community/netsurf/netsurf.install b/community/netsurf/netsurf.install new file mode 100644 index 000000000..fb5b06997 --- /dev/null +++ b/community/netsurf/netsurf.install @@ -0,0 +1,20 @@ +post_install() { + echo "Updating icon cache" + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + echo "Updating mime entries" + update-desktop-database -q +} + +post_upgrade() { + echo "Updating icon cache" + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + echo "Updating mime entries" + update-desktop-database -q +} + +post_remove() { + echo "Updating icon cache" + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + echo "Updating mime entries" + update-desktop-database -q +} diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index c03032002..e5d40753d 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56085 2011-09-30 23:18:02Z spupykin $ +# $Id: PKGBUILD 56187 2011-10-03 07:27:47Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Miroslaw Szot @@ -11,7 +11,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') @@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" changelog=changelog source=(http://nginx.org/download/nginx-$pkgver.tar.gz nginx) -md5sums=('2a63d20301b924fa44c7d02586ae7ade' +md5sums=('1049e5fc6e80339f6ba8668fadfb75f9' '0e8032d3ba26c3276e8c7c30588d375f') build() { diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 4fd24a269..ebcbab11a 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55934 2011-09-26 09:37:58Z spupykin $ +# $Id: PKGBUILD 56203 2011-10-03 11:01:21Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis pkgver=2.2.14 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" @@ -19,7 +19,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") md5sums=('3605e3d4c9465fdfefa2e96f3a408ef5' - 'bf61968d18d0e42529880f5c488ea9ed' + '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') build() { diff --git a/community/redis/redis.d b/community/redis/redis.d index 333f45d6b..3294963ed 100644 --- a/community/redis/redis.d +++ b/community/redis/redis.d @@ -1,53 +1,65 @@ #!/bin/bash +daemon_name=redis + . /etc/rc.conf . /etc/rc.d/functions -PID=`cat /var/run/redis.pid 2>/dev/null` +REDISPORT=6379 +EXEC=/usr/bin/redis-server +CLIEXEC=/usr/bin/redis-cli +PIDFILE=/var/run/redis.pid +WORKDIR=/var/lib/redis +CONF="/etc/redis.conf" + case "$1" in start) - stat_busy "Starting Redis Server" - [ -d /var/lib/redis ] || { mkdir /var/lib/redis; } - if [ -z "$PID" ]; then - /usr/bin/redis-server /etc/redis.conf >/dev/null - RESULT=$? - else - REDIS_PID=`pidof redis-server` - if [ -z "$REDIS_PID" ]; then - /usr/bin/redis-server /etc/redis.conf >/dev/null - RESULT=$? - elif [ `pidof redis-server` -eq $PID ]; then - RESULT=1 - else - /usr/bin/redis-server /etc/redis.conf >/dev/null - RESULT=$? - fi - fi + stat_busy "Starting $daemon_name" + [ -d $WORKDIR ] || mkdir $WORKDIR - if [ $RESULT -gt 0 ]; then + if [ -f $PIDFILE ]; then stat_fail + exit 1 else - add_daemon redis - stat_done + $EXEC $CONF >/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon $daemon_name + stat_done + fi fi ;; + stop) - stat_busy "Stopping Redis Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then + stat_busy "Stopping $daemon_name" + + if [ ! -f $PIDFILE ]; then stat_fail + exit 1 else - rm /var/run/redis.pid - rm_daemon redis - stat_done + PID=$(cat $PIDFILE) + $CLIEXEC -p $REDISPORT shutdown + [ -d /proc/${PID} ] && sleep 1 + [ -d /proc/${PID} ] && sleep 5 + [ -d /proc/${PID} ] && kill -9 $PID + [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; } fi ;; + restart) $0 stop sleep 1 $0 start ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|status}" esac exit 0 diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index 19feb931e..be383a4e1 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $ -# Maintainer: Eric Belanger +# $Id: PKGBUILD 139637 2011-10-04 00:28:34Z eric $ +# Maintainer: Eric Bélanger pkgname=inetutils pkgver=1.8 -pkgrel=3 +pkgrel=5 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL') +groups=('base') depends=('readline' 'ncurses' 'pam') provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') @@ -16,16 +17,20 @@ backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ 'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') options=('!emptydirs') install=inetutils.install -source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz \ - ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd) -md5sums=('ad8fdcdf1797b9ca258264a6b04e48fd' 'c167200f6faeb64659e69ced2a9d672a'\ - 'e6e6e5990a2e8159a276fef8fbf54c04' '8596208d119045543c5fb644e1d713d5'\ - '2c3655985cf122591d71d031af84ff90' 'c490ea36751ac5f1d61d2c014959a3d1'\ - 'c25d8382a994de84d9c6962d804f689b' 'c3aa508a9d1293a787341108cd49c1b7') -sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e' '84dc802b5e57b5e04c847572225a3b9612017155'\ - '68a590083b45997dfdb80e666b2de762f494ba74' 'bfad98a4a62f1fff8779f076c6019ed07f9111af'\ - '27d99b910eec0fc26bd79ccc2c1de26608330298' '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'\ - '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda') +source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ + ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \ + dnsdomainname domainname) +sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e' + 'c439b577214017be9cccd1b2fbba048964386a0e' + '84dc802b5e57b5e04c847572225a3b9612017155' + '68a590083b45997dfdb80e666b2de762f494ba74' + 'bfad98a4a62f1fff8779f076c6019ed07f9111af' + '27d99b910eec0fc26bd79ccc2c1de26608330298' + '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605' + '81f10b3b688e3952f793b35bcef63b5bf257a92b' + '81f4a8da823cf0bb14284fc71ee6108849691eda' + 'ac69756d6cc50157d430d863db04a5aac4688380' + 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -38,13 +43,12 @@ build() { --enable-rlogin --enable-rlogind \ --enable-rsh --enable-rshd \ --enable-rexec --enable-rexecd \ - --enable-rcp \ + --enable-rcp --enable-hostname \ --disable-tftp --disable-tftpd \ --disable-ping --disable-ping6 \ --disable-logger --disable-syslogd \ --disable-inetd --disable-whois \ - --disable-uucpd --disable-hostname \ - --disable-ifconfig --disable-traceroute + --disable-uucpd --disable-ifconfig --disable-traceroute make } @@ -52,6 +56,12 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/bin" + ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" + install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname" + install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" + echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1" + echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" diff --git a/core/inetutils/dnsdomainname b/core/inetutils/dnsdomainname new file mode 100644 index 000000000..4bba209fe --- /dev/null +++ b/core/inetutils/dnsdomainname @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/hostname -y "$@" diff --git a/core/inetutils/domainname b/core/inetutils/domainname new file mode 100644 index 000000000..a1b8a8c31 --- /dev/null +++ b/core/inetutils/domainname @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/hostname -d "$@" diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 94356ab28..b86c0a91c 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 133509 2011-07-28 19:16:56Z stephane $ +# $Id: PKGBUILD 139635 2011-10-03 23:42:42Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=krb5 pkgver=1.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -17,11 +17,13 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar krb5-kadmind krb5-kdc - krb5-1.9.1-config-script.patch) + krb5-1.9.1-config-script.patch + krb5-1.9.1-canonicalize-fallback.patch) sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '8d1ec8bdb39fec230caace112d1a41ad792f7d97') + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + '238c268fa6cb42fc7324ab54db9abda5cd77f833') options=('!emptydirs') build() { @@ -30,14 +32,21 @@ build() { # - Make krb5-config suppress CFLAGS output when called with --libs # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 - # http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch # # - Omit extra libraries because their interfaces are not exposed to applications # by libkrb5, unless do_deps is set to 1, which indicates that the caller # wants the whole list. - # cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch + # + # Patch from upstream : + # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + # FS#25515 + patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ @@ -69,5 +78,8 @@ package() { install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch new file mode 100644 index 000000000..e5a38498f --- /dev/null +++ b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch @@ -0,0 +1,58 @@ +diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c +--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 ++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 +@@ -470,13 +470,10 @@ + + /***** STATE_REFERRALS *****/ + +-/* +- * Possibly retry a request in the fallback realm after a referral request +- * failure in the local realm. Expects ctx->reply_code to be set to the error +- * from a referral request. +- */ ++/* Possibly try a non-referral request after a referral request failure. ++ * Expects ctx->reply_code to be set to the error from a referral request. */ + static krb5_error_code +-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) ++try_fallback(krb5_context context, krb5_tkt_creds_context ctx) + { + krb5_error_code code; + char **hrealms; +@@ -485,9 +482,10 @@ + if (ctx->referral_count > 1) + return ctx->reply_code; + +- /* Only fall back if the original request used the referral realm. */ ++ /* If the request used a specified realm, make a non-referral request to ++ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ + if (!krb5_is_referral_realm(&ctx->req_server->realm)) +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + + if (ctx->server->length < 2) { + /* We need a type/host format principal to find a fallback realm. */ +@@ -500,10 +498,10 @@ + if (code != 0) + return code; + +- /* Give up if the fallback realm isn't any different. */ ++ /* If the fallback realm isn't any different, use the existing TGT. */ + if (data_eq_string(ctx->server->realm, hrealms[0])) { + krb5_free_host_realm(context, hrealms); +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + } + + /* Rewrite server->realm to be the fallback realm. */ +@@ -540,9 +538,9 @@ + krb5_error_code code; + const krb5_data *referral_realm; + +- /* Possibly retry with the fallback realm on error. */ ++ /* Possibly try a non-referral fallback request on error. */ + if (ctx->reply_code != 0) +- return try_fallback_realm(context, ctx); ++ return try_fallback(context, ctx); + + if (krb5_principal_compare(context, ctx->reply_creds->server, + ctx->server)) { diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch index 96ee6b001..a72a75edf 100644 --- a/core/krb5/krb5-1.9.1-config-script.patch +++ b/core/krb5/krb5-1.9.1-config-script.patch @@ -1,25 +1,27 @@ diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in --- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 -+++ krb5-1.9.1/src/krb5-config.in 2011-07-28 14:32:00.546990621 -0400 ++++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 @@ -186,7 +186,7 @@ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` -+ -e 's#\$(CFLAGS)##'` ++ -e 's#\$(CFLAGS)##'` if test $library = 'kdb'; then lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" -@@ -214,7 +214,11 @@ +@@ -214,9 +214,13 @@ fi if test $library = 'krb5'; then - lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" -+ if test 0$do_deps -eq 1 ; then -+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" -+ else -+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" -+ fi ++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" fi ++ # If we ever support a flag to generate output suitable for static ++ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" ++ # here. ++ echo $lib_flags + fi + diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index 6a81124ea..e48e2fc5a 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,28 +1,30 @@ -# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $ -# Maintainer: judd +# $Id: PKGBUILD 139639 2011-10-04 00:28:38Z eric $ +# Maintainer: Ronald van Haren +# Contributor: judd + pkgname=net-tools -pkgver=1.60 -pkgrel=18 +pkgver=1.60.20110819cvs +pkgrel=1 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) -license=('GPL') +license=('GPL2') url="http://www.tazenda.demon.co.uk/phil/net-tools" depends=('glibc') -source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 - net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch + +# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 +# use cvs checkout instead +source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 net-tools-1.60-miiioctl.patch - net-tools-1.60-nameif.patch net-tools-1.60-nameif_strncpy.patch) options=(!makeflags) install=net-tools.install +sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' + '654a96bc6575efb4a2e04b49de45d448d240eb6e' + '7888000d8fe867e58b5b00fe2bcf6c3041d716b4') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../net-tools.patch - patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch patch -Np1 -i ../net-tools-1.60-miiioctl.patch - patch -Np1 -i ../gcc340.patch - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch yes "" | make } @@ -34,11 +36,8 @@ package() { # the following is provided by yp-tools rm "${pkgdir}"/bin/{nis,yp}domainname rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 + + # hostname is provided by inetutils + rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm -rf "${pkgdir}"/usr/share/man/man1 } -md5sums=('888774accab40217dde927e21979c165' - '7ef8d0c6818faa0fdeea94970a20e3fb' - 'b52d899cba9956bb0055150506f41ac1' - '51de6eabe2d6d6dc860f72c41cee636b' - 'c16109863bc63f3dad4ef35305a340bb' - '29a32617382fab1735acba4d920f1fcd' - 'e66466b9304dac85eb42b32f1ec3b284') diff --git a/core/net-tools/net-tools-1.60-miiioctl.patch b/core/net-tools/net-tools-1.60-miiioctl.patch index 4859273ed..6c7f0693d 100644 --- a/core/net-tools/net-tools-1.60-miiioctl.patch +++ b/core/net-tools/net-tools-1.60-miiioctl.patch @@ -1,17 +1,17 @@ ---- net-tools-1.60/include/mii.h.bar Tue Jul 31 11:49:39 2001 -+++ net-tools-1.60/include/mii.h Tue Jul 31 11:49:33 2001 -@@ -11,11 +11,9 @@ - +--- net-tools-1.60.20110819cvs/include/mii.h 2011-08-19 10:14:00.743873299 +0200 ++++ net-tools-1.60.20110819cvs/include/mii.h.new 2011-08-19 10:28:26.500524160 +0200 +@@ -14,11 +14,9 @@ /* network interface ioctl's for MII commands */ #ifndef SIOCGMIIPHY + #warning "SIOCGMIIPHY is not defined by your kernel source" -#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ -#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ -#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ -#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ -#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ -+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ -+#define SIOCGMIIREG 0x8948 /* Read any PHY register */ -+#define SIOCSMIIREG 0x8949 /* Write any PHY register */ ++#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ ++#define SIOCGMIIREG 0x8948 /* Read any PHY register */ ++#define SIOCSMIIREG 0x8949 /* Write any PHY register */ #endif #include diff --git a/core/net-tools/net-tools.patch b/core/net-tools/net-tools.patch index 87e062eb2..8af2d2159 100644 --- a/core/net-tools/net-tools.patch +++ b/core/net-tools/net-tools.patch @@ -1,25 +1,3 @@ -diff -Naur net-tools-1.60-orig/config.in net-tools-1.60/config.in ---- net-tools-1.60-orig/config.in 2000-05-21 07:32:12.000000000 -0700 -+++ net-tools-1.60/config.in 2004-05-31 12:36:00.000000000 -0700 -@@ -49,7 +49,7 @@ - * - bool 'UNIX protocol family' HAVE_AFUNIX y - bool 'INET (TCP/IP) protocol family' HAVE_AFINET y --bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n -+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y - bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y - bool 'Appletalk DDP protocol family' HAVE_AFATALK y - bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y -@@ -86,6 +86,6 @@ - * - * Other Features. - * --bool 'IP Masquerading support' HAVE_FW_MASQUERADE n --bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n --bool 'Build mii-tool' HAVE_MII n -+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y -+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y -+bool 'Build mii-tool' HAVE_MII y diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c --- net-tools-1.60-orig/mii-tool.c 2000-05-21 07:31:17.000000000 -0700 +++ net-tools-1.60/mii-tool.c 2004-05-31 12:35:21.000000000 -0700 diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD index 69974e508..2bb71bb52 100644 --- a/extra/abiword/PKGBUILD +++ b/extra/abiword/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135772 2011-08-18 15:03:53Z andyrtr $ +# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $ # Maintainer: Giovanni Scafora # Contributor: Maël Lavault pkgbase=abiword pkgname=('abiword' 'abiword-plugins') pkgver=2.8.6 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url="http://www.abisource.com" diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 7b342e38e..998557870 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 139211 2011-10-01 18:55:32Z ibiru $ +# $Id: PKGBUILD 139555 2011-10-03 12:43:44Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gst -pkgver=1.4.0 +pkgver=1.4.2 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('clutter' 'gstreamer0.10-base' 'libxdamage') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d47b771e1453eec4848bac8d58258058a435319d925b22256a28d348bc8d5270') +sha256sums=('48f623a08a6793ab688ef6b899a2d889ef68053718ba44aac7997a1f9f619e7e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD index aef413f1b..c0700820d 100644 --- a/extra/cups-pdf/PKGBUILD +++ b/extra/cups-pdf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121266 2011-04-29 22:22:36Z andyrtr $ +# $Id: PKGBUILD 139594 2011-10-03 14:30:44Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Thomas Baechler pkgname=cups-pdf -pkgver=2.5.1 +pkgver=2.6.0 pkgrel=1 pkgdesc="PDF printer for cups" arch=(i686 x86_64) @@ -13,7 +13,8 @@ url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf" license=('GPL2') source=(http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/cups-pdf_$pkgver.tar.gz) backup=(etc/cups/cups-pdf.conf) -md5sums=('4b4cf1a249d02a38045db74b5f259aac') +md5sums=('8ee644c77438aac542301352266db181') +sha1sums=('45ecff78f26dab6261bbf66978e708d93385ef31') build() { cd $srcdir/$pkgname-$pkgver/src diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 106f55cec..f88924eea 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138026 2011-09-14 18:37:32Z andrea $ +# $Id: PKGBUILD 139601 2011-10-03 17:47:38Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8cd3f5f2141bbb54ba2fd80371582c2c') +md5sums=('be6100de4961a8cb99a8d9d1688a0460') build() { cd "${srcdir}" diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD index 2edd15320..a8dc20ddb 100644 --- a/extra/enchant/PKGBUILD +++ b/extra/enchant/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 127251 2011-06-11 20:47:42Z andrea $ +# $Id: PKGBUILD 139539 2011-10-03 12:17:06Z jgc $ # Maintainer: Andrea Scarpino # Contributor: dorphell pkgname=enchant pkgver=1.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="A wrapper library for generic spell checking" arch=('i686' 'x86_64') url="http://www.abisource.com/enchant/" license=('LGPL') -depends=('aspell' 'dbus-glib' 'hunspell') -makedepends=('hspell') -optdepends=('hspell: Hebrew dictionary') +depends=('aspell' 'dbus-glib' 'hunspell' 'hspell') options=('!libtool') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('de11011aff801dc61042828041fb59c7') diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 4c5a23f7e..750e87407 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109836 2011-02-13 10:43:46Z allan $ +# $Id: PKGBUILD 139553 2011-10-03 12:37:11Z allan $ # Maintainer : Allan McRae # Contributor: Aaron Griffin pkgname=fakechroot -pkgver=2.14 +pkgver=2.15 pkgrel=1 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64') @@ -12,18 +12,20 @@ license=('LGPL') options=('!libtool') install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) -md5sums=('264c4e3f9a2264ab57e286682f9c4ad2') +md5sums=('ce8bdde1d30274e124e8ecf8f59681ff') -build() -{ +build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } -package() -{ +package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index d448e4eb2..fea27eed6 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 137540 2011-09-09 07:00:04Z andrea $ +# $Id: PKGBUILD 139597 2011-10-03 17:18:33Z andrea $ # Maintainer: Andrea Scarpino # Contributor: csslayer pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.1.1 +pkgver=4.1.2 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('465ede4722d2bb0c7fcf2d1a5206c9ce922902a4') +sha1sums=('d2d4e725b1c2ed60543d466504954b631d5689e3') build() { cd "${srcdir}" diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index 0c5e2dc3e..fe83158e8 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139269 2011-10-01 18:57:05Z ibiru $ +# $Id: PKGBUILD 139625 2011-10-03 20:22:38Z ibiru $ # Maintainer: Jan de Groot pkgname=gdl -pkgver=3.1.5 +pkgver=3.2.0 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('gtk3') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b89a30a7df499f3ee74108bb28ac46a962dc5e94c4e50fe34c8f9cf1580db482') +sha256sums=('f4839224b7837efb8fbec8666f8a3bb1ce9ea110f06c57a8b9438faa0abab533') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d93c3b09e..a1f5cef60 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 138474 2011-09-24 15:33:33Z dan $ +# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.6.4 -_manver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -24,8 +23,9 @@ 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" source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://kernel.org/pub/software/scm/git/git-manpages-$_manver.tar.bz2" + "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" git-daemon git-daemon.conf) changelog=ChangeLog @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('e0b7afcc0e5e43bbb82f85598ae34bd8' - 'cae559424a62507cb2c15252d85a158e' +md5sums=('5d645884e688921e773186783b65ce33' + '2ee47bd79dfd391bc7d1b466539b9734' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6' - 'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44' +sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6' + 'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD index 8e8d3da64..5697957f8 100644 --- a/extra/gnome-media/PKGBUILD +++ b/extra/gnome-media/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 111636 2011-02-27 21:57:39Z ibiru $ +# $Id: PKGBUILD 139627 2011-10-03 20:26:30Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-media pkgver=2.91.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Media Tools" arch=('i686' 'x86_64') license=('GPL') depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme') makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') url="http://www.gnome.org" -groups=('gnome') -replaces=('gnome-media-pulse') +groups=('gnome-extra') options=('!libtool' '!emptydirs') install=gnome-media.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index ab9dbadde..0132134cd 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139319 2011-10-01 18:58:22Z ibiru $ +# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-settings-daemon pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -15,11 +15,14 @@ url="http://www.gnome.org" groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +fix_color_crash.patch) +sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' + 'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_color_crash.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids diff --git a/extra/gnome-settings-daemon/fix_color_crash.patch b/extra/gnome-settings-daemon/fix_color_crash.patch new file mode 100644 index 000000000..24602100f --- /dev/null +++ b/extra/gnome-settings-daemon/fix_color_crash.patch @@ -0,0 +1,186 @@ +From fd4c0057b8e3f72b30acb6f1c82688e29b31c0c0 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 03 Oct 2011 08:52:06 +0000 +Subject: color: Fix a crash if ~/.local is deleted at runtime + +Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660664 +--- +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index d325162..3dde406 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -254,6 +254,8 @@ gcm_profile_store_process_child (GcmProfileStore *profile_store, + + /* check we're not in a loop */ + helper = gcm_profile_store_find_directory (profile_store, path); ++ if (helper == NULL) ++ goto out; + if (helper->depth > GCM_PROFILE_STORE_MAX_RECURSION_LEVELS) { + g_warning ("recursing more than %i levels deep is insane", + GCM_PROFILE_STORE_MAX_RECURSION_LEVELS); +-- +cgit v0.9.0.2 +From e3313eb16fd2cb25ab3fbc010837b910e525acf6 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 03 Oct 2011 10:02:56 +0000 +Subject: color: Simplify gcm_profile_store_mkdir_with_parents() + +No need to check for the path existing, +g_file_make_directory_with_parents() will do that for us. +--- +(limited to 'plugins/color/gcm-profile-store.c') + +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index 3dde406..d705604 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -419,19 +419,12 @@ static gboolean + gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) + { + gboolean ret; +- GFile *file = NULL; + + /* ensure destination exists */ +- ret = g_file_test (filename, G_FILE_TEST_EXISTS); +- if (!ret) { +- file = g_file_new_for_path (filename); +- ret = g_file_make_directory_with_parents (file, NULL, error); +- if (!ret) +- goto out; +- } +-out: +- if (file != NULL) +- g_object_unref (file); ++ file = g_file_new_for_path (filename); ++ ret = g_file_make_directory_with_parents (file, NULL, error); ++ g_object_unref (file); ++ + return ret; + } + +-- +cgit v0.9.0.2 +From a711ba99fd5a9bc7bf79dcdc763deed39440eb86 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 03 Oct 2011 10:38:36 +0000 +Subject: Make commit e3313eb16fd2cb25ab3fbc010837b910e525acf6 actually compile + +--- +(limited to 'plugins/color/gcm-profile-store.c') + +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index d705604..0b3cfa0 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -419,6 +419,7 @@ static gboolean + gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) + { + gboolean ret; ++ GFile *file; + + /* ensure destination exists */ + file = g_file_new_for_path (filename); +-- +cgit v0.9.0.2 +From 42fa1af884fda1590bc7af0f78e4fc70d0eb621b Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 03 Oct 2011 10:34:04 +0000 +Subject: color: Cancel any in-progress directory searching on plugin unload + +--- +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index 0b3cfa0..bcb7adc 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -34,6 +34,7 @@ struct _GcmProfileStorePrivate + { + GPtrArray *filename_array; + GPtrArray *directory_array; ++ GCancellable *cancellable; + }; + + enum { +@@ -326,7 +327,7 @@ gcm_profile_store_next_files_cb (GObject *source_object, + g_file_enumerator_next_files_async (enumerator, + 5, + G_PRIORITY_LOW, +- NULL, ++ profile_store->priv->cancellable, + gcm_profile_store_next_files_cb, + user_data); + +@@ -343,6 +344,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object, + gchar *path = NULL; + GError *error = NULL; + GFileEnumerator *enumerator; ++ GcmProfileStore *profile_store = GCM_PROFILE_STORE (user_data); + + enumerator = g_file_enumerate_children_finish (G_FILE (source_object), + res, +@@ -360,7 +362,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object, + g_file_enumerator_next_files_async (enumerator, + 5, + G_PRIORITY_LOW, +- NULL, ++ profile_store->priv->cancellable, + gcm_profile_store_next_files_cb, + user_data); + g_object_unref (enumerator); +@@ -407,7 +409,7 @@ gcm_profile_store_search_path (GcmProfileStore *profile_store, const gchar *path + G_FILE_ATTRIBUTE_STANDARD_TYPE, + G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, + G_PRIORITY_LOW, +- NULL, ++ profile_store->priv->cancellable, + gcm_profile_store_enumerate_children_cb, + profile_store); + out: +@@ -416,14 +418,16 @@ out: + } + + static gboolean +-gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) ++gcm_profile_store_mkdir_with_parents (const gchar *filename, ++ GCancellable *cancellable, ++ GError **error) + { + gboolean ret; + GFile *file; + + /* ensure destination exists */ + file = g_file_new_for_path (filename); +- ret = g_file_make_directory_with_parents (file, NULL, error); ++ ret = g_file_make_directory_with_parents (file, cancellable, error); + g_object_unref (file); + + return ret; +@@ -438,7 +442,9 @@ gcm_profile_store_search (GcmProfileStore *profile_store) + + /* get Linux per-user profiles */ + path = g_build_filename (g_get_user_data_dir (), "icc", NULL); +- ret = gcm_profile_store_mkdir_with_parents (path, &error); ++ ret = gcm_profile_store_mkdir_with_parents (path, ++ profile_store->priv->cancellable, ++ &error); + if (!ret) { + g_warning ("failed to create directory on startup: %s", error->message); + g_error_free (error); +@@ -480,6 +486,7 @@ static void + gcm_profile_store_init (GcmProfileStore *profile_store) + { + profile_store->priv = GCM_PROFILE_STORE_GET_PRIVATE (profile_store); ++ profile_store->priv->cancellable = g_cancellable_new (); + profile_store->priv->filename_array = g_ptr_array_new_with_free_func (g_free); + profile_store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gcm_profile_store_helper_free); + } +@@ -490,6 +497,8 @@ gcm_profile_store_finalize (GObject *object) + GcmProfileStore *profile_store = GCM_PROFILE_STORE (object); + GcmProfileStorePrivate *priv = profile_store->priv; + ++ g_cancellable_cancel (profile_store->priv->cancellable); ++ g_object_unref (profile_store->priv->cancellable); + g_ptr_array_unref (priv->filename_array); + g_ptr_array_unref (priv->directory_array); + +-- +cgit v0.9.0.2 diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index cd594befa..cca232ee5 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130812 2011-07-08 04:52:51Z eric $ +# $Id: PKGBUILD 139548 2011-10-03 12:22:55Z jgc $ # Maintainer: Aaron Griffin # Contributor: Mark Schneider pkgname=gnucash pkgver=2.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') url="http://www.gnucash.org" diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 2fd9e4799..51531a917 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125165 2011-05-25 19:05:49Z foutrelis $ +# $Id: PKGBUILD 139544 2011-10-03 12:22:49Z jgc $ # Maintainer: Eric Belanger # Contributor: Kritoke pkgname=gnumeric -pkgver=1.10.15 -pkgrel=2 +pkgver=1.10.17 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" @@ -16,8 +16,8 @@ optdepends=('pygobject: for python plugin 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') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 0352c9453..a7a8f4fe9 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 124493 2011-05-22 15:24:56Z ibiru $ +# $Id: PKGBUILD 139546 2011-10-03 12:22:52Z jgc $ # Maintainer: Aaron Griffin pkgname=goffice -pkgver=0.8.15 +pkgver=0.8.17 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -10,12 +10,16 @@ url="http://www.gnome.org" license=('GPL') options=('!libtool') depends=('gtk2' 'gconf' 'libgsf') -makedepends=('pkgconfig' 'intltool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58') +makedepends=('pkgconfig' 'intltool' 'gtk-doc') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + use-apiver-for-dirs.patch) +sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15' + '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make diff --git a/extra/goffice/use-apiver-for-dirs.patch b/extra/goffice/use-apiver-for-dirs.patch new file mode 100644 index 000000000..3d0909da3 --- /dev/null +++ b/extra/goffice/use-apiver-for-dirs.patch @@ -0,0 +1,32 @@ +--- configure.in.orig 2011-09-07 08:45:49.687783970 +0000 ++++ configure.in 2011-09-07 09:12:55.709382840 +0000 +@@ -418,7 +418,7 @@ + fi + + dnl ************************************************** +-AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) ++AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER}) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The package name, for gettext]) + AM_GLIB_GNU_GETTEXT +@@ -638,9 +638,9 @@ + dnl ****************** + dnl + dnl These are changed in goffice.c for WIN32 packages +-AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') +-AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') +-AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') ++AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}') + AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') + dnl + AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') +--- libgoffice.pc.in.orig 2010-02-18 22:49:39.000000000 +0000 ++++ libgoffice.pc.in 2011-09-07 09:18:53.655992532 +0000 +@@ -11,4 +11,4 @@ + Libs.private: @EXTRA_LIBS@ + Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@ + +-PluginDir=${libdir}/goffice/@VERSION@/plugins ++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 0c352df2a..b57eefce4 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 139338 2011-10-01 18:58:50Z ibiru $ +# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $ # Maintainer: Jan "heftig" Steffens pkgname=grilo-plugins pkgver=0.1.17 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo') -makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest') +makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql') optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'quvi: Youtube plugin' @@ -18,13 +18,18 @@ optdepends=('gupnp-av: uPnP plugin' 'sqlite3: Bookmarks plugin' 'sqlite3: Metadata store plugin' 'libgcrypt: Vimeo plugin' - 'rest: Blip.tv plugin') + 'rest: Blip.tv plugin' + 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # support tracker 0.12, already fixed in git master. + sed -i 's/sparql-0.11/sparql-0.12/g' configure + ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index e37c1ef09..aa78f6b01 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139341 2011-10-01 18:58:54Z ibiru $ +# $Id: PKGBUILD 139610 2011-10-03 19:05:04Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: György Balló pkgname=gssdp -pkgver=0.10.0 +pkgver=0.12.0 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('libsoup') makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') optdepends=('gtk2: gssdp-device-sniffer') options=('!libtool') -source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) -sha256sums=('94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('7f02903989b4ac7cfb7508898706a5b4a01c9ace2f6345bd96bf8a3faa30ae1a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index a4f822080..0e60a45da 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139345 2011-10-01 18:59:03Z ibiru $ +# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $ # Maintainer: Ionut Biru pkgname=gtk3 pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -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.2/gtk+-${pkgver}.tar.xz - settings.ini) + settings.ini + a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45) sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/a11y.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index a2a49d388..16dcc2de5 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139358 2011-10-01 18:59:22Z ibiru $ +# $Id: PKGBUILD 139612 2011-10-03 19:05:21Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Thijs Vermeir # Contributor: Denis Zawada pkgname=gupnp-av -pkgver=0.8.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('LGPL') depends=('gupnp') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') -source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) -sha256sums=('e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('41aeb5d243426b293c315788b41bc79a2be1f466eeff114cf6c89a37140f507e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 9fcb01a55..5c8810754 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139356 2011-10-01 18:59:21Z ibiru $ +# $Id: PKGBUILD 139611 2011-10-03 19:05:21Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: György Balló pkgname=gupnp -pkgver=0.16.1 +pkgver=0.18.0 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('gssdp') makedepends=('gobject-introspection' 'gtk-doc') optdepends=('python2: gupnp-binding-tool') options=('!libtool') -source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) -sha256sums=('f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('82f4758b26ef0531cf6301f526fe705f06c329eaef403bb30925128fcbb6a71a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,7 +22,7 @@ build() { sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + --disable-static --with-context-manager=linux make } diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD index 17236fa71..49a0fe584 100644 --- a/extra/liblrdf/PKGBUILD +++ b/extra/liblrdf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $ +# $Id: PKGBUILD 139617 2011-10-03 19:42:49Z jgc $ # Maintainer: Giovanni Scafora pkgname=liblrdf pkgver=0.4.0 -pkgrel=8 +pkgrel=9 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf" @@ -13,16 +13,19 @@ license=('GPL') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz md5.patch - raptor2.diff) + raptor2.diff + pkgconfig-raptor.patch) groups=('ladspa-plugins') md5sums=('327a5674f671c4b360c6353800226877' - 'a6d231d052dc188cbc4c1039cf3a2003' - '80e938469da06a178e03107ca5b41e55') + 'a6d231d052dc188cbc4c1039cf3a2003' + '80e938469da06a178e03107ca5b41e55' + '982ae1bd4b39c2fb5cba108fbcbfbad1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/md5.patch - patch -Np0 -i ${srcdir}/raptor2.diff + patch -Np1 -i "${srcdir}/md5.patch" + patch -Np0 -i "${srcdir}/raptor2.diff" + patch -Np1 -i "${srcdir}/pkgconfig-raptor.patch" autoreconf -vfi ./configure --prefix=/usr make diff --git a/extra/liblrdf/pkgconfig-raptor.patch b/extra/liblrdf/pkgconfig-raptor.patch new file mode 100644 index 000000000..c68f1f1b5 --- /dev/null +++ b/extra/liblrdf/pkgconfig-raptor.patch @@ -0,0 +1,9 @@ +--- liblrdf-0.4.0/lrdf.pc.in.orig 2011-10-03 19:28:16.702773254 +0000 ++++ liblrdf-0.4.0/lrdf.pc.in 2011-10-03 19:28:43.003017477 +0000 +@@ -7,4 +7,5 @@ + Version: @VERSION@ + Description: liblrdf, a lightweight RDF library with extensions for LADSPA + Libs: -L${libdir} -llrdf +-Cflags: -I${includedir} ++Libs.private: @RAPTOR_LIBS@ ++Cflags: @RAPTOR_CFLAGS@ -I${includedir} diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD index c00b18954..c9b11d1c0 100644 --- a/extra/libmowgli/PKGBUILD +++ b/extra/libmowgli/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $ +# $Id: PKGBUILD 139564 2011-10-03 13:29:22Z bisson $ # Contributor: Alexander Fehr # Contributor: Brad Gordon # Maintainer: Gaetan Bisson pkgname=libmowgli -pkgver=0.9.50 +pkgver=0.9.95 pkgrel=1 pkgdesc='Performance and usability-oriented extensions to C' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://www.atheme.org/project/mowgli' license=('custom') depends=('glibc') source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2") -sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88') +sha1sums=('50d32d4d84f2438382c203bd7c85adc976683c25') build() { cd "${srcdir}/libmowgli-${pkgver}" diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD index b5b1deeff..edb5a8d03 100644 --- a/extra/mail-notification/PKGBUILD +++ b/extra/mail-notification/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 119734 2011-04-14 10:44:43Z jgc $ +# $Id: PKGBUILD 139560 2011-10-03 13:09:05Z jgc $ # Maintainer: Roman Kyrylych pkgname=mail-notification pkgver=5.4 -pkgrel=8 +pkgrel=9 pkgdesc="Tray icon application that informs you if you have new mail" arch=('i686' 'x86_64') url="http://www.nongnu.org/mailnotify/" license=('GPL3' 'FDL') -depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') -makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils') +depends=('gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') +makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2') options=('!libtool' '!emptydirs') install=mail-notification.install -source=(http://savannah.nongnu.org/download/mailnotify/${pkgname}-${pkgver}.tar.bz2 +source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2 dont-update-cache.patch remove-ubuntu-special-case.patch mail-notification-5.4-evolution.patch @@ -39,8 +39,8 @@ md5sums=('c8dc33a61251acb5474e56eab6b18f43' '31bde95dfd39449959d8b3316f91429c' 'cdead6a88d1779f69a5f40dc75d5cb84' 'c7991b831834724eddc1c6802c3e06a6' - '49fe910f68393b0f6a1f1bcb7a8bdcd3' - '55ed1aeb56ca053cc1a0a6062761c2b4' + 'b370b1085ebb2814bd5d345a6d2b45ea' + '1ba948759110787dd57097cff157b75a' '09df61b4dc29c676ac81ff9054e840ac') build() { diff --git a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch index 51a0eb519..51938b5fa 100644 --- a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch +++ b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch @@ -28,6 +28,18 @@ #include #include #include "mn-evolution.h" +@@ -240,7 +241,11 @@ + EMEventTargetFolder *folder) + { + if (evo_server) ++#if EDS_CHECK_VERSION(3,1,0) ++ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name)); ++#else + mn_evolution_server_folder_changed(evo_server, folder->uri); ++#endif + } + + void @@ -249,10 +250,16 @@ { if (evo_server) @@ -38,7 +50,7 @@ +#else + char *url = mail_tools_folder_to_url(message->folder); +#endif - + - url = mail_tools_folder_to_url(message->folder); mn_evolution_server_message_reading(evo_server, url); + @@ -68,3 +80,43 @@ if (folder) self_cache_folder(uri, folder); else +@@ -677,7 +681,12 @@ + folder = self_lookup_folder(folder_uri, err); + if (folder) + { ++#if EDS_CHECK_VERSION(3,1,0) ++ *ret = g_strdup(camel_folder_get_display_name(folder)); ++#else + *ret = g_strdup(camel_folder_get_name(folder)); ++#endif ++ + #if EDS_CHECK_VERSION(2,31,0) + g_object_unref(folder); + #else +@@ -725,8 +734,12 @@ + shell = e_shell_get_default (); + shell_backend = e_shell_get_backend_by_name (shell, "mail"); + +- browser = e_mail_browser_new (shell_backend); ++ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); ++#if EDS_CHECK_VERSION(3,1,0) ++ e_mail_reader_set_folder (E_MAIL_READER (browser), folder); ++#else + e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); ++#endif + e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); + gtk_widget_show (browser); + #else +--- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200 ++++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200 +@@ -444,7 +444,9 @@ + { + #line 61 "src/mn-evolution-folder-tree-server.gob" + +-#if EDS_CHECK_VERSION(2,91,0) ++#if EDS_CHECK_VERSION(3,1,0) ++ selfp->tree = em_folder_tree_new(NULL, NULL); ++#elif EDS_CHECK_VERSION(2,91,0) + selfp->session = e_mail_session_new(); + selfp->tree = em_folder_tree_new(selfp->session); + #elif EDS_CHECK_VERSION(2,29,0) diff --git a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch index cd19c2e84..6a29f8622 100644 --- a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch +++ b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch @@ -20,7 +20,7 @@ + jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1"); jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - jb_check_packages_for_options("GMime", "gmime", "gmime-2.4", + jb_check_packages_for_options("GMime", "gmime", "gmime-2.6", --- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:38:01.503049512 +0100 +++ build/src/mn-file-chooser-button.c 2011-02-02 23:38:16.988222034 +0100 @@ -358,7 +358,7 @@ @@ -545,7 +545,7 @@ + int y; + + gtk_widget_get_allocation(widget, &allocation); -+ y = allocation.y; ++ y = 0; - if (! GTK_WIDGET_DRAWABLE(widget)) + if (! gtk_widget_is_drawable(widget)) @@ -557,7 +557,7 @@ Row *row = g_ptr_array_index(selfp->rows, i); int j; - int x = widget->allocation.x; -+ int x = allocation.x; ++ int x = 0; int column = 0; MN_ARRAY_FOREACH(j, row->cells) @@ -587,6 +587,20 @@ #line 109 "mn-tooltips.c" #line 308 "src/mn-tooltips.gob" static void mn_tooltips_draw_tips (MNTooltips * self); +@@ -422,7 +422,13 @@ + + if (! selfp->window) + { ++ GtkStyleContext *ctx; ++ + selfp->window = gtk_window_new(GTK_WINDOW_POPUP); ++ ++ ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window)); ++ gtk_style_context_add_class(ctx, "tooltip"); ++ + self_update_screen(self, TRUE); + gtk_widget_set_app_paintable(selfp->window, TRUE); + gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE); @@ -430,7 +430,7 @@ gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width); @@ -614,23 +628,32 @@ { #line 600 "mn-tooltips.c" #define __GOB_FUNCTION__ "MN:Tooltips::paint_window" -@@ -608,13 +608,12 @@ +@@ -608,18 +608,13 @@ GtkRequisition req; - gtk_widget_size_request(selfp->window, &req); - gtk_paint_flat_box(selfp->window->style, - selfp->window->window, -+ gtk_widget_size_request(GTK_WIDGET(selfp), &req); -+ gtk_paint_flat_box(gtk_widget_get_style(GTK_WIDGET(selfp)), -+ cr, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - NULL, +- GTK_STATE_NORMAL, +- GTK_SHADOW_OUT, +- NULL, - selfp->window, - "tooltip", - 0, - 0, +- "tooltip", +- 0, +- 0, +- req.width, +- req.height); ++ gtk_widget_size_request(GTK_WIDGET(selfp->window), &req); ++ gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)), ++ cr, ++ 0, ++ 0, ++ req.width, ++ req.height); + + return FALSE; + }} @@ -651,10 +650,11 @@ gint monitor_num, px, py; GdkRectangle monitor; @@ -1380,3 +1403,14 @@ #include "mn-util.h" #include "mn-conf.h" #include "mn-shell.h" +--- data/mail-notification.desktop.in.orig 2011-07-08 13:46:52.327548264 +0200 ++++ data/mail-notification.desktop.in 2011-07-08 13:47:00.732704467 +0200 +@@ -5,7 +5,7 @@ + _Comment=Get notified when new mail arrives + Type=Application + Categories=GNOME;GTK;Network;Email; +-Exec=mail-notification --sm-disable ++Exec=mail-notification + Terminal=false + StartupNotify=true + X-GNOME-DocPath=mail-notification/mail-notification.xml diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index bcf5e453d..e517de22b 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134671 2011-08-07 11:28:53Z andyrtr $ +# $Id: PKGBUILD 139590 2011-10-03 14:23:27Z andyrtr $ # Maintainer: Andreas Radke # Contributor: rabyte # Contributor: Johannes Krampf pkgname=midori pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -14,11 +14,19 @@ install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('14aa14ccabf3d003903f1584dab15d7a') +source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2 + webkit_search.diff) +md5sums=('14aa14ccabf3d003903f1584dab15d7a' + '293c026e1875145e0df9584e1ff2a70e') +sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585' + '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # FS#26207 + patch -Np1 -i ${srcdir}/webkit_search.diff + # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf diff --git a/extra/midori/webkit_search.diff b/extra/midori/webkit_search.diff new file mode 100644 index 000000000..620cdc96f --- /dev/null +++ b/extra/midori/webkit_search.diff @@ -0,0 +1,59 @@ +From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001 +From: Christian Dywan +Date: Wed, 21 Sep 2011 21:50:51 +0000 +Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1 + +Fixes: https://bugs.launchpad.net/midori/+bug/799603 +--- +diff --git a/midori/midori-view.c b/midori/midori-view.c +index 0d7a96e..e426e7f 100644 +--- a/midori/midori-view.c ++++ b/midori/midori-view.c +@@ -39,9 +39,11 @@ + #include + #endif + ++#if !WEBKIT_CHECK_VERSION (1, 5, 1) + /* This is unstable API, so we need to declare it */ + gchar* + webkit_web_view_get_selected_text (WebKitWebView* web_view); ++#endif + + static void + midori_view_construct_web_view (MidoriView* view); +@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view) + gboolean + midori_view_has_selection (MidoriView* view) + { ++#if WEBKIT_CHECK_VERSION (1, 5, 1) ++ WebKitDOMDocument* doc; ++ WebKitDOMDOMWindow* window; ++ WebKitDOMDOMSelection* selection; ++ WebKitDOMRange* range; ++#endif ++ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + ++ ++#if WEBKIT_CHECK_VERSION (1, 5, 1) ++ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); ++ window = webkit_dom_document_get_default_view (doc); ++ selection = webkit_dom_dom_window_get_selection (window); ++ if (selection == NULL) ++ return FALSE; ++ ++ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); ++ if (range == NULL) ++ return FALSE; ++ ++ katze_assign (view->selected_text, webkit_dom_range_get_text (range)); ++#else + katze_assign (view->selected_text, webkit_web_view_get_selected_text ( + WEBKIT_WEB_VIEW (view->web_view))); ++#endif ++ + if (view->selected_text && *view->selected_text) + return TRUE; + else +-- +cgit diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index 59de81965..34d7c3c11 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139447 2011-10-01 19:01:50Z ibiru $ +# $Id: PKGBUILD 139536 2011-10-03 11:27:50Z ibiru $ # Maintainer: Jan de Groot pkgname=upower -pkgver=0.9.13 -pkgrel=2 +pkgver=0.9.14 +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" @@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2c7dd2c26d11da628d68111d50eed51244a8337c1d0830addecd1372a7d44a22') +sha256sums=('81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf874a4c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index 97a0fd198..fc7ebe757 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.0.2 +pkgver=3.2.0 pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64') @@ -23,8 +23,8 @@ conflicts=("$_pkgname") 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') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('00fc74269978b6e455fea97f22ba81b588bdf3e79548003b75f3328104b418b6') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install index 182126c39..10a148241 100644 --- a/libre/file-roller-libre/file-roller.install +++ b/libre/file-roller-libre/file-roller.install @@ -20,4 +20,3 @@ post_upgrade() { post_remove() { post_install $1 } - diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD index d94638df2..03652ec06 100644 --- a/libre/file-roller-libre/rePKGBUILD +++ b/libre/file-roller-libre/rePKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Nicolás Reynolds source PKGBUILD -#CARCH=x86_64 +CARCH=x86_64 unset build package md5sums source _repo=extra # Put the repo here _mirror=ftp://ftp.archlinux.org # Put mirror here diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index af3a0250c..47cc99f42 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -21,7 +21,7 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=6.0 +pkgver=7.0 pkgrel=1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') @@ -32,7 +32,7 @@ depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss>=3.12.10' 'libxt' 'libxrender' 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo') makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb') -options=(!buildflags) +options=(!buildflags !distcc) url="http://www.gnu.org/software/gnuzilla/" install=icecat.install source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz @@ -52,7 +52,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz # Default options firefox.js region.properties) -md5sums=('9b752e408717ccb50d50f0bafe18a552' +md5sums=('f486a11f638e208b45b04c29d41de19b' 'e7fe1de533599f4ae645ea1661e4006a' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' @@ -88,7 +88,7 @@ build() { sed -i 's/@PRE_RELEASE_SUFFIX@//g' \ browser/base/content/browser.xul - export LDFLAGS="-Wl,-rpath,/usr/lib/icecat-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-$pkgver" export PYTHON="/usr/bin/python2" # PGO diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch index 85a8fb18d..a72eab698 100644 --- a/libre/icecat/firefox-version.patch +++ b/libre/icecat/firefox-version.patch @@ -5,7 +5,7 @@ diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/in include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="4.0" ++MOZ_APP_VERSION="7.0" + include $(topsrcdir)/config/rules.mk diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD index 5aeb0f1bc..2e5826a1b 100644 --- a/multilib/lib32-gdk-pixbuf2/PKGBUILD +++ b/multilib/lib32-gdk-pixbuf2/PKGBUILD @@ -2,10 +2,10 @@ # Maintainer: Ionut Biru _pkgbasename=gdk-pixbuf2 pkgname=lib32-$_pkgbasename -pkgver=2.23.3 -pkgrel=1 +pkgver=2.24.0 +pkgrel=2 pkgdesc="An image loading library for gtk2 (32-bit)" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.gtk.org/" license=('GPL2') depends=('lib32-glib2>=2.25.15' @@ -14,8 +14,8 @@ depends=('lib32-glib2>=2.25.15' makedepends=(gcc-multilib) options=('!libtool' '!docs') install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2) -sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a') +source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.bz2) +md5sums=('d8ece3a4ade4a91c768328620e473ab8') build() { export CC="gcc -m32" diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD index 8d06a14fc..3c9e3e1f8 100644 --- a/multilib/lib32-glib2/PKGBUILD +++ b/multilib/lib32-glib2/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 51310 2011-07-06 22:35:51Z lcarlier $ +# $Id: PKGBUILD 56231 2011-10-03 15:46:17Z bluewind $ # Maintainer: Ionut Biru # Contributor: Pierre Schmitz # Contributor: Mikko Seppälä _pkgbasename=glib2 pkgname=lib32-$_pkgbasename -pkgver=2.28.8 +pkgver=2.30.0 pkgrel=1 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" url="http://www.gtk.org/" arch=('x86_64') license=('LGPL') -depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' $_pkgbasename) -makedepends=('gcc-multilib') +depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename) +makedepends=('gcc-multilib' python2) options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz) -sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz) +sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1') build() { export CC="gcc -m32" @@ -36,4 +36,5 @@ package() { cd "${pkgdir}"/usr/bin mv gio-querymodules gio-querymodules-32 rm -f gdbus glib* gobject-query gsettings gtester* + rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0} } diff --git a/staging/gnome-color-manager/PKGBUILD b/staging/gnome-color-manager/PKGBUILD new file mode 100644 index 000000000..078ccdffb --- /dev/null +++ b/staging/gnome-color-manager/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 139604 2011-10-03 18:33:27Z heftig $ +# Maintainer: Jan "heftig" Steffens + +pkgname=gnome-color-manager +pkgver=3.2.0 +pkgrel=2 +pkgdesc="Color profile manager for the GNOME desktop" +arch=(i686 x86_64) +url="http://projects.gnome.org/gnome-color-manager/" +license=(GPL2) +depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash') +makedepends=('intltool' 'gtk-doc') +install=gnome-color-manager.install +options=('!libtool' '!emptydirs') +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273') + +build(){ + cd "$srcdir/$pkgname-$pkgver" + + # man pages need docbook-sgml, which we don't have + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-color-manager \ + --disable-static --disable-man-pages + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/gnome-color-manager/gnome-color-manager.install b/staging/gnome-color-manager/gnome-color-manager.install new file mode 100644 index 000000000..04fda0ddc --- /dev/null +++ b/staging/gnome-color-manager/gnome-color-manager.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 gnome-color-manager + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD new file mode 100644 index 000000000..8e46803cc --- /dev/null +++ b/staging/gthumb/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 139528 2011-10-03 09:58:33Z jgc $ +# Maintainer: Jan de Groot +# Contributor: Tobias Kieslich + +pkgname=gthumb +pkgver=2.13.91 +pkgrel=2 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://gthumb.sourceforge.net/" +depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2') +makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') +optdepends=('gstreamer0.10-base: video support') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('b1f7686572829cf5cadae58e7d45e43a056f19929fd6d80d7ff9ac7c53bbfe90') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --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 gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install new file mode 100644 index 000000000..6046ebb6f --- /dev/null +++ b/staging/gthumb/gthumb.install @@ -0,0 +1,24 @@ +pkgname=gthumb + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..847cedd6d --- /dev/null +++ b/staging/kdebase-runtime/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 139520 2011-10-03 08:17:47Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=kdebase-runtime +pkgver=4.7.1 +pkgrel=2 +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/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") +sha1sums=('fc8da236bff699518b54b2fe6bcf8a518206b6e3') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kde-runtime-${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/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/staging/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/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD new file mode 100644 index 000000000..dd0389248 --- /dev/null +++ b/staging/kdegraphics-gwenview/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 139524 2011-10-03 08:19:21Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-gwenview +pkgver=4.7.1 +pkgrel=2 +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: extra plugins to share photos') +install=$pkgname.install +source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") +sha1sums=('a58997d7e23f5708ff94d9198258dc0d6e82f8cf') + +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/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/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/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD new file mode 100644 index 000000000..ebe551942 --- /dev/null +++ b/staging/libkexiv2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 139522 2011-10-03 08:18:29Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=libkexiv2 +pkgver=4.7.1 +pkgrel=2 +pkgdesc="A library to manipulate pictures metadata" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('c1c1afb6c3928222eb33ce592d77dd6478aa4911') + +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/strigi/PKGBUILD b/staging/strigi/PKGBUILD new file mode 100644 index 000000000..e05701d8b --- /dev/null +++ b/staging/strigi/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 139526 2011-10-03 08:19:55Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Tobias Powalowski + +pkgname=strigi +pkgver=0.7.5 +pkgrel=5 +pkgdesc="Fast crawling desktop search engine with Qt4 GUI" +arch=('i686' 'x86_64') +url="http://www.vandenoever.info/software/strigi/" +license=('GPL2') +depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs') +makedepends=('qt' 'cmake' 'pkg-config' 'boost') +optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' + 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') +source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0559e2ab65d187d30916e9ffe36e0fb6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_INOTIFY=ON \ + -DENABLE_LOG4CXX=OFF \ + -DENABLE_FAM=OFF \ + -DENABLE_CLUCENE=OFF \ + -DENABLE_CLUCENE_NG=OFF \ + -DENABLE_FFMPEG=OFF \ + -DENABLE_XINE=OFF + make +} + +package() { + cd "${srcdir}/build/libstreams" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/build/libstreamanalyzer" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/build/strigiutils" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD new file mode 100644 index 000000000..cde42dbd4 --- /dev/null +++ b/testing/avidemux/PKGBUILD @@ -0,0 +1,120 @@ +# $Id: PKGBUILD 139585 2011-10-03 14:22:38Z ibiru $ +# Maintainer: Eric Bélanger + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.5.5 +pkgrel=4 +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz + avidemux-2.5.4-x264-build115.patch) +md5sums=('33bbe210c6826cea1987ed18a41d57a7' + '24a18b53a58b678b9e87d30566985751') + +build() { + cd "${srcdir}/${pkgbase}_${pkgver}" + + patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch" + + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + make + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ + -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ + -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ + -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. + make +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin') + provides=('avidemux') + conflicts=('avidemux') + replaces=('avidemux') + + cd "${srcdir}/${pkgbase}_${pkgver}/build" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} + rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" + + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -d "${pkgdir}/usr/share/avidemux/i18n" + install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 000000000..c627667ec --- /dev/null +++ b/testing/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); + printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); + printf("[x264] b_cabac = %d\n", x264Param->b_cabac); +-#if X264_BUILD > 101 ++#if X264_BUILD > 101 && X264_BUILD < 115 + printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); ++#elif X264_BUILD > 114 ++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop); + #endif + printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); + #if X264_BUILD > 88 +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac; + } + +-#if X264_BUILD > 101 ++#if X264_BUILD > 101 && X264_BUILD < 115 + unsigned int x264Options::getOpenGopMode(void) + { + return _param.i_open_gop; +@@ -428,6 +428,17 @@ + if (openGopMode < 3) + _param.i_open_gop = openGopMode; + } ++#elif X264_BUILD > 114 ++unsigned int x264Options::getOpenGopMode(void) ++{ ++ return _param.b_open_gop; ++} ++ ++void x264Options::setOpenGopMode(unsigned int openGopMode) ++{ ++ if (openGopMode < 3) ++ _param.b_open_gop = openGopMode; ++} + #endif + + unsigned int x264Options::getInterlaced(void) diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/testing/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch new file mode 100644 index 000000000..694f4bb67 --- /dev/null +++ b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch @@ -0,0 +1,35 @@ +0003_saslauthd_mdoc.dpatch by + +Use the correct path for the saslauthd.conf file, and use another +date format (cosmetic). + +diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc +--- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO diff --git a/testing/cyrus-sasl/0010_maintainer_mode.patch b/testing/cyrus-sasl/0010_maintainer_mode.patch new file mode 100644 index 000000000..cf3d02a08 --- /dev/null +++ b/testing/cyrus-sasl/0010_maintainer_mode.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + diff --git a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch new file mode 100644 index 000000000..3805b4857 --- /dev/null +++ b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ diff --git a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch new file mode 100644 index 000000000..d50ec8343 --- /dev/null +++ b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch @@ -0,0 +1,20 @@ +0012_xopen_crypt_prototype.dpatch by + +When _XOPEN_SOURCE is defined, the subsequent #include +will define a correct function prototype for the crypt function. +This avoids segfaults on architectures where the size of a pointer +is greater than the size of an integer (ia64 and amd64 are examples). +This may be detected by looking for build log lines such as the +following: +auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ +auth_shadow.c:183: warning: cast to pointer from integer of different +size + +diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c +--- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 +@@ -1,3 +1,4 @@ ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + /* MODULE: auth_shadow */ diff --git a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch new file mode 100644 index 000000000..e9170cef3 --- /dev/null +++ b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch @@ -0,0 +1,27 @@ +0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar + +pid_file_lock is created with a mask of 644 instead of 0644. +This patch fixes this octal/decimal confusion as well as the +(harmless) one in the previous umask() call. + +diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c +--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 +@@ -276,7 +276,7 @@ + exit(1); + } + +- umask(077); ++ umask(0077); + + pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; + if ((pid_file_lock = malloc(pid_file_size)) == NULL) { +@@ -287,7 +287,7 @@ + strlcpy(pid_file_lock, run_path, pid_file_size); + strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); + +- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { ++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { + rc = errno; + logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); + logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch new file mode 100644 index 000000000..13fa999f0 --- /dev/null +++ b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch @@ -0,0 +1,35 @@ +0016_auth_rimap_quotes.dpatch by + +All lines beginning with `## DP:' are a description of the patch. +Avoid infinite loop when username/password has a double quote character. +Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 + +diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c +--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 ++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 +@@ -162,6 +162,7 @@ + num_quotes = 0; + p1 = s; + while ((p1 = strchr(p1, '"')) != NULL) { ++ p1++; + num_quotes++; + } + +@@ -438,7 +439,7 @@ + syslog(LOG_WARNING, "auth_rimap: writev: %m"); + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + (void)close(s); + return strdup(RESP_IERROR); +@@ -447,7 +448,7 @@ + /* don't need these any longer */ + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + + /* read and parse the LOGIN response */ diff --git a/testing/cyrus-sasl/0019_ldap_deprecated.patch b/testing/cyrus-sasl/0019_ldap_deprecated.patch new file mode 100644 index 000000000..8825256cb --- /dev/null +++ b/testing/cyrus-sasl/0019_ldap_deprecated.patch @@ -0,0 +1,22 @@ +0019_ldap_deprecated.dpatch by dann frazier + +The function ldap_get_values, used in saslauthd/lak.c, is deprecated. +Therefore, its prototype is not included by default when compiling +against the ldap.h headers. As a result, the compiler cannot know the +return type of the function at compile time, and will implicitly +convert to a pointer. This has implications on 64-bit systems. +This patch sets the deprecation mode on, so that the function prototype +gets included when compiling. +(Description by Fabian Fagerholm ) + +diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c +--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 ++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 +@@ -55,6 +55,7 @@ + #include + #endif + ++#define LDAP_DEPRECATED 1 + #include + #include + #include diff --git a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 000000000..a49b553f0 --- /dev/null +++ b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -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/0025_ld_as_needed.patch b/testing/cyrus-sasl/0025_ld_as_needed.patch new file mode 100644 index 000000000..67b48b4a4 --- /dev/null +++ b/testing/cyrus-sasl/0025_ld_as_needed.patch @@ -0,0 +1,27 @@ +Author: Matthias Klose +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = diff --git a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch new file mode 100644 index 000000000..cc00867ef --- /dev/null +++ b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch new file mode 100644 index 000000000..522824074 --- /dev/null +++ b/testing/cyrus-sasl/0027_db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondřej Surý +Description: Support newer Berkeley DB versions +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + 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_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + 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_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + 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/0030-dont_use_la_files_for_opening_plugins.patch b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch new file mode 100644 index 000000000..14a322496 --- /dev/null +++ b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD new file mode 100644 index 000000000..b54f8c797 --- /dev/null +++ b/testing/cyrus-sasl/PKGBUILD @@ -0,0 +1,202 @@ +# $Id: PKGBUILD 139621 2011-10-03 19:56:54Z jgc $ +# Maintainer: Jan de Groot + +# This package spans multiple repositories. +# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. + +pkgbase=('cyrus-sasl') +pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') +#pkgname=libsasl +pkgver=2.1.23 +pkgrel=8 +pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" +arch=('i686' 'x86_64') +url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" +license=('custom') +options=('!makeflags' '!libtool') +makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz + cyrus-sasl-2.1.19-checkpw.c.patch + cyrus-sasl-2.1.22-crypt.patch + cyrus-sasl-2.1.22-qa.patch + cyrus-sasl-2.1.22-automake-1.10.patch + cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch + 0010_maintainer_mode.patch + 0011_saslauthd_ac_prog_libtool.patch + 0012_xopen_crypt_prototype.patch + 0016_pid_file_lock_creation_mask.patch + 0018_auth_rimap_quotes.patch + 0019_ldap_deprecated.patch + 0022_gcc4.4_preprocessor_syntax.patch + 0025_ld_as_needed.patch + 0026_drop_krb5support_dependency.patch + 0027_db5_support.patch + 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.conf.d + saslauthd) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + 'e27ddff076342e7a3041c4759817d04b' + 'd7e6886e88af04d05f3dec7f0a59ccf7' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f4131b077ddb5240b375d749162f1b7a' + 'c7ad2c70c1ef814eb4b119f316c064f2' + 'caeeac3feba19cbbd36e7345cc805600' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + 'dfdc052a7e678db9f687482c5d52f34e' + '4a09f6b24b91f8450892a78e378860da' + '213abe7c5dfe0d7f446992787da1e780' + '5a0321177ad30cb5518c8b6812e3961a' + '0c965748970eea29fa295524821d43f0' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' + '8e7106f32e495e9ade69014fd1b3352a' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') + +build() { + cd "${srcdir}/cyrus-sasl-${pkgver}" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" + patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" + patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" + patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" + patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" + patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" + patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" + patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" + patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" + patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" + patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" + patch -Np1 -i "${srcdir}/0027_db5_support.patch" + patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf + + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + --enable-shared \ + --enable-alwaystrue \ + --enable-checkapop \ + --enable-cram \ + --enable-digest \ + --disable-otp \ + --disable-srp \ + --disable-srp-setpass \ + --disable-krb4 \ + --enable-gssapi \ + --enable-auth-sasldb \ + --enable-plain \ + --enable-anon \ + --enable-login \ + --enable-ntlm \ + --disable-passdss \ + --enable-sql \ + --enable-ldapdb \ + --disable-macos-framework \ + --with-pam \ + --with-saslauthd=/var/run/saslauthd \ + --with-ldap \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --sysconfdir=/etc \ + --with-devrandom=/dev/urandom + make +} + +package_libsasl() { + pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" + depends=('openssl') + conflicts=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}" + for dir in include lib sasldb plugins utils; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" + install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +} + +package_cyrus-sasl() { + depends=("libsasl=${pkgver}-${pkgrel}") + pkgdesc="Cyrus saslauthd SASL authentication daemon" + backup=('etc/conf.d/saslauthd') + + cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 -d "${pkgdir}/etc/conf.d" + install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" +} + +package_cyrus-sasl-sql() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" +} diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch new file mode 100644 index 000000000..f7bf44b79 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch @@ -0,0 +1,170 @@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in +--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 ++++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 +@@ -120,7 +120,7 @@ + JAVA_TRUE = @JAVA_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = -lcrypt @LIBS@ + LIBTOOL = @LIBTOOL@ + LIB_CRYPT = @LIB_CRYPT@ + LIB_DES = @LIB_DES@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c +--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 ++++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 +@@ -94,6 +94,23 @@ + # endif + #endif + ++/****************************** ++ * crypt(3) patch start * ++ ******************************/ ++char *crypt(const char *key, const char *salt); ++ ++/* cleartext password formats */ ++#define PASSWORD_FORMAT_CLEARTEXT 1 ++#define PASSWORD_FORMAT_CRYPT 2 ++#define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_SALT_BUF_LEN 22 ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format); ++ ++/****************************** ++ * crypt(3) patch stop * ++ ******************************/ + + /* we store the following secret to check plaintext passwords: + * +@@ -143,7 +160,51 @@ + "*cmusaslsecretPLAIN", + NULL }; + struct propval auxprop_values[3]; +- ++ ++ /****************************** ++ * crypt(3) patch start * ++ * for password format check * ++ ******************************/ ++ sasl_getopt_t *getopt; ++ void *context; ++ const char *p = NULL; ++ /** ++ * MD5: 12 char salt ++ * BLOWFISH: 16 char salt ++ */ ++ char salt[PASSWORD_SALT_BUF_LEN]; ++ int password_format; ++ ++ /* get password format from auxprop configuration */ ++ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { ++ getopt(context, NULL, "password_format", &p, NULL); ++ } ++ ++ /* set password format */ ++ if (p) { ++ /* ++ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); ++ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); ++ */ ++ /* modern, modular crypt(3) */ ++ if (strncmp(p, "crypt", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPT; ++ /* traditional crypt(3) */ ++ else if (strncmp(p, "crypt_trad", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* cleartext password */ ++ else ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } else { ++ /* cleartext password */ ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } ++ ++ /****************************** ++ * crypt(3) patch stop * ++ * for password format check * ++ ******************************/ ++ + if (!conn || !userstr) + return SASL_BADPARAM; + +@@ -180,14 +241,31 @@ + goto done; + } + +- /* At the point this has been called, the username has been canonified +- * and we've done the auxprop lookup. This should be easy. */ +- if(auxprop_values[0].name +- && auxprop_values[0].values +- && auxprop_values[0].values[0] +- && !strcmp(auxprop_values[0].values[0], passwd)) { +- /* We have a plaintext version and it matched! */ +- return SASL_OK; ++ ++ /****************************** ++ * crypt(3) patch start * ++ ******************************/ ++ ++ /* get salt */ ++ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); ++ ++ /* crypt(3)-ed password? */ ++ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare password */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } ++ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare passwords */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ /****************************** ++ * crypt(3) patch stop * ++ ******************************/ + } else if(auxprop_values[1].name + && auxprop_values[1].values + && auxprop_values[1].values[0]) { +@@ -975,3 +1053,37 @@ + #endif + { NULL, NULL } + }; ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format) { ++ int num; /* how many characters is salt long? */ ++ switch (format) { ++ case PASSWORD_FORMAT_CRYPT: ++ /* md5 crypt */ ++ if (src[1] == '1') ++ num = 12; ++ /* blowfish crypt */ ++ else if (src[1] == '2') ++ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; ++ /* traditional crypt */ ++ else ++ num = 2; ++ break; ++ ++ case PASSWORD_FORMAT_CRYPTTRAD: ++ num = 2; ++ break; ++ ++ default: ++ return 1; ++ } ++ ++ /* destroy destination */ ++ memset(dest, '\0', (num + 1)); ++ ++ /* copy salt to destination */ ++ strncpy(dest, src, num); ++ ++ return 1; ++} ++ diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch new file mode 100644 index 000000000..1294cb507 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch new file mode 100644 index 000000000..8cd71c0c5 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch @@ -0,0 +1,94 @@ +Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was +originally written by Jacek Konieczny and makes cyrus-sasl building +using automake 1.10. + +--- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 ++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 +@@ -82,73 +82,73 @@ + libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la + + libplain_la_SOURCES = plain.c plain_init.c $(common_sources) +-libplain_la_LDFLAGS = -version-info $(plain_version) ++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) + libplain_la_DEPENDENCIES = $(COMPAT_OBJS) + libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) +-libanonymous_la_LDFLAGS = -version-info $(anonymous_version) ++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) + libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) + libanonymous_la_LIBADD = $(COMPAT_OBJS) + + libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) +-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) ++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) + libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) + libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) + + libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) +-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) ++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) + libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) + libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) + + libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) +-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) ++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) + libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libcrammd5_la_LIBADD = $(COMPAT_OBJS) + + libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) +-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) ++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) + libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) + + liblogin_la_SOURCES = login.c login_init.c $(common_sources) +-liblogin_la_LDFLAGS = -version-info $(login_version) ++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) + liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) + liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) +-libsrp_la_LDFLAGS = -version-info $(srp_version) ++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) + libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) + libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) + + libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) +-libotp_la_LDFLAGS = -version-info $(otp_version) ++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) + libotp_la_DEPENDENCIES = $(COMPAT_OBJS) + libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) + + libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) +-libntlm_la_LDFLAGS = -version-info $(ntlm_version) ++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) + libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) + libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) + + libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) +-libpassdss_la_LDFLAGS = -version-info $(passdss_version) ++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) + libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) + libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) + + # Auxprop Plugins + libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) +-libsasldb_la_LDFLAGS = -version-info $(sasldb_version) ++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) + libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) + libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) + + libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) +-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) + libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) + libldapdb_la_LIBADD = $(COMPAT_OBJS) + + libsql_la_SOURCES = sql.c sql_init.c $(common_sources) +-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) + libsql_la_DEPENDENCIES = $(COMPAT_OBJS) + libsql_la_LIBADD = $(COMPAT_OBJS) + diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 000000000..fd356327b --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/152544 + +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -45,6 +45,7 @@ sasl_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + ++AM_CFLAGS = -fPIC + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a + noinst_LIBRARIES = @SASL_STATIC_LIBS@ +--- cyrus-sasl-2.1.22/plugins/Makefile.am ++++ cyrus-sasl-2.1.22/plugins/Makefile.am +@@ -63,6 +63,7 @@ srp_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) ++AM_CFLAGS = -fPIC + + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + +--- cyrus-sasl-2.1.22/sasldb/Makefile.am ++++ cyrus-sasl-2.1.22/sasldb/Makefile.am +@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top + + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c + ++AM_CFLAGS = -fPIC + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +--- cyrus-sasl-2.1.22/utils/Makefile.am ++++ cyrus-sasl-2.1.22/utils/Makefile.am +@@ -42,7 +42,7 @@ + # + ################################################################ + +-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) ++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) + all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) + + sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer +--- cyrus-sasl-2.1.22/sample/Makefile.am ++++ cyrus-sasl-2.1.22/sample/Makefile.am +@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c + server_SOURCES = server.c common.c common.h + client_SOURCES = client.c common.c common.h + +-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + +-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + + EXTRA_DIST = NTMakefile +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) + libsasl2_la_LDFLAGS = -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) +-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) ++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) + + if MACOSX + framedir = /Library/Frameworks/SASL2.framework diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch new file mode 100644 index 000000000..4f7b04f13 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include ++#include + #include + #include + #include +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include ++#include + + extern char *crypt(); + diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch new file mode 100644 index 000000000..f5f372d17 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch @@ -0,0 +1,28 @@ +fix warnings: + +auth_sasldb.c: In function ‘auth_sasldb’: +auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ + +auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type +../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ + +--- saslauthd/auth_sasldb.c ++++ saslauthd/auth_sasldb.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + /* END PUBLIC DEPENDENCIES */ + + #define RETURN(x) return strdup(x) +@@ -131,7 +132,8 @@ + /* VARIABLES */ + char pw[1024]; /* pointer to passwd file entry */ + sasl_utils_t utils; +- int ret, outsize; ++ int ret; ++ size_t outsize; + const char *use_realm; + char realm_buf[MAXHOSTNAMELEN]; + /* END VARIABLES */ diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd new file mode 100644 index 000000000..6afafae0b --- /dev/null +++ b/testing/cyrus-sasl/saslauthd @@ -0,0 +1,49 @@ +#!/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_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd + if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then + add_daemon $DAEMON_NAME + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon $DAEMON_NAME + stat_done + fi + ;; + + 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 new file mode 100644 index 000000000..167211290 --- /dev/null +++ b/testing/cyrus-sasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD new file mode 100644 index 000000000..2e84ce9c0 --- /dev/null +++ b/testing/fakeroot/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 139541 2011-10-03 12:19:54Z allan $ +# Maintainer: Allan McRae +# Contributor: Jochem Kossen + +pkgname=fakeroot +pkgver=1.18.1 +pkgrel=1 +pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" +arch=('i686' 'x86_64') +license=('GPL') +url="http://packages.debian.org/fakeroot" +groups=('base-devel') +install=fakeroot.install +depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') +options=('!libtool') +source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) +md5sums=('8eedda3dcb71b6ab6f62297b82ae5ac6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \ + --disable-static --with-ipc=sysv + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/etc/ld.so.conf.d/ + echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf + + # install README for sysv/tcp usage + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README +} diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install new file mode 100644 index 000000000..986c91b06 --- /dev/null +++ b/testing/fakeroot/fakeroot.install @@ -0,0 +1,14 @@ +post_install() { + sbin/ldconfig -r . +} + +post_upgrade() { + if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then + sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf + fi + sbin/ldconfig -r . +} + +pre_remove() { + sbin/ldconfig -r . +} diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD new file mode 100644 index 000000000..2b4de898e --- /dev/null +++ b/testing/ffmpeg/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 139579 2011-10-03 14:22:30Z ibiru $ +# Maintainer : Ionut Biru +# Contributor: Tom Newsom +# Contributor: Paul Mattal + +pkgname=ffmpeg +pkgver=20111003 +pkgrel=1 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +arch=('i686' 'x86_64') +url="http://ffmpeg.org/" +license=('GPL') +depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') +makedepends=('yasm' 'git') +#git clone git://git.videolan.org/ffmpeg.git +source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) +md5sums=('38139817bee918a5664c549adb487468') + +build() { + cd "$srcdir/$pkgname" + + ./configure \ + --prefix=/usr \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install install-man + install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..75c57e041 --- /dev/null +++ b/testing/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 139587 2011-10-03 14:22:40Z ibiru $ +# Maintainer: Jan de Groot + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.18 +pkgrel=3 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) +md5sums=('04a7009a4efea2844075949c111f5e4d') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/testing/libsasl/0003_saslauthd_mdoc.patch b/testing/libsasl/0003_saslauthd_mdoc.patch new file mode 100644 index 000000000..694f4bb67 --- /dev/null +++ b/testing/libsasl/0003_saslauthd_mdoc.patch @@ -0,0 +1,35 @@ +0003_saslauthd_mdoc.dpatch by + +Use the correct path for the saslauthd.conf file, and use another +date format (cosmetic). + +diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc +--- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO diff --git a/testing/libsasl/0010_maintainer_mode.patch b/testing/libsasl/0010_maintainer_mode.patch new file mode 100644 index 000000000..cf3d02a08 --- /dev/null +++ b/testing/libsasl/0010_maintainer_mode.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + diff --git a/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch b/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch new file mode 100644 index 000000000..3805b4857 --- /dev/null +++ b/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ diff --git a/testing/libsasl/0012_xopen_crypt_prototype.patch b/testing/libsasl/0012_xopen_crypt_prototype.patch new file mode 100644 index 000000000..d50ec8343 --- /dev/null +++ b/testing/libsasl/0012_xopen_crypt_prototype.patch @@ -0,0 +1,20 @@ +0012_xopen_crypt_prototype.dpatch by + +When _XOPEN_SOURCE is defined, the subsequent #include +will define a correct function prototype for the crypt function. +This avoids segfaults on architectures where the size of a pointer +is greater than the size of an integer (ia64 and amd64 are examples). +This may be detected by looking for build log lines such as the +following: +auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ +auth_shadow.c:183: warning: cast to pointer from integer of different +size + +diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c +--- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 +@@ -1,3 +1,4 @@ ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + /* MODULE: auth_shadow */ diff --git a/testing/libsasl/0016_pid_file_lock_creation_mask.patch b/testing/libsasl/0016_pid_file_lock_creation_mask.patch new file mode 100644 index 000000000..e9170cef3 --- /dev/null +++ b/testing/libsasl/0016_pid_file_lock_creation_mask.patch @@ -0,0 +1,27 @@ +0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar + +pid_file_lock is created with a mask of 644 instead of 0644. +This patch fixes this octal/decimal confusion as well as the +(harmless) one in the previous umask() call. + +diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c +--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 +@@ -276,7 +276,7 @@ + exit(1); + } + +- umask(077); ++ umask(0077); + + pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; + if ((pid_file_lock = malloc(pid_file_size)) == NULL) { +@@ -287,7 +287,7 @@ + strlcpy(pid_file_lock, run_path, pid_file_size); + strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); + +- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { ++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { + rc = errno; + logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); + logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/testing/libsasl/0018_auth_rimap_quotes.patch b/testing/libsasl/0018_auth_rimap_quotes.patch new file mode 100644 index 000000000..13fa999f0 --- /dev/null +++ b/testing/libsasl/0018_auth_rimap_quotes.patch @@ -0,0 +1,35 @@ +0016_auth_rimap_quotes.dpatch by + +All lines beginning with `## DP:' are a description of the patch. +Avoid infinite loop when username/password has a double quote character. +Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 + +diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c +--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 ++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 +@@ -162,6 +162,7 @@ + num_quotes = 0; + p1 = s; + while ((p1 = strchr(p1, '"')) != NULL) { ++ p1++; + num_quotes++; + } + +@@ -438,7 +439,7 @@ + syslog(LOG_WARNING, "auth_rimap: writev: %m"); + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + (void)close(s); + return strdup(RESP_IERROR); +@@ -447,7 +448,7 @@ + /* don't need these any longer */ + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + + /* read and parse the LOGIN response */ diff --git a/testing/libsasl/0019_ldap_deprecated.patch b/testing/libsasl/0019_ldap_deprecated.patch new file mode 100644 index 000000000..8825256cb --- /dev/null +++ b/testing/libsasl/0019_ldap_deprecated.patch @@ -0,0 +1,22 @@ +0019_ldap_deprecated.dpatch by dann frazier + +The function ldap_get_values, used in saslauthd/lak.c, is deprecated. +Therefore, its prototype is not included by default when compiling +against the ldap.h headers. As a result, the compiler cannot know the +return type of the function at compile time, and will implicitly +convert to a pointer. This has implications on 64-bit systems. +This patch sets the deprecation mode on, so that the function prototype +gets included when compiling. +(Description by Fabian Fagerholm ) + +diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c +--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 ++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 +@@ -55,6 +55,7 @@ + #include + #endif + ++#define LDAP_DEPRECATED 1 + #include + #include + #include diff --git a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 000000000..a49b553f0 --- /dev/null +++ b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -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/libsasl/0025_ld_as_needed.patch b/testing/libsasl/0025_ld_as_needed.patch new file mode 100644 index 000000000..67b48b4a4 --- /dev/null +++ b/testing/libsasl/0025_ld_as_needed.patch @@ -0,0 +1,27 @@ +Author: Matthias Klose +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = diff --git a/testing/libsasl/0026_drop_krb5support_dependency.patch b/testing/libsasl/0026_drop_krb5support_dependency.patch new file mode 100644 index 000000000..cc00867ef --- /dev/null +++ b/testing/libsasl/0026_drop_krb5support_dependency.patch @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/testing/libsasl/0027_db5_support.patch b/testing/libsasl/0027_db5_support.patch new file mode 100644 index 000000000..522824074 --- /dev/null +++ b/testing/libsasl/0027_db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondřej Surý +Description: Support newer Berkeley DB versions +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + 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_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + 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_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + 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/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch new file mode 100644 index 000000000..14a322496 --- /dev/null +++ b/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); diff --git a/testing/libsasl/PKGBUILD b/testing/libsasl/PKGBUILD new file mode 100644 index 000000000..4d207429d --- /dev/null +++ b/testing/libsasl/PKGBUILD @@ -0,0 +1,202 @@ +# $Id: PKGBUILD 139568 2011-10-03 13:37:30Z jgc $ +# Maintainer: Jan de Groot + +# This package spans multiple repositories. +# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. + +#pkgbase=('cyrus-sasl') +#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') +pkgname=libsasl +pkgver=2.1.23 +pkgrel=8 +pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" +arch=('i686' 'x86_64') +url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" +license=('custom') +options=('!makeflags' '!libtool') +makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz + cyrus-sasl-2.1.19-checkpw.c.patch + cyrus-sasl-2.1.22-crypt.patch + cyrus-sasl-2.1.22-qa.patch + cyrus-sasl-2.1.22-automake-1.10.patch + cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch + 0010_maintainer_mode.patch + 0011_saslauthd_ac_prog_libtool.patch + 0012_xopen_crypt_prototype.patch + 0016_pid_file_lock_creation_mask.patch + 0018_auth_rimap_quotes.patch + 0019_ldap_deprecated.patch + 0022_gcc4.4_preprocessor_syntax.patch + 0025_ld_as_needed.patch + 0026_drop_krb5support_dependency.patch + 0027_db5_support.patch + 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.conf.d + saslauthd) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + 'e27ddff076342e7a3041c4759817d04b' + 'd7e6886e88af04d05f3dec7f0a59ccf7' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f4131b077ddb5240b375d749162f1b7a' + 'c7ad2c70c1ef814eb4b119f316c064f2' + 'caeeac3feba19cbbd36e7345cc805600' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + 'dfdc052a7e678db9f687482c5d52f34e' + '4a09f6b24b91f8450892a78e378860da' + '213abe7c5dfe0d7f446992787da1e780' + '5a0321177ad30cb5518c8b6812e3961a' + '0c965748970eea29fa295524821d43f0' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' + '8e7106f32e495e9ade69014fd1b3352a' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') + +build() { + cd "${srcdir}/cyrus-sasl-${pkgver}" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" + patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" + patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" + patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" + patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" + patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" + patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" + patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" + patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" + patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" + patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" + patch -Np1 -i "${srcdir}/0027_db5_support.patch" + patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf + + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + --enable-shared \ + --enable-alwaystrue \ + --enable-checkapop \ + --enable-cram \ + --enable-digest \ + --disable-otp \ + --disable-srp \ + --disable-srp-setpass \ + --disable-krb4 \ + --enable-gssapi \ + --enable-auth-sasldb \ + --enable-plain \ + --enable-anon \ + --enable-login \ + --enable-ntlm \ + --disable-passdss \ + --enable-sql \ + --enable-ldapdb \ + --disable-macos-framework \ + --with-pam \ + --with-saslauthd=/var/run/saslauthd \ + --with-ldap \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --sysconfdir=/etc \ + --with-devrandom=/dev/urandom + make +} + +package_libsasl() { + pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" + depends=('openssl') + conflicts=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}" + for dir in include lib sasldb plugins utils; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" + install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +} + +package_cyrus-sasl() { + depends=("libsasl=${pkgver}-${pkgrel}") + pkgdesc="Cyrus saslauthd SASL authentication daemon" + backup=('etc/conf.d/saslauthd') + + cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 -d "${pkgdir}/etc/conf.d" + install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" +} + +package_cyrus-sasl-sql() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" +} diff --git a/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch new file mode 100644 index 000000000..f7bf44b79 --- /dev/null +++ b/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch @@ -0,0 +1,170 @@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in +--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 ++++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 +@@ -120,7 +120,7 @@ + JAVA_TRUE = @JAVA_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = -lcrypt @LIBS@ + LIBTOOL = @LIBTOOL@ + LIB_CRYPT = @LIB_CRYPT@ + LIB_DES = @LIB_DES@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c +--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 ++++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 +@@ -94,6 +94,23 @@ + # endif + #endif + ++/****************************** ++ * crypt(3) patch start * ++ ******************************/ ++char *crypt(const char *key, const char *salt); ++ ++/* cleartext password formats */ ++#define PASSWORD_FORMAT_CLEARTEXT 1 ++#define PASSWORD_FORMAT_CRYPT 2 ++#define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_SALT_BUF_LEN 22 ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format); ++ ++/****************************** ++ * crypt(3) patch stop * ++ ******************************/ + + /* we store the following secret to check plaintext passwords: + * +@@ -143,7 +160,51 @@ + "*cmusaslsecretPLAIN", + NULL }; + struct propval auxprop_values[3]; +- ++ ++ /****************************** ++ * crypt(3) patch start * ++ * for password format check * ++ ******************************/ ++ sasl_getopt_t *getopt; ++ void *context; ++ const char *p = NULL; ++ /** ++ * MD5: 12 char salt ++ * BLOWFISH: 16 char salt ++ */ ++ char salt[PASSWORD_SALT_BUF_LEN]; ++ int password_format; ++ ++ /* get password format from auxprop configuration */ ++ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { ++ getopt(context, NULL, "password_format", &p, NULL); ++ } ++ ++ /* set password format */ ++ if (p) { ++ /* ++ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); ++ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); ++ */ ++ /* modern, modular crypt(3) */ ++ if (strncmp(p, "crypt", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPT; ++ /* traditional crypt(3) */ ++ else if (strncmp(p, "crypt_trad", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* cleartext password */ ++ else ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } else { ++ /* cleartext password */ ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } ++ ++ /****************************** ++ * crypt(3) patch stop * ++ * for password format check * ++ ******************************/ ++ + if (!conn || !userstr) + return SASL_BADPARAM; + +@@ -180,14 +241,31 @@ + goto done; + } + +- /* At the point this has been called, the username has been canonified +- * and we've done the auxprop lookup. This should be easy. */ +- if(auxprop_values[0].name +- && auxprop_values[0].values +- && auxprop_values[0].values[0] +- && !strcmp(auxprop_values[0].values[0], passwd)) { +- /* We have a plaintext version and it matched! */ +- return SASL_OK; ++ ++ /****************************** ++ * crypt(3) patch start * ++ ******************************/ ++ ++ /* get salt */ ++ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); ++ ++ /* crypt(3)-ed password? */ ++ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare password */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } ++ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare passwords */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ /****************************** ++ * crypt(3) patch stop * ++ ******************************/ + } else if(auxprop_values[1].name + && auxprop_values[1].values + && auxprop_values[1].values[0]) { +@@ -975,3 +1053,37 @@ + #endif + { NULL, NULL } + }; ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format) { ++ int num; /* how many characters is salt long? */ ++ switch (format) { ++ case PASSWORD_FORMAT_CRYPT: ++ /* md5 crypt */ ++ if (src[1] == '1') ++ num = 12; ++ /* blowfish crypt */ ++ else if (src[1] == '2') ++ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; ++ /* traditional crypt */ ++ else ++ num = 2; ++ break; ++ ++ case PASSWORD_FORMAT_CRYPTTRAD: ++ num = 2; ++ break; ++ ++ default: ++ return 1; ++ } ++ ++ /* destroy destination */ ++ memset(dest, '\0', (num + 1)); ++ ++ /* copy salt to destination */ ++ strncpy(dest, src, num); ++ ++ return 1; ++} ++ diff --git a/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch new file mode 100644 index 000000000..1294cb507 --- /dev/null +++ b/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch new file mode 100644 index 000000000..8cd71c0c5 --- /dev/null +++ b/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch @@ -0,0 +1,94 @@ +Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was +originally written by Jacek Konieczny and makes cyrus-sasl building +using automake 1.10. + +--- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 ++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 +@@ -82,73 +82,73 @@ + libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la + + libplain_la_SOURCES = plain.c plain_init.c $(common_sources) +-libplain_la_LDFLAGS = -version-info $(plain_version) ++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) + libplain_la_DEPENDENCIES = $(COMPAT_OBJS) + libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) +-libanonymous_la_LDFLAGS = -version-info $(anonymous_version) ++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) + libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) + libanonymous_la_LIBADD = $(COMPAT_OBJS) + + libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) +-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) ++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) + libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) + libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) + + libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) +-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) ++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) + libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) + libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) + + libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) +-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) ++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) + libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libcrammd5_la_LIBADD = $(COMPAT_OBJS) + + libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) +-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) ++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) + libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) + + liblogin_la_SOURCES = login.c login_init.c $(common_sources) +-liblogin_la_LDFLAGS = -version-info $(login_version) ++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) + liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) + liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) +-libsrp_la_LDFLAGS = -version-info $(srp_version) ++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) + libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) + libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) + + libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) +-libotp_la_LDFLAGS = -version-info $(otp_version) ++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) + libotp_la_DEPENDENCIES = $(COMPAT_OBJS) + libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) + + libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) +-libntlm_la_LDFLAGS = -version-info $(ntlm_version) ++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) + libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) + libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) + + libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) +-libpassdss_la_LDFLAGS = -version-info $(passdss_version) ++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) + libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) + libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) + + # Auxprop Plugins + libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) +-libsasldb_la_LDFLAGS = -version-info $(sasldb_version) ++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) + libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) + libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) + + libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) +-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) + libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) + libldapdb_la_LIBADD = $(COMPAT_OBJS) + + libsql_la_SOURCES = sql.c sql_init.c $(common_sources) +-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) + libsql_la_DEPENDENCIES = $(COMPAT_OBJS) + libsql_la_LIBADD = $(COMPAT_OBJS) + diff --git a/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch b/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 000000000..fd356327b --- /dev/null +++ b/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/152544 + +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -45,6 +45,7 @@ sasl_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + ++AM_CFLAGS = -fPIC + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a + noinst_LIBRARIES = @SASL_STATIC_LIBS@ +--- cyrus-sasl-2.1.22/plugins/Makefile.am ++++ cyrus-sasl-2.1.22/plugins/Makefile.am +@@ -63,6 +63,7 @@ srp_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) ++AM_CFLAGS = -fPIC + + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + +--- cyrus-sasl-2.1.22/sasldb/Makefile.am ++++ cyrus-sasl-2.1.22/sasldb/Makefile.am +@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top + + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c + ++AM_CFLAGS = -fPIC + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +--- cyrus-sasl-2.1.22/utils/Makefile.am ++++ cyrus-sasl-2.1.22/utils/Makefile.am +@@ -42,7 +42,7 @@ + # + ################################################################ + +-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) ++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) + all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) + + sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer +--- cyrus-sasl-2.1.22/sample/Makefile.am ++++ cyrus-sasl-2.1.22/sample/Makefile.am +@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c + server_SOURCES = server.c common.c common.h + client_SOURCES = client.c common.c common.h + +-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + +-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + + EXTRA_DIST = NTMakefile +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) + libsasl2_la_LDFLAGS = -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) +-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) ++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) + + if MACOSX + framedir = /Library/Frameworks/SASL2.framework diff --git a/testing/libsasl/cyrus-sasl-2.1.22-qa.patch b/testing/libsasl/cyrus-sasl-2.1.22-qa.patch new file mode 100644 index 000000000..4f7b04f13 --- /dev/null +++ b/testing/libsasl/cyrus-sasl-2.1.22-qa.patch @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include ++#include + #include + #include + #include +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include ++#include + + extern char *crypt(); + diff --git a/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch new file mode 100644 index 000000000..f5f372d17 --- /dev/null +++ b/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch @@ -0,0 +1,28 @@ +fix warnings: + +auth_sasldb.c: In function ‘auth_sasldb’: +auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ + +auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type +../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ + +--- saslauthd/auth_sasldb.c ++++ saslauthd/auth_sasldb.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + /* END PUBLIC DEPENDENCIES */ + + #define RETURN(x) return strdup(x) +@@ -131,7 +132,8 @@ + /* VARIABLES */ + char pw[1024]; /* pointer to passwd file entry */ + sasl_utils_t utils; +- int ret, outsize; ++ int ret; ++ size_t outsize; + const char *use_realm; + char realm_buf[MAXHOSTNAMELEN]; + /* END VARIABLES */ diff --git a/testing/libsasl/saslauthd b/testing/libsasl/saslauthd new file mode 100644 index 000000000..6afafae0b --- /dev/null +++ b/testing/libsasl/saslauthd @@ -0,0 +1,49 @@ +#!/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_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd + if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then + add_daemon $DAEMON_NAME + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon $DAEMON_NAME + stat_done + fi + ;; + + 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/libsasl/saslauthd.conf.d b/testing/libsasl/saslauthd.conf.d new file mode 100644 index 000000000..167211290 --- /dev/null +++ b/testing/libsasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD new file mode 100644 index 000000000..d76bbc55c --- /dev/null +++ b/testing/mpfr/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 139633 2011-10-03 23:32:17Z allan $ +# Maintainer: Allan McRae +# Contributor: damir + +pkgname=mpfr +_pkgver=3.1.0 +pkgver=${_pkgver} +#_patchlevel=p4 +#pkgver=${_pkgver}.${_patchlevel} +pkgrel=2 +pkgdesc="Multiple-precision floating-point library" +arch=('i686' 'x86_64') +url="http://www.mpfr.org/" +license=('LGPL') +depends=('gmp>=5.0') +options=('!libtool') +install=mpfr.install +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz) +md5sums=('6e495841bb026481567006cec0f821c3') + +build() { + cd "${srcdir}/${pkgname}-${_pkgver}" + #patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch + ./configure --prefix=/usr --enable-thread-safe --enable-shared + make +} + +check() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install new file mode 100644 index 000000000..d6dd0475b --- /dev/null +++ b/testing/mpfr/mpfr.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(mpfr.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD new file mode 100644 index 000000000..b1c1dcdf7 --- /dev/null +++ b/testing/opal/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 139583 2011-10-03 14:22:35Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Tom K +pkgname=opal +pkgver=3.10.2 +pkgrel=2 +pkgdesc="Open Phone Abstraction Library" +arch=(i686 x86_64) +url="http://www.ekiga.org" +license=('GPL') +depends=('ptlib' 'libtheora' 'x264' 'speex') +makedepends=('ffmpeg') +options=(!makeflags) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205') + +build() { + cd "${srcdir}/opal-${pkgver}" + CXXFLAGS="$CXXFLAGS -fpermissive" \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/opal-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/rubberband/PKGBUILD b/testing/rubberband/PKGBUILD new file mode 100644 index 000000000..b9549213f --- /dev/null +++ b/testing/rubberband/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 139630 2011-10-03 20:52:06Z schiv $ +# Maintainer: Ray Rashif +# Contributor: Felipe Machado aka arch_audio + +pkgname=rubberband +pkgver=1.6.0 +pkgrel=2 +pkgdesc="Time-stretching and pitch-shifting audio library and utility" +arch=('i686' 'x86_64') +url="http://www.breakfastquay.com/rubberband/" +license=('GPL') +depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk') +makedepends=('ladspa') +source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2" + 'gcc46.patch' + 'vectorops.patch') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fix gcc 4.6 compatibility + patch -Np1 -i "$srcdir/gcc46.patch" + + # fix bug exposed by gcc 4.6 + # see https://bugs.archlinux.org/task/26140 + patch -Np1 -i "$srcdir/vectorops.patch" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: +md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' + '7c2f404975da6052f6b80eac12efbeb4' + '4bdc9689179d3a2cf64172f0f911701d') diff --git a/testing/rubberband/gcc46.patch b/testing/rubberband/gcc46.patch new file mode 100644 index 000000000..38ac76d42 --- /dev/null +++ b/testing/rubberband/gcc46.patch @@ -0,0 +1,10 @@ +--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h ++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + /** + * @mainpage RubberBand diff --git a/testing/rubberband/vectorops.patch b/testing/rubberband/vectorops.patch new file mode 100644 index 000000000..cae961591 --- /dev/null +++ b/testing/rubberband/vectorops.patch @@ -0,0 +1,13 @@ +--- a/src/system/VectorOps.h Mon Mar 21 21:51:33 2011 +0000 ++++ b/src/system/VectorOps.h Sun Oct 02 21:12:42 2011 +0100 +@@ -84,8 +84,8 @@ + } + + template +-inline void v_move(T *const R__ dst, +- const T *const R__ src, ++inline void v_move(T *const dst, ++ const T *const src, + const int count) + { + memmove(dst, src, count * sizeof(T)); diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD new file mode 100644 index 000000000..871aa83eb --- /dev/null +++ b/testing/vlc/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 139589 2011-10-03 14:22:44Z ibiru $ +# Maintainer: Giovanni Scafora +# Contributor: Sarah Hay +# Contributor: Martin Sandsmark + +pkgname=vlc +pkgver=1.1.11 +pkgrel=5 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/http/.hosts' + 'usr/share/vlc/http/dialogs/.hosts' + 'usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install new file mode 100644 index 000000000..4a1091bc5 --- /dev/null +++ b/testing/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD new file mode 100644 index 000000000..e76355a09 --- /dev/null +++ b/testing/x264/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 139577 2011-10-03 14:22:28Z ibiru $ +# Maintainer : Ionut Biru +# Contributor: damir +# Contributor: Paul Mattal + +pkgname=x264 +pkgver=20111001 +pkgrel=1 +pkgdesc="free library for encoding H264/AVC video streams" +arch=('i686' 'x86_64') +url="http://www.videolan.org/developers/x264.html" +license=('GPL') +depends=('glibc') +makedepends=('yasm') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) +md5sums=('dd67dca96ac79e7cb963bfcbf68e017b') + +build() { + cd "$srcdir/$pkgname-snapshot-$pkgver-2245" + + ./configure --enable-shared + + make + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 5442e9b8f357932ed5d6cb46e90fcbf6f453469f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Oct 2011 23:14:37 +0000 Subject: Thu Oct 6 23:14:37 UTC 2011 --- community-staging/epdfview/PKGBUILD | 38 + community-staging/epdfview/epdfview.desktop.patch | 11 + community-staging/epdfview/epdfview.install | 12 + community-staging/gummi/PKGBUILD | 32 + community-staging/zathura/PKGBUILD | 29 + community-staging/zathura/zathura.install | 13 + community/cairo-compmgr/PKGBUILD | 6 +- community/csfml/PKGBUILD | 4 +- community/darktable/PKGBUILD | 4 +- community/gmic/PKGBUILD | 11 +- community/gmic/opencv-buildfix.patch | 15 + community/gnome-commander/PKGBUILD | 6 +- community/ibus-chewing/PKGBUILD | 12 +- .../ibus-chewing-696864-abrt-ibus-1.4.patch | 84 ++ community/kphotoalbum/PKGBUILD | 4 +- community/krename/PKGBUILD | 7 +- community/libextractor/PKGBUILD | 4 +- community/libgexiv2/PKGBUILD | 10 +- community/libmediainfo/PKGBUILD | 12 +- .../libmediainfo/libmediainfo-0.7.50-libmms.patch | 50 ++ community/luminancehdr/PKGBUILD | 12 +- community/mediainfo-gui/PKGBUILD | 6 +- community/mediainfo/PKGBUILD | 6 +- community/nautilus-actions/PKGBUILD | 10 +- community/parole/PKGBUILD | 31 + community/parole/parole.install | 11 + community/qgo/PKGBUILD | 29 +- community/qgo/gcc43.patch | 37 + community/qgo/gcc45.patch | 205 +++++ community/rawstudio/PKGBUILD | 4 +- community/recoll/PKGBUILD | 6 +- community/shotwell/PKGBUILD | 13 +- core/nfs-utils/PKGBUILD | 22 +- core/nfs-utils/start-statd.patch | 4 +- extra/cmake/PKGBUILD | 11 +- extra/cmake/cmake.install | 2 +- extra/exiv2/PKGBUILD | 14 +- extra/fvwm/PKGBUILD | 8 +- extra/geeqie/PKGBUILD | 4 +- extra/gimp-ufraw/PKGBUILD | 13 +- extra/gimp-ufraw/gimp-ufraw.install | 11 + extra/gnome-color-manager/PKGBUILD | 4 +- extra/gthumb/PKGBUILD | 4 +- extra/hugin/PKGBUILD | 17 +- extra/hwloc/PKGBUILD | 6 +- extra/kdeaccessibility/PKGBUILD | 6 +- extra/kdeadmin/PKGBUILD | 6 +- extra/kdeartwork/PKGBUILD | 6 +- extra/kdebase-konsole/PKGBUILD | 6 +- extra/kdebase-runtime/PKGBUILD | 6 +- extra/kdebase-workspace/PKGBUILD | 63 +- extra/kdebase-workspace/kdm-xinitrd.patch | 18 + extra/kdebase/PKGBUILD | 6 +- extra/kdebindings-kimono/PKGBUILD | 6 +- extra/kdebindings-korundum/PKGBUILD | 6 +- extra/kdebindings-kross/PKGBUILD | 6 +- extra/kdebindings-perlkde/PKGBUILD | 6 +- extra/kdebindings-perlqt/PKGBUILD | 6 +- extra/kdebindings-python/PKGBUILD | 6 +- extra/kdebindings-qtruby/PKGBUILD | 6 +- extra/kdebindings-qyoto/PKGBUILD | 6 +- extra/kdebindings-smokegen/PKGBUILD | 6 +- extra/kdebindings-smokekde/PKGBUILD | 6 +- extra/kdebindings-smokeqt/PKGBUILD | 8 +- extra/kdeedu-blinken/PKGBUILD | 6 +- extra/kdeedu-cantor/PKGBUILD | 6 +- extra/kdeedu-kalgebra/PKGBUILD | 6 +- extra/kdeedu-kalzium/PKGBUILD | 6 +- extra/kdeedu-kanagram/PKGBUILD | 6 +- extra/kdeedu-kbruch/PKGBUILD | 6 +- extra/kdeedu-kgeography/PKGBUILD | 6 +- extra/kdeedu-khangman/PKGBUILD | 6 +- extra/kdeedu-kig/PKGBUILD | 6 +- extra/kdeedu-kiten/PKGBUILD | 6 +- extra/kdeedu-klettres/PKGBUILD | 6 +- extra/kdeedu-kmplot/PKGBUILD | 6 +- extra/kdeedu-kstars/PKGBUILD | 6 +- extra/kdeedu-ktouch/PKGBUILD | 6 +- extra/kdeedu-kturtle/PKGBUILD | 6 +- extra/kdeedu-kwordquiz/PKGBUILD | 6 +- extra/kdeedu-marble/PKGBUILD | 13 +- extra/kdeedu-parley/PKGBUILD | 6 +- extra/kdeedu-rocs/PKGBUILD | 6 +- extra/kdeedu-step/PKGBUILD | 6 +- extra/kdegames/PKGBUILD | 6 +- extra/kdegraphics-gwenview/PKGBUILD | 6 +- extra/kdegraphics-kamera/PKGBUILD | 6 +- extra/kdegraphics-kcolorchooser/PKGBUILD | 6 +- extra/kdegraphics-kgamma/PKGBUILD | 6 +- extra/kdegraphics-kolourpaint/PKGBUILD | 6 +- extra/kdegraphics-kruler/PKGBUILD | 6 +- extra/kdegraphics-ksaneplugin/PKGBUILD | 6 +- extra/kdegraphics-ksnapshot/PKGBUILD | 6 +- extra/kdegraphics-mobipocket/PKGBUILD | 6 +- extra/kdegraphics-okular/PKGBUILD | 6 +- extra/kdegraphics-strigi-analyzer/PKGBUILD | 6 +- extra/kdegraphics-svgpart/PKGBUILD | 6 +- extra/kdegraphics-thumbnailers/PKGBUILD | 6 +- extra/kdelibs/PKGBUILD | 19 +- extra/kdemultimedia/PKGBUILD | 6 +- extra/kdenetwork/PKGBUILD | 6 +- extra/kdepim-runtime/PKGBUILD | 6 +- extra/kdepim/PKGBUILD | 8 +- extra/kdepimlibs/PKGBUILD | 6 +- extra/kdeplasma-addons/PKGBUILD | 6 +- extra/kdeplasma-applets-networkmanagement/PKGBUILD | 6 +- extra/kdesdk-kate/PKGBUILD | 6 +- extra/kdesdk/PKGBUILD | 6 +- extra/kdetoys/PKGBUILD | 6 +- extra/kdeutils/PKGBUILD | 6 +- extra/kdewebdev/PKGBUILD | 6 +- extra/koffice/PKGBUILD | 4 +- extra/libkdcraw/PKGBUILD | 6 +- extra/libkdeedu/PKGBUILD | 6 +- extra/libkexiv2/PKGBUILD | 6 +- extra/libkipi/PKGBUILD | 6 +- extra/libksane/PKGBUILD | 6 +- extra/openmpi/PKGBUILD | 13 +- extra/sane/PKGBUILD | 12 +- extra/sane/xerox_mfp_fix_usb_devices.patch | 67 ++ extra/strigi/PKGBUILD | 16 +- extra/xterm/PKGBUILD | 6 +- kde-unstable/kdebase-workspace/PKGBUILD | 30 +- multilib/lib32-atk/PKGBUILD | 8 +- multilib/lib32-pango/PKGBUILD | 8 +- staging/evince/PKGBUILD | 37 + staging/evince/evince.install | 19 + staging/gimp-devel/PKGBUILD | 51 ++ staging/gimp-devel/gimp-devel.install | 12 + staging/gimp-devel/linux.gpl | 19 + staging/inkscape/PKGBUILD | 52 ++ staging/inkscape/install | 13 + staging/libreoffice/PKGBUILD | 940 +++++++++++++++++++++ staging/libreoffice/buildfix_boost.diff | 40 + staging/libreoffice/buildfix_ct2n.diff | 17 + staging/libreoffice/libreoffice.install | 47 ++ .../scp2-more-reasonable-file-access-rights.diff | 15 + staging/libreoffice/vbahelper.visibility.patch | 33 + staging/poppler/PKGBUILD | 68 ++ staging/tracker/PKGBUILD | 82 ++ staging/tracker/tracker.install | 13 + staging/xournal/PKGBUILD | 35 + staging/xournal/install | 13 + staging/xournal/pdf-export-64.patch | 89 ++ staging/xournal/poppler-api.patch | 158 ++++ testing/kbd/PKGBUILD | 44 + testing/kbd/fix-es.po.patch | 11 + testing/libreoffice/PKGBUILD | 928 ++++++++++++++++++++ testing/libreoffice/buildfix_boost.diff | 40 + testing/libreoffice/buildfix_ct2n.diff | 17 + testing/libreoffice/libreoffice.install | 47 ++ .../scp2-more-reasonable-file-access-rights.diff | 15 + testing/libreoffice/vbahelper.visibility.patch | 33 + testing/telepathy-mission-control/PKGBUILD | 6 +- 154 files changed, 3994 insertions(+), 437 deletions(-) create mode 100644 community-staging/epdfview/PKGBUILD create mode 100644 community-staging/epdfview/epdfview.desktop.patch create mode 100644 community-staging/epdfview/epdfview.install create mode 100644 community-staging/gummi/PKGBUILD create mode 100644 community-staging/zathura/PKGBUILD create mode 100644 community-staging/zathura/zathura.install create mode 100644 community/gmic/opencv-buildfix.patch create mode 100644 community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch create mode 100644 community/libmediainfo/libmediainfo-0.7.50-libmms.patch create mode 100644 community/parole/PKGBUILD create mode 100644 community/parole/parole.install create mode 100644 community/qgo/gcc43.patch create mode 100644 community/qgo/gcc45.patch create mode 100644 extra/gimp-ufraw/gimp-ufraw.install create mode 100644 extra/kdebase-workspace/kdm-xinitrd.patch create mode 100644 extra/sane/xerox_mfp_fix_usb_devices.patch create mode 100644 staging/evince/PKGBUILD create mode 100644 staging/evince/evince.install create mode 100644 staging/gimp-devel/PKGBUILD create mode 100644 staging/gimp-devel/gimp-devel.install create mode 100644 staging/gimp-devel/linux.gpl create mode 100644 staging/inkscape/PKGBUILD create mode 100644 staging/inkscape/install create mode 100644 staging/libreoffice/PKGBUILD create mode 100644 staging/libreoffice/buildfix_boost.diff create mode 100644 staging/libreoffice/buildfix_ct2n.diff create mode 100644 staging/libreoffice/libreoffice.install create mode 100644 staging/libreoffice/scp2-more-reasonable-file-access-rights.diff create mode 100644 staging/libreoffice/vbahelper.visibility.patch create mode 100644 staging/poppler/PKGBUILD create mode 100644 staging/tracker/PKGBUILD create mode 100644 staging/tracker/tracker.install create mode 100644 staging/xournal/PKGBUILD create mode 100644 staging/xournal/install create mode 100644 staging/xournal/pdf-export-64.patch create mode 100644 staging/xournal/poppler-api.patch create mode 100644 testing/kbd/PKGBUILD create mode 100644 testing/kbd/fix-es.po.patch create mode 100644 testing/libreoffice/PKGBUILD create mode 100644 testing/libreoffice/buildfix_boost.diff create mode 100644 testing/libreoffice/buildfix_ct2n.diff create mode 100644 testing/libreoffice/libreoffice.install create mode 100644 testing/libreoffice/scp2-more-reasonable-file-access-rights.diff create mode 100644 testing/libreoffice/vbahelper.visibility.patch (limited to 'community-staging') diff --git a/community-staging/epdfview/PKGBUILD b/community-staging/epdfview/PKGBUILD new file mode 100644 index 000000000..557f0745a --- /dev/null +++ b/community-staging/epdfview/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 56323 2011-10-05 15:49:12Z schuay $ +# Maintainer: schuay +# Contributor: Tom K +# Contributor: Thayer Williams + +pkgname=epdfview +pkgver=0.1.8 +pkgrel=2 +pkgdesc="A free lightweight PDF document viewer." +url="http://www.emma-soft.com/projects/epdfview/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2') +makedepends=('pkgconfig') +install='epdfview.install' +source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2" + "${pkgname}.desktop.patch") +md5sums=('e50285b01612169b2594fea375f53ae4' + 'fbf22bbabdbb7544db615ac5775d57e2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + for size in 24 32 48; do + install -Dm644 data/icon_${pkgname}-${size}.png \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png" + done +} diff --git a/community-staging/epdfview/epdfview.desktop.patch b/community-staging/epdfview/epdfview.desktop.patch new file mode 100644 index 000000000..d86fc3088 --- /dev/null +++ b/community-staging/epdfview/epdfview.desktop.patch @@ -0,0 +1,11 @@ +--- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700 ++++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700 +@@ -7,7 +7,7 @@ + GenericName=PDF Viewer + GenericName[ca]=Visor PDF + GenericName[es]=Visor PDF +-Icon=icon_epdfview-48 ++Icon=epdfview + Name=ePDFViewer + Name[ca]=ePDFViewer + Name[es]=ePDFViewer diff --git a/community-staging/epdfview/epdfview.install b/community-staging/epdfview/epdfview.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-staging/epdfview/epdfview.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/gummi/PKGBUILD b/community-staging/gummi/PKGBUILD new file mode 100644 index 000000000..dc4b902b2 --- /dev/null +++ b/community-staging/gummi/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Sergio A. Morales +# Contributor: soeren + +pkgname=gummi +pkgver=0.5.8 +pkgrel=3 +pkgdesc='Simple LaTex editor for GTK users' +arch=('i686' 'x86_64') +url='http://gummi.midnightcoding.org/' +license=('MIT') +depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib') +makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') +source=("http://dev.midnightcoding.org/redmine/attachments/download/141/gummi-0.5.8-2.tar.gz") +md5sums=('79cd1360779125ad85a0f0b459951b27') + +build() { + cd ${pkgname}-${pkgver} + + find . -type f -exec touch {} \; + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make prefix=${pkgdir}/usr install +} diff --git a/community-staging/zathura/PKGBUILD b/community-staging/zathura/PKGBUILD new file mode 100644 index 000000000..2110282d5 --- /dev/null +++ b/community-staging/zathura/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 56321 2011-10-05 15:47:17Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: ML + +pkgname=zathura +pkgver=0.0.8.4 +pkgrel=3 +pkgdesc="a PDF viewer" +arch=('i686' 'x86_64') +url="http://zathura.pwmt.org" +license=('custom') +depends=('poppler-glib' 'gtk2' 'cairo') +makedepends=('docutils') +install=zathura.install +DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=(https://pwmt.org/download/zathura-$pkgver.tar.gz) +md5sums=('e3a7f82401059e591ed549d615f53ddd') + +build() { + cd $srcdir/zathura-$pkgver + make +} + +package() { + cd $srcdir/zathura-$pkgver + make install DESTDIR=$pkgdir + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-staging/zathura/zathura.install b/community-staging/zathura/zathura.install new file mode 100644 index 000000000..f450cf9b8 --- /dev/null +++ b/community-staging/zathura/zathura.install @@ -0,0 +1,13 @@ +post_install() { + which gtk-update-icon-cache >/dev/null && \ + [ -d usr/share/icons/hicolor ] && \ + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD index 30c08cec2..dde0b7713 100644 --- a/community/cairo-compmgr/PKGBUILD +++ b/community/cairo-compmgr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56166 2011-10-02 15:46:05Z bluewind $ +# $Id: PKGBUILD 56292 2011-10-05 06:05:11Z bluewind $ # Maintainer: Florian Pritz # Contributor: Adam Hani Schakaki (krzd) # Contributor: Det @@ -8,9 +8,9 @@ # Contributor: Gianni Vialetto pkgname=cairo-compmgr -pkgver=git2011102 +pkgver=git20111002 _commit=348f149af30bc829c2100d0e622c5dcaf43925b7 -pkgrel=3 +pkgrel=1 epoch=1 pkgdesc="A Cairo based composite manager" arch=(i686 x86_64) diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD index 597c18073..d3e3c309c 100644 --- a/community/csfml/PKGBUILD +++ b/community/csfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54271 2011-08-16 02:58:49Z svenstaro $ +# $Id: PKGBUILD 56326 2011-10-05 16:28:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=csfml @@ -6,7 +6,7 @@ pkgname=csfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110816 + pkgver=1.99.git20110917 fi pkgrel=1 diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index eea40b5b0..6f6bfdc34 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54817 2011-08-26 16:20:02Z spupykin $ +# $Id: PKGBUILD 56335 2011-10-05 19:07:45Z andrea $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -6,7 +6,7 @@ pkgname=darktable pkgver=0.9.2 _pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index a508a3029..d9c11df10 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52163 2011-07-20 22:09:09Z spupykin $ +# $Id: PKGBUILD 56316 2011-10-05 15:22:43Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.0.0 +pkgver=1.5.0.3 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64') @@ -14,8 +14,10 @@ license=('custom:CeCILL') url="http://gmic.sourceforge.net" makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick') options=('docs' '!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz") -md5sums=('6ea2d9b3be294d79cd83364c03303a96') +source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" + opencv-buildfix.patch) +md5sums=('beb98c3f257d664da750455a98cc3aa9' + 'f135182ced743c296e08ddd560fa6be9') build() { cd "$srcdir/gmic-$pkgver" @@ -27,6 +29,7 @@ build() { sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile sed -i 's|cp -f gmic_gimp.*||' src/Makefile + patch -p1 <$srcdir/opencv-buildfix.patch make -C src all } diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch new file mode 100644 index 000000000..7fda2ea54 --- /dev/null +++ b/community/gmic/opencv-buildfix.patch @@ -0,0 +1,15 @@ +diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h +--- gmic-1.5.0.3.org/src/CImg.h 2011-09-22 18:37:54.000000000 +0400 ++++ gmic-1.5.0.3/src/CImg.h 2011-10-05 18:03:25.000000000 +0400 +@@ -234,7 +234,11 @@ + // Using OpenCV is not mandatory. + #ifdef cimg_use_opencv + #include ++#undef True ++#undef False + #include "cv.h" ++#define True 1 ++#define False 0 + #include "highgui.h" + #endif + diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index 6f28671fa..0555e3a39 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53650 2011-08-07 16:53:25Z ibiru $ +# $Id: PKGBUILD 56333 2011-10-05 18:51:32Z ibiru $ # Maintainer : Ionut Biru # Contributor: Roman Kyrylych # Contributor: Johannes Sjolund pkgname=gnome-commander -pkgver=1.2.8.13 +pkgver=1.2.8.14 pkgrel=1 pkgdesc="A graphical two-pane filemanager for Gnome" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('d5fd6da276a21046c73ae9ebdc676ee3c82b4a2149e6dc6d38006f8b364a5893') +sha256sums=('3519ff0a6e0b287e9cc700df41c61f4bf29110ad16545a4e2f9445ed9a17df08') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index cbec4f962..67fc6ff52 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56125 2011-10-02 04:43:30Z ebelanger $ +# $Id: PKGBUILD 56294 2011-10-05 06:10:32Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy # Contributor: Lee.MaRS @@ -6,7 +6,7 @@ pkgname=ibus-chewing pkgver=1.3.9.2 -pkgrel=4 +pkgrel=5 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64') license=('GPL') @@ -14,12 +14,14 @@ url='http://ibus.googlecode.com' depends=('ibus' 'libchewing' 'libxtst' 'gconf') makedepends=('swig' 'cmake' 'gob2') install=ibus-chewing.install -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") -md5sums=('8d177d67647944f5d1f9cca0654eaccb') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz + ibus-chewing-696864-abrt-ibus-1.4.patch) +md5sums=('8d177d67647944f5d1f9cca0654eaccb' + '4bc83c143243a4fc5aa6a6e6fb0a3aa1') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" - + patch -p1 -i "${srcdir}/ibus-chewing-696864-abrt-ibus-1.4.patch" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/usr/share \ diff --git a/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch b/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch new file mode 100644 index 000000000..fc2be85d7 --- /dev/null +++ b/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch @@ -0,0 +1,84 @@ +From ff138d7a18b7577e5f04f852bd3caf87cbc9e7cc Mon Sep 17 00:00:00 2001 +From: Ding-Yi Chen +Date: Thu, 20 Jan 2011 17:03:07 +1000 +Subject: [PATCH] Addressed comments of yusake + +--- + src/IBusChewingEngine-def.c | 30 ++++++++++++++++++++++-------- + 1 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/src/IBusChewingEngine-def.c b/src/IBusChewingEngine-def.c +index 90c0384..8c90766 100644 +--- a/src/IBusChewingEngine-def.c ++++ b/src/IBusChewingEngine-def.c +@@ -391,21 +391,29 @@ this option determines how these status be synchronized. Valid values:\n\ + void g_variant_to_g_value(GVariant *gVar, GValue *gValue){ + const GVariantType *gVType=g_variant_get_type(gVar); + if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_BOOLEAN)){ ++ g_value_init(gValue, G_TYPE_BOOLEAN); + g_value_set_boolean(gValue, g_variant_get_boolean(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT16)){ ++ g_value_init(gValue, G_TYPE_UINT); + g_value_set_uint(gValue, g_variant_get_uint16(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT32)){ ++ g_value_init(gValue, G_TYPE_UINT); + g_value_set_uint(gValue, g_variant_get_uint32(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)){ ++ g_value_init(gValue, G_TYPE_UINT64); + g_value_set_uint64(gValue, g_variant_get_uint64(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)){ ++ g_value_init(gValue, G_TYPE_INT); + g_value_set_int(gValue, g_variant_get_int16(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT32)){ ++ g_value_init(gValue, G_TYPE_INT); + g_value_set_int(gValue, g_variant_get_int32(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)){ ++ g_value_init(gValue, G_TYPE_INT); + g_value_set_int64(gValue, g_variant_get_int64(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)){ +- g_value_set_int64(gValue, g_variant_get_string(gVar, NULL)); ++ g_value_init(gValue, G_TYPE_STRING); ++ g_value_set_string(gValue, g_variant_get_string(gVar, NULL)); + } + } + +@@ -419,8 +427,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ + case G_TYPE_UINT: + gVar=g_variant_new_uint32(g_value_get_uint(gValue)); + break; ++ case G_TYPE_UINT64: ++ gVar=g_variant_new_uint64(g_value_get_uint(gValue)); ++ break; + case G_TYPE_INT: +- gVar=g_variant_new_int32(g_value_get_int(gValue)); ++ gVar=g_variant_new_int32(g_value_get_uint(gValue)); ++ break; ++ case G_TYPE_INT64: ++ gVar=g_variant_new_int64(g_value_get_uint(gValue)); + break; + case G_TYPE_STRING: + gVar=g_variant_new_string(g_value_get_string(gValue)); +@@ -435,14 +449,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ + + static gboolean ibus_chewing_config_get_value(IBusConfig *config, const gchar *section, const gchar *key, GValue *gValue){ + #if IBUS_VERSION >= 10399 +- GVariant *gVar=g_variant_ref_sink(ibus_config_get_value(config, section, key)); +- if (gVar!=NULL){ +- g_variant_to_g_value(gVar, gValue); +- g_variant_unref(gVar); +- return TRUE; +- }else{ ++ GVariant *gVar=ibus_config_get_value(config, section, key); ++ if (gVar==NULL){ + return FALSE; + } ++ g_variant_ref_sink(gVar); ++ g_variant_to_g_value(gVar, gValue); ++ g_variant_unref(gVar); ++ return TRUE; + #else + return ibus_config_get_value(config, section, key, gValue); + #endif +-- +1.7.4.4 + diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index b8bb7f281..3af883844 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54428 2011-08-18 10:36:01Z andrea $ +# $Id: PKGBUILD 56337 2011-10-05 19:08:01Z andrea $ # Maintainer: Laurent Carlier # Contributor: Andrea Scarpino # Contributor: Gilles CHAUVIN @@ -7,7 +7,7 @@ pkgname=kphotoalbum pkgver=4.1.1 -pkgrel=9.1 +pkgrel=10 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64') diff --git a/community/krename/PKGBUILD b/community/krename/PKGBUILD index 0c2f94c88..5186211c1 100644 --- a/community/krename/PKGBUILD +++ b/community/krename/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40347 2011-02-23 07:59:53Z ebelanger $ +# $Id: PKGBUILD 56339 2011-10-05 19:08:08Z andrea $ # Maintainer: Eric Bélanger pkgname=krename pkgver=4.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="A very powerfull batch file renamer for KDE" arch=('i686' 'x86_64') url="http://www.krename.net" @@ -12,8 +12,7 @@ depends=('kdelibs' 'taglib' 'xdg-utils') makedepends=('cmake' 'automoc4') options=('libtool') install=krename.install -source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz) -md5sums=('afcf877b55395b35cd58a254163fb75e') +source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('c53d1819247a88bc4f49d52936f1e2bc7fa9850d') build() { diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 84183169c..420a82cc4 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 50663 2011-06-29 11:38:50Z spupykin $ +# $Id: PKGBUILD 56341 2011-10-05 19:08:14Z andrea $ # Maintainer: Sergej Pupykin # Contributor: damir pkgname=libextractor pkgver=0.6.2 -pkgrel=2 +pkgrel=4 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index 80f7bec60..bd81279e0 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40350 2011-02-23 08:01:08Z ebelanger $ +# $Id: PKGBUILD 56343 2011-10-05 19:08:19Z andrea $ # Maintainer: Ionut Biru + pkgname=libgexiv2 -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="GObject-based wrapper around the Exiv2 library." arch=('i686' 'x86_64') url="http://trac.yorba.org/wiki/gexiv2" license=('GPL2') -depends=('exiv2>=0.21' 'glib2') +depends=('exiv2' 'glib2') options=('!libtool') source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b6b2b2ae3c7d57a85d8c346b418ff98c') -sha1sums=('bf1186d480078cc87020db7d9f24f20b1e73a171') +sha1sums=('828894bb4bcb4625820b8c0c468417e9cd8c5c2f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index da78b01ba..e605fc5b3 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54192 2011-08-14 19:28:33Z spupykin $ +# $Id: PKGBUILD 56302 2011-10-05 13:53:49Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=libmediainfo -pkgver=0.7.47 +pkgver=0.7.50 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -13,16 +13,16 @@ depends=( 'curl' 'libmms>=0.5-2' 'libzen>=0.4.15') makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 - "libmediainfo-0.7.44-libmms.patch::http://www.calculate-linux.org/packages/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch?format=raw") -md5sums=('d18e86a4b3e3e893e04bb3afd638fa97' - '1bdae4d3006b72e3f07cb1a9fa124950') + libmediainfo-0.7.50-libmms.patch) +md5sums=('d637d7f1e20b30c1dd1926ad134ee639' + '2f4b21cc250f663d52b497dedb963e3b') build() { cd $srcdir/MediaInfoLib/Project/GNU/Library sh ./autogen ./configure --prefix=/usr --enable-shared --disable-static --with-libcurl --with-libmms make clean - (cd ../../.. && patch -p1 <$srcdir/libmediainfo-0.7.44-libmms.patch) + (cd ../../.. && patch -p1 <$srcdir/libmediainfo-0.7.50-libmms.patch) make } diff --git a/community/libmediainfo/libmediainfo-0.7.50-libmms.patch b/community/libmediainfo/libmediainfo-0.7.50-libmms.patch new file mode 100644 index 000000000..540e4c12d --- /dev/null +++ b/community/libmediainfo/libmediainfo-0.7.50-libmms.patch @@ -0,0 +1,50 @@ +diff -wbBur MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp MediaInfoLib.my/Source/MediaInfo/Reader/Reader_libmms.cpp +--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp 2011-08-25 15:14:50.000000000 +0400 ++++ MediaInfoLib.my/Source/MediaInfo/Reader/Reader_libmms.cpp 2011-10-05 17:29:12.000000000 +0400 +@@ -48,10 +48,8 @@ + #else + #ifdef MEDIAINFO_LIBMMS_FROMSOURCE + #include "mmsx.h" +- #include "mmsh.h" + #else //MEDIAINFO_LIBMMS_FROMSOURCE + #include "libmms/mmsx.h" +- #include "libmms/mmsh.h" + #endif //MEDIAINFO_LIBMMS_FROMSOURCE + #endif + #include +@@ -71,34 +69,9 @@ + //--------------------------------------------------------------------------- + size_t Reader_libmms::Format_Test(MediaInfo_Internal* MI, const String &File_Name) + { +- mmsx_t* Handle; +- +- //Opening the file +- #if MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT +- if (MI->Config.File_Mmsh_Describe_Only_Get()) +- { +- // Use MMSH & Send a DESCRIBE request +- mmsh_t* MmshHandle; +- +- MmshHandle=mmsh_describe_request(0, 0, Ztring(File_Name).To_Local().c_str()); +- if (MmshHandle==NULL) +- return 0; +- +- Handle=mmsx_set_mmsh_handle(MmshHandle); +- if (Handle==NULL) +- { +- mmsh_close(MmshHandle); +- return 0; +- } +- } +- else +- #endif //MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT +- { +- // Use MMS or MMSH (Send a DESCRIBE & PLAY request) +- Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1); ++ mmsx_t* Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1); + if (Handle==NULL) + return 0; +- } + + //Init + size_t Buffer_Size_Max; diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index a38ef06c4..4d960d8e7 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 54664 2011-08-22 18:57:12Z jlichtblau $ +# $Id: PKGBUILD 56345 2011-10-05 19:08:27Z andrea $ # Maintainer: Jaroslav Lichtblau # Contributor: Lukas Jirkovsky # Contributor: Dmitry N. Shilov pkgname=luminancehdr pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' license=('GPL') depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt') -replaces=('qtpfsgui') +optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pk sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac') build() { - cd ${srcdir}/luminance-hdr-${pkgver} + cd "${srcdir}/luminance-hdr-${pkgver}" if [ ${CARCH} = i686 ]; then sed -i 's/ -msse2//' project.pro @@ -31,7 +31,7 @@ build() { } package() { - cd ${srcdir}/luminance-hdr-${pkgver} + cd "${srcdir}/luminance-hdr-${pkgver}" - make INSTALL_ROOT=${pkgdir} install + make INSTALL_ROOT="${pkgdir}" install } diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 4f8f5897f..8e55daefc 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54207 2011-08-14 19:31:37Z spupykin $ +# $Id: PKGBUILD 56306 2011-10-05 13:55:59Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo-gui -pkgver=0.7.47 +pkgver=0.7.50 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo>=0.7.35' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('865b38a17f462edda89aa226418c968a') +md5sums=('1c647544dde097c5730959515a18481a') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index d8cd8d61c..3398979e0 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54202 2011-08-14 19:30:45Z spupykin $ +# $Id: PKGBUILD 56304 2011-10-05 13:54:48Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo -pkgver=0.7.47 +pkgver=0.7.50 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo>=0.7.35') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('865b38a17f462edda89aa226418c968a') +md5sums=('1c647544dde097c5730959515a18481a') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index df7348d10..2171f91ef 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 47289 2011-05-20 18:44:43Z ibiru $ +# $Id: PKGBUILD 56331 2011-10-05 18:42:40Z ibiru $ # Maintainer : Ionut Biru # Contributor: Roman Kyrylych # Contributor: Tor Krill pkgname=nautilus-actions -pkgver=3.1.3 +pkgver=3.1.4 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64') url="http://gnome.org" license=('GPL') -depends=('nautilus' 'libgtop' 'desktop-file-utils' 'gconf' 'libsm') +depends=('nautilus' 'libunique3' 'libgtop' 'gconf' 'libsm') 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=('d7cab5b1a75f4cbeb68e7d2bfe4834ee13890abf6cab9254326f871ee07c9924') +source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz) +sha256sums=('071013f1037a2c22875e4c9a5efa6f28a1626965b4d5c8aa4576f319427cd0e3') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD new file mode 100644 index 000000000..38338fa4f --- /dev/null +++ b/community/parole/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 56327 2011-10-05 16:30:16Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: TDY + +pkgname=parole +pkgver=0.2.0.6 +pkgrel=1 +pkgdesc="A modern media player based on the GStreamer framework" +arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/applications/parole/" +license=('GPL') +depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1' + 'libxfcegui4>=4.6.0' 'taglib>=1.4') +makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools') +optdepends=('xulrunner>=1.9.1: browser plugin') +conflicts=('parole-media-player-git') +options=('!libtool') +install=parole.install +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('5d7e5ab7535bdf89508a8d7e551f9187') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/parole/parole.install b/community/parole/parole.install new file mode 100644 index 000000000..17ca8f78a --- /dev/null +++ b/community/parole/parole.install @@ -0,0 +1,11 @@ +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/qgo/PKGBUILD b/community/qgo/PKGBUILD index d9589aef6..595c07c70 100644 --- a/community/qgo/PKGBUILD +++ b/community/qgo/PKGBUILD @@ -1,25 +1,34 @@ -# Maintainer: Douglas Soares de Andrade +# $Id: PKGBUILD 56296 2011-10-05 06:31:10Z andrea $ +# Maintainer: +# Contributor: Douglas Soares de Andrade pkgname=qgo pkgver=1.5.4 -_realver=1.5.4-r2 -pkgrel=3 -pkgdesc="qGo is a Go client and full featured SGF editor." +_realver=1.5.4-r3 +pkgrel=4 +pkgdesc="A Go client and full featured SGF editor" arch=('i686' 'x86_64') url="http://qgo.sourceforge.net/" license=('GPL') depends=('qt3' 'libsm') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${_realver}.tar.gz - qgo-gcc43-iostream.patch) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-${_realver}.tar.gz" + 'gcc43.patch' + 'gcc45.patch') +md5sums=('f8f9a6288b7854932bb2666a58631988' + '1e242ff9c3b46bcebfda0d7ae3aef2fa' + '58de47198a50dedb029acbe28bd3bb1b') build() { . /etc/profile.d/qt3.sh cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/qgo-gcc43-iostream.patch || return 1 + patch -Np1 -i "${srcdir}"/gcc43.patch + patch -Np1 -i "${srcdir}"/gcc45.patch ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('5b83bd5ec234beabe48ca17eace3957e' - '148c470f6426e6d626b3105807b0c006') diff --git a/community/qgo/gcc43.patch b/community/qgo/gcc43.patch new file mode 100644 index 000000000..1af8b8bd9 --- /dev/null +++ b/community/qgo/gcc43.patch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_g++-4.3.dpatch by Pierre Habouzit +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: g++-4.3 patch + +@DPATCH@ +--- qgo-1.5.4-r2~/src/matrix.cpp 2004-10-30 20:49:50.000000000 +0000 ++++ qgo-1.5.4-r2/src/matrix.cpp 2008-03-16 23:04:18.306414183 +0000 +@@ -2,12 +2,14 @@ + * matrix.cpp + */ + ++#include + #include "matrix.h" +-#include + #ifndef NO_DEBUG +-#include ++#include + #endif + ++using namespace std; ++ + Matrix::Matrix(int s) + : size(s) + { +--- qgo-1.5.4-r2~/src/tree.cpp 2005-05-12 20:58:23.000000000 +0000 ++++ qgo-1.5.4-r2/src/tree.cpp 2008-03-16 23:04:50.660267034 +0000 +@@ -5,7 +5,7 @@ + #include "tree.h" + #include "move.h" + #include "qgo.h" +-#include ++#include + #include + + Tree::Tree(int board_size) diff --git a/community/qgo/gcc45.patch b/community/qgo/gcc45.patch new file mode 100644 index 000000000..6c71f92f6 --- /dev/null +++ b/community/qgo/gcc45.patch @@ -0,0 +1,205 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: fix builiding with gcc4.5 +## Origin/Author: Ubuntu +## Bug: http://bugs.launchpad.net/bugs/756004 +## 06_ftbfs_gcc45.dpatch by Andreas Moog +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix build with gcc 4.5 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qgo-1.5.4-r3~/src/gamedialog.cpp qgo-1.5.4-r3/src/gamedialog.cpp +--- qgo-1.5.4-r3~/src/gamedialog.cpp 2011-04-12 20:03:12.000000000 +0200 ++++ qgo-1.5.4-r3/src/gamedialog.cpp 2011-04-12 20:03:15.640382627 +0200 +@@ -512,7 +512,7 @@ + if (handicapSpin->value() != val.toInt()) + { + handicapSpin->setValue(val.toInt()); +- handicapSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ handicapSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + handicapSpin->unsetPalette(); +@@ -521,7 +521,7 @@ + if (boardSizeSpin->value() != val.toInt()) + { + boardSizeSpin->setValue(val.toInt()); +- boardSizeSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ boardSizeSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + boardSizeSpin->unsetPalette(); +@@ -530,7 +530,7 @@ + if (timeSpin->value() != val.toInt()/60) + { + timeSpin->setValue(val.toInt()/60); +- timeSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ timeSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + timeSpin->unsetPalette(); +@@ -539,7 +539,7 @@ + if (byoTimeSpin->value() != val.toInt()/60) + { + byoTimeSpin->setValue(val.toInt()/60); +- byoTimeSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ byoTimeSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + byoTimeSpin->unsetPalette(); +@@ -550,25 +550,25 @@ + val = element(line,0," "); + if ( !(play_nigiri_button->isChecked()) && (val == "N")) + { +- play_nigiri_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_white_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_black_button->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ play_nigiri_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_white_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_black_button->setPaletteBackgroundColor(QColor("cyan")); + play_nigiri_button->setChecked(true); + + } + else if ( (play_black_button->isChecked()) && (val == "B")) + { +- play_nigiri_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_white_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_black_button->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ play_nigiri_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_white_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_black_button->setPaletteBackgroundColor(QColor("cyan")); + play_white_button->setChecked(true); + + } + else if ( (play_white_button->isChecked()) && (val == "W")) + { +- play_nigiri_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_white_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_black_button->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ play_nigiri_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_white_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_black_button->setPaletteBackgroundColor(QColor("cyan")); + play_black_button->setChecked(true); + + } +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qgo-1.5.4-r3~/src/mainwin.cpp qgo-1.5.4-r3/src/mainwin.cpp +--- qgo-1.5.4-r3~/src/mainwin.cpp 2011-04-12 20:03:12.000000000 +0200 ++++ qgo-1.5.4-r3/src/mainwin.cpp 2011-04-12 20:03:15.640382627 +0200 +@@ -68,35 +68,35 @@ + { + + +- prefsIcon= QPixmap::QPixmap(qembed_findImage("package_settings"));//QPixmap(ICON_PREFS); ++ prefsIcon= QPixmap(qembed_findImage("package_settings"));//QPixmap(ICON_PREFS); + // infoIcon= QPixmap(ICON_GAMEINFO); +- exitIcon = QPixmap::QPixmap(qembed_findImage("exit"));//QPixmap(ICON_EXIT); +- fileNewboardIcon = QPixmap::QPixmap(qembed_findImage("newboard"));//QPixmap(ICON_FILENEWBOARD); +- fileNewIcon = QPixmap::QPixmap(qembed_findImage("filenew"));//QPixmap(ICON_FILENEW); +- fileOpenIcon = QPixmap::QPixmap(qembed_findImage("fileopen"));//QPixmap(ICON_FILEOPEN); ++ exitIcon = QPixmap(qembed_findImage("exit"));//QPixmap(ICON_EXIT); ++ fileNewboardIcon = QPixmap(qembed_findImage("newboard"));//QPixmap(ICON_FILENEWBOARD); ++ fileNewIcon = QPixmap(qembed_findImage("filenew"));//QPixmap(ICON_FILENEW); ++ fileOpenIcon = QPixmap(qembed_findImage("fileopen"));//QPixmap(ICON_FILEOPEN); + // fileSaveIcon = QPixmap(ICON_FILESAVE); + // fileSaveAsIcon = QPixmap(ICON_FILESAVEAS); + // transformIcon = QPixmap(ICON_TRANSFORM); + // charIcon = QPixmap(ICON_CHARSET); +- manualIcon = QPixmap::QPixmap(qembed_findImage("help"));//QPixmap(ICON_MANUAL); ++ manualIcon = QPixmap(qembed_findImage("help"));//QPixmap(ICON_MANUAL); + // autoplayIcon = QPixmap(ICON_AUTOPLAY); +- connectedIcon = QPixmap::QPixmap(qembed_findImage("connected"));//QPixmap(ICON_CONNECTED); +- disconnectedIcon = QPixmap::QPixmap(qembed_findImage("connect_no"));//QPixmap(ICON_DISCONNECTED); +- OpenIcon = QPixmap::QPixmap(qembed_findImage("open"));//QPixmap(ICON_OPEN); +- LookingIcon = QPixmap::QPixmap(qembed_findImage("looking"));//QPixmap(ICON_LOOKING); +- QuietIcon= QPixmap::QPixmap(qembed_findImage("quiet"));//QPixmap(ICON_QUIET); +- NotOpenIcon = QPixmap::QPixmap(qembed_findImage("not_open"));//QPixmap(ICON_NOT_OPEN); +- NotLookingIcon = QPixmap::QPixmap(qembed_findImage("not_looking"));//QPixmap(ICON_NOT_LOOKING); +- NotQuietIcon= QPixmap::QPixmap(qembed_findImage("not_quiet"));//QPixmap(ICON_NOT_QUIET); +- RefreshPlayersIcon = QPixmap::QPixmap(qembed_findImage("refresh_players"));//QPixmap(ICON_REFRESH_PLAYERS); +- RefreshGamesIcon = QPixmap::QPixmap(qembed_findImage("refresh_games"));//QPixmap(ICON_REFRESH_GAMES); +- ComputerPlayIcon = QPixmap::QPixmap(qembed_findImage("computerplay"));//QPixmap(ICON_COMPUTER_PLAY); +- qgoIcon = QPixmap::QPixmap(qembed_findImage("Bowl"));//QPixmap(ICON_COMPUTER_PLAY); +- NotSeekingIcon = QPixmap::QPixmap(qembed_findImage("not_seeking")); +- seekingIcon[0] = QPixmap::QPixmap(qembed_findImage("seeking1")); +- seekingIcon[1] = QPixmap::QPixmap(qembed_findImage("seeking2")); +- seekingIcon[2] = QPixmap::QPixmap(qembed_findImage("seeking3")); +- seekingIcon[3] = QPixmap::QPixmap(qembed_findImage("seeking4")); ++ connectedIcon = QPixmap(qembed_findImage("connected"));//QPixmap(ICON_CONNECTED); ++ disconnectedIcon = QPixmap(qembed_findImage("connect_no"));//QPixmap(ICON_DISCONNECTED); ++ OpenIcon = QPixmap(qembed_findImage("open"));//QPixmap(ICON_OPEN); ++ LookingIcon = QPixmap(qembed_findImage("looking"));//QPixmap(ICON_LOOKING); ++ QuietIcon= QPixmap(qembed_findImage("quiet"));//QPixmap(ICON_QUIET); ++ NotOpenIcon = QPixmap(qembed_findImage("not_open"));//QPixmap(ICON_NOT_OPEN); ++ NotLookingIcon = QPixmap(qembed_findImage("not_looking"));//QPixmap(ICON_NOT_LOOKING); ++ NotQuietIcon= QPixmap(qembed_findImage("not_quiet"));//QPixmap(ICON_NOT_QUIET); ++ RefreshPlayersIcon = QPixmap(qembed_findImage("refresh_players"));//QPixmap(ICON_REFRESH_PLAYERS); ++ RefreshGamesIcon = QPixmap(qembed_findImage("refresh_games"));//QPixmap(ICON_REFRESH_GAMES); ++ ComputerPlayIcon = QPixmap(qembed_findImage("computerplay"));//QPixmap(ICON_COMPUTER_PLAY); ++ qgoIcon = QPixmap(qembed_findImage("Bowl"));//QPixmap(ICON_COMPUTER_PLAY); ++ NotSeekingIcon = QPixmap(qembed_findImage("not_seeking")); ++ seekingIcon[0] = QPixmap(qembed_findImage("seeking1")); ++ seekingIcon[1] = QPixmap(qembed_findImage("seeking2")); ++ seekingIcon[2] = QPixmap(qembed_findImage("seeking3")); ++ seekingIcon[3] = QPixmap(qembed_findImage("seeking4")); + + // init + +@@ -576,7 +576,7 @@ + if (e->timerId() == seekButtonTimer) + { + imagecounter = (imagecounter+1) % 4; +- toolSeek->setIconSet(QIconSet::QIconSet(seekingIcon[imagecounter])); ++ toolSeek->setIconSet(QIconSet(seekingIcon[imagecounter])); + return; + } + +@@ -2950,17 +2950,17 @@ + //tb->setProperty( "geometry", QRect(0, 0, 20, 20)); + + //added the icons +- refreshPlayers->setIconSet(QIconSet::QIconSet(RefreshPlayersIcon)); +- refreshGames->setIconSet(QIconSet::QIconSet(RefreshGamesIcon)); +- fileNew->setIconSet(QIconSet::QIconSet(fileNewIcon)); +- fileNewBoard->setIconSet(QIconSet::QIconSet(fileNewboardIcon)); +- fileOpen->setIconSet(QIconSet::QIconSet(fileOpenIcon)); +- fileQuit->setIconSet(QIconSet::QIconSet(exitIcon)); +- computerPlay->setIconSet(QIconSet::QIconSet(ComputerPlayIcon)); +- Connect->setIconSet(QIconSet::QIconSet(connectedIcon)); +- Disconnect->setIconSet(QIconSet::QIconSet(disconnectedIcon)); +- helpManual->setIconSet(QIconSet::QIconSet(manualIcon)); +- setPreferences->setIconSet(QIconSet::QIconSet(prefsIcon)); ++ refreshPlayers->setIconSet(QIconSet(RefreshPlayersIcon)); ++ refreshGames->setIconSet(QIconSet(RefreshGamesIcon)); ++ fileNew->setIconSet(QIconSet(fileNewIcon)); ++ fileNewBoard->setIconSet(QIconSet(fileNewboardIcon)); ++ fileOpen->setIconSet(QIconSet(fileOpenIcon)); ++ fileQuit->setIconSet(QIconSet(exitIcon)); ++ computerPlay->setIconSet(QIconSet(ComputerPlayIcon)); ++ Connect->setIconSet(QIconSet(connectedIcon)); ++ Disconnect->setIconSet(QIconSet(disconnectedIcon)); ++ helpManual->setIconSet(QIconSet(manualIcon)); ++ setPreferences->setIconSet(QIconSet(prefsIcon)); + setIcon(qgoIcon); + + UserToolbar->show(); +@@ -3218,7 +3218,7 @@ + toolSeek->setOn(false); + toolSeek->setPopup(seekMenu); + toolSeek->setPopupDelay(1); +- toolSeek->setIconSet(QIconSet::QIconSet(NotSeekingIcon)); ++ toolSeek->setIconSet(QIconSet(NotSeekingIcon)); + killTimer(seekButtonTimer); + seekButtonTimer = 0; + } +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qgo-1.5.4-r3~/src/qgtp.cpp qgo-1.5.4-r3/src/qgtp.cpp +--- qgo-1.5.4-r3~/src/qgtp.cpp 2011-04-12 20:03:12.000000000 +0200 ++++ qgo-1.5.4-r3/src/qgtp.cpp 2011-04-12 20:03:22.360029899 +0200 +@@ -277,7 +277,7 @@ + _cpt++; + + qDebug(QString("flush -> %1").arg(s)); +- programProcess->writeToStdin(QString::QString(s)); ++ programProcess->writeToStdin(QString(s)); + + + } diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index 665c93bc7..337f08e7a 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46083 2011-05-03 10:24:47Z spupykin $ +# $Id: PKGBUILD 56347 2011-10-05 19:08:35Z andrea $ # Maintainer: Sergej Pupykin # Maintainer: Daniel J Griffiths # Contributor: Roman Kyrylych @@ -6,7 +6,7 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 876af1fc3..e5b615df3 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55244 2011-09-07 09:45:33Z spupykin $ +# $Id: PKGBUILD 56300 2011-10-05 09:11:05Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Andrea Scarpino # Contributor: Vladimir Chizhov @@ -6,7 +6,7 @@ # Maintainer: Daniel J Griffiths pkgname=recoll -pkgver=1.15.9 +pkgver=1.16.1 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'python2: for using some filters') install=recoll.install source=(http://www.lesbonscomptes.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('93755266553f4a403d1b9293212aae16') +md5sums=('5fbb5aee1c048fafef39384622138394') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 3434efba7..f235c872d 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 55810 2011-09-21 20:42:30Z spupykin $ +# $Id: PKGBUILD 56349 2011-10-05 19:08:41Z andrea $ # Maintainer: Sergej Pupykin # Maintainer : Ionut Biru # Contributor: Joeny Ang pkgname=shotwell pkgver=0.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' +depends=('gconf' 'libgee' 'libgphoto2' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'vala') install=shotwell.install -source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2") -md5sums=('bbb479eaa4bbcf67d8ff454b406ed249') +source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" + "http://arch.p5n.pp.ru/~sergej/dl/shotwell-gtk3.patch.gz") +md5sums=('bbb479eaa4bbcf67d8ff454b406ed249' + 'e9ac0d9d818242220f0f788c493e453d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/shotwell-gtk3.patch ./configure --prefix=/usr \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-schemas-install \ diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 1bb34eb31..cdcbf3e86 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136623 2011-08-31 07:26:31Z tpowa $ +# $Id: PKGBUILD 139845 2011-10-05 07:58:34Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -6,14 +6,14 @@ # Contributor: Marco Lima pkgname=nfs-utils -pkgver=1.2.4 -pkgrel=3 +pkgver=1.2.5 +pkgrel=1 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' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common @@ -24,31 +24,29 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn idmapd.conf start-statd.patch nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch - kernel-3.0-segfault.patch) + nfs-utils-1.1.4-no-exec.patch) install=nfs-utils.install -md5sums=('938dc0574f3eb9891a8ed4746f806277' +md5sums=('8395ac770720b83c5c469f88306d7765' 'dd0d65fc6e8f422fa12520813098264b' 'f73f197a16b02c3e248488ec35c4cf43' 'e619f18354ff958ed624d05d08853d8f' '2bf71def3263325643a09458635520f0' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e24f81a8c8657672e262c61235d34b4a' + 'e9144277a89a620d9bc80413158a7d27' '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2' - 'ab92e67f3d0ee2935faab9cdabef8003') + '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 - patch -Np1 -i ../kernel-3.0-segfault.patch # arch specific patch patch -Np0 -i $srcdir/start-statd.patch ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc + --without-tcp-wrappers --with-statedir=/var/lib/nfs \ + --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount make } diff --git a/core/nfs-utils/start-statd.patch b/core/nfs-utils/start-statd.patch index 38c60a784..5d73b6e35 100644 --- a/core/nfs-utils/start-statd.patch +++ b/core/nfs-utils/start-statd.patch @@ -1,7 +1,7 @@ --- 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/bash -p +#!/bin/sh + +# Original script provided by the NFS project @@ -10,7 +10,7 @@ # 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 + # It should run statd with whatever flags are apropriate for this # site. -PATH=/sbin:/usr/sbin -exec rpc.statd --no-notify diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 56432ec30..0c7b1a706 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 130915 2011-07-09 03:24:24Z andrea $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 139853 2011-10-05 11:46:05Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino # Contributor: Pierre Schmitz -# Contributor: damir -# Contributor: Konstantinos Pachnis pkgname=cmake -pkgver=2.8.5 +pkgver=2.8.6 pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') @@ -16,7 +15,7 @@ makedepends=('qt') optdepends=('qt: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('3c5d32cec0f4c2dc45f4c2e84f4a20c5') +md5sums=('2147da452fd9212bb9b4542a9eee9d5b') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/cmake/cmake.install b/extra/cmake/cmake.install index 64e7020ea..55f6c843b 100644 --- a/extra/cmake/cmake.install +++ b/extra/cmake/cmake.install @@ -1,6 +1,6 @@ post_install() { update-mime-database usr/share/mime &> /dev/null - [ -x usr/bin/update-desktop-database ] && update-desktop-database -q + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true } post_upgrade() { diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD index b1bf53dcf..278a7dd8d 100644 --- a/extra/exiv2/PKGBUILD +++ b/extra/exiv2/PKGBUILD @@ -1,18 +1,18 @@ -#$Id: PKGBUILD 128049 2011-06-21 07:56:57Z eric $ +#$Id: PKGBUILD 139877 2011-10-05 19:06:34Z andrea $ # Maintainer: tobias pkgname=exiv2 -pkgver=0.21.1 -pkgrel=2 -pkgdesc="Exif and Iptc metadata manipulation library and tools." +pkgver=0.22 +pkgrel=1 +pkgdesc="Exif and Iptc metadata manipulation library and tools" arch=('i686' 'x86_64') url="http://exiv2.org" -license=('GPL2') +license=('GPL') depends=('gcc-libs' 'zlib' 'expat') options=('!libtool') source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz") -md5sums=('5c99bbcaa998f6b200b92f2bf0ac4f9e') -sha1sums=('d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca') +md5sums=('84d7d5b1802529efca8ac3d6e6a97e3a') +sha1sums=('35211d853a986fe1b008fca14db090726e8dcce3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index b5ff775d7..867680ccb 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 134633 2011-08-07 01:06:26Z eric $ +# $Id: PKGBUILD 140040 2011-10-06 00:22:58Z eric $ # Maintainer: Eric Bélanger pkgname=fvwm -pkgver=2.6.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') @@ -15,9 +15,7 @@ conflicts=('fvwm-devel') replaces=('fvwm-devel') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) -md5sums=('78c830a324680d22e95428ea277b8ece' - 'a12c52729a74355838404ee2f5716e0c') -sha1sums=('522e1fac1101de7825e792ba36bb956216f40fda' +sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39' '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { diff --git a/extra/geeqie/PKGBUILD b/extra/geeqie/PKGBUILD index b2315cea4..ce3605cdb 100644 --- a/extra/geeqie/PKGBUILD +++ b/extra/geeqie/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119080 2011-04-10 20:19:22Z eric $ +# $Id: PKGBUILD 139879 2011-10-05 19:06:37Z andrea $ # Maintainer: Eric Bélanger # Contributor: Lukas Jirkovsky pkgname=geeqie pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A lightweight image browser and viewer (fork of GQview)" arch=('i686' 'x86_64') url="http://geeqie.sourceforge.net/" diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD index 98a22bbc8..dcee11765 100644 --- a/extra/gimp-ufraw/PKGBUILD +++ b/extra/gimp-ufraw/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 110928 2011-02-23 07:43:56Z eric $ +# $Id: PKGBUILD 139881 2011-10-05 19:06:39Z andrea $ # Maintainer: Tobias Kieslich pkgname=gimp-ufraw pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="Standalone or gimp plugin converter for raw files" url="http://ufraw.sourceforge.net/" arch=('i686' 'x86_64') -license=('GPL2') -depends=('gtkimageview' 'exiv2') -makedepends=('gimp' 'cinepaint' 'pkg-config') +license=('GPL') +depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils') +makedepends=('gimp' 'cinepaint') optdepends=('gimp: to use the gimp import plugin for raw images' - 'cinepaint: to use the cinepaint import plugin for raw images') + 'cinepaint: to use the cinepaint import plugin for raw images') +install=gimp-ufraw.install source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz) md5sums=('454f40a402928998a82e2645d9265d96') sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2') diff --git a/extra/gimp-ufraw/gimp-ufraw.install b/extra/gimp-ufraw/gimp-ufraw.install new file mode 100644 index 000000000..80312d4a6 --- /dev/null +++ b/extra/gimp-ufraw/gimp-ufraw.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 7d6f5b994..50b342724 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139286 2011-10-01 18:57:30Z ibiru $ +# $Id: PKGBUILD 139883 2011-10-05 19:06:43Z andrea $ # Maintainer: Jan "heftig" Steffens pkgname=gnome-color-manager pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) url="http://projects.gnome.org/gnome-color-manager/" diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index d9c4cde43..15912ef82 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139343 2011-10-01 18:58:59Z ibiru $ +# $Id: PKGBUILD 139885 2011-10-05 19:06:47Z andrea $ # Maintainer: Jan de Groot # Contributor: Tobias Kieslich pkgname=gthumb pkgver=2.13.91 -pkgrel=1 +pkgrel=2 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=('GPL') diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index f8dc362c8..311733ad9 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 138484 2011-09-24 16:46:40Z stephane $ +# $Id: PKGBUILD 139887 2011-10-05 19:06:49Z andrea $ # Maintainer: Tobias Kieslich # Contributor: Giovanni Scafora # Contributor: Dominik Ryba pkgname=hugin -pkgver=2011.0.0 -pkgrel=3 +pkgver=2011.2.0 +pkgrel=1 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') +license=('GPL') +depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' + 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost' 'tclap') install=hugin.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ac8a129b4c3021233df6d9368c8164cf') -sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116') +sha1sums=('79dfdac229b4e58f50c893c1238bdd0921ad9da6') build() { cd "${srcdir}" diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index e0d40b332..25445be95 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130527 2011-07-07 11:15:35Z stephane $ +# $Id: PKGBUILD 139869 2011-10-05 15:17:09Z stephane $ # Maintainer : Stéphane Gaudreault # Contributor: Sylvain HENRY # Contributor: Hervé YVIQUEL pkgname=hwloc -pkgver=1.2 +pkgver=1.2.2 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('43886dfdddda5bfbaa841976275e7bf643453d7b') +sha1sums=('9805effb53a69199bcaf86efaf349fee684cb0a6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD index aa79d8d6a..fd12321df 100644 --- a/extra/kdeaccessibility/PKGBUILD +++ b/extra/kdeaccessibility/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137397 2011-09-07 17:22:37Z andrea $ +# $Id: PKGBUILD 139936 2011-10-05 19:10:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -8,7 +8,7 @@ pkgname=('kdeaccessibility-jovie' 'kdeaccessibility-kmag' 'kdeaccessibility-kmousetool' 'kdeaccessibility-kmouth') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://accessibility.kde.org' @@ -16,7 +16,7 @@ license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b9d0bf7503e684f9ddd1912d9c274bcdd8489bfd') +sha1sums=('7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1') build() { cd ${srcdir} diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index a11de8418..e9af7a565 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137399 2011-09-07 17:23:01Z andrea $ +# $Id: PKGBUILD 139938 2011-10-05 19:10:23Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('3d1b1be2003fe20c5c3faee63ba31c65621d53b7' +sha1sums=('c96ddd94a4903b035e73b3e958e6b189ca173fe9' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 5b9dad626..1682f2656 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137401 2011-09-07 17:23:24Z andrea $ +# $Id: PKGBUILD 139940 2011-10-05 19:10:25Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('df8c3225b025e0afb43efb73a5c53573ee3be77e') +sha1sums=('a536d530e1f97d14f11ada47435f3e194e93beae') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 5c0cb3ee2..a2950e2f4 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137403 2011-09-07 17:24:17Z andrea $ +# $Id: PKGBUILD 139942 2011-10-05 19:10:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebase-konsole -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2") -sha1sums=('1169c7ea5e4c5aa0a29d1948c9e02ee3cc2c54a2') +sha1sums=('20150963cc5ebd2f2c13a617a37e018440e0f18c') build() { cd "${srcdir}" diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index ffe6b680c..6fd718d35 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137359 2011-09-07 17:15:33Z andrea $ +# $Id: PKGBUILD 139898 2011-10-05 19:09:13Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-runtime -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('htdig: to build the search index in khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") -sha1sums=('fc8da236bff699518b54b2fe6bcf8a518206b6e3') +sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index c83933c40..d6316f37d 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137806 2011-09-11 11:17:09Z andrea $ +# $Id: PKGBUILD 139920 2011-10-05 19:09:49Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.7.1 -pkgrel=6 +pkgver=4.7.2 +pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,14 +14,17 @@ 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' - 'xorg-xsetroot' 'libxcomposite' 'libxinerama') +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' - 'networkmanager') + 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +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' @@ -30,9 +33,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' - 'important-performance-bugfix.patch') -sha1sums=('c7867d2f788086078abbcff53a035a6131232539' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('afd37b2f583690e391828c1ceb7311e2e8d37c6f' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' @@ -40,18 +42,16 @@ sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - '4fa046db21e3203771fd29bc0e1c32918862b894') + 'd509dac592bd8b310df27991b208c95b6d907514') 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}"/${_pkgname}-${pkgver} + patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + patch -p0 -i "${srcdir}"/terminate-server.patch - # Already fixed upstream - patch -p1 -i "${srcdir}"/important-performance-bugfix.patch - - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ @@ -61,23 +61,22 @@ build() { -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ - -DKWIN_MOBILE_EFFECTS=OFF \ -DWITH_OpenGLES=OFF \ -DKWIN_BUILD_WITH_OPENGLES=OFF make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + 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 -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 + install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm } diff --git a/extra/kdebase-workspace/kdm-xinitrd.patch b/extra/kdebase-workspace/kdm-xinitrd.patch new file mode 100644 index 000000000..f5fc0e571 --- /dev/null +++ b/extra/kdebase-workspace/kdm-xinitrd.patch @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index a60bcb89c..6db22e453 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137383 2011-09-07 17:19:55Z andrea $ +# $Id: PKGBUILD 139922 2011-10-05 19:09:53Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") -sha1sums=('5e7ced4d94f035ed86960025dbd66a1126a848ac') +sha1sums=('b52937ad8e5e4be884cc76f265c19964f461ac2c') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index d355e71a9..dcaabb562 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137405 2011-09-07 17:24:39Z andrea $ +# $Id: PKGBUILD 139944 2011-10-05 19:10:30Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-kimono -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2") -sha1sums=('e8cf2bfbb47a606a5ca8674a8b6913bb1dcac96f') +sha1sums=('2c2c331991e2b42101957ecfd13a18fbd4f86a68') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 0bcd6f410..3c7bfe870 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137407 2011-09-07 17:25:06Z andrea $ +# $Id: PKGBUILD 139946 2011-10-05 19:10:32Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-korundum -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="KDE bindings for ruby" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2") -sha1sums=('fdbcde4dd622f41faa7c22cbc96a8687612d099e') +sha1sums=('091cfd121e41d4edf38eab31e2dca65656e7349d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index e7e11b090..678394623 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137409 2011-09-07 17:25:30Z andrea $ +# $Id: PKGBUILD 139948 2011-10-05 19:10:35Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") -sha1sums=('4e5923fcb30501ca3474981a3d210940f0bc7320') +sha1sums=('7dba16c2e5e18c955d2fc40536d6a40bc4872cff') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 718802242..c55b3b51d 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137411 2011-09-07 17:25:55Z andrea $ +# $Id: PKGBUILD 139950 2011-10-05 19:10:37Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlkde -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") -sha1sums=('24e90923554ac1194da9fb84dab9efe580fa979e') +sha1sums=('a355563b55dc2dd004373a39853af38cda0d005d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index ef180f726..44bbbdd74 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137373 2011-09-07 17:18:01Z andrea $ +# $Id: PKGBUILD 139912 2011-10-05 19:09:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") -sha1sums=('f2534fc9677ce4f3e58a67b4d9b255f403250064') +sha1sums=('cde0c6b325e62d26ee6bd2f3f25d01e0563197c9') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index de49fe87e..0d6e33e75 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137375 2011-09-07 17:18:20Z andrea $ +# $Id: PKGBUILD 139914 2011-10-05 19:09:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-python -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="KDE bindings for Python" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") -sha1sums=('fd05f0c04586878c3c23e80bb1c59b316184d7ab') +sha1sums=('cc7844851110697f06da60cf4a1ee527eda76087') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index aa100ca7c..d674c8567 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137379 2011-09-07 17:19:01Z andrea $ +# $Id: PKGBUILD 139918 2011-10-05 19:09:45Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qtruby -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") -sha1sums=('a40e760ea16482885cbd061c95cec984af1ec4ac') +sha1sums=('1d13c0dd79a2c90c9e964e23fee3573c9397bd4d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index a3ec7dcdb..f27231c4a 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137377 2011-09-07 17:18:42Z andrea $ +# $Id: PKGBUILD 139916 2011-10-05 19:09:41Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qyoto -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") -sha1sums=('a08fd3750cd021578e82e096a1534b093591dbb1') +sha1sums=('f002a31fcdcaa94af02bbf5e368e79463974e467') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 11c8d1876..bb45d7257 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137363 2011-09-07 17:16:17Z andrea $ +# $Id: PKGBUILD 139902 2011-10-05 19:09:18Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokegen -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") -sha1sums=('952181277c8d212db7028476034d0160a152e696') +sha1sums=('f2f605b2ca40403529b9065e745ebb1d9b7e0fcb') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 5ea497b51..ab3bac156 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137371 2011-09-07 17:17:41Z andrea $ +# $Id: PKGBUILD 139910 2011-10-05 19:09:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokekde -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") -sha1sums=('20b8db2cce9aad11047ba758e1e327ea6970427a') +sha1sums=('8874744db367dd5c9d7a8783f662b6283b69dc1f') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 3a20803c5..cf29b72be 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137928 2011-09-12 16:11:31Z andrea $ +# $Id: PKGBUILD 139904 2011-10-05 19:09:22Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokeqt -pkgver=4.7.1 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('7f6074c552a3e9a72ebbbc1683786d7cb479871a') +sha1sums=('93bf50c340e5188f2432da97c5a3ff7e2928eb3e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index fc14f7d7b..d1cc2e3f6 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137413 2011-09-07 17:26:17Z andrea $ +# $Id: PKGBUILD 139952 2011-10-05 19:10:40Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-blinken -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2") -sha1sums=('3b3062ce82174417c8a7496743f78e6b583fa1e9') +sha1sums=('ec0418900c5d71d64f65407b898d740a5255ce08') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index df3485f74..fb6968f6b 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137415 2011-09-07 17:26:39Z andrea $ +# $Id: PKGBUILD 139954 2011-10-05 19:10:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-cantor -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2") -sha1sums=('97251c369424e22d26c804387270d0e3291587b1') +sha1sums=('5cb978903868d3dbda7367fec21a02818f693d6b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index 2cde258d2..e1c8bfacb 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137417 2011-09-07 17:27:01Z andrea $ +# $Id: PKGBUILD 139956 2011-10-05 19:10:44Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalgebra -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") -sha1sums=('16d74602bc446d3e45688379b92aabb2158becbb') +sha1sums=('4507b93e67d953705f7fe5eccec10868971a79ca') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 6983570e2..5989e539e 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137419 2011-09-07 17:27:23Z andrea $ +# $Id: PKGBUILD 139958 2011-10-05 19:10:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalzium -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") -sha1sums=('08600b1cf7df1afed67e5edd619953ae0f585687') +sha1sums=('3e750692964ca76da9ccbae5bdc263413a22a049') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 6c182f25f..320a46736 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137421 2011-09-07 17:27:50Z andrea $ +# $Id: PKGBUILD 139960 2011-10-05 19:10:53Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kanagram -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") -sha1sums=('8e1aab59132504d36cedfe843290d9a630562f7c') +sha1sums=('0dd7dd66f87f99a5f0f2b4a7340c4690240c2478') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index d8599f587..36068781d 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137423 2011-09-07 17:28:19Z andrea $ +# $Id: PKGBUILD 139962 2011-10-05 19:10:58Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kbruch -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") -sha1sums=('6d6a44740e52618c84dffb33dec41535637a7466') +sha1sums=('db4959982db7a36fef61798978d8c885408a3e3f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index e418bad06..3f3b79ea4 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137425 2011-09-07 17:28:51Z andrea $ +# $Id: PKGBUILD 139964 2011-10-05 19:11:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kgeography -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") -sha1sums=('65ebeb391952229ee3d410d0087d8a4e5262b6f7') +sha1sums=('843322c2dd1131122abf03d226b87ec31217ed36') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 722b42794..b176a7288 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137428 2011-09-07 17:29:15Z andrea $ +# $Id: PKGBUILD 139966 2011-10-05 19:11:07Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-khangman -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2") -sha1sums=('ac13da342cb2380ba2c703fbef9f131b75675b9e') +sha1sums=('24d3c41b0cf0aaf68ad053b0e701d7bc3df8bd0f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 52c64c5e1..2e9693041 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137430 2011-09-07 17:29:36Z andrea $ +# $Id: PKGBUILD 139968 2011-10-05 19:11:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kig -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('b198ceff93164fe455e466cb8e1d5616f524d209') +sha1sums=('2234ddb85e8c52214f9fdb5eb25f9491e23c7d86') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 31dc5c19a..1c2ed2132 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137432 2011-09-07 17:29:56Z andrea $ +# $Id: PKGBUILD 139970 2011-10-05 19:11:15Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kiten -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2") -sha1sums=('bc9f7b4e1891d8be6e322345e941377c988b8697') +sha1sums=('f6d76b2c15fdf47090db15303413114180358f39') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 3a2e7e63a..726dbcafd 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137434 2011-09-07 17:30:21Z andrea $ +# $Id: PKGBUILD 139972 2011-10-05 19:11:17Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-klettres -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2") -sha1sums=('e7fba352257c44d9ee84439dee4d3dfb58d4fd8d') +sha1sums=('44a0fa094b90da19c5b0acc25da1150c0ff02b1a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 6c1631ffb..dbb57eafd 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137436 2011-09-07 17:30:41Z andrea $ +# $Id: PKGBUILD 139974 2011-10-05 19:11:19Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kmplot -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") -sha1sums=('d0058f4d7a3f63b9a092085cb8058c4426dba1f8') +sha1sums=('dc496d88d6e062f7ecbf6f41187df95aa374fe9b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index c64afe366..0717238c3 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137438 2011-09-07 17:30:59Z andrea $ +# $Id: PKGBUILD 139976 2011-10-05 19:11:22Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kstars -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2") -sha1sums=('e9f899897df555933c7f9fd9e931dc49bcb924ae') +sha1sums=('bc51179a16fc2337d1dacab4c1d291042fc0b69c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 3a98393cc..3673c92c8 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137441 2011-09-07 17:31:22Z andrea $ +# $Id: PKGBUILD 139978 2011-10-05 19:11:24Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-ktouch -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") -sha1sums=('88e607fb584ea5cacc05f0f2909ae07139fdeed3') +sha1sums=('d5e0abd7defece0f455818c7bc53c50730419c46') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index 6815c15b0..70a8fbf77 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137443 2011-09-07 17:31:41Z andrea $ +# $Id: PKGBUILD 139980 2011-10-05 19:11:27Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kturtle -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") -sha1sums=('c2a33ff1ac68715e81108a8009ff67b5cb53ae2e') +sha1sums=('cc86eb08310e8ff591ebb394d08ffc214c264206') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index fb7e3d5c1..a1b8a1927 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137445 2011-09-07 17:32:00Z andrea $ +# $Id: PKGBUILD 139982 2011-10-05 19:11:29Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kwordquiz -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") -sha1sums=('17952dd5f8c042c467f15f2840399b7c5dd3fa05') +sha1sums=('f9450b1b7f539955e55877d96b37424c8abe576e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 2b46a7d14..be1863085 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137387 2011-09-07 17:20:56Z andrea $ +# $Id: PKGBUILD 139926 2011-10-05 19:09:59Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-marble -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -13,15 +13,10 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2" - 'gpsd3.patch') -sha1sums=('71c9ccd884495b34c8af4f7c432ca8942dfaa9dd' - '3916dd6307109d70d0dd538de913c91eede81d78') +source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") +sha1sums=('2b6353ff589d66dcf95a3eb79059275f620e03b2') build() { - cd "${srcdir}"/marble-${pkgver} - patch -p1 -i "${srcdir}"/gpsd3.patch - cd "${srcdir}" mkdir build cd build diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 45b509128..9c3631fa7 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137447 2011-09-07 17:32:18Z andrea $ +# $Id: PKGBUILD 139984 2011-10-05 19:11:31Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-parley -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2") -sha1sums=('c89739816f87048b0f9e336c3f3b74d038b8fae9') +sha1sums=('65fab5b04f2b0a3598c764ab138acb3c335cbb48') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 3b4ae4923..63ecd249f 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137449 2011-09-07 17:32:38Z andrea $ +# $Id: PKGBUILD 139986 2011-10-05 19:11:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-rocs -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('a22bfef644447271702c7e164070306a54270d57') +sha1sums=('19f2bf19dfe7a0787180c3fc9d1f32c14316f985') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 562625229..5137e6e92 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137451 2011-09-07 17:32:57Z andrea $ +# $Id: PKGBUILD 139988 2011-10-05 19:11:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-step -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2") -sha1sums=('64463c38648dcb7d1727f42aad642ce00602eee4') +sha1sums=('642f24c49990181ab2cc2d1ad974bcdc3d47ed46') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index e9fe797ce..c41a67c49 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137453 2011-09-07 17:33:19Z andrea $ +# $Id: PKGBUILD 139990 2011-10-05 19:11:41Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('282a54432b3f38bbb6afcf13e859299757ce59f8') +sha1sums=('a84be8406fce38cf5b172c320904bb1cbe59e729') build() { cd $srcdir diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 3d37f3e26..7df5e8e10 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137455 2011-09-07 17:34:39Z andrea $ +# $Id: PKGBUILD 139992 2011-10-05 19:11:44Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-gwenview -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") -sha1sums=('a58997d7e23f5708ff94d9198258dc0d6e82f8cf') +sha1sums=('ce1c3df9e9147d81ce250c41e7d9a328993d8632') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 21b812db3..08800cafa 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137457 2011-09-07 17:34:58Z andrea $ +# $Id: PKGBUILD 139994 2011-10-05 19:11:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kamera -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2") -sha1sums=('3b6dda64d13f25f521e9839709d716af27cf9f74') +sha1sums=('354d45d8f62c66bef0bc04c6e6e2056060ca7f0b') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 592c0bcc5..4e9b216c2 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137459 2011-09-07 17:35:19Z andrea $ +# $Id: PKGBUILD 139996 2011-10-05 19:11:49Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kcolorchooser -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") -sha1sums=('ca8885cf33806e32c9be572d5c5819c17f935f75') +sha1sums=('64bd726f1bbb1e771bc037d9929f0eba098d844d') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 569594e3f..bff860783 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137461 2011-09-07 17:35:40Z andrea $ +# $Id: PKGBUILD 139998 2011-10-05 19:11:51Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kgamma -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") -sha1sums=('789a1b7908be10711e2c4c38abecf37cebc8239d') +sha1sums=('3f8cf9bf169a0bc058d0de610bfa4910c54ef475') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index efc1c2d67..861447372 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137463 2011-09-07 17:35:58Z andrea $ +# $Id: PKGBUILD 140000 2011-10-05 19:11:54Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kolourpaint -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") -sha1sums=('bb49a7e07fea66110502f7042c898611d2d5329e') +sha1sums=('d4ec3e463ea3d50731e9fc87cc52eec50bc67ff8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index de1c550c8..9ab0e08df 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137465 2011-09-07 17:36:17Z andrea $ +# $Id: PKGBUILD 140002 2011-10-05 19:11:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kruler -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2") -sha1sums=('96fd638bb9db27abd3bbb57d90d7c60ec6d65185') +sha1sums=('acd3b77bf68fb409f456322d8a68a9d59d1014cb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 9e64f508a..1a542c09d 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137467 2011-09-07 17:36:35Z andrea $ +# $Id: PKGBUILD 140004 2011-10-05 19:11:58Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-ksaneplugin -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") -sha1sums=('e5b94fd03ddbc1be74881f19e52932c070663044') +sha1sums=('0a35cd7818089b31772dc974dc01a936e91c7d80') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 8362bc281..0d86a5948 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137469 2011-09-07 17:36:57Z andrea $ +# $Id: PKGBUILD 140006 2011-10-05 19:12:00Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-ksnapshot -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") -sha1sums=('a59b5bf582a70cd4b8620697161b022df31294e2') +sha1sums=('b6b3978639f7f3c06cf5b5653d9a367e38a70cec') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 28b935d6e..fec3672d2 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137471 2011-09-07 17:37:20Z andrea $ +# $Id: PKGBUILD 140008 2011-10-05 19:12:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-mobipocket -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2") -sha1sums=('54b7cd4e32325f8fe10f1765856e418fcc75e469') +sha1sums=('554dabf927e406aeff5e495b8eb7445a080d3195') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 42ce0d7fb..26a23d382 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137367 2011-09-07 17:16:58Z andrea $ +# $Id: PKGBUILD 139906 2011-10-05 19:09:29Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-okular -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('73d2b9ecdafa43feb9da645d6ff9ea309a55b669') +sha1sums=('5bc14efec8d00429a45a807a5bc839ffc783a10f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index db8c62132..bfdc8b9c9 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137473 2011-09-07 17:37:42Z andrea $ +# $Id: PKGBUILD 140010 2011-10-05 19:12:05Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-strigi-analyzer -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('1d88ceb5c156625945dabbb347cc405b253b67a5') +sha1sums=('6094f33788f619e316efad7bc3eb6178b1b28121') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 36e7a54b8..6c81eba9e 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137475 2011-09-07 17:38:02Z andrea $ +# $Id: PKGBUILD 140012 2011-10-05 19:12:07Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-svgpart -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") -sha1sums=('62bf2bc578a84a7b585002d80cc2386b9be10817') +sha1sums=('fe17a4f801ef94356a6bbc629affadc28a203b72') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 8a879ca25..eda714a60 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137477 2011-09-07 17:38:25Z andrea $ +# $Id: PKGBUILD 140014 2011-10-05 19:12:09Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-thumbnailers -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b82128adbd0cc352765a25428f38839f40715bc4') +sha1sums=('281c84bcec1ce4b02148caf164c28fbc47d9b11b') build() { cd "${srcdir}" diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index ec77e5271..24ac8c85c 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137929 2011-09-12 16:31:20Z andrea $ +# $Id: PKGBUILD 139893 2011-10-05 19:09:04Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdelibs -pkgver=4.7.1 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,24 +19,19 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 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' - 'fix-kdirwatch-with-linux3.patch') -sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2' + 'kde-applications-menu.patch' 'archlinux-menu.patch') +sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '54e6cbd7a8c4f9df947f18692512ca618c824c43') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67') build() { cd "${srcdir}"/${pkgname}-${pkgver} - # avoid file conflict with gnome-menu + # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # add Archlinux menu entry patch -p1 -i "${srcdir}"/archlinux-menu.patch - # Already fixed upstream - patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.patch - cd "${srcdir}" mkdir build cd build diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index bc6d246ed..edb678d17 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137479 2011-09-07 17:38:46Z andrea $ +# $Id: PKGBUILD 140016 2011-10-05 19:12:12Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -10,7 +10,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'mplayerthumbs.config') -sha1sums=('7f20d969133a146bce0e3ea18285aa6db9e4a262' +sha1sums=('2fc12558284fe95da63e24c73612846c6c1d31e1' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 379cb9f78..de902dd2c 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137481 2011-09-07 17:39:17Z andrea $ +# $Id: PKGBUILD 140018 2011-10-05 19:12:17Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('4fd674223dcb68a548ddec3e65acf380d3d2ec68') +sha1sums=('59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 98a749460..f67ef64df 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137361 2011-09-07 17:15:56Z andrea $ +# $Id: PKGBUILD 139900 2011-10-05 19:09:16Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepim-runtime -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('0e7645c83debc64d0b351d39f97b801dc8417630') +sha1sums=('f82886a63c48d718f30d60bd76ea7ac97f17a4c3') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index e591b6ae5..4b96d20cb 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137483 2011-09-07 17:39:52Z andrea $ +# $Id: PKGBUILD 140020 2011-10-05 19:12:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,8 +20,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.7.1 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('be22b012f547b2caa6ca92a6dd396328fda6a53b') +sha1sums=('41983556eb54a740a20d274878006ace5bc73c1c') build() { cd "${srcdir}" diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 6125ebe60..3b2555bc7 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137356 2011-09-07 17:13:21Z andrea $ +# $Id: PKGBUILD 139895 2011-10-05 19:09:07Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepimlibs -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6a2cb3d872339fc9549189f31163fc07889fc3ec') +sha1sums=('9ad72ec123c2837783e6836e8c79210c658d2536') build() { cd ${srcdir} diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index fc0494a04..a0a61e915 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137485 2011-09-07 17:40:51Z andrea $ +# $Id: PKGBUILD 140022 2011-10-05 19:12:28Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-pattern' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('301714467bef00c99613d334558eb517664e29a5') +sha1sums=('e1504ed7e21da8982610f42e70c3028b77ede6f1') build() { cd "${srcdir}" diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 28849d7db..726af5db2 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=git20110911 -_commit=6028b72a14f7fa714e6b4b101d51a4fb4bda3168 +pkgver=0.9.0beta1 +_commit=90c59c37c68920a44860ff5b8f7bcc146850efcf pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('8c8d92af3409be5a4faac21b25d0b5d0') +md5sums=('d6100be03b9114bffc079ef4b690a33e') build() { cd "${srcdir}" diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 62776e6ca..c17abe94a 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 137369 2011-09-07 17:17:19Z andrea $ +# $Id: PKGBUILD 139908 2011-10-05 19:09:32Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdesdk-kate pkgname=('kdebase-kwrite' 'kdesdk-kate') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2" 'pkgbuild-syntax-highlight.patch') -sha1sums=('12eadb7c74c16fb11d51d4415d141095a624f010' +sha1sums=('467b0558f1f86d0b210abd2d78c94cbe63b8579d' 'ab0c5d2a796b0f283154799add161c99f48ffcd5') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 03b6ca19d..0bc4c41aa 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137487 2011-09-07 17:42:51Z andrea $ +# $Id: PKGBUILD 140024 2011-10-05 19:12:39Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -24,7 +24,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -34,7 +34,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'fix-python2-path.patch') -sha1sums=('0c47d62a32e737c6ff576843d5b5c7f9bceeccbd' +sha1sums=('b6259b46fed642c35e1c1d1f90712084141ca441' 'd05ca0231869c484fd3861955d960a60aff7dcfb') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 285718703..87c86b125 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137489 2011-09-07 17:43:48Z andrea $ +# $Id: PKGBUILD 140026 2011-10-05 19:12:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('05e0f77fd13ed9887afa0c5dd33afd224abc2505') +sha1sums=('51213ffadf0326863aad82d9d581a2c9997dda58') build() { cd $srcdir diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index fa4930b31..fe47af50e 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137491 2011-09-07 17:44:13Z andrea $ +# $Id: PKGBUILD 140028 2011-10-05 19:12:50Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -16,7 +16,7 @@ pkgname=('kdeutils-ark' 'kdeutils-printer-applet' 'kdeutils-superkaramba' 'kdeutils-sweeper') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,7 +26,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('96eb89be0e319e5d0709430f86dc6a7db80d9967') +sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4') build() { cd ${srcdir} diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 991ddc091..4cf983f37 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137493 2011-09-07 17:44:52Z andrea $ +# $Id: PKGBUILD 140030 2011-10-05 19:12:56Z andrea $ # Maintainer: Pierre Schmitz pkgbase=kdewebdev @@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('ce9e7c37d2056b2f69e88fb92154463d917c9b85') +sha1sums=('82910da01dc84e86134d0dbae23b4bf66b565faa') build() { cd $srcdir diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 3dc376292..e901013ce 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138486 2011-09-24 16:46:43Z stephane $ +# $Id: PKGBUILD 139889 2011-10-05 19:06:53Z andrea $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,7 +37,7 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 4ef6a7a0a..8a8b3f292 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137389 2011-09-07 17:21:20Z andrea $ +# $Id: PKGBUILD 139928 2011-10-05 19:10:03Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdcraw -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d54aa4671c0d1f396bf1923583988d6c3aa19137') +sha1sums=('9e32ee20a1d201e55aacc5a1fb1de87ad50f3579') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 1710302ea..75a005a11 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137385 2011-09-07 17:20:37Z andrea $ +# $Id: PKGBUILD 139924 2011-10-05 19:09:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdeedu -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6eb16c156f35332675c9eaad0074e31969313e7b') +sha1sums=('51f8ce8847b71674244f7620536939ba4f36d476') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index ab282191d..eadcb1745 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137391 2011-09-07 17:21:38Z andrea $ +# $Id: PKGBUILD 139930 2011-10-05 19:10:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkexiv2 -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('c1c1afb6c3928222eb33ce592d77dd6478aa4911') +sha1sums=('fbd158168c219cbe1009019d2a33376fca951a5e') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index f6e013ca7..6a195b748 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137393 2011-09-07 17:21:58Z andrea $ +# $Id: PKGBUILD 139932 2011-10-05 19:10:13Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkipi -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('309b93ca86ae2c803f5b91ac206affc0059059f1') +sha1sums=('a75cd016c2d9faa71b2867cb4b3eed40edfb3b85') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index d0c66cc98..fb4ed89be 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137395 2011-09-07 17:22:17Z andrea $ +# $Id: PKGBUILD 139934 2011-10-05 19:10:18Z andrea $ # Maintainer: Andrea Scarpino pkgname=libksane -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d461b668e890069afb8818e6b367063fc92721da') +sha1sums=('223182cf23fc29a10ff2f1ce7756aecf4258b41c') build() { cd "${srcdir}" diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index c8b2eaf46..a0aba50c9 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 130580 2011-07-07 13:38:27Z stephane $ +# $Id: PKGBUILD 139875 2011-10-05 16:57:34Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=openmpi -pkgver=1.5.3 -pkgrel=4 +pkgver=1.5.4 +pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" license=('custom') depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') -makedepends=('net-tools') +makedepends=('inetutils') options=(!libtool) source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('669565c708deab82ad4069d82675b2020eb0e0c6') +sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,7 +22,6 @@ build() { --enable-mpi-f90 \ --libdir=/usr/lib/${pkgname} \ --with-threads=posix \ - --enable-mpi-threads \ --enable-smp-locks \ --with-valgrind \ --enable-memchecker \ @@ -32,7 +31,7 @@ build() { --with-hwloc=external \ --with-libltdl=/usr \ FC=/usr/bin/gfortran \ - LDFLAGS='-Wl,-z,noexecstack' + LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" make } diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 5fbfd67f3..6d0d26c57 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123295 2011-05-09 20:29:22Z andrea $ +# $Id: PKGBUILD 140036 2011-10-05 21:49:29Z ibiru $ # Maintainer: Tobias Powalowski # Contributor: Sarah Hay # Contributor: Simo L. @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.22 -pkgrel=2 +pkgrel=4 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -17,13 +17,16 @@ install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' - 'libv4l-0.8.3.patch') + 'libv4l-0.8.3.patch' + 'xerox_mfp_fix_usb_devices.patch') options=(!libtool) build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch + # fix https://bugs.archlinux.org/task/26114 + patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -50,4 +53,5 @@ package () { } md5sums=('fadf56a60f4776bfb24491f66b617cf5' 'da946cc36fb83612162cf9505986d4b2' - 'e645a8921cff9f18ffbdabb2ed885060') + 'e645a8921cff9f18ffbdabb2ed885060' + 'cfef73e7db7c28308914d3db6767d852') diff --git a/extra/sane/xerox_mfp_fix_usb_devices.patch b/extra/sane/xerox_mfp_fix_usb_devices.patch new file mode 100644 index 000000000..5ed29b974 --- /dev/null +++ b/extra/sane/xerox_mfp_fix_usb_devices.patch @@ -0,0 +1,67 @@ +commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7 +Author: Alex Belkin +Date: Tue Mar 8 17:57:19 2011 +0300 + + keep usb device by default (correct for bug introduced by tcp sub-backend + +diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c +index e08b50f..d4672a7 100644 +--- a/backend/xerox_mfp.c ++++ b/backend/xerox_mfp.c +@@ -37,10 +37,10 @@ + static const SANE_Device **devlist = NULL; /* sane_get_devices array */ + static struct device *devices_head = NULL; /* sane_get_devices list */ + +-transport available_transports[] = { ++enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX }; ++transport available_transports[TRANSPORTS_MAX] = { + { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device }, + { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device }, +- { 0 } + }; + + static int resolv_state(int state) +@@ -824,7 +824,13 @@ free_devices (void) + devices_head = NULL; + } + +-/* SANE API ignores return code of this callback */ ++static transport *tr_from_devname(SANE_String_Const devname) ++{ ++ if (strncmp("tcp", devname, 3) == 0) ++ return &available_transports[TRANSPORT_TCP]; ++ return &available_transports[TRANSPORT_USB]; ++} ++ + static SANE_Status + list_one_device (SANE_String_Const devname) + { +@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname) + return SANE_STATUS_GOOD; + } + +- for (tr = available_transports; tr->ttype; tr++) { +- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) +- break; +- } +- if (!tr->ttype) +- return SANE_STATUS_INVAL; ++ tr = tr_from_devname(devname); + + dev = calloc (1, sizeof (struct device)); + if (dev == NULL) +@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname) + static SANE_Status + list_conf_devices (UNUSED (SANEI_Config * config), const char *devname) + { +- transport *tr; +- +- for (tr = available_transports; tr->ttype; tr++) { +- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) +- return tr->configure_device(devname, list_one_device); +- } +- return SANE_STATUS_INVAL; ++ return tr_from_devname(devname)->configure_device(devname, list_one_device); + } + + SANE_Status diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index 2292ed9cc..73aa4c242 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 129328 2011-06-26 19:20:34Z andrea $ +# $Id: PKGBUILD 139891 2011-10-05 19:06:59Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=strigi -pkgver=0.7.5 -pkgrel=4 +pkgver=0.7.6 +pkgrel=1 pkgdesc="Fast crawling desktop search engine with Qt4 GUI" arch=('i686' 'x86_64') url="http://www.vandenoever.info/software/strigi/" license=('GPL2') depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs') makedepends=('qt' 'cmake' 'pkg-config' 'boost') -source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0559e2ab65d187d30916e9ffe36e0fb6') +optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' + 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') +#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('41cddd39e4ae3f590d82c859a14e9261') build() { cd "${srcdir}" @@ -26,8 +29,7 @@ build() { -DENABLE_FAM=OFF \ -DENABLE_CLUCENE=OFF \ -DENABLE_CLUCENE_NG=OFF \ - -DENABLE_FFMPEG=OFF \ - -DENABLE_XINE=OFF + -DENABLE_FFMPEG=OFF make } diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 62f025ed3..594d9715b 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134190 2011-08-02 13:30:23Z jgc $ +# $Id: PKGBUILD 139849 2011-10-05 10:55:56Z jgc $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xterm -pkgver=271 +pkgver=275 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('e07b05bd3d3a666a8cf086fcc8d227f3' +md5sums=('bbbe6a4566c04656ec21863351570ac8' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD index ccf43537a..857e3c4ef 100644 --- a/kde-unstable/kdebase-workspace/PKGBUILD +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137807 2011-09-11 11:17:41Z andrea $ +# $Id: PKGBUILD 139832 2011-10-05 06:09:41Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.7.1 -pkgrel=7 +pkgver=4.7.2 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,14 +14,17 @@ 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' - 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles' 'libegl') +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb' 'libgles' 'libegl') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +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' @@ -30,9 +33,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' - 'important-performance-bugfix.patch') -sha1sums=('c7867d2f788086078abbcff53a035a6131232539' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('afd37b2f583690e391828c1ceb7311e2e8d37c6f' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' @@ -40,17 +42,15 @@ sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - '4fa046db21e3203771fd29bc0e1c32918862b894') + 'd509dac592bd8b310df27991b208c95b6d907514') build() { cd "${srcdir}"/${_pkgname}-${pkgver} patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch - # Already fixed upstream - patch -p1 -i "${srcdir}"/important-performance-bugfix.patch - cd "${srcdir}" mkdir build cd build diff --git a/multilib/lib32-atk/PKGBUILD b/multilib/lib32-atk/PKGBUILD index 2243310b5..89fdf434c 100644 --- a/multilib/lib32-atk/PKGBUILD +++ b/multilib/lib32-atk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 27946 2010-09-30 16:10:31Z heftig $ +# $Id: PKGBUILD 56310 2011-10-05 14:32:13Z bluewind $ # Contributor: Pierre Schmitz # Maintainer: Mikko Seppälä _pkgbasename=atk pkgname=lib32-$_pkgbasename -pkgver=1.32.0 +pkgver=2.2.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility (32-bit)" arch=('x86_64') @@ -11,9 +11,9 @@ license=('LGPL') depends=('lib32-glib2>=2.25.17' $_pkgbasename) makedepends=('gcc-multilib') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.32/${_pkgbasename}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) url='http://www.gtk.org/' -sha256sums=('e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e') +sha256sums=('8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d') build() { export CC="gcc -m32" diff --git a/multilib/lib32-pango/PKGBUILD b/multilib/lib32-pango/PKGBUILD index a3951d41d..ccb80357b 100644 --- a/multilib/lib32-pango/PKGBUILD +++ b/multilib/lib32-pango/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 27942 2010-09-30 15:32:18Z heftig $ +# $Id: PKGBUILD 56312 2011-10-05 14:35:52Z bluewind $ # Contributor: Pierre Schmitz # Contributor: Mikko Seppälä # Maintainer: Biru Ionut _pkgbasename=pango pkgname=lib32-$_pkgbasename -pkgver=1.28.3 +pkgver=1.29.4 pkgrel=1 pkgdesc="A library for layout and rendering of text (32-bit)" arch=('x86_64') @@ -14,10 +14,10 @@ depends=('lib32-glib2>=2.25.15' 'lib32-cairo>=1.10.0' 'lib32-libxft>=2.1.14' makedepends=("gcc-multilib") options=('!libtool' '!emptydirs') install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.28/${_pkgbasename}-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.29/${_pkgbasename}-${pkgver}.tar.xz pango-modules-conffile.patch) url="http://www.pango.org/" -sha256sums=('5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632' +sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f' '4a178b60dd420ae53baeabbecfaaeca4070a4b777b2b3f36d137cd70b5a270c3') build() { diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD new file mode 100644 index 000000000..a204249bb --- /dev/null +++ b/staging/evince/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 139867 2011-10-05 14:44:08Z jgc $ +# Maintainer: Jan de Groot + +pkgname=evince +pkgver=3.2.0 +pkgrel=2 +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.xz) +sha256sums=('a9bc17e7f99489354cc66ffede68466ea0a9c52664b18198291c3a40d0150235') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./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/staging/evince/evince.install b/staging/evince/evince.install new file mode 100644 index 000000000..9643a9ba0 --- /dev/null +++ b/staging/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/staging/gimp-devel/PKGBUILD b/staging/gimp-devel/PKGBUILD new file mode 100644 index 000000000..615b5fa95 --- /dev/null +++ b/staging/gimp-devel/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 140045 2011-10-06 02:16:00Z eric $ +# Maintainer: Eric Bélanger + +pkgname=gimp-devel +pkgver=2.7.3 +pkgrel=2 +pkgdesc="GNU Image Manipulation Program (Development Version)" +arch=('i686' 'x86_64') +url="http://www.gimp.org/" +license=('GPL3' 'LGPL3') +depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \ + 'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') +optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' + 'libwebkit: for the help browser or web-page plug-ins' + 'poppler-glib: for pdf support' + 'alsa-lib: for MIDI event controller module' + 'curl: for URI support') +options=('!libtool' '!makeflags') +conflicts=('gimp') +provides=("gimp=${pkgver}") +install=gimp-devel.install +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl) +md5sums=('851b55dc4af966e62ef5c8b679bcc623' + 'bb27bc214261d36484093e857f015f38') +sha1sums=('bea6edc3423774ace8dd86222314f4ef2278cdd8' + '110ce9798173b19a662d086ed7b882b4729f06cf') + +build() { + cd "${srcdir}/gimp-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-mp --enable-gimp-console --enable-python --with-libcurl \ + --with-gif-compression=lzw --without-aa --without-gvfs + make +} + +package() { + cd "${srcdir}/gimp-${pkgver}" + make DESTDIR="${pkgdir}" install + sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py + install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" + + ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" + ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz" + ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" + ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz" + + ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp" + ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console" + ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" +} diff --git a/staging/gimp-devel/gimp-devel.install b/staging/gimp-devel/gimp-devel.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/staging/gimp-devel/gimp-devel.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/staging/gimp-devel/linux.gpl b/staging/gimp-devel/linux.gpl new file mode 100644 index 000000000..0a73d8979 --- /dev/null +++ b/staging/gimp-devel/linux.gpl @@ -0,0 +1,19 @@ +GIMP Palette +Name: linux +# + 0 0 0 + 0 0 170 + 0 170 0 + 0 170 170 +170 0 0 +170 0 170 +170 85 0 +170 170 170 + 85 85 85 + 85 85 255 + 85 255 85 + 85 255 255 +255 85 85 +255 85 255 +255 255 85 +255 255 255 diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD new file mode 100644 index 000000000..8e7c497b7 --- /dev/null +++ b/staging/inkscape/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 140042 2011-10-06 00:30:12Z bisson $ +# Contributor: tobias +# Contributor: Tobias Kieslich +# Maintainer: Gaetan Bisson + +pkgname=inkscape +pkgver=0.48.2 +pkgrel=3 +pkgdesc='Vector graphics editor using the SVG file format' +url='http://inkscape.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +makedepends=('boost' 'pkg-config' 'intltool') +depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' + 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + 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 +} diff --git a/staging/inkscape/install b/staging/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/staging/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/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD new file mode 100644 index 000000000..7448877fb --- /dev/null +++ b/staging/libreoffice/PKGBUILD @@ -0,0 +1,940 @@ +# $Id: PKGBUILD 140047 2011-10-06 02:56:16Z andyrtr $ +# Maintainer: AndyRTR + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + #'libreoffice-extension-barcode' # + 'libreoffice-extension-diagram' + 'libreoffice-extension-google-docs' + 'libreoffice-extension-hunart' + #'libreoffice-extension-lightproof' # no source integration + #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity + 'libreoffice-extension-nlpsolver' + 'libreoffice-extension-ct2n' + 'libreoffice-extension-numbertext' + 'libreoffice-extension-oooblogger' + 'libreoffice-extension-pdfimport' + 'libreoffice-extension-presenter-screen' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-report-builder' + 'libreoffice-extension-scripting-beanshell' + 'libreoffice-extension-scripting-javascript' + 'libreoffice-extension-scripting-python' + 'libreoffice-extension-typo' + 'libreoffice-extension-validator' + 'libreoffice-extension-watch-window' + 'libreoffice-extension-wiki-publisher') +_LOver=3.4.3.2 +pkgver=3.4.3 +pkgrel=4 +arch=('i686' 'x86_64') +#_LO_tree="3.4" +_OFFICEUPD="340" +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' + 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' + #'saxon' - currently broken + # the depends from libreoffice main pkg + "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script + 'ttf-dejavu') # to satisfy regression tests + # translate-toolkit - todo move them to extra to allow --with-system-foo builds +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://hg.services.openoffice.org/binaries" +source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll + http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz + http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt + buildfix_boost.diff + buildfix_ct2n.diff + vbahelper.visibility.patch + scp2-more-reasonable-file-access-rights.diff + java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842 + oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 + poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe + pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b + poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b + build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42) +noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll + b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt + 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt + 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt + b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt + 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt + dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt + b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) +md5sums=('7c2e73f1197d169519f86efe422e5df9' + '823956297a7e0b7603c585c49bd9fd4e' + '465b3be0e30f88e1139c45d2e2217927' + 'a1d5af5be5eb522c8a24feacbb0161fa' + '8b972e130dfe62eb41d1d71d72de4b76' + 'a6b22494e3a65a3b242ecb896aa7ab48' + 'b7d86f8baee5b31af210cc81785e5676' + 'de6c062d334daab99cf0592aa3568215' + 'df46914d540ef0126cd746d09c68ca2a' + '8f308250c397ddc6fdb1aae13e102927' + '1fd00a0fcfd4a5d1956c3f6a0990d1ce' + '86914ac8bc30ea721b708b2f2faa3111' + '1452229e57ac3c4191e798eac4c0a7e0' + 'bb46bdb682689629d432cdbf5f3f42c2' + 'bec7f633562762debdf810690002e688' + '87061613efece1c253906a90cd4dc01f' + '308284d7d1d1bd6860d128b26e24390b' + 'fa8b36365a2b2fb110c44886d7069774' + 'da8a40cac4bd9d4f6f326e0e3b1b7e2a' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'fdb27bfe2dbe2e7b57ae194d9bf36bab' + 'ada24d37d8d638b3d8a9985e80bc2978' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '2ae988b339daec234019a7066f96733e' + '2c9b0f83ed5890af02c0df1c1776f39b' + 'af3c3acf618de6108d65fcdc92b492e1' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '18f577b374d60b3c760a3a3350407632' + '0ff7d225d087793c8c2c680d77aac3e7' + '185d60944ea767075d27247c3162b3bc' + 'b4cae0700aa1c2aef7eb7f345365e6f1' + '90401bca927835b6fbae4a707ed187c8' + 'f02578f5218f217a9f20e9c30e119c6a' + '0625a7d661f899a8ce263fc8a9879108' + '451ccf439a36a568653b024534669971' + '7e7efc5d4a03126bb9ae3ae9aa2c4e87' + '41c9b65ad60af4b3255bbecdfef11736' + 'bbdd5639ada63e3130761daaecae1a10' + '23bd75552206dfcd8fd4e29137dcac84' + 'b8cbca7b3363e6ca2d02bc0ba2b63904' + 'b632bdd25649cc4067bcb410bae23d2b' + '9d60b6cfa3ef1926848710bbcd11115b' + 'dbaafd21de055e582d92d7d32fe9da13' + 'b7b2d0e04e142f26dd96119c80757d1f' + 'bc228237108cab7745897a9f466b6d39' + 'eee273f501ff45dc5f1365e78c6d57c0' + '43b145db28e6c0d73578ae6fd35e510d' + '37638431e7e40baf2e47966ebb9bc0e9' + 'ca6032e86229ae798f3744ae244f5bfe' + '3c6c62e77c30649a3dfe73512947cc9a' + '64497be966802e62ffe3282d3facf7b7' + '89ff871e77e10357a976fe9d1ab3a65a' + 'c4cb0d7f2602396a3f4cac55b8a4e308' + 'b8f1fb7f3902d22aeaa2575c6b08a62c') + +build() { + + unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh + [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + + # move all LibO sources into one build directory + mkdir ${srcdir}/build && cd ${srcdir}/build + for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations + mv ${srcdir}/$i/* . + done +# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* . +# ./bin/unpack-sources ${srcdir}/build + + # move external sources into place + mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + + cd ${srcdir}/build + + # buildfixes & bugfixes + patch -Np1 -i ${srcdir}/buildfix_boost.diff + patch -Np1 -i ${srcdir}/buildfix_ct2n.diff + patch -Np0 -i ${srcdir}/vbahelper.visibility.patch + patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + patch -Np1 -i ${srcdir}/java-detection.diff + patch -Np1 -i ${srcdir}/oracle-recognition.diff + patch -Np1 -i ${srcdir}/poppler-check.diff + patch -Np1 -i ${srcdir}/pdfimport.diff + patch -Np1 -i ${srcdir}/poppler-buildfix.diff + patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff + + # unset C(XX)FLAGS + # http://www.openoffice.org/issues/show_bug.cgi?id=103205 +# unset CFLAGS +# unset CXXFLAGS + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + # python2 fix + export PYTHON=python2 + + # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options + +# if [ "$CARCH" = "x86_64" ]; then +# EXTRAOPTS="--without-stlport" +# else +# EXTRAOPTS="--with-stlport" # --without-system-boost" +# # # avoid problems with ixion for now +# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 +# fi + + # needed for 0003-distro-install-fix-en-US-only-installation.patch + autoconf -v -f + + # non-SMP test build +# export MAKEFLAGS="-j1" + ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + --with-unix-wrapper="libreoffice" \ + --enable-split-app-modules \ + --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ + --disable-verbose \ + --with-lang="" \ + --enable-cairo\ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-graphite --without-system-graphite \ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-ldap \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-opengl\ + --enable-ext-barcode \ + --enable-ext-diagram \ + --enable-ext-google-docs \ + --enable-ext-hunart \ + --disable-ext-lightproof \ + --disable-ext-mysql-connector \ + --with-system-mysql \ + --enable-ext-nlpsolver \ + --enable-ext-ct2n \ + --enable-ext-numbertext \ + --enable-ext-oooblogger \ + --enable-ext-pdfimport \ + --enable-ext-presenter-console \ + --enable-ext-presenter-minimizer \ + --enable-ext-report-builder \ + --enable-ext-scripting-beanshell \ + --enable-ext-scripting-javascript \ + --enable-ext-scripting-python \ + --enable-ext-typo \ + --enable-ext-validator \ + --enable-ext-watch-window \ + --enable-ext-wiki-publisher \ + --without-fonts\ + --without-afms\ + --without-ppds\ + --without-system-libwps\ + --without-system-mdds\ + --without-myspell-dicts \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-cppunit\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-saxon\ + --with-system-libtextcat \ + --with-external-libtextcat-data \ + --with-openldap\ + --with-ant-home="/usr/share/java/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mozilla\ + --with-system-mythes\ + --with-system-xrender-headers\ + --with-system-headers\ + --with-alloc=system\ + --with-system-lucene\ + --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ + --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-java-target-version=1.5 \ + $EXTRAOPTS || return 1 + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + +#--with-servlet-api-jar=JARFILE +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-system-saxon\ +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ + + touch src.downloaded + #./download + unset MAKEFLAGS + ./bootstrap + make + + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=${pkgbase}.install + depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script + #'java-runtime' + #'saxon' + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'gconf: adds additional gnome support' + 'nss: adds support for signed files/macros' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'poppler: for shipped pdfimport extension' + 'libmythes: for use in thesaurus' + 'hsqldb-java: default database format for OpenOffice.org' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' + 'libldap: to get profiles via ldap' + 'lucene: full-text search engine library for Java needed in the help section' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # # remove version in menu entry and make it visible +# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop +# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + #fix http://bugs.archlinux.org/task/17656 + find ${pkgdir} -perm 444 -exec ls -lh {} \; + find ${pkgdir} -perm 444 -exec chmod 644 {} \; + find ${pkgdir} -perm 555 -exec ls -lh {} \; + find ${pkgdir} -perm 555 -exec chmod 755 {} \; +} + +package_libreoffice-base() { + pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + depends=('libreoffice-common' 'lpsolve' ) + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'dbus-glib') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + depends=('libreoffice-common') + optdepends=('mesa: for the OGLTrans extension') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Applicationfor LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix ArchLinux LibreOffice installation paths + sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ + -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ + -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ + -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ + -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ + -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ + -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Applicationfor LibreOffice." + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-barcode() { + + pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode + chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode +} + +package_libreoffice-extension-diagram() { + + pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram +} + +package_libreoffice-extension-google-docs() { + + pkgdesc="Google Documents extension for LibreOffice" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs +} + +package_libreoffice-extension-hunart() { + + pkgdesc="Hungarian cross-reference toolbar extension" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart +} + +#package_libreoffice-extension-lightproof() { + +# pkgdesc="Lightproof extension for LibreOffice" + #arch=('any') +# depends=('libreoffice-common') +# groups=('libreoffice-extensions') + +# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions +# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof +#} + +#package_libreoffice-extension-mysql-connector() { + +# pkgdesc="MySQL Connector extension for LibreOffice" + #arch=('any') +# depends=('libreoffice-common') +# groups=('libreoffice-extensions') + +# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions +# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector +#} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} + +package_libreoffice-extension-ct2n() { + + pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n +} + +package_libreoffice-extension-numbertext() { + + pkgdesc="NUMBERTEXT/MONEYTEXT extensions" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext +} + +package_libreoffice-extension-oooblogger() { + + pkgdesc="An extensions for blogging" + #arch=('any') + depends=('libreoffice-common' 'coreutils' 'python') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger +} + +package_libreoffice-extension-pdfimport() { + + pkgdesc="This extension allows you to import and modify PDF documents" + depends=('libreoffice-common' 'poppler') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport +} + +package_libreoffice-extension-presenter-screen() { + + pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-report-builder() { + + pkgdesc="This extension creates smart-looking database reports" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder +} + +package_libreoffice-extension-scripting-beanshell() { + + pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell +} + +package_libreoffice-extension-scripting-javascript() { + + pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript +} + +package_libreoffice-extension-scripting-python() { + + pkgdesc="LibreOffice extension - Enables support for scripts in Python" + depends=('libreoffice-common' 'python') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python +} + +package_libreoffice-extension-typo() { + + pkgdesc="Typography toolbar extension" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo + find ${pkgdir} -type d -exec chmod 755 {} \; + #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo +} + +package_libreoffice-extension-validator() { + + pkgdesc="Validator extension for LibreOffice" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-watch-window() { + + pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window +} diff --git a/staging/libreoffice/buildfix_boost.diff b/staging/libreoffice/buildfix_boost.diff new file mode 100644 index 000000000..d8608d0d4 --- /dev/null +++ b/staging/libreoffice/buildfix_boost.diff @@ -0,0 +1,40 @@ +From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Tue, 05 Apr 2011 14:07:02 +0000 +Subject: silence some more of that annoying gcc#47679 + +--- +diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch +index 1c804aa..9b33a5f 100644 +--- a/boost/boost.gcc47679.patch ++++ b/boost/boost.gcc47679.patch +@@ -36,3 +36,26 @@ + template + inline bool allow_more_digits(std::size_t i) + { ++--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 +++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 ++@@ -31,6 +31,8 @@ ++ ++ #include "boost/optional/optional_fwd.hpp" ++ +++#include +++ ++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) ++ // VC6.0 has the following bug: ++ // When a templated assignment operator exist, an implicit conversion ++@@ -114,6 +116,11 @@ ++ ++ public: ++ +++ aligned_storage() +++ { +++ memset(&dummy_, 0, sizeof(dummy_)); +++ } +++ ++ void const* address() const { return &dummy_.data[0]; } ++ void * address() { return &dummy_.data[0]; } ++ } ; +-- +cgit v0.8.3-6-g21f6 + diff --git a/staging/libreoffice/buildfix_ct2n.diff b/staging/libreoffice/buildfix_ct2n.diff new file mode 100644 index 000000000..979587f79 --- /dev/null +++ b/staging/libreoffice/buildfix_ct2n.diff @@ -0,0 +1,17 @@ +From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Tue, 12 Apr 2011 19:35:51 +0000 +Subject: duplicate NULLs + +--- +diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst +index 91f44b7..714d926 100644 +--- a/ct2n/prj/build.lst ++++ b/ct2n/prj/build.lst +@@ -1,3 +1,3 @@ +-ct2n ct2n : solenv NULL NULL ++ct2n ct2n : solenv NULL + ct2n ct2n usr1 - all ct2n_mkout NULL + ct2n ct2n nmake - all ct2n_ct2n NULL +-- +cgit v0.8.3-6-g21f6 diff --git a/staging/libreoffice/libreoffice.install b/staging/libreoffice/libreoffice.install new file mode 100644 index 000000000..809472f89 --- /dev/null +++ b/staging/libreoffice/libreoffice.install @@ -0,0 +1,47 @@ +post_install() { + +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-desktop-database -q +update-mime-database usr/share/mime > /dev/null 2>&1 + +echo " * see https://wiki.archlinux.org/index.php/LibreOffice" +echo "-------------------------------------------------------------------" +echo "LibreOffice has been split into several packages:" +echo "- libreoffice-common" +echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" +echo "- libreoffice-{gnome,kde4} - desktop integration plugins" +echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" +echo " the LibreOffice APIs and for creating" +echo " extensions (UNO components)." +echo "-------------------------------------------------------------------" +echo " * you need to install at least one libreoffice-langpack" +echo " * you may want to pacman -Ss libreoffice-extensions" +echo " to see what additional extensions are prepared to install" +echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg + for spell checking" +echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" +} + +post_upgrade() { +# post_install $1 +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-desktop-database -q +update-mime-database usr/share/mime > /dev/null 2>&1 + if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then + # important upgrade notice + echo "LibreOffice has been split into several packages:" + echo "- libreoffice-common" + echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" + echo "- libreoffice-{gnome,kde4} - desktop integration plugins" + echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" + echo " the LibreOffice APIs and for creating" + echo " extensions (UNO components)." + echo "Now you need to install at least one libreoffice-langpack!" + fi +} + +post_remove() { +update-desktop-database -q +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-mime-database usr/share/mime > /dev/null 2>&1 +} diff --git a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff b/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff new file mode 100644 index 000000000..fd61cb4ca --- /dev/null +++ b/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff @@ -0,0 +1,15 @@ +--- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200 ++++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200 +@@ -92,10 +92,10 @@ + #endif + + #define BIN_FILE_BODY \ +- UnixRights = 555 ++ UnixRights = 755 + + #define TXT_FILE_BODY \ +- UnixRights = 444 ++ UnixRights = 644 + + #define USER_FILE_BODY \ + UnixRights = 644 diff --git a/staging/libreoffice/vbahelper.visibility.patch b/staging/libreoffice/vbahelper.visibility.patch new file mode 100644 index 000000000..5739100d0 --- /dev/null +++ b/staging/libreoffice/vbahelper.visibility.patch @@ -0,0 +1,33 @@ +--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 ++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 +@@ -238,7 +238,7 @@ + + // including a HelperInterface implementation + template< typename Ifc1 > +-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > ++class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > + { + typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; + protected: +--- sc/Library_vbaobj.mk ++++ sc/Library_vbaobj.mk +@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbaquerytable \ + sc/source/ui/vba/vbarange \ + sc/source/ui/vba/vbasheetobject \ +- sc/source/ui/vba/vbasheetobjects \ + sc/source/ui/vba/vbastyle \ + sc/source/ui/vba/vbastyles \ + sc/source/ui/vba/vbatextboxshape \ +@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbawsfunction \ + )) + ++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ ++ sc/source/ui/vba/vbasheetobjects \ ++ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ ++)) ++ + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) + $(eval $(call gb_Library_set_ldflags,vbaobj,\ + $$(LDFLAGS) \ diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD new file mode 100644 index 000000000..11686b551 --- /dev/null +++ b/staging/poppler/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 139863 2011-10-05 14:22:51Z jgc $ +# Maintainer: Jan de Groot + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.18.0 +pkgrel=1 +arch=(i686 x86_64) +license=('GPL') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://poppler.freedesktop.org/" +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) +md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg --enable-zlib \ + --enable-poppler-qt4 \ + --enable-poppler-glib + make +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + 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 +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'glib2') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/glib" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* + rm -f "${pkgdir}/usr/bin/poppler-glib-demo" +} + +package_poppler-qt() { + pkgdesc="Poppler Qt bindings" + depends=("poppler=${pkgver}" 'qt') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt4" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD new file mode 100644 index 000000000..a70723036 --- /dev/null +++ b/staging/tracker/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 139873 2011-10-05 16:29:31Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Sergej Pupykin +# Contributor: Alexander Fehr + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.12.3 +_tver=${pkgver%.*} +pkgrel=2 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' + 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' + 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) +sha256sums=('97c9e151d48878409129eeeea2da0716f14a52d6097d8db3b304c6af0b7ae187') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/staging/tracker/tracker.install @@ -0,0 +1,13 @@ +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 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/xournal/PKGBUILD b/staging/xournal/PKGBUILD new file mode 100644 index 000000000..8622a5f9c --- /dev/null +++ b/staging/xournal/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 139871 2011-10-05 16:16:06Z bisson $ +# Maintainer: Gaetan Bisson + +pkgname=xournal +pkgver=0.4.5 +pkgrel=5 +pkgdesc='Notetaking and sketching application' +arch=('i686' 'x86_64') +url='http://xournal.sourceforge.net/' +license=('GPL') +depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds') +source=("http://downloads.sourceforge.net/xournal/xournal-${pkgver}.tar.gz" + 'pdf-export-64.patch' + 'poppler-api.patch') +sha1sums=('390cb275774469ed1b04b7268dd625bd456c895e' + 'f23f53b9f69ba8a5773c53d7bca99abf9d8504f8' + '5aedd5610b42df96e964bb889d4bf0831c2080bc') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../pdf-export-64.patch # from xournal CVS, see FS#21693 + patch -p1 -i ../poppler-api.patch + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install desktop-install +} diff --git a/staging/xournal/install b/staging/xournal/install new file mode 100644 index 000000000..dfcb68374 --- /dev/null +++ b/staging/xournal/install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/xournal/pdf-export-64.patch b/staging/xournal/pdf-export-64.patch new file mode 100644 index 000000000..9f7075c54 --- /dev/null +++ b/staging/xournal/pdf-export-64.patch @@ -0,0 +1,89 @@ +diff -aur old/src/xo-print.c new/src/xo-print.c +--- old/src/xo-print.c 2009-09-28 23:36:54.000000000 +0200 ++++ new/src/xo-print.c 2009-11-15 06:06:00.000000000 +0100 +@@ -761,7 +761,7 @@ + + make_xref(xref, xref->last+1, pdfbuf->len); + g_string_append_printf(pdfbuf, +- "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject " ++ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject " + "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB " + "/BitsPerComponent 8 >> stream\n", + xref->last, zpix->len, width, height); +@@ -840,8 +840,10 @@ + gboolean fallback, is_binary; + guchar encoding[256]; + gushort glyphs[256]; +- int i, j, num, len1, len2; +- gsize len; ++ int i, j, num; ++ guint32 len1, len2; ++ guint32 tt_len; ++ gsize t1_len; + TrueTypeFont *ttfnt; + char *seg1, *seg2; + char *fontdata, *p; +@@ -862,14 +864,14 @@ + } + font->num_glyphs_used = num-1; + if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) { +- if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num, ++ if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num, + 0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) { + make_xref(xref, xref->last+1, pdfbuf->len); + nobj_fontprog = xref->last; + g_string_append_printf(pdfbuf, +- "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n", +- nobj_fontprog, (int)len, (int)len); +- g_string_append_len(pdfbuf, fontdata, len); ++ "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n", ++ nobj_fontprog, tt_len, tt_len); ++ g_string_append_len(pdfbuf, fontdata, tt_len); + g_string_append(pdfbuf, "endstream\nendobj\n"); + g_free(fontdata); + } +@@ -879,7 +881,7 @@ + else fallback = TRUE; + } else { + // embed the font file: Type1 case +- if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) { ++ if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) { + if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) { + is_binary = TRUE; + len1 = pfb_get_length((unsigned char *)fontdata+2); +@@ -898,7 +900,7 @@ + if (*p=='\n' || *p=='\r') p++; + if (*p=='\n' || *p=='\r') p++; + len1 = p-fontdata; +- p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END); ++ p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END); + if (p==NULL) fallback = TRUE; + else { + // rewind 512 zeros +@@ -936,7 +938,7 @@ + make_xref(xref, xref->last+1, pdfbuf->len); + nobj_fontprog = xref->last; + g_string_append_printf(pdfbuf, +- "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n", ++ "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n", + nobj_fontprog, len1+len2, len1, len2); + g_string_append_len(pdfbuf, seg1, len1); + g_string_append_len(pdfbuf, seg2, len2); +@@ -1258,7 +1260,7 @@ + tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1), + pg->width, pg->height); + g_string_append_printf(pdfbuf, +- "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n", ++ "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n", + n_obj_prefix, tmpstr->len, tmpstr->str); + g_string_free(tmpstr, TRUE); + g_string_prepend(pgstrm, "Q Q Q "); +@@ -1276,7 +1278,7 @@ + + make_xref(&xref, xref.last+1, pdfbuf->len); + g_string_append_printf(pdfbuf, +- "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n", ++ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n", + xref.last, zpgstrm->len); + g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len); + g_string_free(zpgstrm, TRUE); diff --git a/staging/xournal/poppler-api.patch b/staging/xournal/poppler-api.patch new file mode 100644 index 000000000..9e33c7feb --- /dev/null +++ b/staging/xournal/poppler-api.patch @@ -0,0 +1,158 @@ +diff -aur old/src/xo-file.c new/src/xo-file.c +--- old/src/xo-file.c 2009-09-29 09:36:05.000000000 +1000 ++++ new/src/xo-file.c 2011-10-06 03:11:17.307822836 +1100 +@@ -975,6 +975,140 @@ + g_free(req); + } + ++/* ++ * Copied from http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617 ++ * as a temporary workaround to poppler removing depreciated functions while we wait for ++ * upstream to rewrite against cairo ++ */ ++static void ++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf) ++{ ++ int cairo_width, cairo_height, cairo_rowstride; ++ unsigned char *pixbuf_data, *dst, *cairo_data; ++ int pixbuf_rowstride, pixbuf_n_channels; ++ unsigned int *src; ++ int x, y; ++ ++ cairo_width = cairo_image_surface_get_width (surface); ++ cairo_height = cairo_image_surface_get_height (surface); ++ cairo_rowstride = cairo_image_surface_get_stride (surface); ++ cairo_data = cairo_image_surface_get_data (surface); ++ ++ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); ++ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); ++ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); ++ ++ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) ++ cairo_width = gdk_pixbuf_get_width (pixbuf); ++ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) ++ cairo_height = gdk_pixbuf_get_height (pixbuf); ++ for (y = 0; y < cairo_height; y++) ++ { ++ src = (unsigned int *) (cairo_data + y * cairo_rowstride); ++ dst = pixbuf_data + y * pixbuf_rowstride; ++ for (x = 0; x < cairo_width; x++) ++ { ++ dst[0] = (*src >> 16) & 0xff; ++ dst[1] = (*src >> 8) & 0xff; ++ dst[2] = (*src >> 0) & 0xff; ++ if (pixbuf_n_channels == 4) ++ dst[3] = (*src >> 24) & 0xff; ++ dst += pixbuf_n_channels; ++ src++; ++ } ++ } ++} ++ ++static void ++_poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ gboolean printing, ++ GdkPixbuf *pixbuf) ++{ ++ cairo_t *cr; ++ cairo_surface_t *surface; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ++ src_width, src_height); ++ cr = cairo_create (surface); ++ cairo_save (cr); ++ switch (rotation) { ++ case 90: ++ cairo_translate (cr, src_x + src_width, -src_y); ++ break; ++ case 180: ++ cairo_translate (cr, src_x + src_width, src_y + src_height); ++ break; ++ case 270: ++ cairo_translate (cr, -src_x, src_y + src_height); ++ break; ++ default: ++ cairo_translate (cr, -src_x, -src_y); ++ } ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ if (rotation != 0) ++ cairo_rotate (cr, rotation * G_PI / 180.0); ++ ++ if (printing) ++ poppler_page_render_for_printing (page, cr); ++ else ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1., 1., 1.); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ copy_cairo_surface_to_pixbuf (surface, pixbuf); ++ cairo_surface_destroy (surface); ++} ++ ++/** ++ * poppler_page_render_to_pixbuf: ++ * @page: the page to render from ++ * @src_x: x coordinate of upper left corner ++ * @src_y: y coordinate of upper left corner ++ * @src_width: width of rectangle to render ++ * @src_height: height of rectangle to render ++ * @scale: scale specified as pixels per point ++ * @rotation: rotate the document by the specified degree ++ * @pixbuf: pixbuf to render into ++ * ++ * First scale the document to match the specified pixels per point, ++ * then render the rectangle given by the upper left corner at ++ * (src_x, src_y) and src_width and src_height. ++ * This function is for rendering a page that will be displayed. ++ * If you want to render a page that will be printed use ++ * poppler_page_render_to_pixbuf_for_printing() instead ++ * ++ * Deprecated: 0.16 ++ **/ ++void ++poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf) ++{ ++ g_return_if_fail (POPPLER_IS_PAGE (page)); ++ g_return_if_fail (scale > 0.0); ++ g_return_if_fail (pixbuf != NULL); ++ ++ _poppler_page_render_to_pixbuf (page, src_x, src_y, ++ src_width, src_height, ++ scale, rotation, ++ FALSE, ++ pixbuf); ++} + /* process a bg PDF request from the queue, and recurse */ + + gboolean bgpdf_scheduler_callback(gpointer data) +diff -aur old/src/xo-file.h new/src/xo-file.h +--- old/src/xo-file.h 2009-09-28 08:45:53.000000000 +1000 ++++ new/src/xo-file.h 2011-10-06 03:11:17.311156160 +1100 +@@ -36,3 +36,10 @@ + void init_config_default(void); + void load_config_from_file(void); + void save_config_to_file(void); ++ ++void poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf); diff --git a/testing/kbd/PKGBUILD b/testing/kbd/PKGBUILD new file mode 100644 index 000000000..ebc08f967 --- /dev/null +++ b/testing/kbd/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 139865 2011-10-05 14:29:41Z tpowa $ +# Maintainer: Tobias Powalowski + +pkgname=kbd +pkgver=1.15.3 +pkgrel=2 +pkgdesc="Keytable files and keyboard utilities" +arch=('i686' 'x86_64') +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 + fix-es.po.patch) +md5sums=('8143e179a0f3c25646ce5085e8777200' + '4ded3edb50fb7a3277bae6a870cee812') + +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) + # this should be removed when upstream adopts the change + mv data/keymaps/i386/qwertz/cz{,-qwertz}.map + mv data/keymaps/i386/olpc/es{,-olpc}.map + mv data/keymaps/i386/olpc/pt{,-olpc}.map + mv data/keymaps/i386/dvorak/no{,-dvorak}.map + mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map + mv data/keymaps/i386/colemak/{en-latin9,colemak}.map + + ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man + 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 + # remove this when next versions of kbd + # and initscripts with /usr/bin/loadkeys usage will be released + mkdir ${pkgdir}/bin + ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys +} diff --git a/testing/kbd/fix-es.po.patch b/testing/kbd/fix-es.po.patch new file mode 100644 index 000000000..578f0a7b7 --- /dev/null +++ b/testing/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/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD new file mode 100644 index 000000000..87f1fadd1 --- /dev/null +++ b/testing/libreoffice/PKGBUILD @@ -0,0 +1,928 @@ +# $Id: PKGBUILD 139852 2011-10-05 11:45:47Z andyrtr $ +# Maintainer: AndyRTR + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + #'libreoffice-extension-barcode' # + 'libreoffice-extension-diagram' + 'libreoffice-extension-google-docs' + 'libreoffice-extension-hunart' + #'libreoffice-extension-lightproof' # no source integration + #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity + 'libreoffice-extension-nlpsolver' + 'libreoffice-extension-ct2n' + 'libreoffice-extension-numbertext' + 'libreoffice-extension-oooblogger' + 'libreoffice-extension-pdfimport' + 'libreoffice-extension-presenter-screen' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-report-builder' + 'libreoffice-extension-scripting-beanshell' + 'libreoffice-extension-scripting-javascript' + 'libreoffice-extension-scripting-python' + 'libreoffice-extension-typo' + 'libreoffice-extension-validator' + 'libreoffice-extension-watch-window' + 'libreoffice-extension-wiki-publisher') +_LOver=3.4.3.2 +pkgver=3.4.3 +pkgrel=3 +arch=('i686' 'x86_64') +#_LO_tree="3.4" +_OFFICEUPD="340" +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. + 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' + 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' + #'saxon' - currently broken + # the depends from libreoffice main pkg + "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script + 'ttf-dejavu') # to satisfy regression tests + # translate-toolkit - todo move them to extra to allow --with-system-foo builds +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://hg.services.openoffice.org/binaries" +source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll + http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz + http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt + buildfix_boost.diff + buildfix_ct2n.diff + vbahelper.visibility.patch + scp2-more-reasonable-file-access-rights.diff + java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842 + oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1) +noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll + b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt + 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt + 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt + b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt + 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt + dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt + b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) +md5sums=('7c2e73f1197d169519f86efe422e5df9' + '823956297a7e0b7603c585c49bd9fd4e' + '465b3be0e30f88e1139c45d2e2217927' + 'a1d5af5be5eb522c8a24feacbb0161fa' + '8b972e130dfe62eb41d1d71d72de4b76' + 'a6b22494e3a65a3b242ecb896aa7ab48' + 'b7d86f8baee5b31af210cc81785e5676' + 'de6c062d334daab99cf0592aa3568215' + 'df46914d540ef0126cd746d09c68ca2a' + '8f308250c397ddc6fdb1aae13e102927' + '1fd00a0fcfd4a5d1956c3f6a0990d1ce' + '86914ac8bc30ea721b708b2f2faa3111' + '1452229e57ac3c4191e798eac4c0a7e0' + 'bb46bdb682689629d432cdbf5f3f42c2' + 'bec7f633562762debdf810690002e688' + '87061613efece1c253906a90cd4dc01f' + '308284d7d1d1bd6860d128b26e24390b' + 'fa8b36365a2b2fb110c44886d7069774' + 'da8a40cac4bd9d4f6f326e0e3b1b7e2a' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'fdb27bfe2dbe2e7b57ae194d9bf36bab' + 'ada24d37d8d638b3d8a9985e80bc2978' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '2ae988b339daec234019a7066f96733e' + '2c9b0f83ed5890af02c0df1c1776f39b' + 'af3c3acf618de6108d65fcdc92b492e1' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '18f577b374d60b3c760a3a3350407632' + '0ff7d225d087793c8c2c680d77aac3e7' + '185d60944ea767075d27247c3162b3bc' + 'b4cae0700aa1c2aef7eb7f345365e6f1' + '90401bca927835b6fbae4a707ed187c8' + 'f02578f5218f217a9f20e9c30e119c6a' + '0625a7d661f899a8ce263fc8a9879108' + '451ccf439a36a568653b024534669971' + '7e7efc5d4a03126bb9ae3ae9aa2c4e87' + '41c9b65ad60af4b3255bbecdfef11736' + 'bbdd5639ada63e3130761daaecae1a10' + '23bd75552206dfcd8fd4e29137dcac84' + 'b8cbca7b3363e6ca2d02bc0ba2b63904' + 'b632bdd25649cc4067bcb410bae23d2b' + '9d60b6cfa3ef1926848710bbcd11115b' + 'dbaafd21de055e582d92d7d32fe9da13' + 'b7b2d0e04e142f26dd96119c80757d1f' + 'bc228237108cab7745897a9f466b6d39' + 'eee273f501ff45dc5f1365e78c6d57c0' + '43b145db28e6c0d73578ae6fd35e510d' + '37638431e7e40baf2e47966ebb9bc0e9' + 'ca6032e86229ae798f3744ae244f5bfe' + '3c6c62e77c30649a3dfe73512947cc9a') + +build() { + + unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh + [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + + # move all LibO sources into one build directory + mkdir ${srcdir}/build && cd ${srcdir}/build + for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations + mv ${srcdir}/$i/* . + done +# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* . +# ./bin/unpack-sources ${srcdir}/build + + # move external sources into place + mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + + cd ${srcdir}/build + + # buildfixes & bugfixes + patch -Np1 -i ${srcdir}/buildfix_boost.diff + patch -Np1 -i ${srcdir}/buildfix_ct2n.diff + patch -Np0 -i ${srcdir}/vbahelper.visibility.patch + patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + patch -Np1 -i ${srcdir}/java-detection.diff + patch -Np1 -i ${srcdir}/oracle-recognition.diff + + # unset C(XX)FLAGS + # http://www.openoffice.org/issues/show_bug.cgi?id=103205 +# unset CFLAGS +# unset CXXFLAGS + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + # python2 fix + export PYTHON=python2 + + # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options + +# if [ "$CARCH" = "x86_64" ]; then +# EXTRAOPTS="--without-stlport" +# else +# EXTRAOPTS="--with-stlport" # --without-system-boost" +# # # avoid problems with ixion for now +# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 +# fi + + # needed for 0003-distro-install-fix-en-US-only-installation.patch + autoconf -v -f + + # non-SMP test build +# export MAKEFLAGS="-j1" + ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + --with-unix-wrapper="libreoffice" \ + --enable-split-app-modules \ + --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ + --disable-verbose \ + --with-lang="" \ + --enable-cairo\ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-graphite --without-system-graphite \ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-ldap \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-opengl\ + --enable-ext-barcode \ + --enable-ext-diagram \ + --enable-ext-google-docs \ + --enable-ext-hunart \ + --disable-ext-lightproof \ + --disable-ext-mysql-connector \ + --with-system-mysql \ + --enable-ext-nlpsolver \ + --enable-ext-ct2n \ + --enable-ext-numbertext \ + --enable-ext-oooblogger \ + --enable-ext-pdfimport \ + --enable-ext-presenter-console \ + --enable-ext-presenter-minimizer \ + --enable-ext-report-builder \ + --enable-ext-scripting-beanshell \ + --enable-ext-scripting-javascript \ + --enable-ext-scripting-python \ + --enable-ext-typo \ + --enable-ext-validator \ + --enable-ext-watch-window \ + --enable-ext-wiki-publisher \ + --without-fonts\ + --without-afms\ + --without-ppds\ + --without-system-libwps\ + --without-system-mdds\ + --without-myspell-dicts \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-cppunit\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-saxon\ + --with-system-libtextcat \ + --with-external-libtextcat-data \ + --with-openldap\ + --with-ant-home="/usr/share/java/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mozilla\ + --with-system-mythes\ + --with-system-xrender-headers\ + --with-system-headers\ + --with-alloc=system\ + --with-system-lucene\ + --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ + --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-java-target-version=1.5 \ + $EXTRAOPTS || return 1 + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + +#--with-servlet-api-jar=JARFILE +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-system-saxon\ +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ + + touch src.downloaded + #./download + unset MAKEFLAGS + ./bootstrap + make + + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=${pkgbase}.install + depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script + #'java-runtime' + #'saxon' + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'gconf: adds additional gnome support' + 'nss: adds support for signed files/macros' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'poppler: for shipped pdfimport extension' + 'libmythes: for use in thesaurus' + 'hsqldb-java: default database format for OpenOffice.org' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' + 'libldap: to get profiles via ldap' + 'lucene: full-text search engine library for Java needed in the help section' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # # remove version in menu entry and make it visible +# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop +# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + #fix http://bugs.archlinux.org/task/17656 + find ${pkgdir} -perm 444 -exec ls -lh {} \; + find ${pkgdir} -perm 444 -exec chmod 644 {} \; + find ${pkgdir} -perm 555 -exec ls -lh {} \; + find ${pkgdir} -perm 555 -exec chmod 755 {} \; +} + +package_libreoffice-base() { + pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + depends=('libreoffice-common' 'lpsolve' ) + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'dbus-glib') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + depends=('libreoffice-common') + optdepends=('mesa: for the OGLTrans extension') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Applicationfor LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix ArchLinux LibreOffice installation paths + sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ + -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ + -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ + -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ + -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ + -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ + -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Applicationfor LibreOffice." + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-barcode() { + + pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode + chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode +} + +package_libreoffice-extension-diagram() { + + pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram +} + +package_libreoffice-extension-google-docs() { + + pkgdesc="Google Documents extension for LibreOffice" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs +} + +package_libreoffice-extension-hunart() { + + pkgdesc="Hungarian cross-reference toolbar extension" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart +} + +#package_libreoffice-extension-lightproof() { + +# pkgdesc="Lightproof extension for LibreOffice" + #arch=('any') +# depends=('libreoffice-common') +# groups=('libreoffice-extensions') + +# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions +# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof +#} + +#package_libreoffice-extension-mysql-connector() { + +# pkgdesc="MySQL Connector extension for LibreOffice" + #arch=('any') +# depends=('libreoffice-common') +# groups=('libreoffice-extensions') + +# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions +# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector +#} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} + +package_libreoffice-extension-ct2n() { + + pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n +} + +package_libreoffice-extension-numbertext() { + + pkgdesc="NUMBERTEXT/MONEYTEXT extensions" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext +} + +package_libreoffice-extension-oooblogger() { + + pkgdesc="An extensions for blogging" + #arch=('any') + depends=('libreoffice-common' 'coreutils' 'python') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger +} + +package_libreoffice-extension-pdfimport() { + + pkgdesc="This extension allows you to import and modify PDF documents" + depends=('libreoffice-common' 'poppler') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport +} + +package_libreoffice-extension-presenter-screen() { + + pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-report-builder() { + + pkgdesc="This extension creates smart-looking database reports" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder +} + +package_libreoffice-extension-scripting-beanshell() { + + pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell +} + +package_libreoffice-extension-scripting-javascript() { + + pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript +} + +package_libreoffice-extension-scripting-python() { + + pkgdesc="LibreOffice extension - Enables support for scripts in Python" + depends=('libreoffice-common' 'python') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python +} + +package_libreoffice-extension-typo() { + + pkgdesc="Typography toolbar extension" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo + find ${pkgdir} -type d -exec chmod 755 {} \; + #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo +} + +package_libreoffice-extension-validator() { + + pkgdesc="Validator extension for LibreOffice" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-watch-window() { + + pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window +} diff --git a/testing/libreoffice/buildfix_boost.diff b/testing/libreoffice/buildfix_boost.diff new file mode 100644 index 000000000..d8608d0d4 --- /dev/null +++ b/testing/libreoffice/buildfix_boost.diff @@ -0,0 +1,40 @@ +From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Tue, 05 Apr 2011 14:07:02 +0000 +Subject: silence some more of that annoying gcc#47679 + +--- +diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch +index 1c804aa..9b33a5f 100644 +--- a/boost/boost.gcc47679.patch ++++ b/boost/boost.gcc47679.patch +@@ -36,3 +36,26 @@ + template + inline bool allow_more_digits(std::size_t i) + { ++--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 +++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 ++@@ -31,6 +31,8 @@ ++ ++ #include "boost/optional/optional_fwd.hpp" ++ +++#include +++ ++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) ++ // VC6.0 has the following bug: ++ // When a templated assignment operator exist, an implicit conversion ++@@ -114,6 +116,11 @@ ++ ++ public: ++ +++ aligned_storage() +++ { +++ memset(&dummy_, 0, sizeof(dummy_)); +++ } +++ ++ void const* address() const { return &dummy_.data[0]; } ++ void * address() { return &dummy_.data[0]; } ++ } ; +-- +cgit v0.8.3-6-g21f6 + diff --git a/testing/libreoffice/buildfix_ct2n.diff b/testing/libreoffice/buildfix_ct2n.diff new file mode 100644 index 000000000..979587f79 --- /dev/null +++ b/testing/libreoffice/buildfix_ct2n.diff @@ -0,0 +1,17 @@ +From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Tue, 12 Apr 2011 19:35:51 +0000 +Subject: duplicate NULLs + +--- +diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst +index 91f44b7..714d926 100644 +--- a/ct2n/prj/build.lst ++++ b/ct2n/prj/build.lst +@@ -1,3 +1,3 @@ +-ct2n ct2n : solenv NULL NULL ++ct2n ct2n : solenv NULL + ct2n ct2n usr1 - all ct2n_mkout NULL + ct2n ct2n nmake - all ct2n_ct2n NULL +-- +cgit v0.8.3-6-g21f6 diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install new file mode 100644 index 000000000..809472f89 --- /dev/null +++ b/testing/libreoffice/libreoffice.install @@ -0,0 +1,47 @@ +post_install() { + +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-desktop-database -q +update-mime-database usr/share/mime > /dev/null 2>&1 + +echo " * see https://wiki.archlinux.org/index.php/LibreOffice" +echo "-------------------------------------------------------------------" +echo "LibreOffice has been split into several packages:" +echo "- libreoffice-common" +echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" +echo "- libreoffice-{gnome,kde4} - desktop integration plugins" +echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" +echo " the LibreOffice APIs and for creating" +echo " extensions (UNO components)." +echo "-------------------------------------------------------------------" +echo " * you need to install at least one libreoffice-langpack" +echo " * you may want to pacman -Ss libreoffice-extensions" +echo " to see what additional extensions are prepared to install" +echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg + for spell checking" +echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" +} + +post_upgrade() { +# post_install $1 +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-desktop-database -q +update-mime-database usr/share/mime > /dev/null 2>&1 + if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then + # important upgrade notice + echo "LibreOffice has been split into several packages:" + echo "- libreoffice-common" + echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" + echo "- libreoffice-{gnome,kde4} - desktop integration plugins" + echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" + echo " the LibreOffice APIs and for creating" + echo " extensions (UNO components)." + echo "Now you need to install at least one libreoffice-langpack!" + fi +} + +post_remove() { +update-desktop-database -q +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-mime-database usr/share/mime > /dev/null 2>&1 +} diff --git a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff b/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff new file mode 100644 index 000000000..fd61cb4ca --- /dev/null +++ b/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff @@ -0,0 +1,15 @@ +--- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200 ++++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200 +@@ -92,10 +92,10 @@ + #endif + + #define BIN_FILE_BODY \ +- UnixRights = 555 ++ UnixRights = 755 + + #define TXT_FILE_BODY \ +- UnixRights = 444 ++ UnixRights = 644 + + #define USER_FILE_BODY \ + UnixRights = 644 diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch new file mode 100644 index 000000000..5739100d0 --- /dev/null +++ b/testing/libreoffice/vbahelper.visibility.patch @@ -0,0 +1,33 @@ +--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 ++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 +@@ -238,7 +238,7 @@ + + // including a HelperInterface implementation + template< typename Ifc1 > +-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > ++class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > + { + typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; + protected: +--- sc/Library_vbaobj.mk ++++ sc/Library_vbaobj.mk +@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbaquerytable \ + sc/source/ui/vba/vbarange \ + sc/source/ui/vba/vbasheetobject \ +- sc/source/ui/vba/vbasheetobjects \ + sc/source/ui/vba/vbastyle \ + sc/source/ui/vba/vbastyles \ + sc/source/ui/vba/vbatextboxshape \ +@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbawsfunction \ + )) + ++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ ++ sc/source/ui/vba/vbasheetobjects \ ++ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ ++)) ++ + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) + $(eval $(call gb_Library_set_ldflags,vbaobj,\ + $$(LDFLAGS) \ diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD index a7cdfb0a1..82c0f846f 100644 --- a/testing/telepathy-mission-control/PKGBUILD +++ b/testing/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139059 2011-09-28 19:33:19Z ibiru $ +# $Id: PKGBUILD 139858 2011-10-05 14:00:12Z ibiru $ # Maintainer: Ionut Biru # Contributor: Ju Liu # Contributor: Bjorn Lindeijer # Contributor: Andreas Zwinkau pkgname=telepathy-mission-control -pkgver=5.9.2 +pkgver=5.9.3 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('312fb289f644a90d4514064586445d58') +md5sums=('15fc8e560bc67a86393a3138d7ac38e3') build() { cd "$srcdir/$pkgname-$pkgver" -- cgit v1.2.3-54-g00ecf