diff options
Diffstat (limited to 'community')
24 files changed, 239 insertions, 170 deletions
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 31230ed9b..a68bdcbff 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -71,7 +71,7 @@ package_gdc() { depends=('libmpc' 'zlib') optdepends=('libgphobos-devel: D standard library, GDC version') - description="Compiler for D programming language wich uses gcc backend" + pkgdesc="Compiler for D programming language wich uses gcc backend" install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/4.8.1/cc1d @@ -79,7 +79,7 @@ package_gdc() package_libgphobos-devel() { - description="Standard library for D programming language, GDC port" + pkgdesc="Standard library for D programming language, GDC port" depends=('gdc') # druntime diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 035275fed..10b972507 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96332 2013-08-25 18:27:42Z dicebot $ +# $Id: PKGBUILD 96883 2013-09-07 01:54:31Z dicebot $ # Maintainer: Mihails Strasuns <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=('ldc' 'liblphobos-devel') groups=('dlang' 'dlang-ldc') pkgver=0.11.0 epoch=1 -pkgrel=2 +pkgrel=3 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') url="https://github.com/ldc-developers/ldc" @@ -67,6 +67,7 @@ package_liblphobos-devel() { mkdir -p $pkgdir/usr/include/dlang/ldc cp -r $srcdir/ldc/build/import/* $pkgdir/usr/include/dlang/ldc/ cp -r $srcdir/ldc/runtime/phobos/std $pkgdir/usr/include/dlang/ldc/ + cp -r $srcdir/ldc/runtime/phobos/etc $pkgdir/usr/include/dlang/ldc/ # licenses install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 7dd62306c..2bd7f915c 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $ +# $Id: PKGBUILD 96900 2013-09-07 14:11:54Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.6.0 -pkgrel=7 +pkgver=1.6.1 +pkgrel=1 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base' 'yelp-tools') -options=('!emptydirs' '!libtool') +options=('!libtool') source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' 'lightdm.tmpfiles' @@ -22,16 +22,16 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv 'lightdm-default-config.patch' 'lightdm-lock-screen-before-switch.patch' 'lightdm-use-login1.patch' - 'xsession') -sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' + 'Xsession') +sha256sums=('43373ed9a48277dd3bf7aa3f042a2674c707bc333c90ce8ffef8bd124116b827' '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' - '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c' + '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b' '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822' - '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac' + 'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { @@ -40,13 +40,14 @@ prepare() { patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch patch -Np0 -i ../lightdm-use-login1.patch - sed -i 's/MOC5 --qt=qt5/MOC5/' configure } build() { cd ${pkgbase}-${pkgver} - ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests} + export MOC4='moc-qt4' + export MOC5='moc-qt5' + ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests} make } @@ -58,17 +59,20 @@ backup=('etc/apparmor.d/lightdm-guest-session' 'etc/lightdm/keys.conf' 'etc/lightdm/lightdm.conf' 'etc/lightdm/users.conf' - 'etc/lightdm/xsession' + 'etc/lightdm/Xsession' 'etc/pam.d/lightdm' 'etc/pam.d/lightdm-autologin' 'etc/pam.d/lightdm-greeter') -install=${pkgbase}.install +install="${pkgbase}.install" cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall + install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession + install -dm 711 "${pkgdir}"/var/log/lightdm rm -rf "${pkgdir}"/etc/init + rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2 # Persistent home install -dm 770 "${pkgdir}"/var/lib/lightdm @@ -76,9 +80,6 @@ install=${pkgbase}.install echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment -# Session wrapper - install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession - # PAM install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin @@ -96,6 +97,7 @@ install=${pkgbase}.install package_liblightdm-qt4() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt4') +options+=('!emptydirs') cd ${pkgbase}-${pkgver} @@ -110,6 +112,7 @@ depends=('lightdm' 'qt4') package_liblightdm-qt5() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt5-base') +options+=('!emptydirs') cd ${pkgbase}-${pkgver} diff --git a/community/lightdm/xsession b/community/lightdm/Xsession index 589205342..589205342 100755..100644 --- a/community/lightdm/xsession +++ b/community/lightdm/Xsession diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch index 42d49536d..7c7b421b6 100755 --- a/community/lightdm/lightdm-default-config.patch +++ b/community/lightdm/lightdm-default-config.patch @@ -1,42 +1,57 @@ -diff -rupN lightdm-1.5.1.orig/data/lightdm.conf lightdm-1.5.1/data/lightdm.conf ---- lightdm-1.5.1.orig/data/lightdm.conf 2013-03-06 03:40:10.000000000 +0100 -+++ lightdm-1.5.1/data/lightdm.conf 2013-03-12 22:59:22.494743200 +0100 -@@ -24,7 +24,7 @@ +--- a/data/lightdm.conf 2013-09-02 17:17:41.167211771 +0200 ++++ b/data/lightdm.conf 2013-09-02 17:20:41.278613565 +0200 +@@ -18,14 +18,14 @@ + # + [LightDM] + #start-default-seat=true +-#greeter-user=lightdm ++greeter-user=lightdm + #minimum-display-number=0 +-#minimum-vt=7 ++minimum-vt=1 + #lock-memory=true #user-authority-in-system-dir=false #guest-account-script=guest-account - #log-directory=/var/log/lightdm +-#log-directory=/var/log/lightdm -#run-directory=/var/run/lightdm ++log-directory=/var/log/lightdm +run-directory=/run/lightdm #cache-directory=/var/cache/lightdm #xsessions-directory=/usr/share/xsessions #remote-sessions-directory=/usr/share/lightdm/remote-sessions -@@ -77,7 +77,7 @@ +@@ -71,7 +71,7 @@ + #xdmcp-manager= + #xdmcp-port=177 + #xdmcp-key= +-#greeter-session=example-gtk-gnome ++greeter-session=lightdm-gtk-greeter + #greeter-hide-users=false + #greeter-allow-guest=true + #greeter-show-manual-login=false +@@ -79,7 +79,7 @@ #user-session=default #allow-guest=true #guest-session=UNIMPLEMENTED -#session-wrapper=lightdm-session -+session-wrapper=/etc/lightdm/xsession ++session-wrapper=/etc/lightdm/Xsession #display-setup-script= #greeter-setup-script= #session-setup-script= -@@ -86,6 +86,7 @@ +@@ -88,6 +88,7 @@ #autologin-user= #autologin-user-timeout=0 #autologin-session=UNIMPLEMENTED +pam-service=lightdm-autologin #exit-on-failure=false - + # -diff -rupN lightdm-1.5.1.orig/data/users.conf lightdm-1.5.1/data/users.conf ---- lightdm-1.5.1.orig/data/users.conf 2013-03-06 03:40:10.000000000 +0100 -+++ lightdm-1.5.1/data/users.conf 2013-03-12 22:54:29.398854700 +0100 -@@ -8,7 +8,7 @@ - # hidden-users = Users that are not shown to the user +--- a/data/users.conf 2013-09-02 17:17:41.167211771 +0200 ++++ b/data/users.conf 2013-09-02 17:21:27.955545717 +0200 +@@ -9,6 +9,6 @@ # hidden-shells = Shells that indicate a user cannot login # --[UserAccounts] + [UserAccounts] -minimum-uid=500 -+[UserList] +minimum-uid=1000 hidden-users=nobody nobody4 noaccess -hidden-shells=/bin/false /usr/sbin/nologin diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch index 89adbdbb7..cc3d5a5fd 100755 --- a/community/lightdm/lightdm-use-login1.patch +++ b/community/lightdm/lightdm-use-login1.patch @@ -386,7 +386,7 @@ === modified file 'tests/src/test-runner.c' --- tests/src/test-runner.c 2013-03-27 00:48:48 +0000 +++ tests/src/test-runner.c 2013-04-14 22:54:54 +0000 -@@ -838,6 +838,101 @@ +@@ -1464,6 +1464,101 @@ accounts_user_set_hidden (AccountsUser * } static void @@ -485,18 +485,9 @@ +} + +static void - load_passwd_file () + load_passwd_file (void) { gchar *path, *data, **lines; -@@ -1474,6 +1569,8 @@ - /* Start D-Bus services */ - if (!g_key_file_get_boolean (config, "test-runner-config", "disable-console-kit", NULL)) - start_console_kit_daemon (); -+ if (!g_key_file_get_boolean (config, "test-runner-config", "disable-login1", NULL)) -+ start_login1_daemon (); - if (!g_key_file_get_boolean (config, "test-runner-config", "disable-accounts-service", NULL)) - start_accounts_service_daemon (); - === added file 'tests/test-no-console-kit-or-login1' --- tests/test-no-console-kit-or-login1 1970-01-01 00:00:00 +0000 diff --git a/community/lightdm/lightdm.install b/community/lightdm/lightdm.install index 7d9d99a26..e560f3e0b 100755 --- a/community/lightdm/lightdm.install +++ b/community/lightdm/lightdm.install @@ -1,18 +1,18 @@ post_install() { - getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm - getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm - passwd -l lightdm > /dev/null - chown -R lightdm:lightdm /var/lib/lightdm > /dev/null - systemd-tmpfiles --create lightdm.conf + getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm + getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm + passwd -l lightdm > /dev/null + systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf + chown lightdm:lightdm /var/log/lightdm > /dev/null } post_upgrade() { - post_install + post_install } post_remove() { - getent passwd lightdm > /dev/null 2>&1 && userdel lightdm - getent group lightdm > /dev/null 2>&1 && groupdel lightdm + getent passwd lightdm > /dev/null 2>&1 && userdel lightdm + getent group lightdm > /dev/null 2>&1 && groupdel lightdm } # vim: ts=2 sw=2 et: diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 87eb5686c..b5466cc93 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96700 2013-09-03 06:44:12Z bpiotrowski $ +# $Id: PKGBUILD 96909 2013-09-07 21:16:35Z eric $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv -pkgver=0.1.4 -pkgrel=4 +pkgver=0.1.5 +pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -13,7 +13,7 @@ depends=('portaudio' 'ffmpeg' 'lcms2' 'libxinerama' 'libquvi' 'mpg123' 'libxv' ' makedepends=('mesa' 'python-docutils') options=(!emptydirs) source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") -md5sums=('7a0ff10fb0c6a2a8c176d40883eb09d4') +md5sums=('693d2b3854b86081382b71465b5cdb3e') build() { unset CFLAGS @@ -41,7 +41,7 @@ package() { cd $pkgname-$pkgver make -j1 DESTDIR="$pkgdir" install - install -d $pkgdir/usr/share/doc/mpv/examples + install -d "$pkgdir"/usr/share/doc/mpv/examples install -m644 etc/{input,example,encoding-example-profiles}.conf \ "$pkgdir"/usr/share/doc/mpv/examples install -m644 DOCS/{encoding.rst,tech-overview.txt} \ diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD index 6c726e662..273b36d6d 100644 --- a/community/portaudio/PKGBUILD +++ b/community/portaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66382 2012-02-24 12:03:33Z lfleischer $ +# $Id: PKGBUILD 96889 2013-09-07 11:45:00Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> @@ -6,12 +6,15 @@ pkgname=portaudio pkgver=19_20111121 -pkgrel=1 +pkgrel=2 pkgdesc='A free, cross-platform, open source, audio I/O library.' arch=('i686' 'x86_64') url='http://www.portaudio.com/' license=('custom') -depends=('jack') +depends=('gcc-libs' 'jack') +conflicts=('portaudio_cpp') +provides=('portaudio_cpp') +replaces=('portaudio_cpp') options=('!libtool') source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz") md5sums=('25c85c1cc5e9e657486cbc299c6c035a') @@ -19,8 +22,8 @@ md5sums=('25c85c1cc5e9e657486cbc299c6c035a') build() { cd "$srcdir/$pkgname" - ./configure --prefix=/usr - make + ./configure --prefix=/usr --enable-cxx + make -j1 } package() { diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD deleted file mode 100644 index be0d476ec..000000000 --- a/community/portaudio_cpp/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 69618 2012-04-20 13:57:47Z lfleischer $ -# Maintainer: Bob Finch <w9ya@qrparci.net> - -pkgname=portaudio_cpp -pkgver=19_20111121 -pkgrel=1 -pkgdesc='PortAudio C++ bindings' -arch=('i686' 'x86_64') -url='http://www.portaudio.com/' -license=('custom') -depends=("portaudio=${pkgver}" 'gcc-libs') -options=('!libtool') -source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz") -md5sums=('25c85c1cc5e9e657486cbc299c6c035a') - -build() { - cd "$srcdir/portaudio" - - ./configure --prefix=/usr --enable-cxx - make -} - -package() { - cd "$srcdir/portaudio/bindings/cpp" - - make DESTDIR="$pkgdir" install - install -Dm0644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" -} diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index e0ce5595d..aac018b62 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 95710 2013-08-15 20:52:28Z arodseth $ +# $Id: PKGBUILD 96894 2013-09-07 11:57:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming environment for creating images, animations and interactions' @@ -15,12 +15,12 @@ options=(!strip) if [ "$CARCH" == "x86_64" ]; then source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('78cbe5d855bc8eeead821513bc345440988d2954b4ef23264edf234a21b41f12' + sha256sums=('8d36995fb1ea0390fe6c3110372316c4b3f86e81af6a34d4e0227f4bb109f707' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('7ae2abf81bbaaa2aad7498a7c85da14a7df48329383c0159d2611b02d306b47f' + sha256sums=('4dc0700fabce04465f1183c87939076655b9b055263cd0c5900d41bb4fa284e3' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index d2ed9985c..234102cdb 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 96836 2013-09-06 09:47:36Z arodseth $ +# $Id: PKGBUILD 96885 2013-09-07 02:44:43Z fyan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686') @@ -13,7 +14,7 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-setuptools' 'python2-setuptools') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('1ed87e7b297f4dfbf9a40176ffeb7faf1ac0b0952d290380f7e632a8fb93694c') +sha256sums=('091d584f7b5d8de60bf6152d9269ec9a29ae7fa34415862b2f092af393233c4e') build() { cd "$srcdir" diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 2790b0a30..6df56a2f9 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 95971 2013-08-19 07:53:19Z tpowa $ +# $Id: PKGBUILD 96875 2013-09-07 00:03:14Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.16 -pkgrel=2 +pkgver=4.2.18 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-lts>=3.0' 'linux-lts<3.1' 'linux-lts-headers>=3.0' 'linux-lts-headers<3.1' "virtualbox-host-dkms>=$pkgver" - "virtualbox-guest-dkms>=$pkgver" - 'expac' - 'sed' - 'bc') + "virtualbox-guest-dkms>=$pkgver") # remember to also adjust the .install files and the package deps below _extramodules=extramodules-3.0-lts diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh index 744f18330..b5c163db9 100755 --- a/community/virtualbox-modules-lts/build.sh +++ b/community/virtualbox-modules-lts/build.sh @@ -1,25 +1,60 @@ #!/bin/bash +# lazyness can be enhanced everyday -set -e - -if (( $# != 1 )); then +usage() { echo "usage: $0 extra" echo " $0 testing" exit 1 -fi +} + +# $1: reference package +update() { + url="https://www.archlinux.org/packages/$1/x86_64/$2/" + curkernel=$(wget -qO- "$url"|sed -nr "s/.*<h2>$2 ([0-9]+)\.([0-9]+).*<\/h2>.*/\1.\2/p") + nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1)) + + echo "** Current kernel: $curkernel" + echo "** Next kernel: $nextkernel" + + sed -ri \ + -e "s/(_?extramodules=).*-(ARCH|lts).*/\1extramodules-$curkernel-\2/i" \ + -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \ + -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \ + PKGBUILD *.install +} + +# $1: repo +# $2: arch +build() { + _pwd=$PWD + cd /var/empty + makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-$arch.pkg.tar.xz -r "$1" + makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-$arch.pkg.tar.xz -r "$1" + cd "$_pwd" + makechrootpkg -n -r "$1" +} -here=$PWD -cd /var/empty -linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -cd "$here" -linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686 +(( $# == 1 )) || usage -cd /var/empty -makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -cd "$here" -makechrootpkg -n -r /var/lib/archbuild/$1-x86_64 +# detect lts case +grep -q linux-lts PKGBUILD && suf=-lts +case $1 in + extra) + update core linux$suf-headers + for arch in i686 x86_64; do + build /var/lib/archbuild/extra-$arch $arch + done + ;; + testing) + update testing linux$suf-headers + for arch in i686 x86_64; do + build /var/lib/archbuild/testing-$arch $arch + done + ;; + *) + usage + ;; +esac # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install index f7526e308..6d27fb834 100644 --- a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install +++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.0-lts' + EXTRAMODULES=extramodules-3.0-lts depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install index cddbffb43..16e32c451 100644 --- a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install +++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.0-lts' + EXTRAMODULES=extramodules-3.0-lts depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 30da87a87..a4b2f8eff 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,21 +1,18 @@ -# $Id: PKGBUILD 96546 2013-08-31 16:05:06Z foutrelis $ +# $Id: PKGBUILD 96877 2013-09-07 00:14:09Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.16 -pkgrel=9 +pkgver=4.2.18 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux>=3.10' 'linux<3.11' 'linux-headers>=3.10' 'linux-headers<3.11' "virtualbox-host-dkms>=$pkgver" - "virtualbox-guest-dkms>=$pkgver" - 'expac' - 'sed' - 'bc') + "virtualbox-guest-dkms>=$pkgver") # remember to also adjust the .install files and the package deps below _extramodules=extramodules-3.10-ARCH diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh index 744f18330..b5c163db9 100755 --- a/community/virtualbox-modules/build.sh +++ b/community/virtualbox-modules/build.sh @@ -1,25 +1,60 @@ #!/bin/bash +# lazyness can be enhanced everyday -set -e - -if (( $# != 1 )); then +usage() { echo "usage: $0 extra" echo " $0 testing" exit 1 -fi +} + +# $1: reference package +update() { + url="https://www.archlinux.org/packages/$1/x86_64/$2/" + curkernel=$(wget -qO- "$url"|sed -nr "s/.*<h2>$2 ([0-9]+)\.([0-9]+).*<\/h2>.*/\1.\2/p") + nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1)) + + echo "** Current kernel: $curkernel" + echo "** Next kernel: $nextkernel" + + sed -ri \ + -e "s/(_?extramodules=).*-(ARCH|lts).*/\1extramodules-$curkernel-\2/i" \ + -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \ + -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \ + PKGBUILD *.install +} + +# $1: repo +# $2: arch +build() { + _pwd=$PWD + cd /var/empty + makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-$arch.pkg.tar.xz -r "$1" + makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-$arch.pkg.tar.xz -r "$1" + cd "$_pwd" + makechrootpkg -n -r "$1" +} -here=$PWD -cd /var/empty -linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -cd "$here" -linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686 +(( $# == 1 )) || usage -cd /var/empty -makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -cd "$here" -makechrootpkg -n -r /var/lib/archbuild/$1-x86_64 +# detect lts case +grep -q linux-lts PKGBUILD && suf=-lts +case $1 in + extra) + update core linux$suf-headers + for arch in i686 x86_64; do + build /var/lib/archbuild/extra-$arch $arch + done + ;; + testing) + update testing linux$suf-headers + for arch in i686 x86_64; do + build /var/lib/archbuild/testing-$arch $arch + done + ;; + *) + usage + ;; +esac # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index ed1762c21..d87c4cf64 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.10-ARCH' + EXTRAMODULES=extramodules-3.10-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 2f7f00d9e..cc590b37c 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.10-ARCH' + EXTRAMODULES=extramodules-3.10-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD index f2bf963fc..873e52767 100644 --- a/community/windowlab/PKGBUILD +++ b/community/windowlab/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69029 2012-04-08 11:16:33Z giovanni $ +# $Id: PKGBUILD 96907 2013-09-07 17:50:24Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: phrakture <aaronmgriffin -at- gmail.dot.com> @@ -6,14 +6,22 @@ pkgname=windowlab pkgver=1.40 -pkgrel=3 +pkgrel=4 pkgdesc="A small and simple window manager." arch=('i686' 'x86_64') url="http://www.nickgravgaard.com/windowlab" license=('GPL') depends=('xorg-server' 'libxft' 'libxext') -source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar") -md5sums=('346f8c187838a446b4cbb2326d035577') +source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar" + 'xft.patch') +md5sums=('7fcf770b3da932ac7d252572974b0d54' + '51e5a2d48c6d5837786f2571ccc1ce72') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ../xft.patch +} build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/windowlab/xft.patch b/community/windowlab/xft.patch new file mode 100644 index 000000000..8fb1eba57 --- /dev/null +++ b/community/windowlab/xft.patch @@ -0,0 +1,14 @@ +--- aaa/Makefile 2009-11-06 10:04:45.000000000 +1300 ++++ bbb/Makefile 2012-08-04 20:33:35.197529653 +1200 +@@ -35,11 +35,11 @@ + # Uncomment to add freetype support (requires XFree86 4.0.2 or later) + # This needs -lXext above, even if you have disabled shape support +-#DEFINES += -DXFT +-#EXTRA_INC += `pkg-config --cflags xft` +-#EXTRA_LIBS += `pkg-config --libs xft` ++DEFINES += -DXFT ++EXTRA_INC += `pkg-config --cflags xft` ++EXTRA_LIBS += `pkg-config --libs xft` + + # Uncomment for debugging info (abandon all hope, ye who enter here) + #DEFINES += -DDEBUG diff --git a/community/xsensors/PKGBUILD b/community/xsensors/PKGBUILD index 16a329b5e..33b613a55 100644 --- a/community/xsensors/PKGBUILD +++ b/community/xsensors/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59264 2011-11-22 07:31:16Z lcarlier $ +# $Id: PKGBUILD 96904 2013-09-07 16:53:18Z bgyorgy $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ray Rashif <schivmeister@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -6,24 +6,27 @@ pkgname=xsensors pkgver=0.70 -pkgrel=3 +pkgrel=5 pkgdesc="X11 interface to lm_sensors" arch=('i686' 'x86_64') url="http://www.linuxhardware.org/xsensors/" license=('GPL') depends=('gtk2' 'lm_sensors') +makedepends=('imagemagick' 'gendesk') changelog=$pkgname.changelog source=(http://www.linuxhardware.org/xsensors/$pkgname-$pkgver.tar.gz remove-unused-variables.patch - replace-deprecated-gtk.patch - xsensors.desktop) + replace-deprecated-gtk.patch) md5sums=('4f8fb83cfd03c0cc34967a73c6021531' '8ca558b7f7e4a5f83f63498668c4ad8f' - 'd9ee6799d45adc7c62273f32085bec5f' - 'fe1369d2b61eed1a25002e2247617357') + 'd9ee6799d45adc7c62273f32085bec5f') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "$srcdir" + gendesk -n --pkgname "$pkgname" --genericname="Hardware Monitor" \ + --comment="View hardware health" --categories="System;Monitor;GTK" + + cd "$pkgname-$pkgver" # patches from debian patch -Np1 -i ${srcdir}/remove-unused-variables.patch @@ -37,6 +40,9 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR="${pkgdir}" install - install -D ${srcdir}/xsensors.desktop \ - ${pkgdir}/usr/share/applications/xsensors.desktop + + convert "$pkgdir/usr/share/pixmaps/xsensors/default.xpm" \ + "$pkgdir/usr/share/pixmaps/xsensors.png" + install -Dm644 "$srcdir/xsensors.desktop" \ + "$pkgdir/usr/share/applications/xsensors.desktop" } diff --git a/community/xsensors/xsensors.desktop b/community/xsensors/xsensors.desktop deleted file mode 100644 index a516b5437..000000000 --- a/community/xsensors/xsensors.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=XSensors -GenericName=Hardware Monitor -Comment=View hardware health -Icon=/usr/share/pixmaps/xsensors/default.xpm -Exec=/usr/bin/xsensors -Terminal=false -Categories=System; |