diff options
55 files changed, 445 insertions, 454 deletions
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 5ec28c926..3769e32f9 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90134 2013-05-06 22:58:48Z faidoc $ +# $Id: PKGBUILD 90971 2013-05-16 22:26:24Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> @@ -6,7 +6,7 @@ pkgname=cinnamon-control-center pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet') @@ -20,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control- "gnomerrlabeler.patch" "idle-delay.patch") sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9' - '604f0a30369d0380a0c5634f1fd50f3f44a89c0b3caec66b60d9e2648b569b90' + 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') build() { diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch index b263613c4..7160bc788 100644 --- a/community/cinnamon-control-center/gnomerrlabeler.patch +++ b/community/cinnamon-control-center/gnomerrlabeler.patch @@ -1,5 +1,6 @@ ---- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c 2013-05-05 13:12:28.000000000 +0200 -+++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200 +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c +--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.000000000 +0200 ++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 @@ -31,12 +31,13 @@ #define GNOME_DESKTOP_USE_UNSTABLE_API #include <libgnome-desktop/gnome-rr.h> @@ -33,7 +34,7 @@ g_object_unref (self->priv->labeler); G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); -@@ -293,14 +294,14 @@ +@@ -293,16 +294,16 @@ self->priv->current_output = NULL; if (self->priv->labeler) { @@ -42,26 +43,36 @@ g_object_unref (self->priv->labeler); } - self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); +- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); ++ self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration); if (cc_panel_get_shell (CC_PANEL (self)) == NULL) - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); else - gnome_rr_labeler_show (self->priv->labeler); +- gnome_rr_labeler_show (self->priv->labeler); ++ cc_rr_labeler_show (self->priv->labeler); -@@ -2596,7 +2597,7 @@ + select_current_output_from_dialog_position (self); + +@@ -2594,9 +2595,9 @@ + if (self->priv->labeler == NULL) + return; if (gtk_window_has_toplevel_focus (window)) - gnome_rr_labeler_show (self->priv->labeler); +- gnome_rr_labeler_show (self->priv->labeler); ++ cc_rr_labeler_show (self->priv->labeler); else - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); } static void -@@ -2608,7 +2609,7 @@ +@@ -2606,9 +2607,9 @@ + if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL) + return; if (gtk_widget_get_visible (widget)) { - gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); +- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); ++ cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); } else { - gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); + cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index a237a17e3..a78c8593c 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84315 2013-02-16 11:41:49Z bpiotrowski $ +# $Id: PKGBUILD 91004 2013-05-17 09:36:29Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> @@ -6,20 +6,21 @@ # Contributor: Jan Fader <jan.fader@web.de> pkgname=fish -pkgver=2.0b2 -pkgrel=4 +pkgver=2.0.0 +pkgrel=1 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64') -url='http://ridiculousfish.com/shell/' +url='http://fishshell.com/' license=('GPL2') depends=('python2') makedepends=('doxygen' 'python') install=fish.install -source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz) -md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1') +source=(fish-$pkgver.tar.gz::http://fishshell.com/files/$pkgver/fish.tar.gz) +md5sums=('fe5907e6af61607d4128ce891a1f6501') build() { - cd "$srcdir"/fishfish + set -x + cd fish autoconf ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -28,7 +29,7 @@ build() { } package() { - cd "$srcdir"/fishfish + cd fish make DESTDIR="$pkgdir" install # use python2 diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index 7b3d9b054..8a1c56714 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87689 2013-04-05 09:27:30Z lcarlier $ +# $Id: PKGBUILD 91015 2013-05-17 22:04:55Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20130328 +pkgver=20130517 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64') @@ -38,3 +38,5 @@ package() { install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('7846a62551352d7dae6f93f8255e9d99' + '8615526144f69ea4e870d9bc37df9b29') diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index c80917dbd..96f437a41 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87551 2013-04-02 23:01:31Z svenstaro $ +# $Id: PKGBUILD 90982 2013-05-16 23:47:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=13 +pkgrel=14 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" @@ -19,7 +19,7 @@ source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" "murmur.service") md5sums=('55804e3dfe98b16eeb40abca6c254625' 'eddea4cdbd0bde4b960a67e16b5d5478' - '4ce52d399ba2d95705e997146e0e2544') + 'd27a9adcd7561859e7b033046729bc0e') build() { cd ${srcdir}/mumble-$pkgver @@ -38,7 +38,7 @@ package() { -i scripts/murmur.ini install -dm755 ${pkgdir}/var/lib/murmur - install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd + install -Dm755 release/murmurd ${pkgdir}/usr/bin/murmurd install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service index 9d58077ab..685b84d13 100644 --- a/community/murmur/murmur.service +++ b/community/murmur/murmur.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini -fg +ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini -fg Restart=always [Install] diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index 3ac9403db..bc073921d 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88083 2013-04-11 08:51:54Z svenstaro $ +# $Id: PKGBUILD 90984 2013-05-16 23:49:59Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,25 +6,24 @@ pkgname=nbd pkgver=3.3 -pkgrel=1 +pkgrel=3 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64') url="http://nbd.sourceforge.net" license=('GPL') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - config nbd nbd.service) + config nbd.service) backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install md5sums=('cde8fe6e870b8a7459f12e5dcf572d86' '2d05d426b8c2708d5f8a0d028fcbae05' - 'e7b13a8b3369e11927d9917664557efa' '5d1acc143018117174f79eff15afa038') build(){ cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog + ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog --sbindir=/usr/bin make } @@ -35,7 +34,6 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config - install -D -m755 "${srcdir}"/nbd "${pkgdir}"/etc/rc.d/nbd install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README diff --git a/community/nbd/nbd b/community/nbd/nbd deleted file mode 100644 index 76d16c779..000000000 --- a/community/nbd/nbd +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE="/var/run/nbd-server.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting Network Block Device Server" - if [ "$PID" = "" ]; then - /usr/bin/nbd-server - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon nbd - stat_done - fi - ;; - stop) - stat_busy "Stopping Network Block Device Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nbd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 44d341870..b503a36af 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90389 2013-05-12 06:32:22Z bpiotrowski $ +# $Id: PKGBUILD 90996 2013-05-17 06:59:15Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index b5e91da38..d59384f47 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88487 2013-04-18 14:09:48Z spupykin $ +# $Id: PKGBUILD 90992 2013-05-17 06:49:35Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.0.rc6 -pkgrel=2 +pkgver=4.0.2 +pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('2cc01a611431f4f980b65b87dbbd9e5a') +md5sums=('0b261a5a9a23858c3fe2999aecdbc552') build(){ cd $srcdir/passenger-release-$pkgver diff --git a/community/python2-cchardet/PKGBUILD b/community/python2-cchardet/PKGBUILD deleted file mode 100644 index c9c108873..000000000 --- a/community/python2-cchardet/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 80426 2012-11-21 14:15:53Z mtorromeo $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> - -pkgname=python2-cchardet -pkgver=0.3.2 -pkgrel=1 -_libname=${pkgname/python2-/} -pkgdesc="Universal encoding detector faster than chardet." -url="http://pypi.python.org/pypi/cchardet/" -depends=('python2') -makedepends=('cython2' 'python2-distribute') -license=('MIT') -arch=('i686' 'x86_64') -source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) - -build() { - cd "$srcdir/$_libname-$pkgver" - find -type f -exec sed -i '1 s|python\s*$|python2|' {} + - python2 setup.py build -} - -package() { - cd "$srcdir/$_libname-$pkgver" - python2 setup.py install --root="$pkgdir" - install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" -} - -sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23') diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 4ec09ea8e..b06e66b1d 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $ +# $Id: PKGBUILD 90973 2013-05-16 23:06:59Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,8 +7,8 @@ # Contributor: delor <bartekpiech gmail com> pkgname=qtcreator -pkgver=2.7.0 -_pkgver=2.7.0 +pkgver=2.7.1 +_pkgver=2.7.1 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') @@ -26,22 +26,16 @@ optdepends=('qt5-doc: for the integrated Qt documentation' 'bzr: for bazaar support' 'valgrind: for analyze support') install=qtcreator.install -source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop' - 'fix-build.patch') -md5sums=('7bf25d211ff8babea47c2034f1b93d08' - '82888d4be900e7833d768050a135cd37' - '4087c00d853addf97ca329d304e9a0a5') +source=("https://qt.gitorious.org/qt-creator/qt-creator/archive-tarball/v${_pkgver}" + 'qtcreator.desktop') +md5sums=('3f552e173918b2705c9dbb17725057b5' + '82888d4be900e7833d768050a135cd37') build() { - cd qt-creator-${_pkgver}-src - patch -p1 -i "${srcdir}"/fix-build.patch - cd ../ - [[ -d build ]] && rm -r build mkdir build && cd build - qmake ../qt-creator-${_pkgver}-src/qtcreator.pro + qmake ../qt-creator-qt-creator/qtcreator.pro make make docs -j1 } @@ -53,5 +47,5 @@ package() { make INSTALL_ROOT="${pkgdir}/usr/" install_docs install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT + install -Dm644 ${srcdir}/qt-creator-qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT } diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD index 51ab75cc5..a5e60dd48 100644 --- a/community/sqlitebrowser/PKGBUILD +++ b/community/sqlitebrowser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85413 2013-03-01 10:40:34Z andrea $ +# $Id: PKGBUILD 91008 2013-05-17 10:22:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> @@ -6,21 +6,28 @@ pkgname=sqlitebrowser pkgver=2.0b1 _pkgrealver=200_b1 -pkgrel=3 +pkgrel=4 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT" arch=('i686' 'x86_64') url="http://sqlitebrowser.sf.net" license=('GPL') -depends=('qt4') +depends=('qt4' 'sqlite') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz) md5sums=('5ca3d41cca454235b93ce72cd585dfe3') -build() { +prepare() { cd $srcdir/trunk/$pkgname sed -i 's|getline|xgetline|' sqlitebrowser/sqlbrowser_util.c sed -i 's|: name( 0 ) { }|: name( ) { }|' sqlitebrowser/sqlitedb.h - qmake - make LINK="g++ -ldl" + sed -i '/sqlite_source\/sqlite3.h/d' sqlitebrowser/sqlbrowser_util.c # Remove two useless #include + sed -i 's/"sqlite_source\/sqlite3.h"/<sqlite3.h>/' sqlitebrowser/sqlbrowser_util.h + sed -i -e '1i LIBS += -lsqlite3' -e '/sqlite_source/d' sqlitebrowser/sqlitebrowser.pro +} + +build() { + cd $srcdir/trunk/$pkgname + qmake-qt4 + make } package() { diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index fe98022b1..8c011e401 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176334 2013-01-30 17:44:19Z tpowa $ +# $Id: PKGBUILD 185681 2013-05-17 08:28:48Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib pkgver=2.8.22 -pkgrel=1 +pkgrel=2 pkgdesc="Password Checking Library" arch=('i686' 'x86_64') license=('GPL') @@ -28,7 +28,9 @@ check() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -Dm644 dicts/cracklib-small $pkgdir/usr/share/dict/cracklib-small + # symlink cracklib-small #34778 + mkdir -p $pkgdir/usr/share/dict + ln -sf /usr/share/cracklib/cracklib-small $pkgdir/usr/share/dict/cracklib-small sh ./util/cracklib-format dicts/cracklib-small \ | sh ./util/cracklib-packer $pkgdir/usr/share/cracklib/pw_dict } diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 7bde3053b..7c751926a 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185550 2013-05-14 23:25:14Z bisson $ +# $Id: PKGBUILD 185721 2013-05-17 17:22:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.20 -pkgrel=1 +pkgrel=2 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -37,6 +37,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib/gnupg \ --enable-maintainer-mode \ --enable-symcryptrun \ diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD index cf727defa..005d95ca5 100644 --- a/core/groff/PKGBUILD +++ b/core/groff/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 178100 2013-02-16 08:46:34Z allan $ +# $Id: PKGBUILD 185682 2013-05-17 08:28:58Z tpowa $ # Maintainer: pkgname=groff pkgver=1.22.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNU troff text-formatting system" arch=('i686' 'x86_64') url="http://www.gnu.org/software/groff/groff.html" license=('GPL') groups=('base-devel') depends=('perl' 'gcc-libs') -makedepends=('netpbm' 'psutils' 'ghostscript') +makedepends=('netpbm' 'psutils' 'ghostscript' 'libxaw') optdepends=('netpbm: for use together with man -H command interaction in browsers' - 'psutils: for use together with man -H command interaction in browsers') + 'psutils: for use together with man -H command interaction in browsers' + 'libxaw: for gxditview') source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz{,.sig} site.tmac) options=('!docs' '!emptydirs') @@ -23,7 +24,7 @@ md5sums=('9f4cd592a5efc7e36481d8d8d8af6d16' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-x + ./configure --prefix=/usr --with-x --with-appresdir=/usr/share/X11/app-defaults make } diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 6eac3bafa..ca682ea48 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175125 2013-01-14 12:47:14Z stephane $ +# $Id: PKGBUILD 185694 2013-05-17 11:13:03Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils pkgver=20121221 -pkgrel=1 +pkgrel=2 pkgdesc="Network monitoring tools, including ping" arch=('i686' 'x86_64') license=('GPL' 'BSD') @@ -40,16 +40,14 @@ build() { package() { cd "${srcdir}/${pkgname}-s${pkgver}" - install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin + install -dm755 "${pkgdir}"/usr/bin - install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \ - "${pkgdir}"/usr/sbin/ + install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 "${pkgdir}"/usr/bin/ install -m755 ping{,6} "${pkgdir}"/usr/bin/ - ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/ - install -dm755 "${pkgdir}"/usr/share/man/man8 - install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ + install -dm755 "${pkgdir}"/usr/share/man/man8 + install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ "${pkgdir}"/usr/share/man/man8/ cd "${pkgdir}"/usr/share/man/man8 diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 463df40bd..61f3db2e2 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162664 2012-06-27 18:33:40Z tpowa $ +# $Id: PKGBUILD 185695 2013-05-17 11:13:15Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils pkgver=1.5.5 -pkgrel=3 +pkgrel=4 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64) url="http://www.kernel.org" @@ -20,7 +20,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install + make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install # add nfsidmap to config file #30396 echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \ diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 945d31f3d..9872d3d5b 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183174 2013-04-18 12:38:02Z stephane $ +# $Id: PKGBUILD 185696 2013-05-17 11:13:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.11.2 -pkgrel=1 +pkgrel=3 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -13,21 +13,15 @@ makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar krb5-config_LDFLAGS.patch - krb5-kadmind krb5-kadmind.service - krb5-kdc krb5-kdc.service - krb5-kpropd krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' - '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' - '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' - '7f402078fa65bb9ff1beb6cbbbb017450df78560' '614401dd4ac18e310153240bb26eb32ff1e8cf5b' '023a8164f8ee7066ac814486a68bc605e79f6101' 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') @@ -48,6 +42,7 @@ build() { export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var/lib \ @@ -77,9 +72,6 @@ package() { install -dm 755 "${pkgdir}"/etc install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf - install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d - install -dm 755 "${pkgdir}"/usr/share/aclocal install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal diff --git a/core/krb5/krb5-kadmind b/core/krb5/krb5-kadmind deleted file mode 100644 index 04df0dcff..000000000 --- a/core/krb5/krb5-kadmind +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting Kerberos Admin Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kadmind - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Admin Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/krb5/krb5-kdc b/core/krb5/krb5-kdc deleted file mode 100644 index 05a03411e..000000000 --- a/core/krb5/krb5-kdc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/krb5kdc` -case "$1" in - start) - stat_busy "Starting Kerberos Authentication" - if [ -z "$PID" ]; then - /usr/sbin/krb5kdc - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Authentication" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/krb5/krb5-kpropd b/core/krb5/krb5-kpropd deleted file mode 100644 index a0077d68e..000000000 --- a/core/krb5/krb5-kpropd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kpropd` -case "$1" in - start) - stat_busy "Starting Kerberos Database Propagation Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kpropd -S - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kpropd - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Database Propagation Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kpropd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index f943a0d97..e962cb42a 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 185727 2013-05-17 18:43:30Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils -pkgver=2.1.4 +pkgver=2.1.5 pkgrel=1 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('e72f941f5041a057a81a1ce22e03497d') +md5sums=('f072cc53c288492061b3199d63e32177') build() { cd $pkgname-$pkgver diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD index 959cb23dd..52275465c 100644 --- a/extra/cpio/PKGBUILD +++ b/extra/cpio/PKGBUILD @@ -1,16 +1,21 @@ -# $Id: PKGBUILD 149526 2012-02-08 11:43:48Z tpowa $ +# $Id: PKGBUILD 185699 2013-05-17 11:26:28Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=cpio pkgver=2.11 -pkgrel=3 +pkgrel=4 pkgdesc="A tool to copy files into or out of a cpio or tar archive" arch=(i686 x86_64) license=('GPL') url="http://www.gnu.org/software/cpio" depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz) +source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz + cpio-2.11-stdio.in.patch) install=cpio.install -md5sums=('1112bb6c45863468b5496ba128792f6c') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch +} build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -22,10 +27,11 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1 - mv ${pkgdir}/usr/bin ${pkgdir}/bin rm -rf ${pkgdir}/usr/libexec # remove mt manpage it conflicts with mt-st from extra rm $pkgdir/usr/share/man/man1/mt.1 || return 1 # remove infodir rm $pkgdir/usr/share/info/dir } +md5sums=('1112bb6c45863468b5496ba128792f6c' + 'd7e58f2a1ec286febd09ea75042cf96e') diff --git a/extra/cpio/cpio-2.11-stdio.in.patch b/extra/cpio/cpio-2.11-stdio.in.patch new file mode 100644 index 000000000..f7016ba71 --- /dev/null +++ b/extra/cpio/cpio-2.11-stdio.in.patch @@ -0,0 +1,13 @@ +diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h +--- cpio-2.11-orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 ++++ cpio-2.11/gnu/stdio.in.h 2012-06-04 10:23:23.804471185 +0200 +@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 1b68f3dfd..abc48f82d 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185124 2013-05-11 09:39:43Z andyrtr $ +# $Id: PKGBUILD 185725 2013-05-17 17:33:15Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -9,7 +9,7 @@ pkgname=dovecot pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" @@ -38,8 +38,11 @@ build() { sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh # configure with openssl, mysql, and postgresql support - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ + ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --with-moduledir=/usr/lib/dovecot/modules \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --disable-static \ --with-nss \ diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index 5bfea48f6..bab08780d 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153257 2012-03-12 15:48:41Z jgc $ +# $Id: PKGBUILD 185705 2013-05-17 12:41:12Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') @@ -15,8 +15,13 @@ sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ + configure.ac autoreconf +} + +build() { + cd "${srcdir}/gst-plugins-base-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental --disable-gnome_vfs \ --with-package-name="GStreamer Base Plugins (Archlinux)" \ diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index 43e9a1b9f..1caedc0b9 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $ +# $Id: PKGBUILD 185691 2013-05-17 10:55:17Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.6 -pkgrel=2 +pkgrel=3 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -14,7 +14,6 @@ backup=(var/spool/hylafax/bin/{faxrcvd,notify} usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} var/spool/hylafax/etc/hosts.hfaxd) source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz - hylafax hylafax.cron.daily config.local faxq.service @@ -30,10 +29,9 @@ build () { package () { cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} + mkdir -p "$pkgdir"/usr/{bin,lib/fax,share/ghostscript/fonts} mkdir -p "$pkgdir"/var/{spool/hylafax,lock} make ROOT="$pkgdir" install - install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax # add missing awk file for notify-4.1 script install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \ @@ -47,15 +45,8 @@ package () { install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } md5sums=('d063d45049c8fcbabefe09d662313067' - '6602288a405324d8c8e3c5eac2bf19fd' '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' - '832c8e8098e2dfa56040c975b554590c' - '38a00db6d9d765d130b2d8d3a98e5c24') -md5sums=('d063d45049c8fcbabefe09d662313067' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' + '5f3a89fbfb10c47755d3ca19183b8a59' '832c8e8098e2dfa56040c975b554590c' '38a00db6d9d765d130b2d8d3a98e5c24' 'fe10ea597e786fe8c09e4104fbdf16de') diff --git a/extra/hylafax/config.local b/extra/hylafax/config.local index 4ea0f3500..ab98c83db 100644 --- a/extra/hylafax/config.local +++ b/extra/hylafax/config.local @@ -62,7 +62,7 @@ DIR_LIBDATA="/usr/lib/fax" # directory for client data DIR_LIBEXEC="/usr/lib/fax" # directory for libraries&hidden apps DIR_MAN="/usr/share/man" # directory for manual pages DIR_SPOOL="/var/spool/hylafax" # directory for spooling area -DIR_SBIN="/usr/sbin" # directory for system apps +DIR_SBIN="/usr/bin" # directory for system apps DIR_LOCKS="/var/lock" # directory for UUCP lock files FONTMAP="/usr/share/ghostscript/fonts" # directorys containing Fontmap files DIR_LOCALE="/usr/share/locale" diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install index 5dacf4045..c631cdaca 100644 --- a/extra/hylafax/hylafax.install +++ b/extra/hylafax/hylafax.install @@ -1,10 +1,6 @@ print_install() { printf "\n" - echo "Add the following to /etc/inittab and run telinit q" - echo " f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0" - echo "faxgetty should now be running" - printf "\n" echo "Run faxsetup to configure and be sure to set..." echo " The device to configure is usually ttyS0" echo " The number of pages to accept to more than 25" diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index ca20cdcb3..3d242f810 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -3,33 +3,26 @@ pkgname=irqbalance pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64') url="http://code.google.com/p/irqbalance" license=('GPL') depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) -backup=(etc/conf.d/irqbalance) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz - irqbalance.conf.d - irqbalance.rc.d irqbalance.service) md5sums=('b6403fa067c96adce448a48c9993654d' - '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c' - '9e82dc471128117982a8dd0c4bd5f246') + 'a97ad17dc7df98b81acb500b27f931e5') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" - install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance - install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service } diff --git a/extra/irqbalance/irqbalance.conf.d b/extra/irqbalance/irqbalance.conf.d deleted file mode 100644 index ef1bdfd75..000000000 --- a/extra/irqbalance/irqbalance.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Settings for irqbalance daemon -# - -# one shot mode - set to 1 if you have Pentium 4 with HT -ONESHOT=0 diff --git a/extra/irqbalance/irqbalance.rc.d b/extra/irqbalance/irqbalance.rc.d deleted file mode 100644 index 987c26b51..000000000 --- a/extra/irqbalance/irqbalance.rc.d +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="--oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` -case "$1" in - start) - stat_busy "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/irqbalance/irqbalance.service b/extra/irqbalance/irqbalance.service index 372ac0aa4..c9fced094 100644 --- a/extra/irqbalance/irqbalance.service +++ b/extra/irqbalance/irqbalance.service @@ -2,7 +2,7 @@ Description=CPU Interrupt Request Balancer [Service] -ExecStart=/usr/sbin/irqbalance --foreground +ExecStart=/usr/bin/irqbalance --foreground [Install] WantedBy=multi-user.target diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 342ed0e54..e72c8e08a 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178113 2013-02-16 16:08:30Z ronald $ +# $Id: PKGBUILD 185713 2013-05-17 13:46:00Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.6.3 -pkgrel=2 +pkgver=3.6.4 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" @@ -14,20 +14,15 @@ depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitespars makedepends=('gcc-fortran' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') -source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} - octave-gethelp.patch) +source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}) options=('!emptydirs') install=octave.install -sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628' - 'de009a9e6803de6b831cbd836cbc85c291de8a3c' - 'd39d54763ac86114029f8bc5d60763d2adce27bb') +sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log - patch -Np0 -i "${srcdir}/octave-gethelp.patch" - autoreconf -vfi # http://www.nabble.com/Random-rounding-errors-td16010966.html diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD index 241d2d0bd..e0720cdaa 100644 --- a/extra/openslp/PKGBUILD +++ b/extra/openslp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $ +# $Id: PKGBUILD 185723 2013-05-17 17:27:12Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openslp pkgver=1.2.1 -pkgrel=5 +pkgrel=7 pkgdesc="Open-source implementation of Service Location Protocol" arch=('i686' 'x86_64') url="http://www.openslp.org" @@ -11,16 +11,16 @@ license=('BSD') depends=('bash' 'openssl') backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae openslp.service) md5sums=('ff9999d1b44017281dd00ed2c4d32330' - '4f6889a5944894b8be2c01404a9566d2' - '296dc3c8f75e7a1823fcb9dd97ea0971') + '90eea4426492287ebfc01b2056a3ef9d') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static \ --enable-slpv1 \ --enable-slpv2-security # service would fail to start without this @@ -31,6 +31,5 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service } diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service index e17eb3b1d..a3c306aa2 100644 --- a/extra/openslp/openslp.service +++ b/extra/openslp/openslp.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi +ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/openslp/rc.slpd b/extra/openslp/rc.slpd deleted file mode 100755 index 4330c3760..000000000 --- a/extra/openslp/rc.slpd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/slpd` -case "$1" in - start) - stat_busy "Starting SLPD" - [ -z "$PID" ] && /usr/sbin/slpd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/slpd.pid - add_daemon slpd - stat_done - fi - ;; - stop) - stat_busy "Stopping SLPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/slpd.pid - rm_daemon slpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index ea8cf6be4..f76242d3b 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $ +# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.4 +pkgver=2.7.5 pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" @@ -17,7 +17,7 @@ optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e') +sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf') build() { cd "${srcdir}/Python-${pkgver}" diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index c1fb0c776..9ff811c5a 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -26,7 +26,6 @@ install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig - replace-urls.txt vendor.js makefile.patch branding.patch @@ -36,8 +35,7 @@ options=(!emptydirs) md5sums=('0c68298c17757257da79b6bb39e3fd10' 'eb2a5e1877d87a16e10388f533c081a6' '5cf95ea94f69cdd36604890cfbf7b954' - '3bf8aefb861095caa45649c118163454' - '4eecc4fc5aafaf0da651a09eadc90bee' + 'da090618f0d207d4f603a07b7b36dbe9' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' 'e785e0c267f4435ae1a9aa0b03bcacfb' @@ -72,17 +70,6 @@ prepare() { patch -Np1 -i "${srcdir}/branding.patch" # fixing branding patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version - # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do - if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" - grep -Erl "${moz_url}" \ - --exclude='*.'{patch,orig,rej} \ - --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g" - fi - done - cp "${srcdir}/mozconfig" .mozconfig # configure script misdetects the preprocessor without an optimization level diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt index 32c94b018..67ffcf119 100644 --- a/libre/icedove-libre/replace-urls.txt +++ b/libre/icedove-libre/replace-urls.txt @@ -13,7 +13,12 @@ https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[ https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain +https?://services.addons.mozilla.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain +https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION% https://trisquel.info/browser-plain +https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIR +ST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED% https://trisquel.info/browser-plain +https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox https://trisquel.info/browser-plain +https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE% https://trisquel.info/browser-plain https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js index 279bdc158..5284fab54 100644 --- a/libre/icedove-libre/vendor.js +++ b/libre/icedove-libre/vendor.js @@ -10,3 +10,18 @@ pref("mail.shell.checkDefaultMail", false); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); +// Preferences for the Get Add-ons panel +pref ("extensions.update.notifyUser", false); +pref ("extensions.getAddons.showPane", false); +pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.maxResults", 5); +pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain"); +pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain"); +pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain"); +pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain"); + +// Dictionary download preference +pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain"); diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 774d80f92..f84c8e745 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -142,20 +142,23 @@ build() { if $_pgo; then export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 + fi - make -f client.mk build MOZ_PGO=1 + kill $! || true else make -f client.mk build fi - - kill $! || true } package() { cd "$srcdir/$DEBIAN_BUILD" make -f client.mk DESTDIR="$pkgdir" install - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js" # I don't even know why we're hitting the objdir, and ConnOS didn't _brandingdir=debian/branding diff --git a/pcr/ams/PKGBUILD b/pcr/ams/PKGBUILD new file mode 100644 index 000000000..75a5062a7 --- /dev/null +++ b/pcr/ams/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer : Guest One <theguestone at gmail dot com> + +_name=alsamodular +pkgname=ams +pkgver=2.0.1 +pkgrel=1 +pkgdesc="Alsa Modular Synth is a realtime modular synthesizer and effect processor" +arch=('i686') +url="http://alsamodular.sourceforge.net/" +license=('GPL') +depends=('qt4' 'clalsadrv' 'ladspa' 'jack') +makedepends=('fftw') +optdepends=('swh-plugins: Steve Harris plugins' + 'cmt: Computer Music Toolkit plugins') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/project/$_name/$_name/$pkgver/$pkgname-$pkgver.tar.bz2" + "$pkgname.desktop" "$pkgname.png") +md5sums=('0d41bd5aac066aa98be45fd7ab12d35f' + 'ffa277cffd52254f0297cbc2f200767e' + '0349171d5431f1c6e56085f080eb8c68') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # DSO link flag + export LIBS=" -ldl" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir/ install + + # desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + + # icon + install -Dm644 ../$pkgname.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" +} diff --git a/pcr/ams/ams.desktop b/pcr/ams/ams.desktop new file mode 100644 index 000000000..4761ab9fc --- /dev/null +++ b/pcr/ams/ams.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Alsa Modular Synth +Comment=Realtime modular synthesizer and effect processor +Exec=ams +Icon=ams +Terminal=false +Categories=Application;AudioVideo;AudioVideo;Qt;X-Jack;X-Sound; +StartupNotify=true
\ No newline at end of file diff --git a/pcr/ams/ams.install b/pcr/ams/ams.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/pcr/ams/ams.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/ams/ams.png b/pcr/ams/ams.png Binary files differnew file mode 100644 index 000000000..d3a8dfe49 --- /dev/null +++ b/pcr/ams/ams.png diff --git a/pcr/clalsadrv/PKGBUILD b/pcr/clalsadrv/PKGBUILD new file mode 100644 index 000000000..bd7f89c05 --- /dev/null +++ b/pcr/clalsadrv/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/clalsadrv/ +pkgname=clalsadrv +pkgver=2.0.0 +pkgrel=1 +pkgdesc="Audio library for aeolus, aliki, ams, jaaa and japa." +arch=('i686') +url="http://kokkinizita.linuxaudio.org/linuxaudio/index.html" +license=('GPL') +depends=('alsa-lib') +install=${pkgname}.install +source=(http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.patch) +md5sums=('be123e1701e4b6c6300907df949bd71c' + 'cc5a4abbc49590dfbbf942ebfd966b70') +build() { + cd "${pkgname}-${pkgver}/libs" + patch < ${srcdir}/${pkgname}.patch + make DESTDIR=${pkgdir} PREFIX=/usr LIBDIR=lib +} + +package(){ + cd "${pkgname}-${pkgver}/libs" + make DESTDIR=${pkgdir} PREFIX=/usr LIBDIR=lib install +} diff --git a/pcr/clalsadrv/clalsadrv.install b/pcr/clalsadrv/clalsadrv.install new file mode 100644 index 000000000..21117d5a8 --- /dev/null +++ b/pcr/clalsadrv/clalsadrv.install @@ -0,0 +1,12 @@ +post_install() { +ldconfig +echo "==> ran ldconfig" +} + +post_upgrade() { +post_install +} + +post_remove() { +post_install +} diff --git a/pcr/clalsadrv/clalsadrv.patch b/pcr/clalsadrv/clalsadrv.patch new file mode 100644 index 000000000..5081f42fb --- /dev/null +++ b/pcr/clalsadrv/clalsadrv.patch @@ -0,0 +1,10 @@ +--- Makefile.orig 2010-03-15 12:58:40.862423046 +0100 ++++ Makefile 2010-03-15 12:59:01.578587306 +0100 +@@ -47,7 +47,6 @@ + install: $(CLALSADRV_MIN) + install -Dm 644 $(CLALSADRV_H) $(DESTDIR)$(PREFIX)/include/$(CLALSADRV_H) + install -Dm 755 $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MIN) +- /sbin/ldconfig $(PREFIX)/$(LIBDIR) + ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO) + + clean: diff --git a/pcr/din/PKGBUILD b/pcr/din/PKGBUILD new file mode 100644 index 000000000..77013fc5c --- /dev/null +++ b/pcr/din/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=din +pkgver=5.2.1 +pkgrel=1 +pkgdesc="A software musical instrument and audio synthesizer using Bezier curves to draw waveforms." +arch=('i686') +url="http://dinisnoise.org/" +license=('GPL3') +depends=('fftw' 'jack' 'liblo' 'libgl' 'libircclient' 'tcl') +makedepends=('mesa') +install="$pkgname.install" +source=("http://din.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('d5a9c375b58e7652004bfcc1e3e17f88') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove previously generated checkdotdin + rm data/checkdotdin + + # colourized echo in m00 script + sed -i "s|echo|& -e|" data/m00 + + # tcl 8.6 fix + sed -i "s/tcl8\.5/tcl8\.6/g" `grep -rl "tcl8\.5"` + + ./configure --prefix=/usr \ + --datarootdir=/usr/share + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/din/din.install b/pcr/din/din.install new file mode 100644 index 000000000..810ee4bfd --- /dev/null +++ b/pcr/din/din.install @@ -0,0 +1,12 @@ +post_install() { + echo ">>> If you get any trouble, remeber to clean your ~/.din folder" + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/minicomputer/PKGBUILD b/pcr/minicomputer/PKGBUILD new file mode 100644 index 000000000..4888c999f --- /dev/null +++ b/pcr/minicomputer/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=minicomputer +pkgver=1.41 +pkgrel=1 +pkgdesc="A standalone Linux softwaresynthesizer for creating experimental electronic sounds." +arch=('i686') +url="http://minicomputer.sourceforge.net" +license=('GPL3') +depends=('fltk' 'jack' 'liblo') +makedepends=('scons') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/MinicomputerV$pkgver.tar.gz" + "$pkgname.desktop") +md5sums=('d2524f5fee7475159292e29a5bcd73d2' + '3cc74321d55870b1684767255c74c2f8') + +build() { + cd "$srcdir" + + # installpresets.sh fix + sed -i "s|factory|/usr/share/$pkgname/&|g" installpresets.sh + + # 'R_OK' was not declared fix + sed -i '/#include <cstdlib>/a#include <unistd.h>' editor/Memory.h + + # DSO linking fix + sed -i "35aenv.Append(LINKFLAGS = ['-lm'])" -i SConstruct + + # build + LDFLAGS="LDFLAGS -lm" scons +} +package() { + cd "$srcdir" + + # bin + install -d "$pkgdir/usr/bin" + install -Dm755 "$pkgname"{,CPU} "$pkgdir/usr/bin" + + # icon + install -Dm644 $pkgname.xpm \ + "$pkgdir/usr/share/pixmaps/$pkgname.xpm" + + # desktop file + install -Dm644 $pkgname.desktop \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + + # presets + install -d "$pkgdir/usr/share/$pkgname/factoryPresets" + install -Dm644 factoryPresets/* "$pkgdir/usr/share/$pkgname/factoryPresets" + + # doc + install -Dm644 "$pkgname"Manual.pdf \ + "$pkgdir/usr/share/doc/$pkgname/Manual.pdf" + + # presets installer script + install -Dm755 installpresets.sh \ + "$pkgdir/usr/share/$pkgname/installpresets.sh" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/minicomputer/minicomputer.desktop b/pcr/minicomputer/minicomputer.desktop new file mode 100644 index 000000000..578f04ddb --- /dev/null +++ b/pcr/minicomputer/minicomputer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Minicomputer +Comment=An industrial grade software synthesizer +Exec=minicomputer +Icon=minicomputer +Terminal=false +Type=Application +Categories=Application;AudioVideo; diff --git a/pcr/minicomputer/minicomputer.install b/pcr/minicomputer/minicomputer.install new file mode 100644 index 000000000..e441a6f02 --- /dev/null +++ b/pcr/minicomputer/minicomputer.install @@ -0,0 +1,21 @@ +post_install() { + post_remove + + cat << EOF + +>>> For installing some sample presets in ~/.miniComputer, use +>>> /usr/share/minicomputer/installpresets.sh +>>> +>>> Use "minicomputer" to start the engine and the GUI +>>> Documentation can be found in /usr/share/doc/minicomputer/Manual.pdf + +EOF +} + +post_upgrade() { + post_remove +} + +post_remove() { + update-desktop-database -q +} |
