diff options
author | root <root@rshg054.dnsready.net> | 2013-05-21 00:28:39 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-05-21 00:28:39 -0700 |
commit | e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 (patch) | |
tree | b3e36d93c34b5b08544b1698462c06fdb99560b8 /community | |
parent | 383955a81810f344e11b1472bd4c5069fa77020c (diff) |
Tue May 21 00:28:39 PDT 2013
Diffstat (limited to 'community')
33 files changed, 116 insertions, 850 deletions
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 27e176e37..f45a04241 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -4,19 +4,20 @@ pkgname=bonnie++ pkgver=1.03e -pkgrel=6 +pkgrel=7 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64') url="http://www.coker.com.au/bonnie++/" license=('GPL') depends=('perl') -source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz) -sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb') +source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch) +sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb' + 'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814') build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile make } @@ -24,6 +25,8 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} + # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ + patch -Np1 -i $srcdir/move_away_from_sbin.patch make prefix="${pkgdir}/usr" install install -d $pkgdir/usr/share/doc/bonnie++ diff --git a/community/bonnie++/move_away_from_sbin.patch b/community/bonnie++/move_away_from_sbin.patch new file mode 100644 index 000000000..18e99e976 --- /dev/null +++ b/community/bonnie++/move_away_from_sbin.patch @@ -0,0 +1,14 @@ +diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile +--- bonnie++-1.03e/Makefile 2013-05-13 08:40:45.122959831 +0000 ++++ bonnie++-1.03ef/Makefile 2013-05-13 08:43:20.365248937 +0000 +@@ -33,8 +33,8 @@ + $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS) + + install-bin: $(EXES) +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- ${INSTALL} -s $(EXES) $(eprefix)/sbin ++ mkdir -p $(eprefix)/bin ++ ${INSTALL} -s $(EXES) $(eprefix)/bin + ${INSTALL} $(SCRIPTS) $(eprefix)/bin + + install: install-bin diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 07b3708d9..59f594221 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $ +# $Id: PKGBUILD 91248 2013-05-20 14:50:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64') @@ -40,12 +40,10 @@ depends=('libltdl' 'iptables') source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' - 'service' - 'rc.d') + 'service') sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' '245c098d121a4a05594553583310953b3a2f6461' - 'b56907f532b9174e1b6995aadb518228d7464d3b' - '0f441718d5519cb043b1130e5a1d0379078adbcc') + '04f676d0b76c34df0bbf94629813e035b1febe04') backup=('etc/collectd.conf') options=('!libtool') @@ -63,7 +61,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --with-python=/usr/bin/python2 make all } @@ -72,7 +71,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rmdir "${pkgdir}/var/run" # FS#30201 - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl } diff --git a/community/collectd/rc.d b/community/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/collectd/service b/community/collectd/service index 9581ec0c9..30540645a 100644 --- a/community/collectd/service +++ b/community/collectd/service @@ -5,7 +5,7 @@ After=local-fs.target network.target [Service] Type=forking PIDFile=/run/collectdmon.pid -ExecStart=/usr/sbin/collectdmon +ExecStart=/usr/bin/collectdmon ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD deleted file mode 100644 index b8af4d326..000000000 --- a/community/compiz-bcop/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68296 2012-03-21 10:32:03Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-bcop -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz option code generator" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core>=0.8.8' 'libxslt') -makedepends=('intltool' 'pkgconfig') -conflicts=('compiz-bcop-git') -source=(http://releases.compiz-fusion.org/$pkgver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9210bd2a537480bdb11df0e3cc5f6d4548fd12da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD deleted file mode 100644 index 459d72d98..000000000 --- a/community/compiz-fusion-plugins-extra/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68298 2012-03-21 10:33:42Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-fusion-plugins-extra -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Extra plugins" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify') -makedepends=('intltool' 'pkg-config' 'gettext' 'gconf') -groups=('compiz-fusion' 'compiz-fusion-gtk' 'compiz-fusion-kde') -conflicts=('compiz-fusion-plugins-extra-git') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-extra-${pkgver}.tar.bz2) -sha1sums=('ce592993696c0b5d4e0bb13171897b4c25b3844e') - -build() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - - sed -i 's/if text "x$use/if test "x$use/' configure - sed -i 's/iconUri, NULL);/iconUri);/' src/notification/notification.c - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD deleted file mode 100644 index b9d61b9ec..000000000 --- a/community/compiz-fusion-plugins-main/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68300 2012-03-21 10:35:13Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-fusion-plugins-main -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Main plugins" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite' - 'libxinerama' 'startup-notification') -makedepends=('intltool' 'pkgconfig' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -conflicts=('compiz-fusion-plugins-main-git') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-main-${pkgver}.tar.bz2) -options=(!libtool) -sha1sums=('3c99841b744ae6c4a3edf2019626484880607dc6') - -build() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/magiclamp.patch b/community/compiz-fusion-plugins-main/magiclamp.patch deleted file mode 100644 index 3a9e4a21e..000000000 --- a/community/compiz-fusion-plugins-main/magiclamp.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/animation/animation.c.orig 2007-12-01 02:22:12.008115484 +0100 -+++ src/animation/animation.c 2007-12-01 02:27:41.541651382 +0100 -@@ -1148,7 +1148,7 @@ - { "horizontal_folds_zoom_to_taskbar", "bool", 0, 0, 0 }, - { "magic_lamp_moving_end", "bool", 0, 0, 0 }, - { "magic_lamp_grid_res", "int", "<min>4</min>", 0, 0 }, -- { "magic_lamp_max_waves", "int", "<min>3</min>", 0, 0 }, -+ { "magic_lamp_max_waves", "int", "<min>0</min>", 0, 0 }, - { "magic_lamp_amp_min", "float", "<min>200</min>", 0, 0 }, - { "magic_lamp_amp_max", "float", "<min>200</min>", 0, 0 }, - { "magic_lamp_open_start_width", "int", "<min>0</min>", 0, 0 }, ---- metadata/animation.xml.in.orig 2007-12-01 02:25:24.011432269 +0100 -+++ metadata/animation.xml.in 2007-12-01 02:27:02.724750938 +0100 -@@ -1272,7 +1272,7 @@ - <_short>Magic Lamp Max Waves</_short> - <_long>The maximum number of waves for Magic Lamp.</_long> - <default>3</default> -- <min>3</min> -+ <min>0</min> - <max>20</max> - </option> - <option name="magic_lamp_amp_min" type="float"> ---- metadata/animation.xml.orig 2007-12-01 02:25:14.584765435 +0100 -+++ metadata/animation.xml 2007-12-01 02:35:07.068035601 +0100 -@@ -3962,7 +3962,7 @@ - <long xml:lang="pt">Número máximo de ondas para Lâmpada Mágica.</long> - <long xml:lang="sv">Den Magiska Lampans maximala antal vågor</long> - <default>3</default> -- <min>3</min> -+ <min>0</min> - <max>20</max> - </option> - <option type="float" name="magic_lamp_amp_min"> diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD deleted file mode 100644 index 08ce577bd..000000000 --- a/community/compiz/PKGBUILD +++ /dev/null @@ -1,142 +0,0 @@ -# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Hussam Al-Tayeb ht990332@gmail.com -# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net> -# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> - -pkgbase=compiz -pkgname=('compiz-core' - 'compiz-decorator-kde' - 'compiz-decorator-gtk') -pkgver=0.8.8 -pkgrel=5 -pkgdesc="Composite manager for Aiglx and Xgl" -url="http://www.compiz.org/" -license=('GPL' 'LGPL' 'MIT') -arch=('i686' 'x86_64') -groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') -makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') -options=(!libtool !emptydirs) -conflicts=('compiz' 'compiz-core-git' 'compiz-git') -replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz - compiz-kde-4.8.patch - compiz-kde-4.9.patch - compiz-kde-4.10.patch - compiz-gcc-4.7.patch) -sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' - '148656352f8a20b3781ee185025c5c8d4b7d720f' - '2b6fa7398ccb96172a99f4d12990bbc0491e355c' - 'f3c97cc9835643d48058682506eac98d6deceeb7' - '2138342ae9f253bae003e96e91fdd0bc9918291a') - -prepare() -{ - cd "$srcdir/compiz-$pkgver" - - patch -p0 -i ../compiz-gcc-4.7.patch - patch -p1 -i ../compiz-kde-4.8.patch - patch -p1 -i ../compiz-kde-4.9.patch - patch -p0 -i ../compiz-kde-4.10.patch -} - -build() -{ - cd "$srcdir/compiz-$pkgver" - - ./configure --prefix=/usr \ - --enable-gnome \ - --enable-gtk \ - --enable-metacity \ - --enable-gconf \ - --with-gconf-schema-file-dir=/etc/gconf/schemas \ - --enable-dbus \ - --enable-librsvg \ - --disable-kde \ - --enable-kde4 - - make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4 -} - -package_compiz-core() -{ - - pkgdesc="Composite manager for Aiglx and Xgl" - depends=('startup-notification' 'librsvg' \ - 'libgl' 'dbus' 'glu' 'libxslt' 'fuse') - - cd "$srcdir/compiz-$pkgver" - make DESTDIR="$pkgdir" install - - # remove stuff which is in one of the decorations - rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator} - rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center} - rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*} - rm -rf "${pkgdir}"/etc - - # install MIT license - install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \ - "$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT" -} - -package_compiz-decorator-gtk() -{ - pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity') - install=compiz-decorator-gtk.install - - cd "$srcdir/compiz-$pkgver" - - pushd gtk - make DESTDIR="$pkgdir" install - install -Dm644 window-decorator/gwd.schemas \ - "$pkgdir/usr/share/gconf/schemas/gwd.schemas" - popd - - for i in dbus gconf ini inotify png regex svg glib kconfig - do - rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas - done - - gconf-merge-schema \ - "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \ - "${srcdir}"/compiz-$pkgver/metadata/*.schemas - - make DESTDIR="$pkgdir" install - - # remove stuff which is in one of the other packages - rm -rf "${pkgdir}"/etc - rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator} - rm -rf "$pkgdir"/usr/include - cd "$pkgdir"/usr/lib - rm libdecoration* - rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc} - cd "${pkgdir}"/usr/lib/compiz - rm $(ls --hide=*gconf*) - rm -rf "${pkgdir}"/usr/share/{compiz,locale} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT -} - -package_compiz-decorator-kde() -{ - pkgdesc="Compiz decorator for KDE" - depends=('kdebase-workspace' 'compiz-core') - - cd "$srcdir"/compiz-$pkgver - make DESTDIR="$pkgdir" install - - # Let's remove stuff that are in compiz-core package or gtk decorator - rm -rf "$pkgdir"/usr/{include,lib} - rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator} - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT -} - diff --git a/community/compiz/compiz-decorator-gtk.install b/community/compiz/compiz-decorator-gtk.install deleted file mode 100644 index b3738fda9..000000000 --- a/community/compiz/compiz-decorator-gtk.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q - -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null -} - -post_remove() { - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q -} - diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch deleted file mode 100644 index 28315baec..000000000 --- a/community/compiz/compiz-gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- kde/window-decorator-kde4/window.cpp 2010-05-21 11:18:14.000000000 +0000 -+++ kde/window-decorator-kde4/window.cpp 2012-09-12 18:05:00.000000000 +0000 -@@ -59,6 +59,9 @@ - - #include "paintredirector.h" - -+// header for gcc-4.7 compatibility -+#include "unistd.h" -+ - KWD::Window::Window (WId parentId, - WId clientId, - WId frame, ---- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400 -+++ configure.ac 2012-09-12 23:40:37.253686000 +0400 -@@ -72,11 +72,6 @@ - *) CFLAGS="$CFLAGS -Wnested-externs" ;; - esac - -- case " $CFLAGS " in -- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; -- *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;; -- esac -- - if test "x$enable_ansi" = "xyes"; then - case " $CFLAGS " in - *[[\ \ ]]-ansi[[\ \ ]]*) ;; -@@ -95,11 +90,6 @@ - *[[\ \ ]]-Wall[[\ \ ]]*) ;; - *) CXXFLAGS="$CXXFLAGS -Wall" ;; - esac -- -- case " $CXXFLAGS " in -- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; -- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;; -- esac - fi - - AC_C_BIGENDIAN diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch deleted file mode 100644 index a30d54b90..000000000 --- a/community/compiz/compiz-kde-4.10.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- kde/window-decorator-kde4/window.cpp 2012-11-14 10:17:09 +0000 -+++ kde/window-decorator-kde4/window.cpp 2012-11-23 06:43:18 +0000 -@@ -554,6 +554,15 @@ - showWindowMenu (pos.bottomLeft ()); - } - -+void KWD::Window::showApplicationMenu (const QPoint &p) -+{ -+} -+ -+bool KWD::Window::menuAvailable () const -+{ -+ return false; -+} -+ - KWD::Options::MouseCommand - KWD::Window::buttonToCommand (Qt::MouseButtons button) - { - ---- kde/window-decorator-kde4/window.h 2012-09-03 07:19:30 +0000 -+++ kde/window-decorator-kde4/window.h 2012-11-23 06:43:18 +0000 -@@ -92,6 +92,8 @@ - virtual void processMousePressEvent (QMouseEvent *); - virtual void showWindowMenu (const QRect &); - virtual void showWindowMenu (const QPoint &); -+ virtual void showApplicationMenu (const QPoint &); -+ virtual bool menuAvailable () const; - virtual void performWindowOperation (WindowOperation); - virtual void setMask (const QRegion &, int); - virtual bool isPreview (void) const; diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch deleted file mode 100644 index f22a3fa21..000000000 --- a/community/compiz/compiz-kde-4.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp ---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 -+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 -@@ -986,10 +986,10 @@ - { - Atom atom = Atoms::compizWindowBlurDecor; - QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- Region topRegion = NULL; -- Region bottomRegion = NULL; -- Region leftRegion = NULL; -- Region rightRegion = NULL; -+ ::Region topRegion = NULL; -+ ::Region bottomRegion = NULL; -+ ::Region leftRegion = NULL; -+ ::Region rightRegion = NULL; - int size = 0; - int w, h; - diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch deleted file mode 100644 index 7b56da95c..000000000 --- a/community/compiz/compiz-kde-4.9.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001 -From: Dennis Kasprzyk <onestone@compiz.org> -Date: Mon, 06 Aug 2012 18:23:17 +0000 -Subject: KDE 4.9 support. - -Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov - ---- -diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp -index a65f99f..78d1a47 100644 ---- a/kde/window-decorator-kde4/window.cpp -+++ b/kde/window-decorator-kde4/window.cpp -@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const - return QRect (); - } - -+KDecorationDefines::WindowOperation -+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) -+{ -+ Options::MouseCommand com = buttonToCommand (button); -+ -+ if (com == Options::MouseOperationsMenu) -+ return KDecorationDefines::OperationsOp; -+ -+ return KDecorationDefines::NoOp; -+} -+ -+ -+#endif -+ -+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) -+ - bool - KWD::Window::isClientGroupActive () - { -@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos) - showWindowMenu (pos); - } - --KDecorationDefines::WindowOperation --KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) -+#endif -+ -+#if KDE_IS_VERSION(4,8,80) -+QString -+KWD::Window::caption(int idx) const - { -- Options::MouseCommand com = buttonToCommand (button); -+ return mName; -+} - -- if (com == Options::MouseOperationsMenu) -- return KDecorationDefines::OperationsOp; -+void -+KWD::Window::closeTab(long id) -+{ -+ closeWindow (); -+} - -- return KDecorationDefines::NoOp; -+void -+KWD::Window::closeTabGroup() -+{ -+ closeWindow (); -+} -+ -+long -+KWD::Window::currentTabId() const -+{ -+ return (long) mClientId; -+} -+ -+QIcon -+KWD::Window::icon(int idx) const -+{ -+ QIcon icon (mIcon); -+ icon.addPixmap (mMiniIcon); -+ return icon; -+} -+ -+void -+KWD::Window::setCurrentTab(long id) -+{ -+} -+ -+void -+KWD::Window::showWindowMenu(const QPoint& pos, long id) -+{ -+ showWindowMenu (pos); -+} -+ -+void -+KWD::Window::tab_A_before_B(long A, long B) -+{ -+} -+ -+void -+KWD::Window::tab_A_behind_B(long A, long B) -+{ -+} -+ -+int -+KWD::Window::tabCount() const -+{ -+ return 1; -+} -+ -+long -+KWD::Window::tabId(int idx) const -+{ -+ return (long) mClientId; -+} -+ -+void -+KWD::Window::untab(long id, const QRect& newGeom) -+{ - } - - #endif - -+ - void - KWD::Window::createDecoration (void) - { -@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset, - int leftOffset, - int rightOffset) - { -- Atom atom = Atoms::compizWindowBlurDecor; -- QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- ::Region topRegion = NULL; -- ::Region bottomRegion = NULL; -- ::Region leftRegion = NULL; -- ::Region rightRegion = NULL; -- int size = 0; -- int w, h; -+ Atom atom = Atoms::compizWindowBlurDecor; -+ QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -+ _XRegion *topRegion = NULL; -+ _XRegion *bottomRegion = NULL; -+ _XRegion *leftRegion = NULL; -+ _XRegion *rightRegion = NULL; -+ int size = 0; -+ int w, h; - - w = mGeometry.width () + mBorder.left + mBorder.right; - h = mGeometry.height () + mBorder.top + mBorder.bottom; -diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h -index c2b274b..1ddfbd1 100644 ---- a/kde/window-decorator-kde4/window.h -+++ b/kde/window-decorator-kde4/window.h -@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable { - virtual bool compositingActive () const; - #if KDE_IS_VERSION(4,3,90) - virtual QRect transparentRect () const; -- -+ virtual WindowOperation -+ buttonToWindowOperation(Qt::MouseButtons button); -+#endif -+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) - virtual bool isClientGroupActive (); - virtual QList<ClientGroupItem> clientGroupItems () const; - virtual long itemId (int index); -@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable { - virtual void closeClientGroupItem (int index); - virtual void closeAllInClientGroup (); - virtual void displayClientMenu (int index, const QPoint& pos); -- -- virtual WindowOperation -- buttonToWindowOperation(Qt::MouseButtons button); -+ -+#endif -+#if KDE_IS_VERSION(4,8,80) -+ using KDecorationBridge::caption; -+ virtual QString caption(int idx) const; -+ virtual void closeTab(long id); -+ virtual void closeTabGroup(); -+ virtual long currentTabId() const; -+ using KDecorationBridge::icon; -+ virtual QIcon icon(int idx) const; -+ virtual void setCurrentTab(long id); -+ using KDecorationBridge::showWindowMenu; -+ virtual void showWindowMenu(const QPoint& pos, long id); -+ virtual void tab_A_before_B(long A, long B); -+ virtual void tab_A_behind_B(long A, long B); -+ virtual int tabCount() const; -+ virtual long tabId(int idx) const; -+ virtual void untab(long id, const QRect& newGeom); - #endif -+ -+ - virtual bool eventFilter (QObject* o, QEvent* e); - - void handleActiveChange (void); --- -cgit v0.8.3.1-30-gff3a diff --git a/community/compizconfig-backend-gconf/PKGBUILD b/community/compizconfig-backend-gconf/PKGBUILD deleted file mode 100644 index 8b8c60cb8..000000000 --- a/community/compizconfig-backend-gconf/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 68302 2012-03-21 10:36:50Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: kasa <biuta.jr@gmail.com> - -pkgname=compizconfig-backend-gconf -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compizconfig backend for gconf" -arch=('i686' 'x86_64') -url="http://opencompositing.org" -license=('GPL') -depends=('libcompizconfig' 'gconf') -makedepends=('intltool' 'pkgconfig') -conflicts=('compizconfig-backend-gconf-git') -groups=('compiz-fusion-gtk' 'compiz-fusion') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('3869e83a50e82caa4bfda5474a3bf44095ee78dc') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --sysconfdir=/etc - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD deleted file mode 100644 index d4d65ff95..000000000 --- a/community/compizconfig-python/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68381 2012-03-23 15:45:56Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compizconfig-python -pkgver=0.8.4 -pkgrel=4 -pkgdesc="Compizconfig bindings for python" -arch=('i686' 'x86_64') -url="http://opencompositing.org" -license=('GPL') -depends=('compiz-core' 'libcompizconfig' 'glib2' 'python2' 'libxrandr') -makedepends=('intltool' 'pkgconfig' 'pyrex') -conflicts=('compizconfig-python-git') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('702f83f63ce5dc3c6c1d27e07fb62fc3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - PYTHON=python2 ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index cd193ed36..f4becdd48 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $ +# $Id: PKGBUILD 91272 2013-05-20 19:14:00Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.23 -pkgrel=2 +pkgrel=3 pkgdesc='Plugins for Geany' arch=('x86_64' 'i686') url='http://plugins.geany.org/' license=('GPL') -depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' +depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache' 'lua51') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index b6a270944..2e689dd5d 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86000 2013-03-10 22:54:45Z arodseth $ +# $Id: PKGBUILD 91268 2013-05-20 18:58:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -6,7 +6,7 @@ # Contributor: Allan McRae <mcrae_allan@hotmail.com> pkgname=geany -pkgver=1.23 +pkgver=1.23.1 pkgrel=1 pkgdesc='Fast and lightweight IDE' arch=('x86_64' 'i686') @@ -20,7 +20,17 @@ optdepends=('vte: for terminal support' install="$pkgname.install" options=('!libtool') source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") -sha256sums=('cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0') +sha256sums=('8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Python2 fix + sed -i '0,/on/s//on2/' data/templates/files/main.py + + # Syntax highlighting for PKGBUILD files + sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,14 +38,8 @@ build() { ./configure --prefix=/usr make - # Python2 fix - sed -i '0,/on/s//on2/' data/templates/files/main.py - # Fix for FS#10318 setconf geany.desktop MimeType '' - - # Syntax highlighting for PKGBUILD files - sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf } package() { diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 1ac198b22..f3d84a587 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,11 +1,11 @@ -#$Id: PKGBUILD 90755 2013-05-13 16:04:18Z arodseth $ +#$Id: PKGBUILD 91294 2013-05-20 20:42:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide pkgver=18.1 -pkgrel=2 +pkgrel=3 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') @@ -13,17 +13,17 @@ url='https://github.com/visualfc/liteide' depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') makedepends=('gendesk') options=('!strip') -source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip" +source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'golangide.png' 'golangide.sh') -sha256sums=('d3706ff01ebb501eec4d237f418121bbc4523dac793e6c2430f7b5ac3712ce53' +sha256sums=('60ab324bffb5ec4e7b1b3f9cae9729c7c6c499df3bb994861de65e473f2d64fe' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') prepare() { cd "$srcdir" - gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Golang IDE' + gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd "liteide-x$pkgver/build" chmod +x build_linux.sh } @@ -43,9 +43,10 @@ build() { package() { msg2 'Creating directories...' - mkdir -p "$pkgdir/usr/lib/liteide" - mkdir -p "$pkgdir/usr/share/liteide" - mkdir -p "$pkgdir/usr/share/doc/$pkgname" + mkdir -p \ + "$pkgdir/usr/lib/liteide" \ + "$pkgdir/usr/share/liteide" \ + "$pkgdir/usr/share/doc/$pkgname" cd "$srcdir/liteide-x$pkgver/build/liteide" @@ -58,8 +59,7 @@ package() { cd "$srcdir/liteide-x$pkgver/liteidex" msg2 'Packaging resources...' - cp -r deploy/* "$pkgdir/usr/share/liteide" - cp -r os_deploy/* "$pkgdir/usr/share/liteide" + cp -r deploy/* os_deploy/* "$pkgdir/usr/share/liteide" msg2 'Packaging libraries and plugins...' cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide" diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD index 679dad5ca..2e15b7557 100644 --- a/community/i2c-tools/PKGBUILD +++ b/community/i2c-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $ +# $Id: PKGBUILD 91137 2013-05-20 09:47:55Z jelle $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=i2c-tools pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/wiki/I2CTools" @@ -25,7 +25,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make prefix="${pkgdir}/usr" install - install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin" + install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/bin" cd py-smbus python2 setup.py install --prefix "${pkgdir}/usr" rm -rf "${pkgdir}/usr/include" diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index a75362d7f..772815e49 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $ +# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $ # Maintainer: # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64') url='http://kmess.sourceforge.net/' license=('GPL') depends=('kdebase-lib') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'optipng') optdepends=('cabextract: provides winks support') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") md5sums=('a2e57911713308bef81b9347135cc5dd') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix invalid PNG images to work with libpng 1.6 + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}" mkdir build diff --git a/community/libcompizconfig/PKGBUILD b/community/libcompizconfig/PKGBUILD deleted file mode 100644 index 79fc479ed..000000000 --- a/community/libcompizconfig/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 68306 2012-03-21 10:40:24Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=libcompizconfig -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz configuration system library" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libxml2' 'libxcomposite' 'libxinerama' 'startup-notification' - 'libxml++') -makedepends=('intltool' 'pkgconfig') -conflicts=('libcompizconfig-git') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -options=('!emptydirs' '!libtool') -sha1sums=('8ea1f15fd9e1e2eb37a9814646659a31a8018fd8') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index 7a7d8dc62..797a82a98 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $ +# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd pkgver=3.2.15 -pkgrel=1 +pkgrel=2 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -15,32 +15,25 @@ arch=('i686' 'x86_64') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664' - '1cfa2d7254139be50f11753d4e07281ed2af36eb') + 'f35ecb887e86ae0a54ac70aef5a7577fc8761877') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/ \ - --exec-prefix=/usr \ + --sbindir=/usr/bin \ --datarootdir=/usr/share \ --with-pidfile=/run/nsd.pid \ - --enable-ratelimit \ - + --enable-ratelimit make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}"/etc/rc.d - ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service - rm doc/differences.pdf install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" diff --git a/community/nsd/service b/community/nsd/service index 28bb1c5b7..ca423c29c 100644 --- a/community/nsd/service +++ b/community/nsd/service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/run/nsd.pid -ExecStart=/usr/sbin/nsdc start -ExecReload=/usr/sbin/nsdc reload -ExecStop=/usr/sbin/nsdc stop +ExecStart=/usr/bin/nsdc start +ExecReload=/usr/bin/nsdc reload +ExecStop=/usr/bin/nsdc stop [Install] WantedBy=multi-user.target diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index db92359f5..5b08531df 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90701 2013-05-13 14:33:26Z spupykin $ +# $Id: PKGBUILD 91143 2013-05-20 09:54:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=2 +pkgrel=3 pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64) url="http://members.home.nl/p.a.rombouts/pdnsd/" @@ -17,13 +17,13 @@ md5sums=('2f3e705d59a0f9308ad9504b24400769' 'fad5e518d126b29fc947941d57a0a494') build() { - cd $srcdir/$pkgname-$_pkgver - ./configure --prefix=/usr --sysconfdir=/etc + cd $srcdir/$pkgname-${_pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-ipv6 make } package() { - cd $srcdir/$pkgname-$_pkgver + cd $srcdir/$pkgname-${_pkgver} make DESTDIR=$pkgdir install install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service } diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index 6a21c4821..3eb00faf6 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $ +# $Id: PKGBUILD 91250 2013-05-20 17:00:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=1 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64') license=('GPL') @@ -14,15 +14,25 @@ optdepends=('python') url="http://sdcc.sourceforge.net/" options=(!strip) source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) -md5sums=('0808a9b4109d2ba6046ddd7b679a0012') +md5sums=('c7c6aa75415580795ecc4fd31948e5ba') + +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|CC -E|CC -O2 -E|g' support/sdbinutils/libiberty/configure +} build() { - cd $srcdir/$pkgname + cd $srcdir/$pkgname-$pkgver ./configure \ --prefix=/usr \ --includedir=/usr/include/sdcc \ --libdir=/usr/lib/sdcc make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make install DESTDIR=$pkgdir if [ -d $pkgdir/usr/lib/lib ]; then diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 7fd8d4357..498d72401 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90725 2013-05-13 14:38:23Z spupykin $ +# $Id: PKGBUILD 91152 2013-05-20 09:56:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat pkgver=10.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -37,4 +37,5 @@ package() { install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat chown -R root:root $pkgdir install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + mv $pkgdir/usr/bin/nfsiostat $pkgdir/usr/bin/$pkgname-nfsiostat } diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 067bed6d2..ca9efec0f 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,54 +1,48 @@ -# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $ +# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.20 -pkgrel=1 +pkgrel=2 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') arch=('i686' 'x86_64') -options=('!libtool') depends=('openssl' 'ldns') makedepends=('expat') optdepends=('expat: unbound-anchor') backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" - 'unbound.service' - 'unbound.conf' - 'rc.d') + 'service' + 'conf') sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43' - 'a2493cb105ff6aa23d756514badb13b02d37f319' - '5d473ec2943fd85367cdb653fcd58e186f07383f' - 'dc96e772f467b32555df21d16fdb15e98194c228') + 'b543ae6f8b87423bec095fca6b335a9ee43739a8' + '5d473ec2943fd85367cdb653fcd58e186f07383f') +options=('!libtool') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --disable-rpath \ --with-conf-file=/etc/unbound/unbound.conf \ - --with-pidfile=/run/unbound.pid \ - + --with-pidfile=/run/unbound.pid make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf" - install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" - install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service" + install -Dm644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service" + install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf" } diff --git a/community/unbound/unbound.conf b/community/unbound/conf index 445bceff1..445bceff1 100644 --- a/community/unbound/unbound.conf +++ b/community/unbound/conf diff --git a/community/unbound/rc.d b/community/unbound/rc.d deleted file mode 100644 index b5b6466de..000000000 --- a/community/unbound/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=unbound -prog="/usr/sbin/unbound" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && eval $prog &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/unbound/unbound.service b/community/unbound/service index 8e59e5a6a..c569602de 100644 --- a/community/unbound/unbound.service +++ b/community/unbound/service @@ -4,7 +4,7 @@ After=network.target [Service] PIDFile=/run/unbound.pid -ExecStart=/usr/sbin/unbound -d +ExecStart=/usr/bin/unbound -d ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index eb1e77d9d..b584c0778 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $ +# $Id: PKGBUILD 91154 2013-05-20 09:57:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> pkgname=uriparser -pkgver=0.7.7 +pkgver=0.7.8 pkgrel=1 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" url="http://sourceforge.net/projects/uriparser/" @@ -12,7 +12,7 @@ makedepends=(doxygen graphviz) arch=('i686' 'x86_64') license=("custom") source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) -md5sums=('2da950ef006be5a842dcc383cbbeaa78') +md5sums=('1ff590e25e8d9f5eaaa409c741fc387b') build() { cd ${srcdir}/$pkgname-$pkgver |