From ddab05fd84b7fa1d67fcd18b532f0427189d8df1 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 29 Jul 2012 00:03:59 +0000 Subject: Sun Jul 29 00:03:59 UTC 2012 --- community/fox/PKGBUILD | 6 +- community/intellij-idea-libs/PKGBUILD | 8 +- community/nsd/PKGBUILD | 8 +- community/xlockmore/PKGBUILD | 6 +- core/btrfs-progs/70-btrfs.rules | 1 + core/btrfs-progs/PKGBUILD | 13 +- core/btrfs-progs/initcpio-hook-btrfs | 5 +- core/btrfs-progs/initcpio-install-btrfs | 4 +- core/iptables/PKGBUILD | 19 +- core/iptables/iptables-1.4.12-fixresore.patch | 28 +++ core/iw/PKGBUILD | 4 +- extra/calligra/PKGBUILD | 4 +- extra/libktorrent/PKGBUILD | 15 +- extra/libktorrent/magnet.patch | 226 ++++++++++++++++++++++ extra/live-media/PKGBUILD | 6 +- extra/mpg123/PKGBUILD | 8 +- extra/python-numpy/PKGBUILD | 6 +- extra/telepathy-kde-accounts-kcm/PKGBUILD | 6 +- extra/telepathy-kde-approver/PKGBUILD | 6 +- extra/telepathy-kde-auth-handler/PKGBUILD | 6 +- extra/telepathy-kde-call-ui/PKGBUILD | 6 +- extra/telepathy-kde-common-internals/PKGBUILD | 6 +- extra/telepathy-kde-contact-applet/PKGBUILD | 6 +- extra/telepathy-kde-contact-list/PKGBUILD | 6 +- extra/telepathy-kde-contact-runner/PKGBUILD | 6 +- extra/telepathy-kde-filetransfer-handler/PKGBUILD | 6 +- extra/telepathy-kde-integration-module/PKGBUILD | 6 +- extra/telepathy-kde-presence-applet/PKGBUILD | 6 +- extra/telepathy-kde-send-file/PKGBUILD | 6 +- extra/telepathy-kde-text-ui/PKGBUILD | 6 +- extra/xf86-input-mouse/PKGBUILD | 6 +- extra/xf86-video-intel/PKGBUILD | 18 +- extra/xf86-video-intel/fix_gen4.diff | 142 ++++++++++++++ libre/luxrays-libre/PKGBUILD | 2 +- libre/luxrender-libre/PKGBUILD | 2 +- pcr/ryzom-client/PKGBUILD | 10 +- pcr/ryzom-nel/PKGBUILD | 10 +- staging/glew/PKGBUILD | 29 +++ testing/curl/PKGBUILD | 64 ++++++ testing/curl/curlbuild.h | 9 + testing/systemd/PKGBUILD | 9 +- testing/systemd/use-split-usr-path.patch | 14 ++ ~mtjm/cups-usblp/PKGBUILD | 39 ++-- ~mtjm/cups-usblp/cups-avahi-1-config.patch | 12 +- ~mtjm/cups-usblp/cups-avahi-2-backend.patch | 101 +++++----- ~mtjm/cups-usblp/cups-avahi-3-timeouts.patch | 28 +-- ~mtjm/cups-usblp/cups-avahi-4-poll.patch | 18 +- ~mtjm/cups-usblp/cups-avahi-5-services.patch | 161 +++++++++++---- ~mtjm/cups-usblp/cups-no-gzip-man.patch | 18 ++ 49 files changed, 887 insertions(+), 250 deletions(-) create mode 100644 core/btrfs-progs/70-btrfs.rules create mode 100644 core/iptables/iptables-1.4.12-fixresore.patch create mode 100644 extra/libktorrent/magnet.patch create mode 100644 extra/xf86-video-intel/fix_gen4.diff create mode 100644 staging/glew/PKGBUILD create mode 100644 testing/curl/PKGBUILD create mode 100644 testing/curl/curlbuild.h create mode 100644 testing/systemd/use-split-usr-path.patch create mode 100644 ~mtjm/cups-usblp/cups-no-gzip-man.patch diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 3ab908481..2b607fc5a 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70277 2012-05-03 15:59:36Z spupykin $ +# $Id: PKGBUILD 74419 2012-07-27 14:49:42Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Ben pkgname=fox -pkgver=1.6.45 +pkgver=1.6.46 pkgrel=1 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libt optdepends=('perl') options=('!libtool') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) -md5sums=('57bef430c3d01463508d76a88f61d763') +md5sums=('da2c5cf36eff32a0c49cfcd9494fe6b7') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 565c5597e..656d796a0 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $ +# $Id: PKGBUILD 74411 2012-07-27 08:27:33Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=intellij-idea-libs -pkgver=11.1.2 -_pkgver=117.418 +pkgver=11.1.3 +_pkgver=117.798 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('eae2d36d088677e1d5670986da311f85') +md5sums=('b8ae865e3645cfd0a8d16dac481fd25c') build() { cd "$srcdir" diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index ce1701117..6923d2233 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74075 2012-07-19 14:27:58Z bisson $ -# Maintainer: Kaiting Chen +# $Id: PKGBUILD 74417 2012-07-27 10:50:01Z bisson $ # Maintainer: Gaetan Bisson +# Contributor: Kaiting Chen # Contributor: Roberto Alsina pkgname=nsd -pkgver=3.2.12 +pkgver=3.2.13 pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' @@ -14,7 +14,7 @@ makedepends=('flex') arch=('i686' 'x86_64') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') -sha1sums=('dd8606a05525f6a493dfacb7ddfa7e1fa3c6a85b' +sha1sums=('2cb44f75e9686fd73c7ee9765857a36a8fe5bca9' '29a74ce922b3991dd65ae5254bafa0a308d915e9') install=install diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 49ab44988..6916de04d 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64132 2012-02-09 01:00:06Z spupykin $ +# $Id: PKGBUILD 74407 2012-07-27 05:34:52Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: dorphell pkgname=xlockmore -pkgver=5.38 +pkgver=5.40 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64) @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 LICENSE) -md5sums=('da08b39ea92d2f0b95564b1314f57a42' +md5sums=('47a8e16c485da7b0ebfa3f3e43300189' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/core/btrfs-progs/70-btrfs.rules b/core/btrfs-progs/70-btrfs.rules new file mode 100644 index 000000000..c0e8c776c --- /dev/null +++ b/core/btrfs-progs/70-btrfs.rules @@ -0,0 +1 @@ +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k" diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 8b3f37ea8..2c5b6f907 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $ +# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=btrfs-progs pkgver=0.19.20120328 -pkgrel=3 +pkgrel=4 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -13,11 +13,13 @@ conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + 70-btrfs.rules initcpio-install-btrfs initcpio-hook-btrfs) md5sums=('f4504e73cf9254779b78d5b2318ac570' - '3eae9bf1541e297fa72aa40ebf7320c6' - 'b09688a915a0ec8f40e2f5aacbabc9ad') + '345c62c8b267082361729ca5b647518f' + 'e5186ec3fe8a809b7473470128d1c4ab' + '9fb35142755b477a96cb7292f3d64839') build() { cd $srcdir/$pkgname-$pkgver @@ -33,6 +35,9 @@ package() { mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + # add udev rule + install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" + # install mkinitcpio hooks install -Dm644 "$srcdir/initcpio-install-btrfs" \ "$pkgdir/usr/lib/initcpio/install/btrfs" diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs index 7965d0a8a..913cec528 100644 --- a/core/btrfs-progs/initcpio-hook-btrfs +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -1,7 +1,10 @@ #!/usr/bin/ash run_hook() { - btrfs device scan + # if udevd is running, this is done async by add/change events + if [ "$udevd_running" -ne 1 ]; then + btrfs device scan + fi } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index a70a324ed..aad263378 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -1,9 +1,11 @@ #!/bin/bash build() { - add_all_modules btrfs + add_module btrfs add_binary btrfs add_runscript + + add_file /usr/lib/udev/rules.d/70-btrfs.rules } help() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index d2c859de4..cc6e506e1 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $ +# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $ # Maintainer: Ronald van Haren # Contributor: Thomas Baechler pkgname=iptables pkgver=1.4.14 -pkgrel=2 +pkgrel=3 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -23,10 +23,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-nat.rules empty-raw.rules empty-security.rules - 0503-extension_cppflags.patch - iptables.service - ip6tables.service - iptables-flush) + 0503-extension_cppflags.patch + iptables-1.4.12-fixresore.patch + iptables.service + ip6tables.service + iptables-flush) backup=(etc/conf.d/iptables) sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' @@ -40,6 +41,7 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' + '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -52,6 +54,11 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch + # Fix scope issue exposed by gcc 4.7 (patch by fryasu) + # http://bugzilla.netfilter.org/show_bug.cgi?id=774 + # (This will most likely be fixed in iptables 1.4.15) + patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/iptables/iptables-1.4.12-fixresore.patch b/core/iptables/iptables-1.4.12-fixresore.patch new file mode 100644 index 000000000..94358f779 --- /dev/null +++ b/core/iptables/iptables-1.4.12-fixresore.patch @@ -0,0 +1,28 @@ +diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c +--- iptables-1.4.12.2/iptables/ip6tables-restore.c 2012-01-03 02:19:09.000000000 +0900 ++++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c 2012-03-01 10:56:10.000000000 +0900 +@@ -380,9 +380,9 @@ + quote_open = 0; + escaped = 0; + param_len = 0; ++ char param_buffer[1024]; + + for (curchar = parsestart; *curchar; curchar++) { +- char param_buffer[1024]; + + if (quote_open) { + if (escaped) { +diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c +--- iptables-1.4.12.2/iptables/iptables-restore.c 2012-01-03 02:19:09.000000000 +0900 ++++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c 2012-03-01 10:56:00.000000000 +0900 +@@ -377,9 +377,9 @@ + quote_open = 0; + escaped = 0; + param_len = 0; ++ char param_buffer[1024]; + + for (curchar = parsestart; *curchar; curchar++) { +- char param_buffer[1024]; + + if (quote_open) { + if (escaped) { diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 10ea7859d..189ef3e55 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159175 2012-05-17 10:12:16Z thomas $ +# $Id: PKGBUILD 164233 2012-07-28 01:51:21Z eric $ # Maintainer: Thomas Bächler pkgname=iw @@ -9,7 +9,7 @@ arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" license=("GPL") depends=("libnl") -makedepends=("kernel-headers") +makedepends=("linux-api-headers") source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 81d2bf0ed..4572d53c6 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162542 2012-06-27 12:21:57Z andrea $ +# $Id: PKGBUILD 164230 2012-07-28 01:31:18Z eric $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -31,7 +31,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' 'kdegraphics-okular' 'gsl' 'kdeedu-marble' 'libwpd' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') + 'fftw' 'opengtl' 'lcms2' 'libkdcraw') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") md5sums=('469d639f17e3d6a186baabd899147e39') diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index 1f288045d..62fe72ae8 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,21 +1,28 @@ -# $Id: PKGBUILD 161992 2012-06-18 07:10:44Z ronald $ +# $Id: PKGBUILD 164220 2012-07-27 18:35:04Z ronald $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino pkgname=libktorrent pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64') url="http://ktorrent.org/" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost' 'doxygen') -source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2") -sha1sums=('857e4227c4bba685755d66581d881f893f6311ae') +source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2" + "magnet.patch") +sha1sums=('857e4227c4bba685755d66581d881f893f6311ae' + 'f0156489364e5590b0b539cfe2abc929c1922ef8') build() { cd "${srcdir}" + + pushd ${pkgname}-${pkgver}-2 + patch -Np1 -i ${srcdir}/magnet.patch + popd + mkdir build cd build cmake ../${pkgname}-${pkgver}-2 \ diff --git a/extra/libktorrent/magnet.patch b/extra/libktorrent/magnet.patch new file mode 100644 index 000000000..5db76c101 --- /dev/null +++ b/extra/libktorrent/magnet.patch @@ -0,0 +1,226 @@ +commit 5107e4b7a050d7533f44801f5f5f5694203fd3b5 +Author: Joris Guisson +Date: Wed Jul 11 20:16:43 2012 +0200 + + Make sure all trackers are used of a magnet link + + BUG: 302997 + BUG: 303269 + +diff --git a/src/magnet/magnetlink.cpp b/src/magnet/magnetlink.cpp +index 525bfa5..43168dc 100644 +--- a/src/magnet/magnetlink.cpp ++++ b/src/magnet/magnetlink.cpp +@@ -19,13 +19,14 @@ + ***************************************************************************/ + + #include "magnetlink.h" ++#include + #include + #include + #include + + namespace bt + { +- ++ + MagnetLink::MagnetLink() + { + } +@@ -44,7 +45,7 @@ namespace bt + { + parse(mlink); + } +- ++ + MagnetLink::~MagnetLink() + { + } +@@ -64,83 +65,114 @@ namespace bt + { + return info_hash == mlink.infoHash(); + } +- ++ ++ static KUrl::List GetTrackers(const KUrl & url) ++ { ++ KUrl::List result; ++ const QString encoded_query = QString::fromLatin1(url.encodedQuery()); ++ const QString item = QLatin1String("tr="); ++ if(encoded_query.length() <= 1) ++ return result; ++ ++ const QStringList items = encoded_query.split(QString(QLatin1Char('&')), QString::SkipEmptyParts); ++ const int len = item.length(); ++ for(QStringList::ConstIterator it = items.begin(); it != items.end(); ++it) ++ { ++ if((*it).startsWith(item)) ++ { ++ if((*it).length() > len) ++ { ++ QString str = (*it).mid(len); ++ str.replace(QLatin1Char('+'), QLatin1Char(' ')); // + in queries means space. ++ result.push_back(QUrl::fromPercentEncoding(str.toLatin1())); ++ } ++ } ++ } ++ ++ return result; ++ } ++ + void MagnetLink::parse(const QString& mlink) + { + KUrl url(mlink); +- if (url.protocol() != "magnet") ++ if(url.protocol() != "magnet") + { +- Out(SYS_GEN|LOG_NOTICE) << "Invalid protocol of magnet link " +- << mlink << endl; ++ Out(SYS_GEN | LOG_NOTICE) << "Invalid protocol of magnet link " ++ << mlink << endl; + return; + } +- ++ + torrent_url = url.queryItem("to"); + //magnet://description-of-content.btih.HASH(-HASH)*.dht/path/file?x.pt=&x.to= + + // TODO automatically select these files and prefetches from here + path = url.queryItem("pt"); +- if ( path.isEmpty() && url.hasPath() && url.path() != "/" ) { ++ if(path.isEmpty() && url.hasPath() && url.path() != "/") ++ { + // TODO find out why RemoveTrailingSlash does not work + path = url.path(KUrl::RemoveTrailingSlash).remove(QRegExp("^/")); + } + + QString xt = url.queryItem("xt"); +- if ( xt.isEmpty() +- || !xt.startsWith("urn:btih:") ) { ++ if(xt.isEmpty() ++ || !xt.startsWith("urn:btih:")) ++ { + QRegExp btihHash("([^\\.]+).btih"); +- if ( btihHash.indexIn(url.host()) != -1 ) { ++ if(btihHash.indexIn(url.host()) != -1) ++ { + QString primaryHash = btihHash.cap(1).split("-")[0]; +- xt = "urn:btih:"+primaryHash; +- } else { +- Out(SYS_GEN|LOG_NOTICE) << "No hash found in magnet link " +- << mlink << endl; ++ xt = "urn:btih:" + primaryHash; ++ } ++ else ++ { ++ Out(SYS_GEN | LOG_NOTICE) << "No hash found in magnet link " ++ << mlink << endl; + return; + } + } +- ++ + QString ih = xt.mid(9); +- if (ih.length() != 40 && ih.length() != 32) ++ if(ih.length() != 40 && ih.length() != 32) + { +- Out(SYS_GEN|LOG_NOTICE) << "Hash has not valid length in magnet link " +- << mlink << endl; ++ Out(SYS_GEN | LOG_NOTICE) << "Hash has not valid length in magnet link " ++ << mlink << endl; + return; + } +- ++ + try + { +- if (ih.length() == 32) ++ if(ih.length() == 32) + ih = base32ToHexString(ih); + + Uint8 hash[20]; +- memset(hash,0,20); +- for (int i = 0;i < 20;i++) ++ memset(hash, 0, 20); ++ for(int i = 0; i < 20; i++) + { +- Uint8 low = charToHex(ih[2*i + 1]); +- Uint8 high = charToHex(ih[2*i]); ++ Uint8 low = charToHex(ih[2 * i + 1]); ++ Uint8 high = charToHex(ih[2 * i]); + hash[i] = (high << 4) | low; + } +- ++ + info_hash = SHA1Hash(hash); +- tracker_urls = url.queryItem("tr").split(","); ++ tracker_urls = GetTrackers(url); + name = url.queryItem("dn"); + magnet_string = mlink; + } +- catch (...) ++ catch(...) + { +- Out(SYS_GEN|LOG_NOTICE) << "Invalid magnet link " << mlink << endl; ++ Out(SYS_GEN | LOG_NOTICE) << "Invalid magnet link " << mlink << endl; + } + } +- ++ + Uint8 MagnetLink::charToHex(const QChar& ch) + { +- if (ch.isDigit()) ++ if(ch.isDigit()) + return ch.digitValue(); +- +- if (!ch.isLetter()) ++ ++ if(!ch.isLetter()) + throw bt::Error("Invalid char"); +- +- if (ch.isLower()) ++ ++ if(ch.isLower()) + return 10 + ch.toAscii() - 'a'; + else + return 10 + ch.toAscii() - 'A'; +@@ -155,28 +187,28 @@ namespace bt + QString str = s.toUpper(); + // 32 base32 chars -> 40 hex chars + // 4 base32 chars -> 5 hex chars +- for (int i = 0; i < 8; i++) ++ for(int i = 0; i < 8; i++) + { + part = 0; +- for (int j = 0; j < 4; j++) ++ for(int j = 0; j < 4; j++) + { +- ch = str[i*4 + j]; +- if (ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7)) ++ ch = str[i * 4 + j]; ++ if(ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7)) + throw bt::Error("Invalid char"); + +- if (ch.isDigit()) +- tmp = ch.digitValue() + 24; ++ if(ch.isDigit()) ++ tmp = ch.digitValue() + 24; + else + tmp = ch.toAscii() - 'A'; +- part = part + (tmp << 5*(3-j)); ++ part = part + (tmp << 5 * (3 - j)); + } + + // part is a Uint32 with 20 bits (5 hex) +- for (int j = 0; j < 5; j++) ++ for(int j = 0; j < 5; j++) + { +- tmp = (part >> 4*(4-j)) & 0xf; +- if (tmp >= 10) +- ret.append(QChar((tmp-10) + 'a')); ++ tmp = (part >> 4 * (4 - j)) & 0xf; ++ if(tmp >= 10) ++ ret.append(QChar((tmp - 10) + 'a')); + else + ret.append(QChar(tmp + '0')); + } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 8098226b9..d1b6423c1 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163810 2012-07-20 10:44:25Z giovanni $ +# $Id: PKGBUILD 164191 2012-07-27 09:30:54Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.07.18 +pkgver=2012.07.26 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('71e6624ed5114b8f9199500c01bef569') +md5sums=('18374e9f6681f62ab7c987ca0029d494') build() { cd ${srcdir}/live diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index bda0215b7..6cdba928d 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163205 2012-07-09 20:33:57Z eric $ +# $Id: PKGBUILD 164185 2012-07-27 04:44:49Z eric $ # Maintainer: Eric Bélanger pkgname=mpg123 -pkgver=1.14.3 +pkgver=1.14.4 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ conflicts=('mpg321') provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('c3cd800121bccf15d8fc31a30575a5dce8aaa5d5' - '32f4a507aed62c038b1620c938c8001b3a9b04b5') +sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe' + '28ab232dd9bcec8bbb00026cc60960b719d14fed') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 81c6953e0..824ab623b 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $ +# $Id: PKGBUILD 164237 2012-07-28 03:14:33Z stephane $ # Maintainer: Jan de Groot # Contributor: Douglas Soares de Andrade # Contributor: Angel 'angvp' Velasquez pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('custom') url="http://numpy.scipy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('2bce18c08fc4fce461656f0f4dd9103e') +md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 1b46c03c9..1db6ebb39 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161459 2012-06-11 18:14:33Z andrea $ +# $Id: PKGBUILD 164200 2012-07-27 14:43:53Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('fa48134361f955704700d211fdd3489ca58dc9c5') +sha1sums=('e549047634dfd6366def2be143b06e01bee8c159') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index e1bf6312b..1ec4095bd 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161460 2012-06-11 18:15:04Z andrea $ +# $Id: PKGBUILD 164201 2012-07-27 14:44:27Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('d672826fac18817ec115aa0c52831e2c7761cade') +sha1sums=('04563bda017dacfb8a1e2c8f0e39adb47269fd47') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 25c8398ef..ca61be34c 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161461 2012-06-11 18:15:34Z andrea $ +# $Id: PKGBUILD 164202 2012-07-27 14:45:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a0158322f96a1f0356fdb9f1713af19ac4e45b8e') +sha1sums=('534ac05deacac0e9fb8a281813d6316b08ce8933') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-call-ui/PKGBUILD b/extra/telepathy-kde-call-ui/PKGBUILD index de3bd0d50..c65e1dd7c 100644 --- a/extra/telepathy-kde-call-ui/PKGBUILD +++ b/extra/telepathy-kde-call-ui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161457 2012-06-11 18:11:28Z andrea $ +# $Id: PKGBUILD 164203 2012-07-27 14:45:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-call-ui _pkgname=ktp-call-ui -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Voice/Video Call UI for Telepathy" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qt-gstreamer') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('be6bcaecde4091cad41520f203c559b614416bc6') +sha1sums=('e6cadf3bb6820ff015e49801a3b0196827dd9ab3') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index cd4ca8b2b..80aa72d4c 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161462 2012-06-11 18:16:00Z andrea $ +# $Id: PKGBUILD 164213 2012-07-27 14:57:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('db3bdbd93a27c77a1e593e84252cf2950ca773e6') +sha1sums=('9acb65efa371ba4f23063bc83ea7a488ac73e4b7') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD index 2dce5c0ca..fce1f193c 100644 --- a/extra/telepathy-kde-contact-applet/PKGBUILD +++ b/extra/telepathy-kde-contact-applet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161463 2012-06-11 18:16:32Z andrea $ +# $Id: PKGBUILD 164204 2012-07-27 14:46:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-contact-applet _pkgname=ktp-contact-applet -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="The KDE-Telepathy contact plasmoid" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'kdebase-workspace') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('bffa7ed930519c574d25a59917219fa1735b6a2e') +sha1sums=('7cb95c4a9dd3a8b5ebe8775f3d846d4d4a31af60') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 3e3e17a99..e7c38626f 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161464 2012-06-11 18:17:00Z andrea $ +# $Id: PKGBUILD 164205 2012-07-27 14:46:38Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a9f059f434adec33f57e2a77444d704ae8563bc2') +sha1sums=('d9d062316f9eaff49f2fcad1ba2bbdf59dc8cc07') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 7de5e78f6..44dba3e72 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161458 2012-06-11 18:12:10Z andrea $ +# $Id: PKGBUILD 164206 2012-07-27 14:47:49Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('fe7f7d37740b732f8618b1e6129d4e7f30998b43') +sha1sums=('388ebb2933114b7e0844bf6a8e71e5b7fdab3680') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 0cc1daa41..b5a7dc692 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161465 2012-06-11 18:17:36Z andrea $ +# $Id: PKGBUILD 164207 2012-07-27 14:49:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('f318849c4e8a171bff97defc19b7a94f2ee13512') +sha1sums=('bb618e3fc36b321bfe5aaa7a0f8531b4c7fe25c2') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 38ca70d3b..62e802bef 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161466 2012-06-11 18:18:05Z andrea $ +# $Id: PKGBUILD 164208 2012-07-27 14:50:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('552d02b237ac167aef4707fd599dfb69cd944a72') +sha1sums=('a4bfe983db21ea7d56436d0426138215eb77b279') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD index e0b15aa96..966169d17 100644 --- a/extra/telepathy-kde-presence-applet/PKGBUILD +++ b/extra/telepathy-kde-presence-applet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161467 2012-06-11 18:18:34Z andrea $ +# $Id: PKGBUILD 164209 2012-07-27 14:52:00Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-presence-applet _pkgname=ktp-presence-applet -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Plasma applet for managing your Telepathy account presence" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('beb12d534492da288cdda1826b43ba5bcd549fee') +sha1sums=('392758b5ced3eea0f315c9dabacc1f3e421a8171') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 839ae7c71..cd5bdb322 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161468 2012-06-11 18:19:00Z andrea $ +# $Id: PKGBUILD 164216 2012-07-27 15:10:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c72f5a9e26ba24b6558a8dab6d0ec2694aa55afc') +sha1sums=('23aa731d15dff440da587dec359e7298ec0a0895') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index b921c2fb2..397bb8cfd 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161470 2012-06-11 18:19:34Z andrea $ +# $Id: PKGBUILD 164212 2012-07-27 14:57:33Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('4ddf762b928d7e5f1139cdcced27a866c5369312') +sha1sums=('8e32e8708d7283714ad6e999caf07388472bba38') build() { cd "${srcdir}" diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD index 4fd8b64d8..ecac89959 100644 --- a/extra/xf86-input-mouse/PKGBUILD +++ b/extra/xf86-input-mouse/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153613 2012-03-16 17:12:24Z andyrtr $ +# $Id: PKGBUILD 164195 2012-07-27 14:22:36Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-mouse -pkgver=1.7.2 +pkgver=1.8.0 pkgrel=1 pkgdesc="X.org mouse input driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae') +sha256sums=('075fdc392e69b7aefae9f032785bb28e74fa45e865d2cfd67cdd6482580e3fdf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 342454cfc..caade620d 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164055 2012-07-25 15:11:19Z andyrtr $ +# $Id: PKGBUILD 164223 2012-07-27 19:15:17Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.20.1 -pkgrel=3 +pkgver=2.20.2 +pkgrel=2 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -18,17 +18,13 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2 - gmux_backlight.diff - sna_backlight_fixes.diff) -sha256sums=('de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424' - '87383122dae69512f86039e9d72110bd6bf4cf717756a31b34862c200277b31b' - 'a4a6bc1c4a6b79c80c56764eed8ab318a587ed554d5d9a381cc7238ab884ec04') + fix_gen4.diff) +sha256sums=('4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9' + '0c5b98e4980c8108aee12b1e46a78c23029034439dcd277f8ae1264ca3fff8a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # https://bugs.freedesktop.org/show_bug.cgi?id=52423 - patch -Np1 -i ${srcdir}/gmux_backlight.diff - patch -Np1 -i ${srcdir}/sna_backlight_fixes.diff + patch -Np1 -i ${srcdir}/fix_gen4.diff ./configure --prefix=/usr \ --enable-dri make diff --git a/extra/xf86-video-intel/fix_gen4.diff b/extra/xf86-video-intel/fix_gen4.diff new file mode 100644 index 000000000..87a2fa8db --- /dev/null +++ b/extra/xf86-video-intel/fix_gen4.diff @@ -0,0 +1,142 @@ +From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Fri, 27 Jul 2012 11:43:00 +0000 +Subject: sna/gen4: Further refinement to the GT allocation + +Still hunting for why gen4 fails utterly. + +Signed-off-by: Chris Wilson +--- +diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c +index 25229e1..1a860bd 100644 +--- a/src/sna/gen4_render.c ++++ b/src/sna/gen4_render.c +@@ -79,8 +79,8 @@ + #define URB_CS_ENTRY_SIZE 1 + #define URB_CS_ENTRIES 0 + +-#define URB_VS_ENTRY_SIZE 1 // each 512-bit row +-#define URB_VS_ENTRIES 32 // we needs at least 8 entries ++#define URB_VS_ENTRY_SIZE 1 ++#define URB_VS_ENTRIES 32 + + #define URB_GS_ENTRY_SIZE 0 + #define URB_GS_ENTRIES 0 +@@ -89,25 +89,24 @@ + #define URB_CLIP_ENTRIES 0 + + #define URB_SF_ENTRY_SIZE 2 +-#define URB_SF_ENTRIES 8 ++#define URB_SF_ENTRIES 64 + + /* + * this program computes dA/dx and dA/dy for the texture coordinates along + * with the base texture coordinate. It was extracted from the Mesa driver + */ + +-#define SF_KERNEL_NUM_GRF 16 +- +-#define PS_KERNEL_NUM_GRF 32 ++#define SF_KERNEL_NUM_GRF 16 ++#define PS_KERNEL_NUM_GRF 32 + + static const struct gt_info { + uint32_t max_sf_threads; + uint32_t max_wm_threads; + uint32_t urb_size; + } gen4_gt_info = { +- 16, 32, 256, ++ 24, 32, 256, + }, g4x_gt_info = { +- 32, 50, 384, ++ 24, 50, 384, + }; + + static const uint32_t sf_kernel[][4] = { +@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna, + const struct sna_composite_op *op, + uint16_t wm_binding_table) + { ++ gen4_emit_drawing_rectangle(sna, op); + gen4_emit_binding_table(sna, wm_binding_table); + gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel); + gen4_emit_vertex_elements(sna, op); +- gen4_emit_drawing_rectangle(sna, op); + + if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) { + DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__, +-- +cgit v0.9.0.2-2-gbebe +From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Fri, 27 Jul 2012 12:24:04 +0000 +Subject: sna/gen4: Move the common vertex_offset==0 check into the flush() + +Signed-off-by: Chris Wilson +--- +diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c +index 1a860bd..58d4422 100644 +--- a/src/sna/gen4_render.c ++++ b/src/sna/gen4_render.c +@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna, + + static void gen4_vertex_flush(struct sna *sna) + { +- assert(sna->render_state.gen4.vertex_offset); ++ if (sna->render_state.gen4.vertex_offset == 0) ++ return; + + DBG(("%s[%x] = %d\n", __FUNCTION__, + 4*sna->render_state.gen4.vertex_offset, +@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna) + + bo = sna->render.vbo; + if (bo) { +- if (sna->render_state.gen4.vertex_offset) +- gen4_vertex_flush(sna); ++ gen4_vertex_flush(sna); + + for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) { + if (sna->render.vertex_reloc[i]) { +@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna, + } + priv->clear = false; + +- if (sna->render_state.gen4.vertex_offset) +- gen4_vertex_flush(sna); ++ gen4_vertex_flush(sna); + return true; + } + +@@ -2693,8 +2692,7 @@ fastcall static void + gen4_render_composite_spans_done(struct sna *sna, + const struct sna_composite_spans_op *op) + { +- if (sna->render_state.gen4.vertex_offset) +- gen4_vertex_flush(sna); ++ gen4_vertex_flush(sna); + + DBG(("%s()\n", __FUNCTION__)); + +@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna, + static void + gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op) + { +- if (sna->render_state.gen4.vertex_offset) +- gen4_vertex_flush(sna); ++ gen4_vertex_flush(sna); + } + + static bool +@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna, + static void + gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op) + { +- if (sna->render_state.gen4.vertex_offset) +- gen4_vertex_flush(sna); ++ gen4_vertex_flush(sna); + kgem_bo_destroy(&sna->kgem, op->base.src.bo); + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD index 3a5654396..c8ea75082 100644 --- a/libre/luxrays-libre/PKGBUILD +++ b/libre/luxrays-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=luxrays pkgname=luxrays-libre pkgver=1.0rc2 _pkgver=8707be9e6dc9 -pkgrel=1 +pkgrel=2 epoch=0 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)" arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 1430ae826..122a87207 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=luxrender-libre pkgver=1.0rc2 _pkgver=008805644181 -pkgrel=2 +pkgrel=3 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD index 371137029..74d999d29 100644 --- a/pcr/ryzom-client/PKGBUILD +++ b/pcr/ryzom-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jorge Araya Navarro pkgname=('ryzom-client') pkgver=0.8.0 -pkgrel=1 +pkgrel=6 arch=('x86_64' 'i686') url="http://www.ryzom.com" license=('AGPL3') @@ -9,13 +9,13 @@ pkgdesc="An awesome free software 3D MMORPG game" depends=('ryzom-data' 'ryzom-nel' 'luabind') conflicts=('ryzom-client') groups=('ryzom') -options=(!strip) -makedepends=('kervala_libsquish-hg' 'cmake' 'bison' + +makedepends=('kervalasquish-hg' 'cmake' 'bison' 'lua' 'luabind' 'curl' 'libpng' 'libwww' 'boost' 'ryzom-nel') auser="shackra" -achangeset="1af2b43d7297" +achangeset="56d1642e24ac" source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha256sums=('1e2c3f9675b5193029945bb7e4941b3ff82e3c5a03cd32cb8049c8f79348099d') +sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') \ No newline at end of file diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD index 001e00dd2..f7dd7c580 100644 --- a/pcr/ryzom-nel/PKGBUILD +++ b/pcr/ryzom-nel/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Jorge Araya Navarro pkgname='ryzom-nel' pkgver=0.8.0 -pkgrel=8 +pkgrel=10 arch=('x86_64' 'i686') conflicts=('ryzom-nel') groups=('ryzom') -options=(!strip) + pkgdesc="An awesome free software 3D MMORPG game, NeL engine" url="http://www.ryzom.com" license=('AGPL3') @@ -23,7 +23,7 @@ depends=('freetype2' makedepends=('cmake' 'bison' 'kervalasquish-hg') auser="shackra" -achangeset="1af2b43d7297" +achangeset="56d1642e24ac" source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") @@ -40,7 +40,7 @@ build() { cd $pkgname #CMAKE_USE_RELATIVE_PATHS=true - cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON + cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON make -j3 } @@ -49,3 +49,5 @@ package() { cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" make DESTDIR="$pkgdir" install } + +sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD new file mode 100644 index 000000000..c71ce3a24 --- /dev/null +++ b/staging/glew/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 164235 2012-07-28 03:12:10Z eric $ +# Maintainer: Stéphane Gaudreault +# Contributor: SleepyDog + +pkgname=glew +pkgver=1.8.0 +pkgrel=1 +pkgdesc="The OpenGL Extension Wrangler Library" +arch=('i686' 'x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('libxmu' 'libxi' 'mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|lib64|lib|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install.all + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a + chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..218b910f8 --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 164228 2012-07-27 22:56:01Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: Angel Velasquez +# Contributor: Eric Belanger +# Contributor: Lucien Immink +# Contributor: Daniel J Griffiths + +pkgname=curl +pkgver=7.27.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('f0e48fdb635b5939e02a9291b89e5336' + 'b5d6d54f97adcaf5c871174e5460f081' + '751bd433ede935c8fae727377625a8ae') + +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index e8f6573ff..82ac3b88f 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=187 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,19 +16,22 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - 'locale.sh') + 'locale.sh' + 'use-split-usr-path.patch') md5sums=('26606e3c84448800ef0b3ffd57e6e8b6' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - 'f15956945052bb911e5df81cf5e7e5dc') + 'f15956945052bb911e5df81cf5e7e5dc' + '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" # still waiting on ipw2x00 to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + patch -Np1 < "$srcdir/use-split-usr-path.patch" ./configure \ --libexecdir=/usr/lib \ diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch new file mode 100644 index 000000000..057045bf1 --- /dev/null +++ b/testing/systemd/use-split-usr-path.patch @@ -0,0 +1,14 @@ +--- a/src/core/main.c 2012-07-17 19:46:24.000000000 -0400 ++++ b/src/core/main.c 2012-07-27 10:04:13.000000000 -0400 +@@ -1379,11 +1379,7 @@ + + /* Set up PATH unless it is already set */ + setenv("PATH", +-#ifdef HAVE_SPLIT_USR + "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", +-#else +- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", +-#endif + arg_running_as == MANAGER_SYSTEM); + + if (arg_running_as == MANAGER_SYSTEM) { diff --git a/~mtjm/cups-usblp/PKGBUILD b/~mtjm/cups-usblp/PKGBUILD index 5f1c62325..799ab47c2 100644 --- a/~mtjm/cups-usblp/PKGBUILD +++ b/~mtjm/cups-usblp/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 149429 2012-02-07 16:59:12Z andyrtr $ +# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $ # Maintainer: Andreas Radke _pkgname="cups" pkgname="cups-usblp" -pkgver=1.5.2 -pkgrel=1 +pkgver=1.5.3 +pkgrel=2 pkgdesc="The CUPS Printing System - daemon package with usblp backend" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'dbus-core' 'hicolor-icon-theme') +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme') makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' - 'xinetd' 'gzip' 'autoconf' 'php' 'dbus-core' 'avahi' 'hicolor-icon-theme') + 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') optdepends=('php: for included phpcups.so module' 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -20,12 +20,9 @@ optdepends=('php: for included phpcups.so module' provides=("cups=${pkgver}") conflicts=("cups" "cups-libre") backup=(etc/cups/cupsd.conf - etc/cups/mime.convs - etc/cups/mime.types etc/cups/snmp.conf etc/cups/printers.conf etc/cups/classes.conf - etc/cups/client.conf etc/cups/subscriptions.conf etc/dbus-1/system.d/cups.conf etc/logrotate.d/cups @@ -40,22 +37,22 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi-5-services.patch cups-no-export-ssllibs.patch cups-no-gcrypt.patch + cups-no-gzip-man.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('9471d2a7c920cfbb17133c32d2e6866f' - '8496c48a7ab5918ce546cfb72472def3' - '7df4c2e0a69bf072d7b7e96523df9dce' - '9a207c5d5189b1c2fc55907b7ed09372' - '5da4ba0837f9a685f146797fcfcd455e' - 'fe782a8fd4351741120d485d476abe8a' +md5sums=('e1ad15257aa6f162414ea3beae0c5df8' + '8ec0d9d4b6fe3a8902042ed2432fb8b4' + 'c80bd1ff8d342cdf379ce5f445b9e944' + '1a5112f63958643f2888abc9418dbcac' + 'c37d1bf1bb76acc3fe93362c80d91b7c' + '5d302860559960042f3b47a91b97c5fe' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' + 'c9159ba1233902ba6ddbbe6885a46b72' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') -# move client.conf man page for next update to the client pkg. - build() { cd ${srcdir}/${_pkgname}-${pkgver} # http://www.cups.org/str.php?L3066 @@ -70,6 +67,8 @@ build() { patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" + # don't zip man pages in make install, let makepkg do that / Fedora + patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch # Rebuild configure script for --enable-avahi. aclocal -I config-scripts @@ -133,15 +132,15 @@ package() { # install some more configuration files that will get filled by cupsd touch ${pkgdir}/etc/cups/printers.conf touch ${pkgdir}/etc/cups/classes.conf - touch ${pkgdir}/etc/cups/client.conf - echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf - echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} + chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf} # fix .desktop file sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop # compress some driver files, adopted from Fedora find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f + + # remove client.conf man page + rm -f ${pkgdir}/usr/share/man/man5/client.conf.5 } diff --git a/~mtjm/cups-usblp/cups-avahi-1-config.patch b/~mtjm/cups-usblp/cups-avahi-1-config.patch index 663eb39df..516e01fa9 100644 --- a/~mtjm/cups-usblp/cups-avahi-1-config.patch +++ b/~mtjm/cups-usblp/cups-avahi-1-config.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in ---- cups-1.5.0/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 -+++ cups-1.5.0/config.h.in 2011-08-05 15:04:09.535759988 +0100 +diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in +--- cups-1.5.2/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 ++++ cups-1.5.2/config.h.in 2012-03-14 15:04:51.365347165 +0000 @@ -390,6 +390,13 @@ @@ -15,9 +15,9 @@ diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in * Do we have ? */ -diff -up cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.0/config-scripts/cups-dnssd.m4 ---- cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 -+++ cups-1.5.0/config-scripts/cups-dnssd.m4 2011-08-05 15:04:09.525760307 +0100 +diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4 +--- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 ++++ cups-1.5.2/config-scripts/cups-dnssd.m4 2012-03-14 15:04:51.365347165 +0000 @@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn DNSSDLIBS="" DNSSD_BACKEND="" diff --git a/~mtjm/cups-usblp/cups-avahi-2-backend.patch b/~mtjm/cups-usblp/cups-avahi-2-backend.patch index 4c0d4989b..9fa367729 100644 --- a/~mtjm/cups-usblp/cups-avahi-2-backend.patch +++ b/~mtjm/cups-usblp/cups-avahi-2-backend.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c ---- cups-1.5.2/backend/dnssd.c.avahi-2-backend 2012-02-06 11:09:08.318644741 +0100 -+++ cups-1.5.2/backend/dnssd.c 2012-02-06 11:09:08.326644641 +0100 +diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c +--- cups-1.5.3/backend/dnssd.c.avahi-2-backend 2012-05-15 16:53:18.164774446 +0200 ++++ cups-1.5.3/backend/dnssd.c 2012-05-15 17:09:07.684155704 +0200 @@ -15,14 +15,21 @@ * * Contents: @@ -85,23 +85,24 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c static void browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, -@@ -93,12 +131,6 @@ static void browse_local_callback(DNSSe - const char *regtype, +@@ -95,13 +133,6 @@ static void browse_local_callback(DNSSe const char *replyDomain, - void *context); + void *context) + __attribute__((nonnull(1,5,6,7,8))); -static int compare_devices(cups_device_t *a, cups_device_t *b); -static void exec_backend(char **argv); -static cups_device_t *get_device(cups_array_t *devices, - const char *serviceName, - const char *regtype, -- const char *replyDomain); +- const char *replyDomain) +- __attribute__((nonnull(1,2,3,4))); static void query_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, -@@ -107,9 +139,118 @@ static void query_callback(DNSServiceRe - uint16_t rrclass, uint16_t rdlen, +@@ -111,10 +142,119 @@ static void query_callback(DNSServiceRe const void *rdata, uint32_t ttl, - void *context); + void *context) + __attribute__((nonnull(1,5,9,11))); +#endif /* HAVE_DNSSD */ +#ifdef HAVE_AVAHI +static void avahi_client_callback (AvahiClient *client, @@ -117,7 +118,6 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c + AvahiLookupResultFlags flags, + void *context); +#endif /* HAVE_AVAHI */ -+ +static cups_device_t * find_device (cups_array_t *devices, + cups_txt_records_t *txt, + cups_device_t *dkey); @@ -126,9 +126,11 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c +static cups_device_t *get_device(cups_array_t *devices, + const char *serviceName, + const char *regtype, -+ const char *replyDomain); ++ const char *replyDomain) ++ __attribute__((nonnull(1,2,3,4))); static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); + static void unquote(char *dst, const char *src, size_t dstsize) + __attribute__((nonnull(1,2))); +#ifdef HAVE_AVAHI +static AvahiSimplePoll *simple_poll = NULL; @@ -174,7 +176,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c + */ + + datalen = *data++; -+ if (!datalen || (data + datalen) >= txt->dataend) ++ if (!datalen || (data + datalen) > txt->dataend) + return NULL; + txt->datanext = data + datalen; + @@ -217,7 +219,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c /* * 'main()' - Browse for printers. -@@ -120,6 +261,13 @@ main(int argc, /* I - Number of comm +@@ -125,6 +265,13 @@ main(int argc, /* I - Number of comm char *argv[]) /* I - Command-line arguments */ { const char *name; /* Backend name */ @@ -231,7 +233,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c DNSServiceRef main_ref, /* Main service reference */ fax_ipp_ref, /* IPP fax service reference */ ipp_ref, /* IPP service reference */ -@@ -133,12 +281,11 @@ main(int argc, /* I - Number of comm +@@ -138,12 +285,11 @@ main(int argc, /* I - Number of comm pdl_datastream_ref, /* AppSocket service reference */ printer_ref, /* LPD service reference */ riousbprint_ref; /* Remote IO service reference */ @@ -249,7 +251,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; /* Actions for POSIX signals */ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -198,6 +345,49 @@ main(int argc, /* I - Number of comm +@@ -203,6 +349,49 @@ main(int argc, /* I - Number of comm * Browse for different kinds of printers... */ @@ -299,7 +301,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) { perror("ERROR: Unable to create service connection"); -@@ -258,6 +448,7 @@ main(int argc, /* I - Number of comm +@@ -263,6 +452,7 @@ main(int argc, /* I - Number of comm riousbprint_ref = main_ref; DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, "_riousbprint._tcp", NULL, browse_callback, devices); @@ -307,7 +309,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c /* * Loop until we are killed... -@@ -265,6 +456,9 @@ main(int argc, /* I - Number of comm +@@ -270,6 +460,9 @@ main(int argc, /* I - Number of comm while (!job_canceled) { @@ -317,7 +319,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c FD_ZERO(&input); FD_SET(fd, &input); -@@ -284,11 +478,35 @@ main(int argc, /* I - Number of comm +@@ -289,11 +482,35 @@ main(int argc, /* I - Number of comm } else { @@ -353,7 +355,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c cups_device_t *best; /* Best matching device */ char device_uri[1024]; /* Device URI */ int count; /* Number of queries */ -@@ -302,6 +520,7 @@ main(int argc, /* I - Number of comm +@@ -307,6 +524,7 @@ main(int argc, /* I - Number of comm if (device->sent) sent ++; @@ -361,7 +363,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c if (device->ref) count ++; -@@ -333,14 +552,23 @@ main(int argc, /* I - Number of comm +@@ -338,14 +556,23 @@ main(int argc, /* I - Number of comm count ++; } } @@ -386,7 +388,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c if (!best) best = device; -@@ -401,6 +629,7 @@ main(int argc, /* I - Number of comm +@@ -406,6 +633,7 @@ main(int argc, /* I - Number of comm } @@ -394,7 +396,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c /* * 'browse_callback()' - Browse devices. */ -@@ -489,6 +718,7 @@ browse_local_callback( +@@ -494,6 +722,7 @@ browse_local_callback( device->fullName); device->sent = 1; } @@ -402,7 +404,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c /* -@@ -569,6 +799,41 @@ exec_backend(char **argv) /* I - Comman +@@ -574,6 +803,41 @@ exec_backend(char **argv) /* I - Comman /* @@ -444,7 +446,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c * 'get_device()' - Create or update a device. */ -@@ -589,20 +854,7 @@ get_device(cups_array_t *devices, /* I - +@@ -594,20 +858,7 @@ get_device(cups_array_t *devices, /* I - */ key.name = (char *)serviceName; @@ -466,7 +468,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c for (device = cupsArrayFind(devices, &key); device; -@@ -622,8 +874,14 @@ get_device(cups_array_t *devices, /* I - +@@ -627,8 +878,14 @@ get_device(cups_array_t *devices, /* I - free(device->domain); device->domain = strdup(replyDomain); @@ -481,7 +483,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c free(device->fullName); device->fullName = strdup(fullName); } -@@ -643,6 +901,9 @@ get_device(cups_array_t *devices, /* I - +@@ -648,6 +905,9 @@ get_device(cups_array_t *devices, /* I - device->domain = strdup(replyDomain); device->type = key.type; device->priority = 50; @@ -491,7 +493,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c cupsArrayAdd(devices, device); -@@ -650,13 +911,20 @@ get_device(cups_array_t *devices, /* I - +@@ -655,13 +915,20 @@ get_device(cups_array_t *devices, /* I - * Set the "full name" of this service, which is used for queries... */ @@ -512,7 +514,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c /* * 'query_callback()' - Process query data. */ -@@ -680,7 +948,7 @@ query_callback( +@@ -685,7 +952,7 @@ query_callback( *ptr; /* Pointer into string */ cups_device_t dkey, /* Search key */ *device; /* Device */ @@ -521,7 +523,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -714,94 +982,233 @@ query_callback( +@@ -719,94 +986,233 @@ query_callback( if ((ptr = strstr(name, "._")) != NULL) *ptr = '\0'; @@ -638,7 +640,8 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c else - dkey.type = CUPS_DEVICE_RIOUSBPRINT; + fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); -+ + +- for (device = cupsArrayFind(devices, &dkey); + avahi_service_resolver_free (resolver); +} + @@ -713,8 +716,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c +} +#endif /* HAVE_AVAHI */ + - -- for (device = cupsArrayFind(devices, &dkey); ++ +/* + * 'find_device()' - Find a device from its name and domain. + */ @@ -817,7 +819,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c { /* * Add USB device ID information... -@@ -856,6 +1263,10 @@ query_callback( +@@ -861,6 +1267,10 @@ query_callback( if (device->type == CUPS_DEVICE_PRINTER) device->sent = 1; } @@ -828,7 +830,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c } if (device->device_id) -@@ -912,11 +1323,9 @@ query_callback( +@@ -917,11 +1327,9 @@ query_callback( } } @@ -841,9 +843,9 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c /* * 'sigterm_handler()' - Handle termination signals... */ -diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-support.c ---- cups-1.5.2/cups/http-support.c.avahi-2-backend 2011-09-26 20:46:46.000000000 +0200 -+++ cups-1.5.2/cups/http-support.c 2012-02-06 11:09:08.327644629 +0100 +diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c +--- cups-1.5.3/cups/http-support.c.avahi-2-backend 2012-02-15 02:06:12.000000000 +0100 ++++ cups-1.5.3/cups/http-support.c 2012-05-15 17:04:51.045944634 +0200 @@ -43,6 +43,10 @@ * http_copy_decode() - Copy and decode a URI. * http_copy_encode() - Copy and encode a URI. @@ -892,7 +894,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup /* * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1431,6 +1458,9 @@ _httpResolveURI( +@@ -1434,6 +1461,9 @@ _httpResolveURI( if (strstr(hostname, "._tcp")) { @@ -902,7 +904,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup #ifdef HAVE_DNSSD # ifdef WIN32 # pragma comment(lib, "dnssd.lib") -@@ -1449,6 +1479,17 @@ _httpResolveURI( +@@ -1452,6 +1482,17 @@ _httpResolveURI( fd_set input_set; /* Input set for select() */ struct timeval stimeout; /* Timeout value for select() */ #endif /* HAVE_POLL */ @@ -920,7 +922,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup if (options & _HTTP_RESOLVE_STDERR) fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname); -@@ -1485,9 +1526,16 @@ _httpResolveURI( +@@ -1488,9 +1529,16 @@ _httpResolveURI( if (domain) *domain++ = '\0'; @@ -937,7 +939,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup resolved_uri[0] = '\0'; DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " -@@ -1501,6 +1549,7 @@ _httpResolveURI( +@@ -1504,6 +1552,7 @@ _httpResolveURI( uri = NULL; @@ -945,7 +947,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) { localref = ref; -@@ -1608,6 +1657,36 @@ _httpResolveURI( +@@ -1611,6 +1660,36 @@ _httpResolveURI( DNSServiceRefDeallocate(ref); } @@ -982,7 +984,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup if (options & _HTTP_RESOLVE_STDERR) { -@@ -1619,13 +1698,13 @@ _httpResolveURI( +@@ -1622,13 +1701,13 @@ _httpResolveURI( fputs("STATE: -connecting-to-device,offline-report\n", stderr); } @@ -998,10 +1000,10 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup if ((options & _HTTP_RESOLVE_STDERR) && !uri) _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer.")); -@@ -1914,6 +1993,116 @@ http_resolve_cb( +@@ -1916,6 +1995,115 @@ http_resolve_cb( + } #endif /* HAVE_DNSSD */ - +#ifdef HAVE_AVAHI +/* + * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI. @@ -1111,7 +1113,6 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup +} +#endif /* HAVE_AVAHI */ + -+ + /* - * End of "$Id: http-support.c 10017 2011-09-26 18:46:46Z mike $". - */ + * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $". diff --git a/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch b/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch index 1c547c042..daf852a0f 100644 --- a/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch +++ b/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.0/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.0/scheduler/cupsd.h ---- cups-1.5.0/scheduler/cupsd.h.avahi-3-timeouts 2011-05-11 23:17:34.000000000 +0100 -+++ cups-1.5.0/scheduler/cupsd.h 2011-10-07 13:20:41.522867324 +0100 +diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h +--- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts 2011-05-11 23:17:34.000000000 +0100 ++++ cups-1.5.2/scheduler/cupsd.h 2012-03-14 15:06:36.509476983 +0000 @@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int); typedef void (*cupsd_selfunc_t)(void *data); @@ -50,9 +50,9 @@ diff -up cups-1.5.0/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.0/scheduler/cups /* * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $". -diff -up cups-1.5.0/scheduler/main.c.avahi-3-timeouts cups-1.5.0/scheduler/main.c ---- cups-1.5.0/scheduler/main.c.avahi-3-timeouts 2011-10-07 13:20:36.875954675 +0100 -+++ cups-1.5.0/scheduler/main.c 2011-10-07 13:20:41.524867282 +0100 +diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c +--- cups-1.5.2/scheduler/main.c.avahi-3-timeouts 2012-03-14 15:04:17.655305548 +0000 ++++ cups-1.5.2/scheduler/main.c 2012-03-14 15:06:36.511476986 +0000 @@ -146,6 +146,10 @@ main(int argc, /* I - Number of comm int launchd_idle_exit; /* Idle exit on select timeout? */ @@ -116,8 +116,8 @@ diff -up cups-1.5.0/scheduler/main.c.avahi-3-timeouts cups-1.5.0/scheduler/main. + * See if there are any scheduled timed callbacks to run. + */ + -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo) ++ if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL && ++ (now + tmo_delay) < timeout) + { + timeout = tmo_delay; + why = "run a timed callback"; @@ -127,9 +127,9 @@ diff -up cups-1.5.0/scheduler/main.c.avahi-3-timeouts cups-1.5.0/scheduler/main. /* * Check whether we are accepting new connections... */ -diff -up cups-1.5.0/scheduler/Makefile.avahi-3-timeouts cups-1.5.0/scheduler/Makefile ---- cups-1.5.0/scheduler/Makefile.avahi-3-timeouts 2011-10-07 13:20:36.955953170 +0100 -+++ cups-1.5.0/scheduler/Makefile 2011-10-07 13:20:41.521867343 +0100 +diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile +--- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts 2012-03-14 15:04:17.685305586 +0000 ++++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:06:36.508476980 +0000 @@ -39,7 +39,8 @@ CUPSDOBJS = \ server.o \ statbuf.o \ @@ -140,9 +140,9 @@ diff -up cups-1.5.0/scheduler/Makefile.avahi-3-timeouts cups-1.5.0/scheduler/Mak LIBOBJS = \ filter.o \ mime.o \ -diff -up cups-1.5.0/scheduler/timeout.c.avahi-3-timeouts cups-1.5.0/scheduler/timeout.c ---- cups-1.5.0/scheduler/timeout.c.avahi-3-timeouts 2011-10-07 13:20:41.525867259 +0100 -+++ cups-1.5.0/scheduler/timeout.c 2011-10-07 13:20:41.525867259 +0100 +diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c +--- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts 2012-03-14 15:06:36.552477037 +0000 ++++ cups-1.5.2/scheduler/timeout.c 2012-03-14 15:06:36.552477037 +0000 @@ -0,0 +1,235 @@ +/* + * "$Id$" diff --git a/~mtjm/cups-usblp/cups-avahi-4-poll.patch b/~mtjm/cups-usblp/cups-avahi-4-poll.patch index 189e83da6..d7fa5fd56 100644 --- a/~mtjm/cups-usblp/cups-avahi-4-poll.patch +++ b/~mtjm/cups-usblp/cups-avahi-4-poll.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.0/scheduler/avahi.c.avahi-4-poll cups-1.5.0/scheduler/avahi.c ---- cups-1.5.0/scheduler/avahi.c.avahi-4-poll 2011-10-11 10:56:50.102288037 +0100 -+++ cups-1.5.0/scheduler/avahi.c 2011-10-11 10:56:50.102288037 +0100 +diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c +--- cups-1.5.2/scheduler/avahi.c.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000 ++++ cups-1.5.2/scheduler/avahi.c 2012-03-14 15:07:29.477542381 +0000 @@ -0,0 +1,441 @@ +/* + * "$Id$" @@ -443,9 +443,9 @@ diff -up cups-1.5.0/scheduler/avahi.c.avahi-4-poll cups-1.5.0/scheduler/avahi.c +/* + * End of "$Id$". + */ -diff -up cups-1.5.0/scheduler/avahi.h.avahi-4-poll cups-1.5.0/scheduler/avahi.h ---- cups-1.5.0/scheduler/avahi.h.avahi-4-poll 2011-10-11 10:56:50.102288037 +0100 -+++ cups-1.5.0/scheduler/avahi.h 2011-10-11 10:56:50.119287724 +0100 +diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h +--- cups-1.5.2/scheduler/avahi.h.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000 ++++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:07:29.477542381 +0000 @@ -0,0 +1,69 @@ +/* + * "$Id$" @@ -516,9 +516,9 @@ diff -up cups-1.5.0/scheduler/avahi.h.avahi-4-poll cups-1.5.0/scheduler/avahi.h +/* + * End of "$Id$". + */ -diff -up cups-1.5.0/scheduler/Makefile.avahi-4-poll cups-1.5.0/scheduler/Makefile ---- cups-1.5.0/scheduler/Makefile.avahi-4-poll 2011-10-11 10:56:45.868365861 +0100 -+++ cups-1.5.0/scheduler/Makefile 2011-10-11 10:56:50.101288055 +0100 +diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile +--- cups-1.5.2/scheduler/Makefile.avahi-4-poll 2012-03-14 15:06:36.508476980 +0000 ++++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:07:29.476542380 +0000 @@ -17,6 +17,7 @@ include ../Makedefs CUPSDOBJS = \ diff --git a/~mtjm/cups-usblp/cups-avahi-5-services.patch b/~mtjm/cups-usblp/cups-avahi-5-services.patch index 9713bbc53..820b3c32b 100644 --- a/~mtjm/cups-usblp/cups-avahi-5-services.patch +++ b/~mtjm/cups-usblp/cups-avahi-5-services.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.0/cgi-bin/admin.c.avahi-5-services cups-1.5.0/cgi-bin/admin.c ---- cups-1.5.0/cgi-bin/admin.c.avahi-5-services 2011-05-20 04:49:49.000000000 +0100 -+++ cups-1.5.0/cgi-bin/admin.c 2011-10-19 11:53:32.123177998 +0100 +diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c +--- cups-1.5.2/cgi-bin/admin.c.avahi-5-services 2011-08-17 22:01:53.000000000 +0100 ++++ cups-1.5.2/cgi-bin/admin.c 2012-03-14 15:08:25.701611799 +0000 @@ -1643,7 +1643,7 @@ do_config_server(http_t *http) /* I - H else local_protocols[0] = '\0'; @@ -31,10 +31,75 @@ diff -up cups-1.5.0/cgi-bin/admin.c.avahi-5-services cups-1.5.0/cgi-bin/admin.c #ifdef HAVE_LDAP cgiSetVariable("HAVE_LDAP", "1"); -diff -up cups-1.5.0/scheduler/client.c.avahi-5-services cups-1.5.0/scheduler/client.c ---- cups-1.5.0/scheduler/client.c.avahi-5-services 2011-06-10 22:16:18.000000000 +0100 -+++ cups-1.5.0/scheduler/client.c 2011-10-19 11:53:32.127177926 +0100 -@@ -4987,7 +4987,7 @@ valid_host(cupsd_client_t *con) /* I - +diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h +--- cups-1.5.2/scheduler/avahi.h.avahi-5-services 2012-03-14 15:07:29.477542381 +0000 ++++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:08:25.701611799 +0000 +@@ -3,7 +3,7 @@ + * + * Avahi poll implementation for the CUPS scheduler. + * +- * Copyright (C) 2010, 2011 Red Hat, Inc. ++ * Copyright (C) 2010, 2011, 2012 Red Hat, Inc. + * Authors: + * Tim Waugh + * +@@ -32,37 +32,40 @@ + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#include ++#ifndef _CUPS_AVAHI_H_ ++# define _CUPS_AVAHI_H_ + +-#ifdef HAVE_AVAHI +-# include +-# include +-#endif /* HAVE_AVAHI */ ++/* ++ * Include necessary headers... ++ */ + +-#ifdef HAVE_AUTHORIZATION_H +-# include +-#endif /* HAVE_AUTHORIZATION_H */ ++# include + ++# ifdef HAVE_AVAHI ++# include ++# include ++# endif /* HAVE_AVAHI */ + +-#ifdef HAVE_AVAHI ++# ifdef HAVE_AVAHI + typedef struct + { + AvahiPoll api; + cups_array_t *watched_fds; + cups_array_t *timeouts; + } AvahiCupsPoll; +-#endif /* HAVE_AVAHI */ ++# endif /* HAVE_AVAHI */ + + /* + * Prototypes... + */ + +-#ifdef HAVE_AVAHI ++# ifdef HAVE_AVAHI + extern AvahiCupsPoll * avahi_cups_poll_new(void); + extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); + extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); +-#endif /* HAVE_AVAHI */ ++# endif /* HAVE_AVAHI */ + ++#endif /* !_CUPS_AVAHI_H_ */ + + /* + * End of "$Id$". +diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c +--- cups-1.5.2/scheduler/client.c.avahi-5-services 2012-01-13 23:00:22.000000000 +0000 ++++ cups-1.5.2/scheduler/client.c 2012-03-14 15:08:25.703611797 +0000 +@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con) /* I - !strncmp(host, "[::1]:", 6)); } @@ -43,7 +108,7 @@ diff -up cups-1.5.0/scheduler/client.c.avahi-5-services cups-1.5.0/scheduler/cli /* * Check if the hostname is something.local (Bonjour); if so, allow it. */ -@@ -4996,7 +4996,7 @@ valid_host(cupsd_client_t *con) /* I - +@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con) /* I - (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) || !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8))) return (1); @@ -52,10 +117,10 @@ diff -up cups-1.5.0/scheduler/client.c.avahi-5-services cups-1.5.0/scheduler/cli /* * Check if the hostname is an IP address... -diff -up cups-1.5.0/scheduler/conf.c.avahi-5-services cups-1.5.0/scheduler/conf.c ---- cups-1.5.0/scheduler/conf.c.avahi-5-services 2011-10-19 11:53:31.895182225 +0100 -+++ cups-1.5.0/scheduler/conf.c 2011-10-19 11:53:32.131177850 +0100 -@@ -651,7 +651,7 @@ cupsdReadConfiguration(void) +diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c +--- cups-1.5.2/scheduler/conf.c.avahi-5-services 2012-03-14 15:04:17.636305526 +0000 ++++ cups-1.5.2/scheduler/conf.c 2012-03-14 15:08:25.706611803 +0000 +@@ -652,7 +652,7 @@ cupsdReadConfiguration(void) Browsing = CUPS_DEFAULT_BROWSING; DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; @@ -64,9 +129,9 @@ diff -up cups-1.5.0/scheduler/conf.c.avahi-5-services cups-1.5.0/scheduler/conf. cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups"); #endif /* HAVE_DNSSD */ -diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dirsvc.c ---- cups-1.5.0/scheduler/dirsvc.c.avahi-5-services 2011-10-19 11:53:32.011180075 +0100 -+++ cups-1.5.0/scheduler/dirsvc.c 2011-10-19 11:53:58.916681461 +0100 +diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c +--- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services 2012-03-14 15:04:17.674305572 +0000 ++++ cups-1.5.2/scheduler/dirsvc.c 2012-03-14 15:08:25.709611806 +0000 @@ -27,6 +27,7 @@ * ldap_connect() - Start new LDAP connection * ldap_reconnect() - Reconnect to LDAP Server @@ -799,15 +864,31 @@ diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dir /* * De-register the individual printers -@@ -2906,6 +3292,7 @@ dnssdStop(void) - p = (cupsd_printer_t *)cupsArrayNext(Printers)) - dnssdDeregisterPrinter(p); - -+#ifdef HAVE_DNSSD - /* +@@ -2910,12 +3296,23 @@ dnssdStop(void) * Shutdown the rest of the service refs... */ -@@ -2926,14 +3313,17 @@ dnssdStop(void) + ++#ifdef HAVE_DNSSD + if (WebIFRef) + { + DNSServiceRefDeallocate(WebIFRef); + WebIFRef = NULL; + } ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ if (AvahiWebIFGroup) ++ { ++ avahi_entry_group_reset (AvahiWebIFGroup); ++ avahi_entry_group_free (AvahiWebIFGroup); ++ AvahiWebIFGroup = NULL; ++ } ++#endif /* HAVE_AVAHI */ + ++#ifdef HAVE_DNSSD + if (RemoteRef) + { + DNSServiceRefDeallocate(RemoteRef); +@@ -2926,14 +3323,17 @@ dnssdStop(void) DNSServiceRefDeallocate(DNSSDRef); DNSSDRef = NULL; @@ -825,7 +906,7 @@ diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dir /* * 'dnssdUpdate()' - Handle DNS-SD queries. */ -@@ -2955,6 +3345,153 @@ dnssdUpdate(void) +@@ -2955,6 +3355,153 @@ dnssdUpdate(void) #endif /* HAVE_DNSSD */ @@ -979,9 +1060,9 @@ diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dir /* * 'get_auth_info_required()' - Get the auth-info-required value to advertise. */ -diff -up cups-1.5.0/scheduler/dirsvc.h.avahi-5-services cups-1.5.0/scheduler/dirsvc.h ---- cups-1.5.0/scheduler/dirsvc.h.avahi-5-services 2011-03-21 02:12:14.000000000 +0000 -+++ cups-1.5.0/scheduler/dirsvc.h 2011-10-19 11:53:32.138177721 +0100 +diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h +--- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services 2011-03-21 02:12:14.000000000 +0000 ++++ cups-1.5.2/scheduler/dirsvc.h 2012-03-14 15:08:25.711611808 +0000 @@ -31,6 +31,10 @@ # endif /* HAVE_LDAP_SSL_H */ #endif /* HAVE_LDAP */ @@ -1054,10 +1135,10 @@ diff -up cups-1.5.0/scheduler/dirsvc.h.avahi-5-services cups-1.5.0/scheduler/dir #ifdef HAVE_LDAP extern void cupsdUpdateLDAPBrowse(void); #endif /* HAVE_LDAP */ -diff -up cups-1.5.0/scheduler/ipp.c.avahi-5-services cups-1.5.0/scheduler/ipp.c ---- cups-1.5.0/scheduler/ipp.c.avahi-5-services 2011-10-19 11:53:31.978180686 +0100 -+++ cups-1.5.0/scheduler/ipp.c 2011-10-19 11:53:32.147177555 +0100 -@@ -6096,7 +6096,7 @@ copy_printer_attrs( +diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c +--- cups-1.5.2/scheduler/ipp.c.avahi-5-services 2012-03-14 15:04:17.665305560 +0000 ++++ cups-1.5.2/scheduler/ipp.c 2012-03-14 15:08:25.715611813 +0000 +@@ -6099,7 +6099,7 @@ copy_printer_attrs( ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time", ippTimeToDate(curtime)); @@ -1066,7 +1147,7 @@ diff -up cups-1.5.0/scheduler/ipp.c.avahi-5-services cups-1.5.0/scheduler/ipp.c if (!ra || cupsArrayFind(ra, "printer-dns-sd-name")) { if (printer->reg_name) -@@ -6106,7 +6106,7 @@ copy_printer_attrs( +@@ -6109,7 +6109,7 @@ copy_printer_attrs( ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE, "printer-dns-sd-name", 0); } @@ -1075,9 +1156,9 @@ diff -up cups-1.5.0/scheduler/ipp.c.avahi-5-services cups-1.5.0/scheduler/ipp.c if (!ra || cupsArrayFind(ra, "printer-error-policy")) ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME, -diff -up cups-1.5.0/scheduler/main.c.avahi-5-services cups-1.5.0/scheduler/main.c ---- cups-1.5.0/scheduler/main.c.avahi-5-services 2011-10-19 11:53:32.101178406 +0100 -+++ cups-1.5.0/scheduler/main.c 2011-10-19 11:53:32.151177479 +0100 +diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c +--- cups-1.5.2/scheduler/main.c.avahi-5-services 2012-03-14 15:06:36.511476986 +0000 ++++ cups-1.5.2/scheduler/main.c 2012-03-14 15:08:25.718611817 +0000 @@ -120,6 +120,10 @@ main(int argc, /* I - Number of comm cupsd_listener_t *lis; /* Current listener */ time_t current_time, /* Current time */ @@ -1116,9 +1197,9 @@ diff -up cups-1.5.0/scheduler/main.c.avahi-5-services cups-1.5.0/scheduler/main. #endif /* HAVE_AVAHI */ #ifndef __APPLE__ -diff -up cups-1.5.0/scheduler/printers.c.avahi-5-services cups-1.5.0/scheduler/printers.c ---- cups-1.5.0/scheduler/printers.c.avahi-5-services 2011-10-19 11:53:31.916181835 +0100 -+++ cups-1.5.0/scheduler/printers.c 2011-10-19 11:53:32.156177388 +0100 +diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c +--- cups-1.5.2/scheduler/printers.c.avahi-5-services 2012-03-14 15:04:17.646305537 +0000 ++++ cups-1.5.2/scheduler/printers.c 2012-03-14 15:08:25.720611819 +0000 @@ -883,9 +883,9 @@ cupsdDeletePrinter( cupsdClearString(&p->alert); cupsdClearString(&p->alert_description); @@ -1149,9 +1230,9 @@ diff -up cups-1.5.0/scheduler/printers.c.avahi-5-services cups-1.5.0/scheduler/p } -diff -up cups-1.5.0/scheduler/printers.h.avahi-5-services cups-1.5.0/scheduler/printers.h ---- cups-1.5.0/scheduler/printers.h.avahi-5-services 2011-03-18 18:42:46.000000000 +0000 -+++ cups-1.5.0/scheduler/printers.h 2011-10-19 11:53:32.157177369 +0100 +diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h +--- cups-1.5.2/scheduler/printers.h.avahi-5-services 2011-03-18 18:42:46.000000000 +0000 ++++ cups-1.5.2/scheduler/printers.h 2012-03-14 15:08:25.721611820 +0000 @@ -16,6 +16,9 @@ #ifdef HAVE_DNSSD # include diff --git a/~mtjm/cups-usblp/cups-no-gzip-man.patch b/~mtjm/cups-usblp/cups-no-gzip-man.patch new file mode 100644 index 000000000..6786c4430 --- /dev/null +++ b/~mtjm/cups-usblp/cups-no-gzip-man.patch @@ -0,0 +1,18 @@ +diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4 +--- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200 ++++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200 +@@ -69,10 +69,10 @@ case "$uname" in + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and Mac OS X +- MAN1EXT=1.gz +- MAN5EXT=5.gz +- MAN7EXT=7.gz +- MAN8EXT=8.gz ++ MAN1EXT=1 ++ MAN5EXT=5 ++ MAN7EXT=7 ++ MAN8EXT=8 + MAN8DIR=8 + ;; + *) -- cgit v1.2.3-54-g00ecf