From 965fe5dd2bc0fae6b53c10d880c15f494dd589ac Mon Sep 17 00:00:00 2001 From: root Date: Tue, 9 Oct 2012 00:33:26 -0700 Subject: Tue Oct 9 00:33:25 PDT 2012 --- extra/at/PKGBUILD | 11 +++--- extra/at/atd.service | 9 +++++ extra/kdiff3/PKGBUILD | 11 +++--- extra/kdiff3/kdiff3-relative-path.patch | 59 +++++++++++++++++++++++++++++++++ extra/maxima/PKGBUILD | 6 ++-- extra/net-snmp/PKGBUILD | 8 +++-- extra/net-snmp/snmpd.service | 11 ++++++ extra/nicotine/PKGBUILD | 29 ++++++++-------- extra/opus/PKGBUILD | 28 ++++++++++++++++ extra/python-geoip/PKGBUILD | 19 +++++------ extra/sbcl/PKGBUILD | 6 ++-- 11 files changed, 154 insertions(+), 43 deletions(-) create mode 100644 extra/at/atd.service create mode 100644 extra/kdiff3/kdiff3-relative-path.patch create mode 100644 extra/net-snmp/snmpd.service create mode 100644 extra/opus/PKGBUILD (limited to 'extra') diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD index 0f6736512..19267a906 100644 --- a/extra/at/PKGBUILD +++ b/extra/at/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138170 2011-09-18 03:48:48Z eric $ +# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $ # Maintainer: Judd Vinet # Contributor: Todd Musall pkgname=at pkgver=3.1.13 -pkgrel=1 +pkgrel=2 pkgdesc="AT and batch delayed command scheduling utility and daemon" arch=('i686' 'x86_64') url="http://packages.qa.debian.org/a/at.html" @@ -12,10 +12,12 @@ license=('GPL') depends=('pam') makedepends=('ssmtp') backup=('etc/at.deny') +options=('!makeflags') source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz - atd) + atd atd.service) md5sums=('1da61af6c29e323abaaf13ee1a8dad79' - '35574e34829e7df07a3269d4ab646a29') + '35574e34829e7df07a3269d4ab646a29' + '33976a813f4fe7f5659354601044c6f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,4 +32,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make IROOT="${pkgdir}" docdir=/usr/share/doc install install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" + install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" } diff --git a/extra/at/atd.service b/extra/at/atd.service new file mode 100644 index 000000000..ba359878c --- /dev/null +++ b/extra/at/atd.service @@ -0,0 +1,9 @@ +[Unit] +Description=ATD daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/atd + +[Install] +WantedBy=multi-user.target diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index abe2a3adf..8f6f601c0 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166597 2012-09-12 20:12:20Z eric $ +# $Id: PKGBUILD 168298 2012-10-08 05:04:03Z eric $ # Maintainer: Eric Bélanger pkgname=kdiff3 pkgver=0.9.97 -pkgrel=1 +pkgrel=2 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64') url="http://kdiff3.sourceforge.net/" @@ -12,11 +12,14 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml') optdepends=('kdebase-lib: for the plugin') install=kdiff3.install -source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz) -sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547') +source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz + kdiff3-relative-path.patch) +sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547' + 'b5359dcec2ebb8221a232ecc2ea9982b290172e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p2 -i "${srcdir}/kdiff3-relative-path.patch" mkdir release cd release cmake .. -DCMAKE_INSTALL_PREFIX=/usr diff --git a/extra/kdiff3/kdiff3-relative-path.patch b/extra/kdiff3/kdiff3-relative-path.patch new file mode 100644 index 000000000..7cfccd6f5 --- /dev/null +++ b/extra/kdiff3/kdiff3-relative-path.patch @@ -0,0 +1,59 @@ +--- a/kdiff3/src-QT4/fileaccess.cpp ++++ b/kdiff3/src-QT4/fileaccess.cpp +@@ -183,7 +183,8 @@ + + void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) + { +- m_filePath = nicePath( fi.filePath() ); // remove "./" at start ++ m_filePath = pParent == 0 ? fi.absoluteFilePath() : ++ nicePath( fi.filePath() ); // remove "./" at start + + m_bSymLink = fi.isSymLink(); + if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) ) +@@ -566,7 +567,16 @@ + if ( parent() != 0 ) + return parent()->absoluteFilePath() + "/" + m_filePath; + else +- return m_filePath; ++ { ++ if ( m_filePath.isEmpty() ) ++ return QString(); ++ ++ QFileInfo fi( m_filePath ); ++ if ( fi.isAbsolute() ) ++ return m_filePath; ++ else ++ return fi.absoluteFilePath(); // Probably never reached ++ } + } // Full abs path + + // Just the name-part of the path, without parent directories +@@ -1184,7 +1194,7 @@ + m_bSuccess = false; + KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo ); + connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); +- connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); ++ connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); + + ProgressProxy::enterEventLoop( pJob, + i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); +@@ -1673,7 +1683,7 @@ + &pp, SLOT( slotListDirInfoMessage(KJob*, const QString&) )); + + // This line makes the transfer via fish unreliable.:-( +- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); ++ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); + + ProgressProxy::enterEventLoop( pListJob, + i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) ); +--- a/kdiff3/src-QT4/kdiff3.cpp ++++ b/kdiff3/src-QT4/kdiff3.cpp +@@ -211,6 +211,8 @@ + m_outputFilename = args->getOption("output"); + if ( m_outputFilename.isEmpty() ) + m_outputFilename = args->getOption("out"); ++ if ( ! m_outputFilename.isEmpty() ) ++ m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath(); + } + + m_bAutoFlag = args!=0 && args->isSet("auto"); diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 275f5065d..6d0327ed1 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 166487 2012-09-08 10:00:42Z ronald $ +# $Id: PKGBUILD 168309 2012-10-08 09:18:38Z juergen $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=maxima pkgver=5.28.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.0.58' 'texinfo' 'sh') +depends=('sbcl=1.1.0' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index d70068fd4..325c61b06 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160499 2012-06-02 10:26:47Z bluewind $ +# $Id: PKGBUILD 168300 2012-10-08 05:33:09Z eric $ # Maintainer: # Contributor: Dale Blount pkgname=net-snmp pkgver=5.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" @@ -18,11 +18,12 @@ provides=('ucd-snmp') backup=('etc/conf.d/snmpd') options=('!libtool' '!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc libnl32.patch) + snmpd.confd snmpd.rc snmpd.service libnl32.patch) sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' '2bdc2839ce09d7daa608cd54687fa8beb47ed907' 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' + 'f59ddc049c1c689f04e68c3c7cd8b8e301df3158' '74a9848b95f63378eb1753fc309d2b74de5afb0f') build() { @@ -54,5 +55,6 @@ package() { make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" + install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service new file mode 100644 index 000000000..111a8d6a9 --- /dev/null +++ b/extra/net-snmp/snmpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) Daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/snmpd +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD index c37ea7190..08610c142 100644 --- a/extra/nicotine/PKGBUILD +++ b/extra/nicotine/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 144457 2011-12-06 06:35:08Z angvp $ +# $Id: PKGBUILD 168342 2012-10-09 00:13:39Z eric $ # Maintainer: Angel Velasquez # Contributor: Hugo Doria # Contributor: Andrew Wright pkgname=nicotine pkgver=1.2.16 -pkgrel=3 +pkgrel=4 pkgdesc="Soulseek music-sharing client, written in python" -license=('GPL') arch=('i686' 'x86_64') -depends=('pygtk>=2.14.1' 'mutagen') -conflicts=(nicotine-plus) -replaces=(nicotine-plus) url="http://sourceforge.net/projects/nicotine-plus/" +license=('GPL') +depends=('pygtk' 'mutagen') +optdepends=('python2-geoip: to enable Geographical blocker') source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2) -optdepends=('python-sexy: To enable spell checking' - 'python-geoip: to enable Geographical blocker') md5sums=('ac7433c21ef619a37e079a7ae68da94a') - - - build() { - cd ${srcdir}/${pkgname}+-${pkgver} + cd "${srcdir}/${pkgname}+-${pkgver}" sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476 - python2 setup.py install --root=${pkgdir} + sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ + -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py + + python2 setup.py install --root="${pkgdir}" cd trayicon python2 autogen.py make } package() { - cd ${srcdir}/${pkgname}+-${pkgver}/trayicon - make DESTDIR=${pkgdir} install - ln -s nicotine.py ${pkgdir}/usr/bin/nicotine + cd "${srcdir}/${pkgname}+-${pkgver}/trayicon" + make DESTDIR="${pkgdir}" install + ln -s nicotine.py "${pkgdir}/usr/bin/nicotine" } diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD new file mode 100644 index 000000000..c250b548d --- /dev/null +++ b/extra/opus/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Jan de Groot +# Contributor: DrZaius +# Contributor: pumbur + +pkgname=opus +pkgver=1.0.1 +pkgrel=2 +pkgdesc="codec designed for interactive speech and audio transmission over the Internet" +arch=('i686' 'x86_64') +url="http://www.opus-codec.org/" +license=('custom') +depends=('glibc') +source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +options=('!libtool') +md5sums=('bbac19996957b404a1139816e2f357f5') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -m755 -d "${pkgdir}/usr/share/licenses/opus" + install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/" +} diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index 2a5fe156e..f9a76dbbb 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 140200 2011-10-09 08:54:48Z angvp $ +# $Id: PKGBUILD 168340 2012-10-08 23:42:19Z eric $ # Maintainer: Angel Velasquez # Maintainer: Jan de Groot -pkgname=python-geoip +pkgbase=python-geoip +pkgname=('python2-geoip') pkgver=1.2.7 -pkgrel=1 -pkgdesc="Python bindings for the GeoIP IP-to-country resolver library." -arch=(i686 x86_64) +pkgrel=2 +pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" +arch=('i686' 'x86_64') url="http://www.maxmind.com/app/python" license=('LGPL') depends=('python2' 'geoip') source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) -replaces=('geoip-python') -provides=('geoip-python') md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') -build() { - cd ${startdir}/src/GeoIP-Python-${pkgver} - python2 setup.py build install --root=${startdir}/pkg +package_python2-geoip() { + cd "${srcdir}/GeoIP-Python-${pkgver}" + python2 setup.py build install --root="${pkgdir}" } diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 1894bfaa3..8e8f4cd47 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165308 2012-08-15 11:11:17Z juergen $ +# $Id: PKGBUILD 168308 2012-10-08 09:08:03Z juergen $ # Contributor: John Proctor # Contributor: Daniel White # Maintainer: Juergen Hoetzel # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.58 +pkgver=1.1.0 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -17,7 +17,7 @@ makedepends=('sbcl' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('341952949dc90af6f83a89f685da5dde' +md5sums=('7390495ce158eac45002c028ed8c149b' '7ac0c1936547f4278198b8bf7725204d') build() { -- cgit v1.2.3-54-g00ecf