diff options
Diffstat (limited to 'community')
475 files changed, 15024 insertions, 15630 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index fa23ed236..6325cb3f7 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94012 2013-07-13 12:30:26Z svenstaro $ +# $Id: PKGBUILD 96786 2013-09-05 07:34:19Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad -pkgver=a13 -_pkgver=0.0.13-alpha -pkgrel=5 +pkgver=a14 +_pkgver=0.0.14-alpha +pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" @@ -13,15 +13,12 @@ license=('GPL2' 'CCPL') depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -md5sums=('3075c982c4af41a3586b6b6ef637d2c4') +md5sums=('5bbaffa02b6e9082cbd5142d43f9b700') build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces" - sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - - unset CPPFLAGS + unset CPPFLAGS # for le spidermonkey ./update-workspaces.sh \ --with-system-enet \ diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD index 4a40a0267..1ebb46e0e 100644 --- a/community/9base/PKGBUILD +++ b/community/9base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68390 2012-03-23 21:00:56Z cbrannon $ +# $Id: PKGBUILD 97894 2013-09-30 20:21:53Z bpiotrowski $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=9base pkgver=6 -pkgrel=4 +pkgrel=5 pkgdesc="Port of various original Plan9 tools to unix" url="http://tools.suckless.org/9base" source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz 9 plan9.sh) @@ -16,9 +16,8 @@ provides=('plan9') arch=('i686' 'x86_64' 'mips64el') license=('custom') -build() -{ - cd "$srcdir/$pkgname-$pkgver" +build() { + cd $pkgname-$pkgver case $CARCH in i686) sed -i 's#^OBJTYPE\s.*$#OBJTYPE = 386#' config.mk ;; @@ -36,7 +35,7 @@ build() } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -m755 ../9 "$pkgdir/opt/plan9/bin/" install -D -m755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh" diff --git a/community/abe/PKGBUILD b/community/abe/PKGBUILD deleted file mode 100644 index 82568c345..000000000 --- a/community/abe/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: jsteel <mail at jsteel dot org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=abe -pkgver=1.1 -pkgrel=9 -pkgdesc="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" -arch=('i686' 'x86_64' 'mips64el') -url="http://abe.sourceforge.net" -license=('GPL') -depends=('sdl_mixer') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname.patch - $pkgname.desktop) -md5sums=('5537920e1746708e1a631d84d3500f5c' - '74802a45e21b59d3e3d34f35ade252a4' - '6ff678e781290bff780da154a32b9767') - -build() { - cd "$srcdir"/$pkgname-$pkgver - - patch -Np1 -i "$srcdir"/$pkgname.patch - - ./configure --prefix=/usr --host=$CHOST - - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop - install -dm755 "$pkgdir"/usr/share/$pkgname/images - - cp -r images/ maps/ sounds/ "$pkgdir"/usr/share/$pkgname/ - - cd "$pkgdir"/usr/share/$pkgname/images - tar -xf "$srcdir"/$pkgname-$pkgver/images/images.tar abe.bmp - chown root:root abe.bmp -} diff --git a/community/abe/abe.desktop b/community/abe/abe.desktop deleted file mode 100644 index 8c452e7af..000000000 --- a/community/abe/abe.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Abe -GenericName=Platform Game -Comment=Retro Platform Game -Icon=/usr/share/abe/images/abe.bmp -Exec=abe -Categories=Game; diff --git a/community/abe/abe.patch b/community/abe/abe.patch deleted file mode 100644 index 33b0b1af0..000000000 --- a/community/abe/abe.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur abe-1.1.orig/src/Directories.h abe-1.1/src/Directories.h ---- abe-1.1.orig/src/Directories.h 2012-08-25 16:43:45.194974618 +0100 -+++ abe-1.1/src/Directories.h 2012-08-25 16:48:07.489030577 +0100 -@@ -27,7 +27,7 @@ - - // BASE_DIR has not " arround it. - #ifndef BASE_DIR --#define BASE_DIR . -+#define BASE_DIR /usr/share/abe - #endif - - #define IMAGES_DIR "images" -diff -ur abe-1.1.orig/src/Menu.c abe-1.1/src/Menu.c ---- abe-1.1.orig/src/Menu.c 2012-08-25 16:43:45.198307908 +0100 -+++ abe-1.1/src/Menu.c 2012-08-25 16:45:00.319469631 +0100 -@@ -116,7 +116,7 @@ - if(n == SOUND_ENABLED || n == MUSIC_ENABLED) - return sound_loaded; - else -- return 0; -+ return 1; - } - - void diff --git a/community/account-plugins/PKGBUILD b/community/account-plugins/PKGBUILD deleted file mode 100644 index f49f30d5d..000000000 --- a/community/account-plugins/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 79484 2012-11-06 04:10:50Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=account-plugins -pkgver=0.9 -pkgrel=1 -pkgdesc="Account configuration plugins for credentials preferences" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/online-accounts-account-plugins" -license=('GPL') -depends=('credentials-preferences' 'signon-keyring-extension' 'signon-plugin-oauth2') -makedepends=('gobject-introspection' 'vala' 'intltool') -optdepends=('python-gobject: for account-console tool') -options=('!libtool') -install=$pkgname.install -source=(https://launchpad.net/online-accounts-account-plugins/12.10/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('58deed9e3305877bb4db426a51451ec0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community/account-plugins/account-plugins.install b/community/account-plugins/account-plugins.install deleted file mode 100644 index 2c455e952..000000000 --- a/community/account-plugins/account-plugins.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 0b3ff7969..4ae84bafd 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $ +# $Id: PKGBUILD 97250 2013-09-15 20:35:17Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.19 +pkgver=2.0.20 pkgrel=1 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta 'acpid.service' 'anything' 'handler.sh') -md5sums=('0b07a982e3e28cf37645f2c6269af72e' +md5sums=('1b740e6419cf45aaeb2bd78d589f27f9' 'd11700eb136e0489835ddaf977a7905b' '79cc7a9dceacdeffd51f070c2ba5f023' '2d37b98d6e74bab815604b8b48c6cfd4' diff --git a/community/adesklets/PKGBUILD b/community/adesklets/PKGBUILD deleted file mode 100644 index 7f7e84754..000000000 --- a/community/adesklets/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 59648 2011-11-29 01:35:36Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Fubar - -pkgname=adesklets -pkgver=0.6.1 -pkgrel=12 -pkgdesc="An imlib2-based system to have interactive 'desklets'." -arch=('i686' 'x86_64' 'mips64el') -url="http://adesklets.sourceforge.net/" -license=('GPL2') -depends=('imlib2' 'fontconfig' 'python2' 'perl' 'ttf-bitstream-vera' 'libx11') -install=$pkgname.install -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - fontconfig-2.4.patch posix_signal.patch) -md5sums=('cd390c9398449c5566033e2e4792bccb' - '0374aec97670c90713fcabc2710e2160' - 'd9ac15cc92f833f2446218e487e6c607') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i "${srcdir}/posix_signal.patch" - - #patch for fontconfig => 2.4 - patch -Np0 -i "${srcdir}/fontconfig-2.4.patch" - - # Fix linking problems. - sed -ri 's/^adesklets_LDFLAGS(.+) \\$/adesklets_LDADD\1 -lm \\/' src/Makefile.am - - autoreconf - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - - #makefile Fix - sed -i 's/\/bin\/sh//' doc/Makefile - - #python2 fix - for file in checkin installer submit; do - sed -i 's_/usr/bin/env python_/usr/bin/env python2_' utils/${pkgname}_${file} - done - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor install - - #remove the font stuff - rm -f "${pkgdir}"/usr/share/adesklets/{FONT_LICENSE,Vera.ttf} - - find "${pkgdir}" -name '.packlist' -exec rm '{}' \; - find "${pkgdir}" -name 'perllocal.pod' -exec rm '{}' \; -} diff --git a/community/adesklets/adesklets.install b/community/adesklets/adesklets.install deleted file mode 100644 index cae17e499..000000000 --- a/community/adesklets/adesklets.install +++ /dev/null @@ -1,31 +0,0 @@ -infodir=/usr/share/info -filelist=(adesklets.info adesklets_fr.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done - - getent group adesklets > /dev/null || usr/sbin/groupadd -g 107 adesklets -cat << EOF - -==> To be able to save configs of adesklets -==> add your user to the adesklets group: -==> # gpasswd -a USERNAME adesklets - -EOF -} - -post_upgrade() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done - - usr/sbin/groupdel adesklets &>/dev/null -} diff --git a/community/adesklets/fontconfig-2.4.patch b/community/adesklets/fontconfig-2.4.patch deleted file mode 100644 index e7a1ad5ca..000000000 --- a/community/adesklets/fontconfig-2.4.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -1,4 +1,4 @@ --dnl Initialize autoconf and automake -+nl Initialize autoconf and automake - AC_INIT - AC_CONFIG_SRCDIR(src/main.c) - AC_PREREQ(2.52) -@@ -428,7 +428,18 @@ AC_TRY_LINK( - #include <fontconfig/fontconfig.h> - , FcInit(), - AC_MSG_RESULT([yes]) --AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]), -+AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]) -+ -+AC_MSG_CHECKING([For fontconfig FcFini()]) -+AC_TRY_LINK( -+#include <fontconfig/fontconfig.h> -+, FcFini(), -+AC_MSG_RESULT([yes]) -+AC_DEFINE(HAVE_FONTCONFIG_FCFINI,1,[Define to 1 if FcFini() call exists]) -+, -+AC_MSG_RESULT([no])) -+ -+, - AC_MSG_RESULT([no]) - FONTCONFIG_LIBS= - FONTCONFIG_CFLAGS= ---- src/xwindow.c -+++ src/xwindow.c -@@ -123,9 +123,17 @@ - if ((strlen((char*)file)>4) && - (strstr((char*)file+strlen((char*)file)-4,".ttf"))) - imlib_add_path_to_font_path(dirname((char*)file)); -- FcFontSetDestroy(fs); -- FcObjectSetDestroy(os); - } -+#ifdef HAVE_FONTCONFIG_FCFINI -+ FcFini(); -+#else -+ /* On FontConfig >= 2.4, this causes a segfault, probably due to the new -+ caching mechanism: we don't have to care, since FcFini() always exists, -+ and does the dirty dessalocation job just fine. -+ */ -+ if (fs) FcFontSetDestroy(fs); -+ FcObjectSetDestroy(os); -+#endif - } - #endif - imlib_add_path_to_font_path("."); diff --git a/community/adesklets/posix_signal.patch b/community/adesklets/posix_signal.patch deleted file mode 100644 index 90b3e8a12..000000000 --- a/community/adesklets/posix_signal.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 92e686badce5c549699a30e82458a42dbcd99183 Mon Sep 17 00:00:00 2001 -From: Sylvain <syfou@users.sourceforge.net> -Date: Wed, 2 May 2007 13:23:18 -0400 -Subject: [PATCH] Definitive fix for the signal module importation problem - ...from posix_signal on some amd64 systems. Many thanks to Jason - Pontious for his support and patience. - ---- - scripting/python/posix_signal.c | 34 ++++++++++++++++++---------------- - 1 files changed, 18 insertions(+), 16 deletions(-) - -diff --git a/scripting/python/posix_signal.c b/scripting/python/posix_signal.c -index 620248f..7c5ac25 100644 ---- a/scripting/python/posix_signal.c -+++ b/scripting/python/posix_signal.c -@@ -1,16 +1,17 @@ - /*--- posix_signal.c ----------------------------------------------------------- --This is nothing but a forward port from older python code by Lance Ellinghaus, --Guido van Rossum & al., reformatted and put back together by Sylvain Fourmanoit <syfou@users.sourceforge.net> --for recent (2.2.0 final and newer) python implementations. -- --The ability to temporarily delay signals delivery is a very usefull feature - --not all C functions are reentrant (in fact, only a few need to be 'safe' --according to the POSIX 1003.1-2003 list), so being able to create critical --code sections is a must. Although I am convinced Python's developpers --had good reasons, I do not know myself why 'sigprocmask' and associated --functions support was dropped from the signal module on systems which --implemented them... Since I needed them in my blissful ignorance, --here they are, alive and kicking. :-) -+This is nothing but a forward port from older python code by Lance -+Ellinghaus, Guido van Rossum & al., reformatted and put back together -+by Sylvain Fourmanoit <syfou@users.sourceforge.net> for recent (2.2.0 -+final and newer) python implementations. -+ -+The ability to temporarily delay signals delivery is a very usefull -+feature - not all C functions are reentrant (in fact, only a few need -+to be 'safe' according to the POSIX 1003.1-2003 list), so being able -+to create critical code sections is a must. Although I am convinced -+Python's developpers had good reasons, I do not know myself why -+'sigprocmask' and associated functions support was dropped from the -+signal module on systems which implemented them... Since I needed them -+in my blissful ignorance, here they are, alive and kicking. :-) - - ------------------------------------------------------------------------------*/ - #include <Python.h> -@@ -214,8 +215,9 @@ PyMODINIT_FUNC - initposix_signal(void) - { - const char * KEYS [] = { "__doc__", "__name__" , NULL}; -- int i, pos=0; -+ int i; - char * key_str, * doc_str , * new_str; -+ Py_ssize_t pos = 0; - PyObject * m, * mDoc, *d, - * pName, * pModule, * pDict, - * key, * value, *x; -@@ -236,7 +238,6 @@ initposix_signal(void) - /* The chunk of code below roughly perfoms python equivalent of: - 'from signal import *' inside what would be a pure python posix_signal - module ... */ -- pName=PyString_FromString("signal"); - if ((pModule=PyImport_Import((pName=PyString_FromString("signal"))))) { - pDict=PyModule_GetDict(pModule); - while (PyDict_Next(pDict, &pos, &key, &value)) -@@ -246,10 +247,11 @@ initposix_signal(void) - for(i=0;KEYS[i];++i) - if (strncmp(key_str,KEYS[i],strlen(KEYS[i]))==0) - break; -- if (!KEYS[i]) -+ if (!KEYS[i]) { - /* This needs python 2.2 and up */ -+ Py_INCREF(value); - PyModule_AddObject(m,key_str,value); -- else { -+ } else { - if (i==0) { - /* Append signal module documentation */ - if ((mDoc=PyDict_GetItemString(d,KEYS[0]))) { --- -1.6.5.GIT - diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index b9f706c40..9852e6f64 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 96598 2013-09-02 08:35:43Z alucryd $ +# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: kozec <kozec@kozec.com> # Contributor: Limao Luo <luolimao+AUR@gmail.com> pkgname=aegisub pkgver=3.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64' 'mips64el') url="http://www.aegisub.org" license=('GPL' 'BSD') -depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') +depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') makedepends=('mesa') install="${pkgname}.install" source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" @@ -27,9 +27,7 @@ prepare() { build() { cd ${pkgname}/${pkgname} - export ACLOCAL=aclocal - export AUTOMAKE=automake - ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' + ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' make } diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD index 5b24b552b..bfac471f6 100644 --- a/community/aircrack-ng/PKGBUILD +++ b/community/aircrack-ng/PKGBUILD @@ -1,91 +1,30 @@ -# $Id: PKGBUILD 92023 2013-05-30 23:34:33Z seblu $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 96850 2013-09-06 16:26:13Z bgyorgy $ +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: ice-man <icemanf@gmail.com> -pkgbase=aircrack-ng -pkgname=(aircrack-ng aircrack-ng-scripts) +pkgname=aircrack-ng pkgver=1.1 -pkgrel=9 +pkgrel=10 +pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols" arch=('i686' 'x86_64' 'mips64el') url="http://www.aircrack-ng.org" license=('GPL2') -source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz") +depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools') +conflicts=('aircrack-ng-scripts') +replaces=('aircrack-ng-scripts') +provides=('aircrack-ng-scripts') +source=("http://download.aircrack-ng.org/$pkgname-$pkgver.tar.gz") md5sums=('f7a24ed8fad122c4187d06bfd6f998b4') -depends=('openssl' 'sqlite' 'iw' 'net-tools') build() { - cd ${srcdir}/${pkgbase}-${pkgver} - make SQLITE=true unstable=true + cd "$srcdir/$pkgname-$pkgver" + make SQLITE=true UNSTABLE=true } -package_aircrack-ng() { - pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols" - - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} SQLITE=true unstable=true bindir=/usr/bin \ - mandir=/usr/share/man/man1 sbindir=/usr/bin install - - ### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ### - # Scripts - rm ${pkgdir}/usr/bin/airdriver-ng - rm ${pkgdir}/usr/bin/airodump-ng-oui-update - # Man pages - mkdir -p ${srcdir}/tmp/ - mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/ -} - -package_aircrack-ng-scripts() { - pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols" - depends=('python2' 'graphviz' 'python2-pylorcon') - - cd ${srcdir}/aircrack-ng-${pkgver}/scripts - mkdir -p ${pkgdir}/usr/share/man/man1/ \ - ${pkgdir}/usr/bin - - ### AIRDRIVER-NG ### - # Script - install -Dm644 airdriver-ng ${pkgdir}/usr/bin/ - # Libs - mkdir -p ${pkgdir}/usr/lib/airdrop-ng/ - install -Dm644 airdrop-ng/lib/{colorize.py,libDumpParse.py,libOuiParse.py} \ - ${pkgdir}/usr/lib/airdrop-ng/ - # Man page - mv ${srcdir}/tmp/airdriver-ng.1 ${pkgdir}/usr/share/man/man1/ - - ### AIRDROP-NG ### - # Man page - install -Dm644 airdrop-ng/docs/airdrop-ng.1 ${pkgdir}/usr/share/man/man1/ - # Script - sed s/python/python2/ -i airdrop-ng/airdrop-ng.py - install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/bin/airdrop-ng - chmod +x ${pkgdir}/usr/bin/airdrop-ng - - ### AIRGRAPH-NG ### - # Libs - mkdir -p ${pkgdir}/usr/lib/airgraph-ng/ - install -Dm644 airgraph-ng/lib/lib_Airgraphviz.py \ - ${pkgdir}/usr/lib/airgraph-ng/ - # Man page - install -Dm644 airgraph-ng/man/airgraph-ng.1 ${pkgdir}/usr/share/man/man1/ - # Script - sed s/python/python2/ -i airgraph-ng/airgraph-ng.py - sed s_/usr/local/bin/lib_/usr/lib_ -i airgraph-ng/airgraph-ng.py - install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/bin/airgraph-ng - chmod +x ${pkgdir}/usr/bin/airgraph-ng - - ### DUMP-JOIN.PY ### - # Man page - install -Dm644 airgraph-ng/man/dump-join.1 ${pkgdir}/usr/share/man/man1/ - # Script - sed s/python/python2/ -i airgraph-ng/dump-join.py - install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/bin/dump-join.py - chmod +x ${pkgdir}/usr/bin/dump-join.py - - ### AIRODUMP-NG-OUI-UPDATE ### - # Script - install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/bin/ - chmod +x ${pkgdir}/usr/bin/airodump-ng-oui-update - +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" SQLITE=true UNSTABLE=true \ + bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1 install } diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD index e47861ba1..f9d20b165 100644 --- a/community/almanah/PKGBUILD +++ b/community/almanah/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90849 2013-05-14 21:40:34Z andrea $ +# $Id: PKGBUILD 98185 2013-10-07 12:08:18Z jgc $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=almanah pkgver=0.10.1 -pkgrel=3 +pkgrel=4 pkgdesc="Small GTK+ application to allow you to keep a diary of your life" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Almanah_Diary" diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 60e5462fd..b6ccfc609 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $ +# $Id: PKGBUILD 97034 2013-09-11 06:15:17Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.17.1 +pkgver=1.18.0 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) -sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0') +sha256sums=('431aa6a1ba1cf992d5ac68c2822854a6c6991f03d025608311b5d99227fc0ab7') build() { cd $pkgname-$pkgver diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 6f27a9088..6a8a24dac 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 94856 2013-07-31 10:33:01Z mtorromeo $ +# $Id: PKGBUILD 96792 2013-09-05 09:31:14Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit -pkgver=2.2.3 -pkgrel=4 +pkgver=2.3.2 +pkgrel=1 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' -url=http://people.redhat.com/sgrubb/$pkgname +url="http://people.redhat.com/sgrubb/$pkgname" arch=(i686 x86_64 mips64el) depends=(krb5 libcap-ng) makedepends=(libldap swig linux-headers python2) @@ -15,7 +15,7 @@ license=(GPL) options=(!libtool emptydirs) backup=( etc/libaudit.conf - etc/audit/audit.rules + etc/audit/rules.d/audit.rules etc/audit/auditd.conf etc/audisp/audispd.conf etc/audisp/audisp-remote.conf @@ -25,14 +25,11 @@ backup=( etc/audisp/plugins.d/au-remote.conf etc/audisp/plugins.d/syslog.conf ) -source=( - $url/$pkgname-$pkgver.tar.gz - python2.patch -) +source=("$url/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i "$srcdir/python2.patch" + export PYTHON=/usr/bin/python2 ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -51,7 +48,7 @@ package() { cd "$pkgdir" install -d var/log/audit - rm -rf etc/rc.d etc/sysconfig + rm -rf etc/rc.d etc/sysconfig usr/lib/audit sed -ri 's|/sbin|/usr/bin|' \ etc/audit/*.conf \ @@ -61,5 +58,4 @@ package() { chmod 644 usr/lib/systemd/system/auditd.service } -sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02' - '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4') +sha256sums=('8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29') diff --git a/community/audit/python2.patch b/community/audit/python2.patch deleted file mode 100644 index 87286fc5b..000000000 --- a/community/audit/python2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2013-01-16 09:19:32.475800853 +0100 -+++ configure 2013-01-16 09:20:45.764146581 +0100 -@@ -13076,7 +13076,7 @@ - - # Find any Python interpreter. - if test -z "$PYTHON"; then -- for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 -+ for ac_prog in python2 - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index d36c8b1c2..b2c4ecb20 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 92157 2013-06-01 20:12:04Z jelle $ +# $Id: PKGBUILD 97484 2013-09-21 11:43:49Z jelle $ # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=avrdude -pkgver=5.11.1 -pkgrel=4 +pkgver=6.0.1 +pkgrel=1 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/avrdude/" license=('GPL') depends=('libusbx' 'readline' 'libftdi') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3a43e288cb32916703b6945e3f260df9' - '0c23b005d4090aef4e081476aabc1958') +md5sums=('346ec2e46393a54ac152b95abf1d9850' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index a55e1c214..a0d0f2b83 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87494 2013-04-01 17:59:30Z seblu $ +# $Id: PKGBUILD 97620 2013-09-25 19:19:38Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -6,7 +6,7 @@ pkgname=awesome pkgver=3.5.1 -pkgrel=1 +pkgrel=3 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64' 'mips64el') url='http://awesome.naquadah.org/' @@ -42,10 +42,9 @@ optdepends=( 'vicious: widgets for the Awesome window manager' ) provides=('notification-daemon') -source=("$url/download/$pkgname-$pkgver.tar.xz" - "$pkgname.desktop") -md5sums=('f528f66ddcdb07f24e6f494837371702' - '0fdbeec43d211c6750041d7e37611a6a') +backup=('etc/xdg/awesome/rc.lua') +source=("$url/download/$pkgname-$pkgver.tar.xz") +md5sums=('f528f66ddcdb07f24e6f494837371702') build() { cd $pkgname-$pkgver @@ -61,7 +60,7 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # install desktop file so you can start awesome from your login manager - install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" + install -Dm644 awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" } # vim:set ts=2 sw=2 et: diff --git a/community/awesome/awesome.desktop b/community/awesome/awesome.desktop deleted file mode 100644 index 453399c6e..000000000 --- a/community/awesome/awesome.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Awesome -Comment=Highly configurable framework window manager -Type=XSession -Exec=awesome -TryExec=awesome diff --git a/community/bchunk/PKGBUILD b/community/bchunk/PKGBUILD index 1cbafecce..95f327702 100644 --- a/community/bchunk/PKGBUILD +++ b/community/bchunk/PKGBUILD @@ -1,30 +1,29 @@ +# Maintainer: Xyne <ca dot archlinux at xyne, backwards> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Markus Meissner <markus@meissna.de> pkgname=bchunk pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="A Tool to Convert *.raw *.bin files to an ISO file" -url="http://hes.iki.fi/bchunk/" +url="http://he.fi/bchunk/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc') -source=(http://hes.iki.fi/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://he.fi/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('6a613da3f34f9a303f202d2e9731d231') build() { - cd ${srcdir}/${pkgname}-${pkgver} - + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/share/man/man1 - - make PREFIX=${pkgdir}/usr MAN_DIR=${pkgdir}/usr/share/man install - chown root.root ${pkgdir}/usr/share/man/man1/bchunk.1 + cd "$srcdir/$pkgname-$pkgver" + install -dm755 "$pkgdir"/usr/{bin,share/man/man1} + make PREFIX="$pkgdir/usr" MAN_DIR="$pkgdir/usr/share/man" install + chown root:root "$pkgdir/usr/share/man/man1/bchunk.1" } + # vim: ts=2 sw=2 et ft=sh diff --git a/community/bibutils/PKGBUILD b/community/bibutils/PKGBUILD deleted file mode 100644 index db8dbf2bf..000000000 --- a/community/bibutils/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) us> - -pkgname=bibutils -_basename=bibutils -pkgver=5.0 -pkgrel=1 -pkgdesc="Bibliography conversion tools" -arch=("i686" "x86_64" "mips64el") -url="http://sourceforge.net/p/bibutils/home/Bibutils/" -license=('GPL2') -makedepends=('tcsh') -depends=(glibc) -source=("http://downloads.sourceforge.net/project/${_basename}/${_basename}_${pkgver}_src.tgz") -md5sums=('c4838bf0d8ae48e4df49ae395bf643d0') - -build() { - cd ${_basename}_$pkgver - ./configure --dynamic --install-dir "$pkgdir/usr/bin" --install-lib "$pkgdir/usr/lib" - make -} - -package() { - cd ${_basename}_$pkgver - mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib" - make install -} diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index 1b292d09a..2917f33a7 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94599 2013-07-27 17:55:53Z seblu $ +# $Id: PKGBUILD 97454 2013-09-20 14:54:34Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.3-P2 +_pkgver=9.9.4 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='The ISC BIND nameserver' @@ -18,7 +18,7 @@ provides=('dns-server') backup=('etc/logrotate.d/named' 'etc/named.conf') install=$pkgname.install -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc} 'root.hint::http://www.internic.net/zones/named.root' 'tmpfiles.d' 'named.conf' @@ -26,7 +26,8 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('a0235692c488b3fadf54a15858b1f13ae2ab6979' +sha1sums=('d7be390e6c2546f37a7280e1975e1cd134565f62' + 'SKIP' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' @@ -72,7 +73,7 @@ package() { install -D -m600 named.logrotate "$pkgdir/etc/logrotate.d/named" install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf" - install -d -m750 -o 0 -g 40 "$pkgdir/var/named" + install -d -m770 -o 0 -g 40 "$pkgdir/var/named" install -m640 -o 0 -g 40 root.hint "$pkgdir/var/named" install -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named" install -m640 -o 0 -g 40 localhost.zone "$pkgdir/var/named" diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 665dd1db8..3a0166376 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 94013 2013-07-13 12:30:36Z svenstaro $ +# $Id: PKGBUILD 97296 2013-09-16 16:48:10Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.5 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('c6003a6af947e6978b13ab55d7bb7ec97aedc55022fb4924d08792a8d4f83a35') +sha256sums=('84543f10de5e82ce6e88dd5a501db37c6327edf79a2a04f29199c24843e71f63') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" @@ -26,7 +26,7 @@ build() { package_bitcoin-qt() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT" + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt" depends=(boost-libs qt4 miniupnpc qrencode) install=bitcoin-qt.install diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index e729f3b0c..15bada28a 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 94869 2013-08-01 06:54:42Z bpiotrowski $ +# $Id: PKGBUILD 97316 2013-09-17 09:33:55Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=1.0.3 +pkgver=1.1.2 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') @@ -15,12 +15,7 @@ depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp' 'libcddb' 'libmusic makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") -md5sums=('fd942d25127a7936efaf1fe887d66189') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' replaygain/ffmpeginput.cpp -} +md5sums=('628991865a505284a7ce56e117cd36cc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index 35a4a7b7e..a61a9823a 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94187 2013-07-16 14:49:37Z giovanni $ +# $Id: PKGBUILD 98050 2013-10-04 16:09:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.11 -pkgrel=1 +pkgver=1.4.12 +pkgrel=2 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') url="http://pcsclite.alioth.debian.org/ccid.html" @@ -12,15 +12,16 @@ license=('LGPL' 'GPL') depends=('pcsclite' 'libusbx') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/file/3920/${pkgname}-${pkgver}.tar.bz2") -md5sums=('20e3d6f045c53707a597cbacb86b6c5b') +source=("https://alioth.debian.org/frs/download.php/file/3937/${pkgname}-${pkgver}.tar.bz2") +md5sums=('54a314b60b60a9549febc75b6dc516d5') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ - --enable-twinserial + --enable-twinserial \ + --enable-serialconfdir=/etc/reader.conf.d make } @@ -28,4 +29,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + # move the configuration file in /etc and create a symbolic link + mv "${pkgdir}/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist" "${pkgdir}/etc/libccid_Info.plist" + ln -s /etc/libccid_Info.plist ${pkgdir}/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist } diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index cddb91ecf..f3dd9657d 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 94015 2013-07-13 12:31:02Z svenstaro $ +# $Id: PKGBUILD 98184 2013-10-07 12:07:00Z jgc $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.13 -pkgrel=2 +pkgver=0.9.2 +pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' -license=('GPL3') -depends=('boost-libs' 'pcre' 'curl' 'libquvi') -makedepends=('boost' 'chrpath') -source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz") -md5sums=('654892be303c2738dd078dbe6c78595d') +license=('AGPL3') +depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm') +makedepends=('boost') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") +md5sums=('b21f2ed68242901dc0439132a4ea6629') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr boost_cv_rpath_link_ldflag="-L/usr/lib" make } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - chrpath --delete "$pkgdir"/usr/bin/cclive } diff --git a/community/cdck/PKGBUILD b/community/cdck/PKGBUILD deleted file mode 100644 index f5689fafd..000000000 --- a/community/cdck/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 65681 2012-02-21 21:16:27Z cbrannon $ -# Maintainer: Chris Brannon <chris@the-brannons.com> -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> -# Previous Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> -# Contributor: Slash <demodevil5[at]yahoo[dot]com> - -pkgname=cdck -pkgver=0.7.0 -pkgrel=4 -pkgdesc="A simple program to verify CD/DVD quality" -arch=('i686' 'x86_64' 'mips64el') -url="http://swaj.net/unix/" -license=('GPL') -depends=(gcc-libs) -makedepends=('perl') -options=('!libtool') -source=(http://swaj.net/unix/cdck/${pkgname}-${pkgver}.tar.gz) -md5sums=('15029d54b99f2e5cf8aae28077669d3f') - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST - PATH="/usr/bin/core_perl:$PATH" make -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install -} diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index 0f2ac3b0b..dca30042c 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 80665 2012-11-28 22:07:33Z plewis $ +# $Id: PKGBUILD 96780 2013-09-04 22:10:06Z andrea $ # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl> pkgname=choqok -pkgver=1.3 -pkgrel=4 +pkgver=1.4 +pkgrel=1 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url='http://choqok.gnufolks.org/' license=('GPL') @@ -15,12 +15,14 @@ depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') makedepends=('cmake' 'automoc4') optdepends=('kdebase-konqueror: proxy support') install="${pkgname}.install" -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('87eea4f2c23467fb021e3e6b794eb37d') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('2efe34ed903b448a21d9233d8033dbdb') -build() { - cd "${srcdir}" +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -29,9 +31,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install - - # This is already installed by kdepimlibs >= 4.9.80 - rm "${pkgdir}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake } diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 25c9a698d..3b59c0a72 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,44 +1,28 @@ -# $Id: PKGBUILD 95589 2013-08-14 21:07:27Z bgyorgy $ +# $Id: PKGBUILD 98187 2013-10-07 12:08:21Z jgc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=1.8.2 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64' 'mips64el') -depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet') +depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet' 'cinnamon-settings-daemon') optdepends=('gnome-color-manager: for color management tasks') makedepends=('intltool' 'gnome-common') url="https://github.com/linuxmint/cinnamon-control-center" install=cinnamon-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" - "gnomerrlabeler.patch" - "idle-delay.patch" - "remove_obex.patch") -sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f' - 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db' - '98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31' - '3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") +sha256sums=('2a8ea5c17e515afd47d0f76127dbc5172281ef2b6aaf8a5c800ff7079d6d80f2') build() { cd $pkgname-$pkgver - # Build fix for GNOME 3.8 - patch -Np1 -i "$srcdir/gnomerrlabeler.patch" - - # Runtime fix for GNOME 3.8 - patch -Np1 -i "$srcdir/idle-delay.patch" - - # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8 - patch -Np1 -i "$srcdir/remove_obex.patch" - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-systemd \ diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch deleted file mode 100644 index 7160bc788..000000000 --- a/community/cinnamon-control-center/gnomerrlabeler.patch +++ /dev/null @@ -1,766 +0,0 @@ -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> - #include <libgnome-desktop/gnome-rr-config.h> --#include <libgnome-desktop/gnome-rr-labeler.h> - #include <gdk/gdkx.h> - #include <X11/Xlib.h> - #include <glib/gi18n-lib.h> - #include <gdesktop-enums.h> - -+#include "cc-rr-labeler.h" -+ - CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel) - - #define DISPLAY_PANEL_PRIVATE(o) \ -@@ -75,7 +76,7 @@ - { - GnomeRRScreen *screen; - GnomeRRConfig *current_configuration; -- GnomeRRLabeler *labeler; -+ CcRRLabeler *labeler; - GnomeRROutputInfo *current_output; - - GSettings *clock_settings; -@@ -200,7 +201,7 @@ - g_signal_handler_disconnect (GTK_WIDGET (self), self->priv->focus_id_hide); - } - -- gnome_rr_labeler_hide (self->priv->labeler); -+ cc_rr_labeler_hide (self->priv->labeler); - g_object_unref (self->priv->labeler); - - G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); -@@ -293,16 +294,16 @@ - self->priv->current_output = NULL; - - if (self->priv->labeler) { -- gnome_rr_labeler_hide (self->priv->labeler); -+ cc_rr_labeler_hide (self->priv->labeler); - g_object_unref (self->priv->labeler); - } - -- 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); -+ cc_rr_labeler_show (self->priv->labeler); - - 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); -+ cc_rr_labeler_show (self->priv->labeler); - else -- gnome_rr_labeler_hide (self->priv->labeler); -+ cc_rr_labeler_hide (self->priv->labeler); - } - - static void -@@ -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); -+ 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 -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c ---- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c 1970-01-01 01:00:00.000000000 +0100 -+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c 2013-04-22 03:42:12.379900127 +0200 -@@ -0,0 +1,601 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * cc-rr-labeler.c - Utility to label monitors to identify them -+ * while they are being configured. -+ * -+ * Copyright 2008, Novell, Inc. -+ * -+ * This file is part of the Gnome Library. -+ * -+ * The Gnome Library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * The Gnome Library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with the Gnome Library; see the file COPYING.LIB. If not, -+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ * Author: Federico Mena-Quintero <federico@novell.com> -+ */ -+ -+#include <config.h> -+#include <glib/gi18n-lib.h> -+#include <gtk/gtk.h> -+ -+#include <X11/Xproto.h> -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+#include <X11/Xatom.h> -+#include <gdk/gdkx.h> -+ -+#include "cc-rr-labeler.h" -+ -+struct _CcRRLabelerPrivate { -+ GnomeRRConfig *config; -+ -+ int num_outputs; -+ -+ GdkRGBA *palette; -+ GtkWidget **windows; -+ -+ GdkScreen *screen; -+ Atom workarea_atom; -+}; -+ -+enum { -+ PROP_0, -+ PROP_CONFIG, -+ PROP_LAST -+}; -+ -+G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT); -+ -+static void cc_rr_labeler_finalize (GObject *object); -+static void setup_from_config (CcRRLabeler *labeler); -+ -+static GdkFilterReturn -+screen_xevent_filter (GdkXEvent *xevent, -+ GdkEvent *event, -+ CcRRLabeler *labeler) -+{ -+ XEvent *xev; -+ -+ xev = (XEvent *) xevent; -+ -+ if (xev->type == PropertyNotify && -+ xev->xproperty.atom == labeler->priv->workarea_atom) { -+ /* update label positions */ -+ if (labeler->priv->windows != NULL) { -+ cc_rr_labeler_hide (labeler); -+ cc_rr_labeler_show (labeler); -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+cc_rr_labeler_init (CcRRLabeler *labeler) -+{ -+ GdkWindow *gdkwindow; -+ -+ labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate); -+ -+ labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -+ "_NET_WORKAREA", -+ True); -+ -+ labeler->priv->screen = gdk_screen_get_default (); -+ /* code is not really designed to handle multiple screens so *shrug* */ -+ gdkwindow = gdk_screen_get_root_window (labeler->priv->screen); -+ gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler); -+ gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK); -+} -+ -+static void -+cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec) -+{ -+ CcRRLabeler *self = CC_RR_LABELER (gobject); -+ -+ switch (property_id) { -+ case PROP_CONFIG: -+ self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value)); -+ return; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec); -+ } -+} -+ -+static GObject * -+cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties) -+{ -+ CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties); -+ -+ setup_from_config (self); -+ -+ return (GObject*) self; -+} -+ -+static void -+cc_rr_labeler_class_init (CcRRLabelerClass *klass) -+{ -+ GObjectClass *object_class; -+ -+ g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate)); -+ -+ object_class = (GObjectClass *) klass; -+ -+ object_class->set_property = cc_rr_labeler_set_property; -+ object_class->finalize = cc_rr_labeler_finalize; -+ object_class->constructor = cc_rr_labeler_constructor; -+ -+ g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config", -+ "Configuration", -+ "RandR configuration to label", -+ GNOME_TYPE_RR_CONFIG, -+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | -+ G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); -+} -+ -+static void -+cc_rr_labeler_finalize (GObject *object) -+{ -+ CcRRLabeler *labeler; -+ GdkWindow *gdkwindow; -+ -+ labeler = CC_RR_LABELER (object); -+ -+ gdkwindow = gdk_screen_get_root_window (labeler->priv->screen); -+ gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler); -+ -+ if (labeler->priv->config != NULL) { -+ g_object_unref (labeler->priv->config); -+ } -+ -+ if (labeler->priv->windows != NULL) { -+ cc_rr_labeler_hide (labeler); -+ g_free (labeler->priv->windows); -+ } -+ -+ g_free (labeler->priv->palette); -+ -+ G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object); -+} -+ -+static int -+count_outputs (GnomeRRConfig *config) -+{ -+ int i; -+ GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config); -+ -+ for (i = 0; outputs[i] != NULL; i++) -+ ; -+ -+ return i; -+} -+ -+static void -+make_palette (CcRRLabeler *labeler) -+{ -+ /* The idea is that we go around an hue color wheel. We want to start -+ * at red, go around to green/etc. and stop at blue --- because magenta -+ * is evil. Eeeeek, no magenta, please! -+ * -+ * Purple would be nice, though. Remember that we are watered down -+ * (i.e. low saturation), so that would be like Like berries with cream. -+ * Mmmmm, berries. -+ */ -+ double start_hue; -+ double end_hue; -+ int i; -+ -+ g_assert (labeler->priv->num_outputs > 0); -+ -+ labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs); -+ -+ start_hue = 0.0; /* red */ -+ end_hue = 2.0/3; /* blue */ -+ -+ for (i = 0; i < labeler->priv->num_outputs; i++) { -+ double h, s, v; -+ double r, g, b; -+ -+ h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i; -+ s = 1.0 / 3; -+ v = 1.0; -+ -+ gtk_hsv_to_rgb (h, s, v, &r, &g, &b); -+ -+ labeler->priv->palette[i].red = r; -+ labeler->priv->palette[i].green = g; -+ labeler->priv->palette[i].blue = b; -+ labeler->priv->palette[i].alpha = 1.0; -+ } -+} -+ -+static void -+rounded_rectangle (cairo_t *cr, -+ gint x, -+ gint y, -+ gint width, -+ gint height, -+ gint x_radius, -+ gint y_radius) -+{ -+ gint x1, x2; -+ gint y1, y2; -+ gint xr1, xr2; -+ gint yr1, yr2; -+ -+ x1 = x; -+ x2 = x1 + width; -+ y1 = y; -+ y2 = y1 + height; -+ -+ x_radius = MIN (x_radius, width / 2.0); -+ y_radius = MIN (y_radius, width / 2.0); -+ -+ xr1 = x_radius; -+ xr2 = x_radius / 2.0; -+ yr1 = y_radius; -+ yr2 = y_radius / 2.0; -+ -+ cairo_move_to (cr, x1 + xr1, y1); -+ cairo_line_to (cr, x2 - xr1, y1); -+ cairo_curve_to (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1); -+ cairo_line_to (cr, x2, y2 - yr1); -+ cairo_curve_to (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2); -+ cairo_line_to (cr, x1 + xr1, y2); -+ cairo_curve_to (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1); -+ cairo_line_to (cr, x1, y1 + yr1); -+ cairo_curve_to (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1); -+ cairo_close_path (cr); -+} -+ -+#define LABEL_WINDOW_EDGE_THICKNESS 2 -+#define LABEL_WINDOW_PADDING 12 -+/* Look for panel-corner in: -+ * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css -+ * to match the corner radius */ -+#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS -+ -+static void -+label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape) -+{ -+ GdkRGBA shape_color = { 0, 0, 0, 1 }; -+ GdkRGBA *rgba; -+ GtkAllocation allocation; -+ -+ rgba = g_object_get_data (G_OBJECT (widget), "rgba"); -+ gtk_widget_get_allocation (widget, &allocation); -+ -+ cairo_save (cr); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ -+ /* edge outline */ -+ if (for_shape) -+ gdk_cairo_set_source_rgba (cr, &shape_color); -+ else -+ cairo_set_source_rgba (cr, 0, 0, 0, 0.5); -+ -+ rounded_rectangle (cr, -+ LABEL_WINDOW_EDGE_THICKNESS / 2.0, -+ LABEL_WINDOW_EDGE_THICKNESS / 2.0, -+ allocation.width - LABEL_WINDOW_EDGE_THICKNESS, -+ allocation.height - LABEL_WINDOW_EDGE_THICKNESS, -+ LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS); -+ cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS); -+ cairo_stroke (cr); -+ -+ /* fill */ -+ if (for_shape) { -+ gdk_cairo_set_source_rgba (cr, &shape_color); -+ } else { -+ rgba->alpha = 0.75; -+ gdk_cairo_set_source_rgba (cr, rgba); -+ } -+ -+ rounded_rectangle (cr, -+ LABEL_WINDOW_EDGE_THICKNESS, -+ LABEL_WINDOW_EDGE_THICKNESS, -+ allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2, -+ allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2, -+ LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0, -+ LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0); -+ cairo_fill (cr); -+ -+ cairo_restore (cr); -+} -+ -+static void -+maybe_update_shape (GtkWidget *widget) -+{ -+ cairo_t *cr; -+ cairo_surface_t *surface; -+ cairo_region_t *region; -+ -+ /* fallback to XShape only for non-composited clients */ -+ if (gtk_widget_is_composited (widget)) { -+ gtk_widget_shape_combine_region (widget, NULL); -+ return; -+ } -+ -+ surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget), -+ CAIRO_CONTENT_COLOR_ALPHA, -+ gtk_widget_get_allocated_width (widget), -+ gtk_widget_get_allocated_height (widget)); -+ -+ cr = cairo_create (surface); -+ label_draw_background_and_frame (widget, cr, TRUE); -+ cairo_destroy (cr); -+ -+ region = gdk_cairo_region_create_from_surface (surface); -+ gtk_widget_shape_combine_region (widget, region); -+ -+ cairo_surface_destroy (surface); -+ cairo_region_destroy (region); -+} -+ -+static gboolean -+label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data) -+{ -+ if (gtk_widget_is_composited (widget)) { -+ /* clear any content */ -+ cairo_save (cr); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_set_source_rgba (cr, 0, 0, 0, 0); -+ cairo_paint (cr); -+ cairo_restore (cr); -+ } -+ -+ maybe_update_shape (widget); -+ label_draw_background_and_frame (widget, cr, FALSE); -+ -+ return FALSE; -+} -+ -+static void -+position_window (CcRRLabeler *labeler, -+ GtkWidget *window, -+ int x, -+ int y) -+{ -+ GdkRectangle workarea; -+ GdkRectangle monitor; -+ int monitor_num; -+ -+ monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y); -+ gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea); -+ gdk_screen_get_monitor_geometry (labeler->priv->screen, -+ monitor_num, -+ &monitor); -+ gdk_rectangle_intersect (&monitor, &workarea, &workarea); -+ -+ gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y); -+} -+ -+static void -+label_window_realize_cb (GtkWidget *widget) -+{ -+ cairo_region_t *region; -+ -+ /* make the whole window ignore events */ -+ region = cairo_region_create (); -+ gtk_widget_input_shape_combine_region (widget, region); -+ cairo_region_destroy (region); -+ -+ maybe_update_shape (widget); -+} -+ -+static void -+label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler) -+{ -+ if (gtk_widget_get_realized (widget)) -+ maybe_update_shape (widget); -+} -+ -+static GtkWidget * -+create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba) -+{ -+ GtkWidget *window; -+ GtkWidget *widget; -+ char *str; -+ const char *display_name; -+ GdkRGBA black = { 0, 0, 0, 1.0 }; -+ int x, y; -+ GdkScreen *screen; -+ GdkVisual *visual; -+ -+ window = gtk_window_new (GTK_WINDOW_POPUP); -+ gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP); -+ gtk_window_set_resizable (GTK_WINDOW (window), FALSE); -+ gtk_widget_set_app_paintable (window, TRUE); -+ screen = gtk_widget_get_screen (window); -+ visual = gdk_screen_get_rgba_visual (screen); -+ -+ if (visual != NULL) -+ gtk_widget_set_visual (window, visual); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS); -+ -+ /* This is semi-dangerous. The color is part of the labeler->palette -+ * array. Note that in cc_rr_labeler_finalize(), we are careful to -+ * free the palette only after we free the windows. -+ */ -+ g_object_set_data (G_OBJECT (window), "rgba", rgba); -+ -+ g_signal_connect (window, "draw", -+ G_CALLBACK (label_window_draw_event_cb), labeler); -+ g_signal_connect (window, "realize", -+ G_CALLBACK (label_window_realize_cb), labeler); -+ g_signal_connect (window, "composited-changed", -+ G_CALLBACK (label_window_composited_changed_cb), labeler); -+ -+ if (gnome_rr_config_get_clone (labeler->priv->config)) { -+ /* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */ -+ -+ /* Translators: this is the feature where what you see on your -+ * laptop's screen is the same as your external projector. -+ * Here, "Mirrored" is being used as an adjective. For example, -+ * the Spanish translation could be "Pantallas en Espejo". -+ */ -+ display_name = _("Mirrored Displays"); -+ } else -+ display_name = gnome_rr_output_info_get_display_name (output); -+ -+ str = g_strdup_printf ("<b>%s</b>", display_name); -+ widget = gtk_label_new (NULL); -+ gtk_label_set_markup (GTK_LABEL (widget), str); -+ g_free (str); -+ -+ /* Make the label explicitly black. We don't want it to follow the -+ * theme's colors, since the label is always shown against a light -+ * pastel background. See bgo#556050 -+ */ -+ gtk_widget_override_color (widget, -+ gtk_widget_get_state_flags (widget), -+ &black); -+ -+ gtk_container_add (GTK_CONTAINER (window), widget); -+ -+ /* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */ -+ gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL); -+ position_window (labeler, window, x, y); -+ -+ gtk_widget_show_all (window); -+ -+ return window; -+} -+ -+static void -+setup_from_config (CcRRLabeler *labeler) -+{ -+ labeler->priv->num_outputs = count_outputs (labeler->priv->config); -+ -+ make_palette (labeler); -+ -+ cc_rr_labeler_show (labeler); -+} -+ -+/** -+ * cc_rr_labeler_new: -+ * @config: Configuration of the screens to label -+ * -+ * Create a GUI element that will display colored labels on each connected monitor. -+ * This is useful when users are required to identify which monitor is which, e.g. for -+ * for configuring multiple monitors. -+ * The labels will be shown by default, use cc_rr_labeler_hide to hide them. -+ * -+ * Returns: A new #CcRRLabeler -+ */ -+CcRRLabeler * -+cc_rr_labeler_new (GnomeRRConfig *config) -+{ -+ g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL); -+ -+ return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL); -+} -+ -+/** -+ * cc_rr_labeler_show: -+ * @labeler: A #CcRRLabeler -+ * -+ * Show the labels. -+ */ -+void -+cc_rr_labeler_show (CcRRLabeler *labeler) -+{ -+ int i; -+ gboolean created_window_for_clone; -+ GnomeRROutputInfo **outputs; -+ -+ g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); -+ -+ if (labeler->priv->windows != NULL) -+ return; -+ -+ labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs); -+ -+ created_window_for_clone = FALSE; -+ -+ outputs = gnome_rr_config_get_outputs (labeler->priv->config); -+ -+ for (i = 0; i < labeler->priv->num_outputs; i++) { -+ if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) { -+ labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i); -+ -+ if (gnome_rr_config_get_clone (labeler->priv->config)) -+ created_window_for_clone = TRUE; -+ } else -+ labeler->priv->windows[i] = NULL; -+ } -+} -+ -+/** -+ * cc_rr_labeler_hide: -+ * @labeler: A #CcRRLabeler -+ * -+ * Hide ouput labels. -+ */ -+void -+cc_rr_labeler_hide (CcRRLabeler *labeler) -+{ -+ int i; -+ CcRRLabelerPrivate *priv; -+ -+ g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); -+ -+ priv = labeler->priv; -+ -+ if (priv->windows == NULL) -+ return; -+ -+ for (i = 0; i < priv->num_outputs; i++) -+ if (priv->windows[i] != NULL) { -+ gtk_widget_destroy (priv->windows[i]); -+ priv->windows[i] = NULL; -+ } -+ g_free (priv->windows); -+ priv->windows = NULL; -+} -+ -+/** -+ * cc_rr_labeler_get_rgba_for_output: -+ * @labeler: A #CcRRLabeler -+ * @output: Output device (i.e. monitor) to query -+ * @rgba_out: (out): Color of selected monitor. -+ * -+ * Get the color used for the label on a given output (monitor). -+ */ -+void -+cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out) -+{ -+ int i; -+ GnomeRROutputInfo **outputs; -+ -+ g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); -+ g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output)); -+ g_return_if_fail (rgba_out != NULL); -+ -+ outputs = gnome_rr_config_get_outputs (labeler->priv->config); -+ -+ for (i = 0; i < labeler->priv->num_outputs; i++) -+ if (outputs[i] == output) { -+ *rgba_out = labeler->priv->palette[i]; -+ return; -+ } -+ -+ g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output); -+ -+ rgba_out->red = 1.0; -+ rgba_out->green = 0; -+ rgba_out->blue = 1.0; -+ rgba_out->alpha = 1.0; -+} -diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h ---- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h 1970-01-01 01:00:00.000000000 +0100 -+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h 2013-04-22 03:42:12.383233540 +0200 -@@ -0,0 +1,64 @@ -+/* gnome-rr-labeler.h - Utility to label monitors to identify them -+ * while they are being configured. -+ * -+ * Copyright 2008, Novell, Inc. -+ * -+ * This file is part of the Gnome Library. -+ * -+ * The Gnome Library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * The Gnome Library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with the Gnome Library; see the file COPYING.LIB. If not, -+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ * Author: Federico Mena-Quintero <federico@novell.com> -+ */ -+ -+#ifndef CC_RR_LABELER_H -+#define CC_RR_LABELER_H -+ -+#define GNOME_DESKTOP_USE_UNSTABLE_API -+#include <libgnome-desktop/gnome-rr-config.h> -+ -+#define GNOME_TYPE_RR_LABELER (cc_rr_labeler_get_type ()) -+#define CC_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler)) -+#define CC_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_RR_LABELER, CcRRLabelerClass)) -+#define GNOME_IS_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER)) -+#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_RR_LABELER)) -+#define CC_RR_LABELER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_RR_LABELER, CcRRLabelerClass)) -+ -+typedef struct _CcRRLabeler CcRRLabeler; -+typedef struct _CcRRLabelerClass CcRRLabelerClass; -+typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate; -+ -+struct _CcRRLabeler { -+ GObject parent; -+ -+ /*< private >*/ -+ CcRRLabelerPrivate *priv; -+}; -+ -+struct _CcRRLabelerClass { -+ GObjectClass parent_class; -+}; -+ -+GType cc_rr_labeler_get_type (void); -+ -+CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config); -+ -+void cc_rr_labeler_show (CcRRLabeler *labeler); -+ -+void cc_rr_labeler_hide (CcRRLabeler *labeler); -+ -+void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out); -+ -+#endif -diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am cinnamon-control-center-1.7.3/panels/display/Makefile.am ---- cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am 2013-04-15 16:04:38.000000000 +0200 -+++ cinnamon-control-center-1.7.3/panels/display/Makefile.am 2013-04-22 03:42:12.376566715 +0200 -@@ -19,6 +19,8 @@ - display-module.c \ - cc-display-panel.c \ - cc-display-panel.h \ -+ cc-rr-labeler.c \ -+ cc-rr-labeler.h \ - scrollarea.c \ - scrollarea.h \ - $(MARSHALFILES) diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch deleted file mode 100644 index bdf0a8a4a..000000000 --- a/community/cinnamon-control-center/idle-delay.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c ---- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c 2013-08-14 22:10:57.491152667 +0200 -+++ cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c 2013-08-14 21:58:36.533247961 +0200 -@@ -978,9 +978,6 @@ - has_lid = up_client_get_lid_is_present (self->priv->up_client); - - out: -- gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid); -- gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid); -- gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid); - gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries); - gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries); - gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries); -@@ -1067,26 +1064,6 @@ - g_signal_connect (widget, "changed", - G_CALLBACK (combo_enum_changed_cb), - self); -- -- value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action"); -- widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, -- "combobox_lid_ac")); -- disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget)); -- set_value_for_combo (GTK_COMBO_BOX (widget), value); -- g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action"); -- g_signal_connect (widget, "changed", -- G_CALLBACK (combo_enum_changed_cb), -- self); -- -- value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action"); -- widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, -- "combobox_lid_battery")); -- disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget)); -- set_value_for_combo (GTK_COMBO_BOX (widget), value); -- g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action"); -- g_signal_connect (widget, "changed", -- G_CALLBACK (combo_enum_changed_cb), -- self); - - widget = WID (self->priv->builder, "vbox_power"); - gtk_widget_reparent (widget, (GtkWidget *) self); -diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui ---- cinnamon-control-center-1.8.2.orig/panels/power/power.ui 2013-05-22 18:25:19.000000000 +0200 -+++ cinnamon-control-center-1.8.2/panels/power/power.ui 2013-08-14 21:57:54.872240364 +0200 -@@ -222,50 +222,6 @@ - </packing> - </child> - <child> -- <object class="GtkLabel" id="label_lid_action"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="halign">end</property> -- <property name="label" translatable="yes">When the lid is closed</property> -- </object> -- <packing> -- <property name="left_attach">0</property> -- <property name="top_attach">3</property> -- </packing> -- </child> -- <child> -- <object class="GtkComboBox" id="combobox_lid_battery"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="model">liststore_lid</property> -- <property name="hexpand">True</property> -- <accessibility> -- <relation type="labelled-by" target="label_header_battery"/> -- <relation type="labelled-by" target="label_lid_action"/> -- </accessibility> -- </object> -- <packing> -- <property name="left_attach">1</property> -- <property name="top_attach">3</property> -- </packing> -- </child> -- <child> -- <object class="GtkComboBox" id="combobox_lid_ac"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="model">liststore_lid</property> -- <property name="hexpand">True</property> -- <accessibility> -- <relation type="labelled-by" target="label_header_ac"/> -- <relation type="labelled-by" target="label_lid_action"/> -- </accessibility> -- </object> -- <packing> -- <property name="left_attach">2</property> -- <property name="top_attach">3</property> -- </packing> -- </child> -- <child> - <object class="GtkSeparator" id="separator_indicator"> - <property name="visible">True</property> - <property name="can_focus">False</property> -@@ -468,12 +424,10 @@ - </object> - <object class="GtkSizeGroup" id="sizegroup_combos"> - <widgets> -- <widget name="combobox_lid_battery"/> -- <widget name="combobox_lid_ac"/> - <widget name="combobox_critical"/> - <widget name="combobox_sleep_battery"/> - <widget name="combobox_sleep_ac"/> - <widget name="combobox_sleep_ac"/> - </widgets> - </object> --</interface> -\ No newline at end of file -+</interface> -diff -Naur cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c ---- cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c 2013-08-14 22:10:57.541153876 +0200 -+++ cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c 2013-08-14 21:55:41.905692072 +0200 -@@ -352,10 +352,6 @@ - 1, &value, - -1); - -- /* set both battery and ac keys */ -- g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value); -- g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value); -- - set_idle_delay_from_dpms (self, value); - } - -@@ -385,7 +381,7 @@ - { - GtkTreeIter iter; - GtkTreeModel *model; -- gint value; -+ guint value; - gint value_tmp, value_prev; - gboolean ret; - guint i; -@@ -400,7 +396,7 @@ - i = 0; - - /* try to make the UI match the AC setting */ -- value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac"); -+ g_settings_get (self->priv->session_settings, "idle-delay", "u", &value); - do - { - gtk_tree_model_get (model, &iter, -@@ -511,7 +507,7 @@ - /* bind the auto dim checkbox */ - widget = WID ("screen_auto_reduce_checkbutton"); - g_settings_bind (self->priv->gsd_settings, -- "idle-dim-battery", -+ "idle-dim", - widget, "active", - G_SETTINGS_BIND_DEFAULT); - diff --git a/community/cinnamon-control-center/remove_obex.patch b/community/cinnamon-control-center/remove_obex.patch deleted file mode 100644 index abcf1be88..000000000 --- a/community/cinnamon-control-center/remove_obex.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- a/panels/bluetooth/bluetooth.ui -+++ b/panels/bluetooth/bluetooth.ui -@@ -543,34 +543,6 @@ - <property name="position">3</property> - </packing> - </child> -- <child> -- <object class="GtkBox" id="browse_box"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <child> -- <placeholder/> -- </child> -- <child> -- <object class="GtkButton" id="browse_button"> -- <property name="label" translatable="yes">Browse Files...</property> -- <property name="can_focus">True</property> -- <property name="receives_default">True</property> -- <property name="use_action_appearance">False</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">False</property> -- <property name="pack_type">end</property> -- <property name="position">1</property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="position">4</property> -- </packing> -- </child> - </object> - <packing> - <property name="expand">False</property> ---- a/panels/bluetooth/cc-bluetooth-panel.c -+++ b/panels/bluetooth/cc-bluetooth-panel.c -@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc - gtk_widget_hide (WID ("keyboard_box")); - gtk_widget_hide (WID ("sound_box")); - gtk_widget_hide (WID ("mouse_box")); -- gtk_widget_hide (WID ("browse_box")); - gtk_widget_hide (WID ("send_box")); - - bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser)); -@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc - - uuids = (const char **) g_value_get_boxed (&value); - for (i = 0; uuids && uuids[i] != NULL; i++) { -- if (g_str_equal (uuids[i], "OBEXObjectPush")) -+ if (g_str_equal (uuids[i], "OBEXObjectPush")) { - gtk_widget_show (WID ("send_box")); -- else if (g_str_equal (uuids[i], "OBEXFileTransfer")) -- gtk_widget_show (WID ("browse_box")); -+ break; -+ } - } - g_value_unset (&value); - } -@@ -538,34 +537,6 @@ send_callback (GtkButton *button, - g_free (alias); - } - --static void --mount_finish_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GError *error = NULL; -- -- if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) { -- g_printerr ("Failed to mount OBEX volume: %s", error->message); -- g_error_free (error); -- return; -- } --} -- --static void --browse_callback (GtkButton *button, -- CcBluetoothPanel *self) --{ -- char *bdaddr; -- -- bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser)); -- -- bluetooth_browse_address (G_OBJECT (self), bdaddr, -- GDK_CURRENT_TIME, mount_finish_cb, NULL); -- -- g_free (bdaddr); --} -- - /* Visibility/Discoverable */ - static void discoverable_changed (BluetoothClient *client, - GParamSpec *spec, -@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane - G_CALLBACK (keyboard_callback), self); - g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link", - G_CALLBACK (sound_callback), self); -- g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked", -- G_CALLBACK (browse_callback), self); - g_signal_connect (G_OBJECT (WID ("send_button")), "clicked", - G_CALLBACK (send_callback), self); - g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active", - diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD new file mode 100644 index 000000000..d9d585db2 --- /dev/null +++ b/community/cinnamon-desktop/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Alexandre Filgueria <alexfilgueira@antergos.com> +# Contributor: Jan de Groot <jan@archlinux.org> + +pkgname=cinnamon-desktop +pkgver=2.0.0 +pkgrel=1 +pkgdesc="Library with common API for various Cinnamon modules" +arch=(i686 x86_64) +license=(GPL LGPL) +depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes) +makedepends=(intltool gobject-introspection itstool gnome-common) +url="https://github.com/linuxmint/cinnamon-desktop" +options=(!libtool) +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz") +sha256sums=('dd4ef4c14699a0566ae8e7e060a7db8574ef65dcdac80751de350788ea99ff3c') + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ + --with-gnome-distributor="Arch Linux" + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index 7b0cfa99c..3a883ec80 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -4,34 +4,37 @@ # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-screensaver -pkgver=1.8.0 -pkgrel=2 +pkgver=2.0.0 +pkgrel=1 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://github.com/linuxmint/cinnamon-screensaver" backup=(etc/pam.d/cinnamon-screensaver) -depends=('cinnamon' 'gnome-screensaver') +depends=('cinnamon' 'cinnamon-desktop') makedepends=('intltool' 'gnome-common') options=(!emptydirs) source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz cinnamon-screensaver.pam fix-dbus-compatibility.patch lock_screen_on_suspend.patch) -sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1' +sha256sums=('90da7f811892f667202ecd1240091f9c4d253eebe223bbfedb3d544dd68b3fc7' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6' '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8') -build() { +prepare() { cd $pkgname-$pkgver - # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch # Lock screen on suspend with systemd patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch +} + +build() { + cd $pkgname-$pkgver ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon-screensaver \ @@ -45,9 +48,6 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver" - # Remove conflicts with gnome-screensaver - rm "$pkgdir"/usr/bin/gnome-screensaver{,-command} - # Autostart only in Cinnamon cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \ "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop" diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD new file mode 100644 index 000000000..c73cb60eb --- /dev/null +++ b/community/cinnamon-session/PKGBUILD @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com> +# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=cinnamon-session +pkgver=2.0.0 +pkgrel=1 +pkgdesc="The Cinnamon Session Handler" +arch=(i686 x86_64) +license=(GPL LGPL) +depends=(systemd dconf gsettings-desktop-schemas gtk3 + hicolor-icon-theme libgl libsm libxtst upower) +makedepends=(intltool mesa json-glib gtk-doc xtrans gnome-common) +options=('!emptydirs') +install=cinnamon-session.install +url="https://github.com/linuxmint/cinnamon-session" +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz + timeout.patch) +sha256sums=('d1eba64a5484f086f257ee75799d12afd77373fbdb0ced8d3ae48eadcd02a878' + 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a') + +prepare() { + cd $pkgname-$pkgver + + # Increase timeout, for slow machines + patch -Np1 -i ../timeout.patch +} +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \ + --disable-schemas-compile --enable-systemd --disable-gconf + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/cinnamon-session/cinnamon-session.install b/community/cinnamon-session/cinnamon-session.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/community/cinnamon-session/cinnamon-session.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/cinnamon-session/timeout.patch b/community/cinnamon-session/timeout.patch new file mode 100644 index 000000000..f4f5b64ca --- /dev/null +++ b/community/cinnamon-session/timeout.patch @@ -0,0 +1,24 @@ +diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c +--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 ++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 +@@ -36,7 +36,7 @@ + #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ +-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */ ++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */ + + typedef void (*GsmFillHandleProvider) (const char *provides, + const char *default_provider, +diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c +--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 +@@ -30,7 +30,7 @@ + #include <X11/Xatom.h> + + /* Wait up to this long for a running check to finish */ +-#define PROPERTY_CHANGE_TIMEOUT 5000 ++#define PROPERTY_CHANGE_TIMEOUT 12000 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL 0 diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD new file mode 100644 index 000000000..127c715ba --- /dev/null +++ b/community/cinnamon-settings-daemon/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com> +# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=cinnamon-settings-daemon +pkgver=2.0.1 +pkgrel=1 +pkgdesc="The Cinnamon Settings daemon" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'cinnamon-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' + 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'libxklavier' + 'libgnomekbd') +makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl' 'gnome-common') +options=('!emptydirs' '!libtool') +install=cinnamon-settings-daemon.install +url="https://github.com/linuxmint/cinnamon-settings-daemon" +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz") +sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168') + +build() { + cd $pkgname-$pkgver + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index c8d32fbab..fc345c2e4 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 95592 2013-08-14 21:28:25Z bgyorgy $ +# $Id: PKGBUILD 98186 2013-10-07 12:08:20Z jgc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.8.8 -pkgrel=4 +pkgver=1.9.2 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64' 'mips64el') url="http://cinnamon.linuxmint.com/" license=('GPL2') -depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' - 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' +depends=('accountsservice' 'caribou' 'clutter-gtk' 'cjs' 'gnome-bluetooth' + 'gnome-icon-theme' 'gnome-menus' 'cinnamon-settings-daemon' 'cinnamon-session' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' - 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' - 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat' - 'gnome-panel') + 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pexpect' + 'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'gnome-panel' 'python2' 'cinnamon-translations') makedepends=('gnome-common' 'intltool') optdepends=('cinnamon-control-center: extended configurations for Cinnamon' 'cinnamon-screensaver: lock screen' @@ -27,66 +26,38 @@ options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" "remove_GC.patch" - "keyboard_applet.patch" "fix-control-center-check.patch" - "gnome-3.8.patch" - "switch-applications.patch" - "fallback-helpers.patch" - "idle-dim.patch" - "background.patch" - "bluetooth_obex_transfer.patch" - "disable-mpris-support.patch") -sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d' + "background.patch") +sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d' '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680' - 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' - '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e' - '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' - 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' - 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100' - '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f' - '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2' - 'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7') + '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f') -build() { +prepare() { cd ${srcdir}/Cinnamon* # Python2 fix - sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \ - files/usr/bin/$pkgname-menu-editor \ - files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py + sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' # Fix crasher when disconnecting from wifi patch -Np1 -i ../remove_GC.patch - # Fix Keyboard applet - # https://github.com/linuxmint/Cinnamon/issues/1337 - patch -Np1 -i ../keyboard_applet.patch - # Check for the cc-panel path, not for the unneeded binary patch -Np1 -i ../fix-control-center-check.patch - # https://github.com/linuxmint/Cinnamon/pull/1888 - patch -Np1 -i ../gnome-3.8.patch - - # Fix windows switcher keybinding with default settings in GNOME 3.8 - patch -Np1 -i ../switch-applications.patch - - # Start media keys and mount helpers with the session - patch -Np1 -i ../fallback-helpers.patch - - # Fix brightness applet for GNOME 3.8 - patch -Np1 -i ../idle-dim.patch - # Fix missing backgrounds patch -Np1 -i ../background.patch - # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8 - patch -Np1 -i ../bluetooth_obex_transfer.patch + # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center + sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings.desktop - # Disable MPRIS support (workaround for FS#35282) - patch -Np1 -i ../disable-mpris-support.patch + # fix for the python2 PAM module + sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py +} + +build() { + cd ${srcdir}/Cinnamon* ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ @@ -96,7 +67,7 @@ build() { --disable-schemas-compile \ --enable-compile-warnings=yes \ --with-session-tracking=systemd - make + make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations" } package() { @@ -105,7 +76,4 @@ package() { # Remove leftover files after patching find "$pkgdir" -type f -name *.orig | xargs rm - - # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center - sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop" } diff --git a/community/cinnamon/bluetooth_obex_transfer.patch b/community/cinnamon/bluetooth_obex_transfer.patch deleted file mode 100644 index 0e632c48b..000000000 --- a/community/cinnamon/bluetooth_obex_transfer.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js -@@ -455,22 +455,6 @@ MyApplet.prototype = { - this._applet.send_to_address(device.bdaddr, device.alias); - })); - } -- if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) { -- item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) { -- this._applet.browse_address(device.bdaddr, event.get_time(), -- Lang.bind(this, function(applet, result) { -- try { -- applet.browse_address_finish(result); -- } catch (e) { -- this._ensureSource(); -- this._source.notify(new MessageTray.Notification(this._source, -- _("Bluetooth"), -- _("Error browsing device"), -- { body: _("The requested device cannot be browsed, error is '%s'").format(e) })); -- } -- })); -- })); -- } - - switch (device.type) { - case GnomeBluetoothApplet.Type.KEYBOARD: diff --git a/community/cinnamon/disable-mpris-support.patch b/community/cinnamon/disable-mpris-support.patch deleted file mode 100644 index dff615f4f..000000000 --- a/community/cinnamon/disable-mpris-support.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ---- Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js 2013-08-14 16:44:19.955273614 +0000 -+++ Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js 2013-08-14 16:46:34.171029992 +0000 -@@ -600,13 +600,6 @@ - - // menu not showed by default - this._players = {}; -- // watch players -- for (var p=0; p<compatible_players.length; p++) { -- Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, -- Lang.bind(this, this._addPlayer), -- Lang.bind(this, this._removePlayer) -- ); -- } - - this._control = new Gvc.MixerControl({ name: 'Cinnamon Volume Control' }); - this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged)); diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch deleted file mode 100644 index b6810cdba..000000000 --- a/community/cinnamon/fallback-helpers.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session ---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session 2013-04-15 15:55:01.000000000 +0200 -+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session 2013-04-25 01:30:35.435650613 +0200 -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Cinnamon (Software Rendering) --RequiredComponents=cinnamon2d;gnome-settings-daemon; -+RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; - DesktopName=GNOME - -diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session ---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session 2013-04-15 15:55:01.000000000 +0200 -+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session 2013-04-25 01:30:33.645607769 +0200 -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Cinnamon --RequiredComponents=cinnamon;gnome-settings-daemon; -+RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; - DesktopName=GNOME - diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch deleted file mode 100644 index b79ea497a..000000000 --- a/community/cinnamon/gnome-3.8.patch +++ /dev/null @@ -1,4186 +0,0 @@ -From 2ba97ed278777fcb96b86cd58e9176536585ad2d Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Fri, 19 Apr 2013 13:19:50 -0400 -Subject: [PATCH 01/16] Disable XInput on cinnamon startup (for 3.8 compat) - This has no effect on < 1.14 clutter - ---- - src/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/main.c b/src/main.c -index 418fb60..ac90d91 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -260,6 +260,7 @@ - meta_plugin_type_register (gnome_cinnamon_plugin_get_type ()); - - /* Prevent meta_init() from causing gtk to load gail and at-bridge */ -+ g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); - g_setenv ("NO_GAIL", "1", TRUE); - g_setenv ("NO_AT_BRIDGE", "1", TRUE); - meta_init (); --- -1.8.1.6 - - -From 72133f97fbd99c78169cec49e18b97da3edba524 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Fri, 19 Apr 2013 13:21:40 -0400 -Subject: [PATCH 02/16] Explain change - ---- - src/main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index ac90d91..9d37975 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -257,10 +257,12 @@ - - g_option_context_free (ctx); - -+ /* Disable XInput extension - required for 3.8 compatibility */ -+ g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); -+ - meta_plugin_type_register (gnome_cinnamon_plugin_get_type ()); - - /* Prevent meta_init() from causing gtk to load gail and at-bridge */ -- g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); - g_setenv ("NO_GAIL", "1", TRUE); - g_setenv ("NO_AT_BRIDGE", "1", TRUE); - meta_init (); --- -1.8.1.6 - - -From 28210e29e3e0d81c68320b9511574a168f5779e4 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Tue, 16 Apr 2013 17:01:30 -0400 -Subject: [PATCH 03/16] Add backgroundManager - this is needed for gnome 3.8 - compatibility, as gnome-settings-daemon no longer handles the desktop - background. - ---- - configure.ac | 7 +- - data/org.cinnamon.gschema.xml.in | 71 +++- - .../cinnamon-settings/modules/cs_backgrounds.py | 31 +- - js/ui/main.js | 3 +- - src/Makefile.am | 2 + - src/cinnamon-background-manager.c | 411 +++++++++++++++++++++ - src/cinnamon-background-manager.h | 57 +++ - 7 files changed, 562 insertions(+), 20 deletions(-) - create mode 100644 src/cinnamon-background-manager.c - create mode 100644 src/cinnamon-background-manager.h - -diff --git a/configure.ac b/configure.ac -index 0aa47c5..a2a9479 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -68,6 +68,7 @@ GTK_MIN_VERSION=3.0.0 - GIO_MIN_VERSION=2.29.10 - POLKIT_MIN_VERSION=0.100 - STARTUP_NOTIFICATION_MIN_VERSION=0.11 -+GNOME_DESKTOP_MIN_VERSION=3.0.0 - - # Collect more than 20 libraries for a prize! - PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION -@@ -82,7 +83,8 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION - gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION - libcanberra - polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes -- libnm-glib libnm-util gnome-keyring-1) -+ libnm-glib libnm-util gnome-keyring-1 -+ gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION) - - PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) - -@@ -106,7 +108,8 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier) - CFLAGS=$saved_CFLAGS - LIBS=$saved_LIBS - --PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11) -+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 -+ gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION x11) - PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0) - PKG_CHECK_MODULES(TRAY, gtk+-3.0) - PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index f12f8c5..939ea70 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -746,6 +746,23 @@ - </key> - </schema> - -+ -+ <enum id="bg_style"> -+ <value nick="none" value="0"/> -+ <value nick="wallpaper" value="1"/> -+ <value nick="centered" value="2"/> -+ <value nick="scaled" value="3"/> -+ <value nick="stretched" value="4"/> -+ <value nick="zoom" value="5"/> -+ <value nick="spanned" value="6"/> -+ </enum> -+ -+ <enum id="bg_shading"> -+ <value nick="solid" value="0"/> -+ <value nick="vertical" value="1"/> -+ <value nick="horizontal" value="2"/> -+ </enum> -+ - <schema id="org.cinnamon.background" path="/org/cinnamon/background/"> - <key name="mode" type="s"> - <default>"wallpaper"</default> -@@ -776,8 +793,60 @@ - This key defines the delay for the slideshow. - </description> - </key> -+ <key name="draw-background" type="b"> -+ <default>true</default> -+ <_summary>Draw Desktop Background</_summary> -+ <_description>Have GNOME draw the desktop background.</_description> -+ </key> -+ <key name="picture-options" enum="bg_style"> -+ <default>'zoom'</default> -+ <_summary>Picture Options</_summary> -+ <_description> -+ Determines how the image set by wallpaper_filename is rendered. -+ Possible values are "none", "wallpaper", "centered", "scaled", -+ "stretched", "zoom", "spanned". -+ </_description> -+ </key> -+ <key name="picture-uri" type="s"> -+ <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default> -+ <_summary>Picture URI</_summary> -+ <_description> -+ URI to use for the background image. Not that the backend only supports -+ local (file://) URIs. -+ </_description> -+ </key> -+ <key name="picture-opacity" type="i"> -+ <range min="0" max="100"/> -+ <default>100</default> -+ <_summary>Picture Opacity</_summary> -+ <_description> -+ Opacity with which to draw the background picture. -+ </_description> -+ </key> -+ <key name="primary-color" type="s"> -+ <default>'#023c88'</default> -+ <_summary>Primary Color</_summary> -+ <_description> -+ Left or Top color when drawing gradients, or the solid color. -+ </_description> -+ </key> -+ <key name="secondary-color" type="s"> -+ <default>'#5789ca'</default> -+ <_summary>Secondary Color</_summary> -+ <_description> -+ Right or Bottom color when drawing gradients, not used for solid color. -+ </_description> -+ </key> -+ <key name="color-shading-type" enum="bg_shading"> -+ <default>'solid'</default> -+ <_summary>Color Shading Type</_summary> -+ <_description> -+ How to shade the background color. Possible values are "horizontal", -+ "vertical", and "solid". -+ </_description> -+ </key> - </schema> -- -+ - <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/"> - <key name="default-message" type="s"> - <default>""</default> ---- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200 -+++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 23:36:46.718385152 +0200 -@@ -232,11 +232,11 @@ - - - class BackgroundWallpaperPane (Gtk.VBox): -- def __init__(self, sidepage, gnome_background_schema): -+ def __init__(self, sidepage, cinnamon_background_schema): - Gtk.VBox.__init__(self) - self.set_spacing(5) - -- self._gnome_background_schema = gnome_background_schema -+ self._cinnamon_background_schema = cinnamon_background_schema - self._sidepage = sidepage - - scw = Gtk.ScrolledWindow() -@@ -263,15 +263,15 @@ - if wallpaper: - for key in wallpaper: - if key == "filename": -- self._gnome_background_schema.set_string("picture-uri", "file://" + wallpaper[key]) -+ self._cinnamon_background_schema.set_string("picture-uri", "file://" + wallpaper[key]) - elif key == "pcolor": -- self._gnome_background_schema.set_string("primary-color", wallpaper[key]) -+ self._cinnamon_background_schema.set_string("primary-color", wallpaper[key]) - elif key == "scolor": -- self._gnome_background_schema.set_string("secondary-color", wallpaper[key]) -+ self._cinnamon_background_schema.set_string("secondary-color", wallpaper[key]) - elif key == "shade_type": -- self._gnome_background_schema.set_string("color-shading-type", wallpaper[key]) -+ self._cinnamon_background_schema.set_string("color-shading-type", wallpaper[key]) - elif key == "options": -- self._gnome_background_schema.set_string("picture-options", wallpaper[key]) -+ self._cinnamon_background_schema.set_string("picture-options", wallpaper[key]) - if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""): - self._sidepage.remove_wallpaper_button.set_sensitive(True) - -@@ -445,12 +445,11 @@ - f = open(filename, "w") - f.write(xml_data) - f.close() -- Gio.Settings("org.gnome.desktop.background").set_string("picture-uri", "file://" + filename) -+ Gio.Settings("org.cinnamon.background").set_string("picture-uri", "file://" + filename) - - class BackgroundSidePage (SidePage): - def __init__(self, name, icon, keywords, advanced, content_box): - SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1) -- self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background") - self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background") - self._add_wallpapers_dialog = AddWallpapersDialog() - -@@ -515,8 +514,8 @@ - self.mainbox.set_visible_window(False) - self.content_box.pack_start(self.mainbox, True, True, 3) - -- self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema) -- self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema) -+ self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema) -+ self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema) - if self._cinnamon_background_schema["mode"] == "slideshow": - self.mainbox.add(self.slideshow_pane) - else: -@@ -536,21 +535,21 @@ - l = Gtk.Label(_("Picture aspect")) - l.set_alignment(0, 0.5) - advanced_options_box.pack_start(l, False, False, 0) -- self.picture_options = GSettingsComboBox("", "org.gnome.desktop.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS) -+ self.picture_options = GSettingsComboBox("", "org.cinnamon.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS) - advanced_options_box.pack_start(self.picture_options, False, False, 0) - - l = Gtk.Label(_("Gradient")) - l.set_alignment(0, 0.5) - advanced_options_box.pack_start(l, False, False, 0) -- self.color_shading_type = GSettingsComboBox("", "org.gnome.desktop.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES) -+ self.color_shading_type = GSettingsComboBox("", "org.cinnamon.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES) - advanced_options_box.pack_start(self.color_shading_type, False, False, 0) - - hbox = Gtk.HBox() - l = Gtk.Label(_("Colors")) - hbox.pack_start(l, False, False, 2) -- self.primary_color = GSettingsColorChooser("org.gnome.desktop.background", "primary-color", None) -+ self.primary_color = GSettingsColorChooser("org.cinnamon.background", "primary-color", None) - hbox.pack_start(self.primary_color, False, False, 2) -- self.secondary_color = GSettingsColorChooser("org.gnome.desktop.background", "secondary-color", None) -+ self.secondary_color = GSettingsColorChooser("org.cinnamon.background", "secondary-color", None) - hbox.pack_start(self.secondary_color, False, False, 2) - advanced_options_box.pack_start(hbox, False, False, 0) - self.content_box.show_all() - -diff --git a/js/ui/main.js b/js/ui/main.js -index 74154ab..99aee95 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -86,6 +86,7 @@ let _cssStylesheet = null; - let dynamicWorkspaces = null; - let nWorks = null; - let tracker = null; -+let backgroundManager = null; - let desktopShown; - - let workspace_names = []; -@@ -214,7 +215,7 @@ function start() { - // be predictable anyways. - tracker = Cinnamon.WindowTracker.get_default(); - Cinnamon.AppUsage.get_default(); -- -+ backgroundManager = Cinnamon.BackgroundManager.get_default(); - // The stage is always covered so Clutter doesn't need to clear it; however - // the color is used as the default contents for the Muffin root background - // actor so set it anyways. -diff --git a/src/Makefile.am b/src/Makefile.am -index 3bab29c..6bac83c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -105,6 +105,7 @@ cinnamon_public_headers_h = \ - cinnamon-app-system.h \ - cinnamon-app-usage.h \ - cinnamon-arrow.h \ -+ cinnamon-background-manager.h \ - cinnamon-doc-system.h \ - cinnamon-embedded-window.h \ - cinnamon-generic-container.h \ -@@ -142,6 +143,7 @@ libcinnamon_la_SOURCES = \ - cinnamon-app-system.c \ - cinnamon-app-usage.c \ - cinnamon-arrow.c \ -+ cinnamon-background-manager.c \ - cinnamon-doc-system.c \ - cinnamon-embedded-window.c \ - cinnamon-generic-container.c \ -diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c -new file mode 100644 -index 0000000..9d95250 ---- /dev/null -+++ b/src/cinnamon-background-manager.c -@@ -0,0 +1,411 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * Copyright © 2001 Ximian, Inc. -+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -+ * Copyright 2007 Red Hat, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ */ -+ -+#include "config.h" -+ -+#include <sys/types.h> -+#include <sys/wait.h> -+#include <stdlib.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <string.h> -+#include <errno.h> -+ -+#include <locale.h> -+ -+#include <glib.h> -+#include <glib/gi18n.h> -+#include <gio/gio.h> -+#include <gdk/gdk.h> -+#include <gdk/gdkx.h> -+ -+#define GNOME_DESKTOP_USE_UNSTABLE_API -+#include <libgnome-desktop/gnome-bg.h> -+#include <X11/Xatom.h> -+ -+#include "cinnamon-background-manager.h" -+ -+#define CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerPrivate)) -+ -+struct CinnamonBackgroundManagerPrivate -+{ -+ GSettings *settings; -+ GnomeBG *bg; -+ -+ GnomeBGCrossfade *fade; -+ -+ GDBusProxy *proxy; -+ guint proxy_signal_id; -+}; -+ -+static void cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass); -+static void cinnamon_background_manager_init (CinnamonBackgroundManager *background_manager); -+static void cinnamon_background_manager_finalize (GObject *object); -+ -+static void setup_bg (CinnamonBackgroundManager *manager); -+static void connect_screen_signals (CinnamonBackgroundManager *manager); -+ -+G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT) -+ -+static gpointer manager_object = NULL; -+ -+static gboolean -+dont_draw_background (CinnamonBackgroundManager *manager) -+{ -+ return !g_settings_get_boolean (manager->priv->settings, -+ "draw-background"); -+} -+ -+static void -+on_crossfade_finished (CinnamonBackgroundManager *manager) -+{ -+ g_object_unref (manager->priv->fade); -+ manager->priv->fade = NULL; -+} -+ -+static void -+draw_background (CinnamonBackgroundManager *manager, -+ gboolean use_crossfade) -+{ -+ GdkDisplay *display; -+ int n_screens; -+ int i; -+ -+ display = gdk_display_get_default (); -+ n_screens = gdk_display_get_n_screens (display); -+ -+ for (i = 0; i < n_screens; ++i) { -+ GdkScreen *screen; -+ GdkWindow *root_window; -+ cairo_surface_t *surface; -+ -+ screen = gdk_display_get_screen (display, i); -+ -+ root_window = gdk_screen_get_root_window (screen); -+ -+ surface = gnome_bg_create_surface (manager->priv->bg, -+ root_window, -+ gdk_screen_get_width (screen), -+ gdk_screen_get_height (screen), -+ TRUE); -+ -+ if (use_crossfade) { -+ -+ if (manager->priv->fade != NULL) { -+ g_object_unref (manager->priv->fade); -+ } -+ -+ manager->priv->fade = gnome_bg_set_surface_as_root_with_crossfade (screen, surface); -+ g_signal_connect_swapped (manager->priv->fade, "finished", -+ G_CALLBACK (on_crossfade_finished), -+ manager); -+ } else { -+ gnome_bg_set_surface_as_root (screen, surface); -+ } -+ -+ cairo_surface_destroy (surface); -+ } -+} -+ -+static void -+on_bg_transitioned (GnomeBG *bg, -+ CinnamonBackgroundManager *manager) -+{ -+ draw_background (manager, FALSE); -+} -+ -+static gboolean -+settings_change_event_cb (GSettings *settings, -+ gpointer keys, -+ gint n_keys, -+ CinnamonBackgroundManager *manager) -+{ -+ gnome_bg_load_from_preferences (manager->priv->bg, -+ manager->priv->settings); -+ return FALSE; -+} -+ -+static void -+on_screen_size_changed (GdkScreen *screen, -+ CinnamonBackgroundManager *manager) -+{ -+ draw_background (manager, FALSE); -+} -+ -+static void -+watch_bg_preferences (CinnamonBackgroundManager *manager) -+{ -+ g_signal_connect (manager->priv->settings, -+ "change-event", -+ G_CALLBACK (settings_change_event_cb), -+ manager); -+} -+ -+static void -+on_bg_changed (GnomeBG *bg, -+ CinnamonBackgroundManager *manager) -+{ -+ draw_background (manager, TRUE); -+} -+ -+static void -+setup_bg (CinnamonBackgroundManager *manager) -+{ -+ g_return_if_fail (manager->priv->bg == NULL); -+ -+ manager->priv->bg = gnome_bg_new (); -+ -+ g_signal_connect (manager->priv->bg, -+ "changed", -+ G_CALLBACK (on_bg_changed), -+ manager); -+ -+ g_signal_connect (manager->priv->bg, -+ "transitioned", -+ G_CALLBACK (on_bg_transitioned), -+ manager); -+ -+ connect_screen_signals (manager); -+ watch_bg_preferences (manager); -+ gnome_bg_load_from_preferences (manager->priv->bg, -+ manager->priv->settings); -+} -+ -+static void -+setup_bg_and_draw_background (CinnamonBackgroundManager *manager) -+{ -+ setup_bg (manager); -+ draw_background (manager, FALSE); -+} -+ -+static void -+disconnect_session_manager_listener (CinnamonBackgroundManager *manager) -+{ -+ if (manager->priv->proxy && manager->priv->proxy_signal_id) { -+ g_signal_handler_disconnect (manager->priv->proxy, -+ manager->priv->proxy_signal_id); -+ manager->priv->proxy_signal_id = 0; -+ } -+} -+ -+static void -+on_session_manager_signal (GDBusProxy *proxy, -+ const gchar *sender_name, -+ const gchar *signal_name, -+ GVariant *parameters, -+ gpointer user_data) -+{ -+ CinnamonBackgroundManager *manager = CINNAMON_BACKGROUND_MANAGER (user_data); -+ -+ if (g_strcmp0 (signal_name, "SessionRunning") == 0) { -+ setup_bg_and_draw_background (manager); -+ disconnect_session_manager_listener (manager); -+ } -+} -+ -+static void -+draw_background_after_session_loads (CinnamonBackgroundManager *manager) -+{ -+ GError *error = NULL; -+ GDBusProxyFlags flags; -+ -+ flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; -+ manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, -+ flags, -+ NULL, /* GDBusInterfaceInfo */ -+ "org.gnome.SessionManager", -+ "/org/gnome/SessionManager", -+ "org.gnome.SessionManager", -+ NULL, /* GCancellable */ -+ &error); -+ if (manager->priv->proxy == NULL) { -+ g_warning ("Could not listen to session manager: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy, -+ "g-signal", -+ G_CALLBACK (on_session_manager_signal), -+ manager); -+} -+ -+ -+static void -+disconnect_screen_signals (CinnamonBackgroundManager *manager) -+{ -+ GdkDisplay *display; -+ int i; -+ int n_screens; -+ -+ display = gdk_display_get_default (); -+ n_screens = gdk_display_get_n_screens (display); -+ -+ for (i = 0; i < n_screens; ++i) { -+ GdkScreen *screen; -+ screen = gdk_display_get_screen (display, i); -+ g_signal_handlers_disconnect_by_func (screen, -+ G_CALLBACK (on_screen_size_changed), -+ manager); -+ } -+} -+ -+static void -+connect_screen_signals (CinnamonBackgroundManager *manager) -+{ -+ GdkDisplay *display; -+ int i; -+ int n_screens; -+ -+ display = gdk_display_get_default (); -+ n_screens = gdk_display_get_n_screens (display); -+ -+ for (i = 0; i < n_screens; ++i) { -+ GdkScreen *screen; -+ screen = gdk_display_get_screen (display, i); -+ g_signal_connect (screen, -+ "monitors-changed", -+ G_CALLBACK (on_screen_size_changed), -+ manager); -+ g_signal_connect (screen, -+ "size-changed", -+ G_CALLBACK (on_screen_size_changed), -+ manager); -+ } -+} -+ -+static void -+draw_background_changed (GSettings *settings, -+ const char *key, -+ CinnamonBackgroundManager *manager) -+{ -+ if (dont_draw_background (manager) == FALSE) -+ setup_bg_and_draw_background (manager); -+} -+ -+gboolean -+cinnamon_background_manager_start (CinnamonBackgroundManager *manager) -+{ -+ manager->priv->settings = g_settings_new ("org.cinnamon.background"); -+ g_signal_connect (manager->priv->settings, "changed::draw-background", -+ G_CALLBACK (draw_background_changed), manager); -+ -+ setup_bg_and_draw_background (manager); -+ //draw_background_after_session_loads (manager); -+ -+ -+ return TRUE; -+} -+ -+void -+cinnamon_background_manager_stop (CinnamonBackgroundManager *manager) -+{ -+ CinnamonBackgroundManagerPrivate *p = manager->priv; -+ -+ g_debug ("Stopping background manager"); -+ -+ disconnect_screen_signals (manager); -+ -+ if (manager->priv->proxy) { -+ disconnect_session_manager_listener (manager); -+ g_object_unref (manager->priv->proxy); -+ } -+ -+ g_signal_handlers_disconnect_by_func (manager->priv->settings, -+ settings_change_event_cb, -+ manager); -+ -+ if (p->settings != NULL) { -+ g_object_unref (p->settings); -+ p->settings = NULL; -+ } -+ -+ if (p->bg != NULL) { -+ g_object_unref (p->bg); -+ p->bg = NULL; -+ } -+} -+ -+/** -+ * cinnamon_background_manager_get_default: -+ * -+ * Return Value: (transfer none): The global #CinnamonBackgroundManager singleton -+ */ -+CinnamonBackgroundManager * -+cinnamon_background_manager_get_default () -+{ -+ static CinnamonBackgroundManager *instance = NULL; -+ -+ if (instance == NULL) -+ instance = g_object_new (CINNAMON_TYPE_BACKGROUND_MANAGER, NULL); -+ -+ return instance; -+} -+ -+static GObject * -+cinnamon_background_manager_constructor (GType type, -+ guint n_construct_properties, -+ GObjectConstructParam *construct_properties) -+{ -+ CinnamonBackgroundManager *background_manager; -+ -+ background_manager = CINNAMON_BACKGROUND_MANAGER (G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->constructor (type, -+ n_construct_properties, -+ construct_properties)); -+ -+ return G_OBJECT (background_manager); -+} -+ -+static void -+cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass) -+{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ -+ object_class->constructor = cinnamon_background_manager_constructor; -+ object_class->finalize = cinnamon_background_manager_finalize; -+ -+ g_type_class_add_private (klass, sizeof (CinnamonBackgroundManagerPrivate)); -+} -+ -+static void -+cinnamon_background_manager_init (CinnamonBackgroundManager *manager) -+{ -+ manager->priv = CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE (manager); -+ cinnamon_background_manager_start (manager); -+} -+ -+static void -+cinnamon_background_manager_finalize (GObject *object) -+{ -+ CinnamonBackgroundManager *background_manager; -+ -+ g_return_if_fail (object != NULL); -+ g_return_if_fail (CINNAMON_IS_BACKGROUND_MANAGER (object)); -+ -+ background_manager = CINNAMON_BACKGROUND_MANAGER (object); -+ -+ g_return_if_fail (background_manager->priv != NULL); -+ -+ G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->finalize (object); -+} -diff --git a/src/cinnamon-background-manager.h b/src/cinnamon-background-manager.h -new file mode 100644 -index 0000000..9a56e32 ---- /dev/null -+++ b/src/cinnamon-background-manager.h -@@ -0,0 +1,57 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ */ -+ -+#ifndef __CINNAMON_BACKGROUND_MANAGER_H -+#define __CINNAMON_BACKGROUND_MANAGER_H -+ -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+#define CINNAMON_TYPE_BACKGROUND_MANAGER (cinnamon_background_manager_get_type ()) -+#define CINNAMON_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManager)) -+#define CINNAMON_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass)) -+#define CINNAMON_IS_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER)) -+#define CINNAMON_IS_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CINNAMON_TYPE_BACKGROUND_MANAGER)) -+#define CINNAMON_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass)) -+ -+typedef struct CinnamonBackgroundManagerPrivate CinnamonBackgroundManagerPrivate; -+ -+typedef struct -+{ -+ GObject parent; -+ CinnamonBackgroundManagerPrivate *priv; -+} CinnamonBackgroundManager; -+ -+typedef struct -+{ -+ GObjectClass parent_class; -+} CinnamonBackgroundManagerClass; -+ -+GType cinnamon_background_manager_get_type (void); -+ -+CinnamonBackgroundManager *cinnamon_background_manager_get_default (void); -+ -+gboolean cinnamon_background_manager_start (CinnamonBackgroundManager *manager); -+void cinnamon_background_manager_stop (CinnamonBackgroundManager *manager); -+ -+G_END_DECLS -+ -+#endif /* __CINNAMON_BACKGROUND_MANAGER_H */ --- -1.8.1.6 - - -From c971d472a88f8ea725b2bef33715016e111732d9 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Tue, 16 Apr 2013 18:28:16 -0400 -Subject: [PATCH 04/16] Change default background - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 939ea70..6d8c82d 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -808,7 +808,7 @@ - </_description> - </key> - <key name="picture-uri" type="s"> -- <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default> -+ <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default> - <_summary>Picture URI</_summary> - <_description> - URI to use for the background image. Not that the backend only supports --- -1.8.1.6 - - -From 0147459229b449757bac9a92c173c4bd3c2f9eca Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Tue, 16 Apr 2013 18:41:16 -0400 -Subject: [PATCH 05/16] Use distro-agnostic background.. - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 6d8c82d..567dca8 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -808,7 +808,7 @@ - </_description> - </key> - <key name="picture-uri" type="s"> -- <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default> -+ <default>'file:///usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'</default> - <_summary>Picture URI</_summary> - <_description> - URI to use for the background image. Not that the backend only supports --- -1.8.1.6 - - -From 706d244a9dbe2ace9860044e2245a285d8473f47 Mon Sep 17 00:00:00 2001 -From: dalcde <dalcde@yahoo.com.hk> -Date: Mon, 15 Apr 2013 18:34:48 +0800 -Subject: [PATCH 06/16] [GDbus] Port DBus to GDBus (AltLinux patch) - ---- - .../applets/brightness@cinnamon.org/applet.js | 39 +- - .../cinnamon/applets/power@cinnamon.org/applet.js | 102 ++-- - .../cinnamon/applets/sound@cinnamon.org/applet.js | 511 ++++++--------------- - .../cinnamon/applets/xrandr@cinnamon.org/applet.js | 19 +- - js/misc/gnomeSession.js | 147 ++---- - js/misc/modemManager.js | 79 ++-- - js/misc/screenSaver.js | 89 ++-- - js/ui/appletManager.js | 1 - - js/ui/automountManager.js | 106 ++--- - js/ui/autorunManager.js | 27 +- - js/ui/calendar.js | 71 +-- - js/ui/cinnamonDBus.js | 96 ++-- - js/ui/endSessionDialog.js | 79 ++-- - js/ui/keyboard.js | 48 +- - js/ui/layout.js | 14 +- - js/ui/magnifierDBus.js | 134 ++++-- - js/ui/main.js | 6 - - js/ui/messageTray.js | 13 +- - js/ui/notificationDaemon.js | 193 ++++---- - js/ui/scripting.js | 34 +- - 20 files changed, 774 insertions(+), 1034 deletions(-) - -diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js -index 9cbda80..9087b25 100644 ---- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js -@@ -5,7 +5,6 @@ const St = imports.gi.St; - const PopupMenu = imports.ui.popupMenu; - const GLib = imports.gi.GLib; - const Gio = imports.gi.Gio; --const DBus = imports.dbus; - - /* constants */ - const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power"; -@@ -14,24 +13,25 @@ const DimSettingsBattery = "idle-dim-battery"; - const PowerBusName = 'org.gnome.SettingsDaemon'; - const PowerObjectPath = '/org/gnome/SettingsDaemon/Power'; - --/* DBus interface */ --const PowerManagerInterface = { -- name: 'org.gnome.SettingsDaemon.Power.Screen', -- methods: -- [ -- { name: 'GetPercentage', inSignature: '', outSignature: 'u' }, -- { name: 'SetPercentage', inSignature: 'u', outSignature: 'u' }, -- { name: 'StepUp', inSignature: '', outSignature: 'u' }, -- { name: 'StepDown', inSignature: '', outSignature: 'u' }, -- ], -- signals: -- [ -- { name: 'Changed', inSignature: '', outSignature: '' }, -- ] --}; -+const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power.Screen"> -+<method name="GetPercentage"> -+ <arg type="u" direction="out"/> -+</method> -+<method name="SetPercentage"> -+ <arg type="u" direction="in"/> -+ <arg type="u" direction="out"/> -+</method> -+<method name="StepUp"> -+ <arg type="u" direction="out"/> -+</method> -+<method name="StepDown"> -+ <arg type="u" direction="out"/> -+</method> -+<signal name="Changed" /> -+</interface>; - - /* DBus magic */ --let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface); -+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); - - /* TextImageMenuItem taken from sound@cinnamon.org applet */ - let icon_path = "/usr/share/cinnamon/theme/"; -@@ -100,7 +100,7 @@ MyApplet.prototype = { - Applet.IconApplet.prototype._init.call(this, orientation, panel_height); - - try { -- this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath); -+ this._proxy = new PowerManagerProxy(Gio.DBus.session, PowerBusName, PowerObjectPath); - - this.menuManager = new PopupMenu.PopupMenuManager(this); - this.menu = new Applet.AppletPopupMenu(this, orientation); -@@ -137,7 +137,8 @@ MyApplet.prototype = { - this.menu.addMenuItem(this._settingsMenu); - - //get notified -- this._proxy.connect('Changed', Lang.bind(this, this._getBrightness)); -+ this._proxy.connectSignal('Changed', Lang.bind(this, this._getBrightness)); -+ - this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent)); - } else { - this.set_applet_tooltip(_("Brightness")); -diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -index c342fe7..b6b2bcd 100644 ---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -@@ -1,6 +1,5 @@ - const Applet = imports.ui.applet; - const Gio = imports.gi.Gio; --const DBus = imports.dbus; - const Lang = imports.lang; - const St = imports.gi.St; - const PopupMenu = imports.ui.popupMenu; -@@ -42,34 +41,46 @@ const LabelDisplay = { - TIME: 'time' - }; - --const PowerManagerInterface = { -- name: 'org.gnome.SettingsDaemon.Power', -- methods: [ -- { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' }, -- { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' }, -- ], -- signals: [ -- { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' }, -- ], -- properties: [ -- { name: 'Icon', signature: 's', access: 'read' }, -- ] --}; --let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface); -- --const SettingsManagerInterface = { -- name: 'org.freedesktop.DBus.Properties', -- methods: [ -- { name: 'Get', inSignature: 's,s', outSignature: 'v' }, -- { name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' }, -- { name: 'Set', inSignature: 's,s,v', outSignature: '' } -- ], -- signals: [ -- {name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''} -- ] --}; -- --let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface); -+const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power"> -+<method name="GetDevices"> -+ <arg type="a(susdut)" direction="out"/> -+</method> -+<method name="GetPrimaryDevice"> -+ <arg type="(susdut)" direction="out"/> -+</method> -+<signal name="PropertiesChanged"> -+ <arg type="s"/> -+ <arg type="a{sv}"/> -+ <arg type="a[s]"/> -+</signal> -+<property name="Icon" type="s" access="read" /> -+</interface>; -+ -+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); -+ -+const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties"> -+<method name="Get"> -+ <arg type="s" direction="in"/> -+ <arg type="s" direction="in"/> -+ <arg type="v" direction="out"/> -+</method> -+<method name="GetAll"> -+ <arg type="s" direction="in"/> -+ <arg type="a{sv}" direction="out"/> -+</method> -+<method name="Set"> -+ <arg type="s" direction="in"/> -+ <arg type="s" direction="in"/> -+ <arg type="v" direction="in"/> -+</method> -+<signal name="PropertiesChanged"> -+ <arg type="s"/> -+ <arg type="a{sv}"/> -+ <arg type="a[s]"/> -+</signal> -+</interface>; -+ -+const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface); - - function DeviceItem() { - this._init.apply(this, arguments); -@@ -143,11 +154,11 @@ MyApplet.prototype = { - this.menuManager = new PopupMenu.PopupMenuManager(this); - this.menu = new Applet.AppletPopupMenu(this, orientation); - this.menuManager.addMenu(this.menu); -- -+ - //this.set_applet_icon_symbolic_name('battery-missing'); -- this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH); -- this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH); -- -+ this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); -+ this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); -+ - let icon = this.actor.get_children()[0]; - this.actor.remove_actor(icon); - let box = new St.BoxLayout({ name: 'batteryBox' }); -@@ -306,18 +317,19 @@ MyApplet.prototype = { - this._devicesChanged(); - }, - -- _devicesChanged: function() { -- this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) { -- if (icon) { -- this.set_applet_icon_symbolic_name('battery-missing'); -- let gicon = Gio.icon_new_for_string(icon); -- this._applet_icon.gicon = gicon; -- this.actor.show(); -- } else { -- this.menu.close(); -- this.actor.hide(); -- } -- })); -+ -+ _devicesChanged: function() { -+ this.set_applet_icon_symbolic_name('battery-missing'); -+ let icon = this._proxy.Icon; -+ if (icon) { -+ let gicon = Gio.icon_new_for_string(icon); -+ this.setGIcon(gicon); -+ this.actor.show(); -+ } else { -+ this.menu.close(); -+ this.actor.hide(); -+ } -+ - this._readPrimaryDevice(); - this._readOtherDevices(); - this._updateLabel(); -diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -index 50c4e1e..c8427ac 100644 ---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -@@ -1,7 +1,6 @@ - const Applet = imports.ui.applet; - const Mainloop = imports.mainloop; - const Gio = imports.gi.Gio; --const DBus = imports.dbus; - const Lang = imports.lang; - const Cinnamon = imports.gi.Cinnamon; - const Clutter = imports.gi.Clutter; -@@ -12,95 +11,50 @@ const Gvc = imports.gi.Gvc; - const Pango = imports.gi.Pango; - const Tooltips = imports.ui.tooltips; - --const PropIFace = { -- name: 'org.freedesktop.DBus.Properties', -- signals: [{ name: 'PropertiesChanged', -- inSignature: 'a{sv}'}] --}; -- --const MediaServer2IFace = { -- name: 'org.mpris.MediaPlayer2', -- methods: [{ name: 'Raise', -- inSignature: '', -- outSignature: '' }, -- { name: 'Quit', -- inSignature: '', -- outSignature: '' }], -- properties: [{ name: 'CanRaise', -- signature: 'b', -- access: 'read'}, -- { name: 'CanQuit', -- signature: 'b', -- access: 'read'}], --}; -- --const MediaServer2PlayerIFace = { -- name: 'org.mpris.MediaPlayer2.Player', -- methods: [{ name: 'PlayPause', -- inSignature: '', -- outSignature: '' }, -- { name: 'Pause', -- inSignature: '', -- outSignature: '' }, -- { name: 'Play', -- inSignature: '', -- outSignature: '' }, -- { name: 'Stop', -- inSignature: '', -- outSignature: '' }, -- { name: 'Next', -- inSignature: '', -- outSignature: '' }, -- { name: 'Previous', -- inSignature: '', -- outSignature: '' }, -- { name: 'SetPosition', -- inSignature: 'ox', -- outSignature: '' }], -- properties: [{ name: 'Metadata', -- signature: 'a{sv}', -- access: 'read'}, -- { name: 'Shuffle', -- signature: 'b', -- access: 'readwrite'}, -- { name: 'Rate', -- signature: 'd', -- access: 'readwrite'}, -- { name: 'LoopStatus', -- signature: 'b', -- access: 'readwrite'}, -- { name: 'Volume', -- signature: 'd', -- access: 'readwrite'}, -- { name: 'PlaybackStatus', -- signature: 's', -- access: 'read'}, -- { name: 'Position', -- signature: 'x', -- access: 'read'}, -- { name: 'CanGoNext', -- signature: 'b', -- access: 'read'}, -- { name: 'CanGoPrevious', -- signature: 'b', -- access: 'read'}, -- { name: 'CanPlay', -- signature: 'b', -- access: 'read'}, -- { name: 'CanPause', -- signature: 'b', -- access: 'read'}, -- { name: 'CanSeek', -- signature: 'b', -- access: 'read'}], -- signals: [{ name: 'Seeked', -- inSignature: 'x' }] --}; -+const PropIFace = <interface name="org.freedesktop.DBus.Properties"> -+<signal name="PropertiesChanged"> -+ <arg type="a{sv}"/> -+</signal> -+</interface>; -+ -+const MediaServer2IFace = <interface name="org.mpris.MediaPlayer2"> -+<method name="Raise" /> -+<method name="Quit" /> -+<property name="CanRaise" type="b" access="read" /> -+<property name="CanQuit" type="b" access="read" /> -+</interface>; -+ -+const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player"> -+<method name="PlayPause" /> -+<method name="Pause" /> -+<method name="Play" /> -+<method name="Stop" /> -+<method name="Next" /> -+<method name="Previous" /> -+<method name="SetPosition"> -+ <arg type="a{ov}" direction="in"/> -+</method> -+<property name='Metadata' access='read' type='a{sv}' /> -+<property name='Shuffle' access='readwrite' type='b' /> -+<property name='Rate' access='readwrite' type='d' /> -+<property name='LoopStatus' access='readwrite' type='s' /> -+<property name='Volume' access='readwrite' type='d' /> -+<property name='PlaybackStatus' access='read' type='s' /> -+<property name='Position' access='read' type='x' /> -+<property name="CanGoNext" type="b" access="read" /> -+<property name="CanGoPrevious" type="b" access="read" /> -+<property name="CanPlay" type="b" access="read" /> -+<property name="CanPause" type="b" access="read" /> -+<property name="CanSeek" type="b" access="read" /> -+<signal name="Seeked"> -+ <arg type="x"/> -+</signal> -+</interface>; - - /* global values */ - let icon_path = "/usr/share/cinnamon/theme/"; --let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp" ]; --let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ]; -+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ]; -+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ]; - /* dummy vars for translation */ - let x = _("Playing"); - x = _("Paused"); -@@ -112,131 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */ - const ICON_SIZE = 28; - - --function Prop() { -- this._init.apply(this, arguments); --} -- --Prop.prototype = { -- _init: function(owner) { -- DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); -- } --} --DBus.proxifyPrototype(Prop.prototype, PropIFace) -- --function MediaServer2() { -- this._init.apply(this, arguments); --} -- --MediaServer2.prototype = { -- _init: function(owner) { -- DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); -- }, -- getRaise: function(callback) { -- this.GetRemote('CanRaise', Lang.bind(this, -- function(raise, ex) { -- if (!ex) -- callback(this, raise); -- })); -- }, -- getQuit: function(callback) { -- this.GetRemote('CanQuit', Lang.bind(this, -- function(quit, ex) { -- if (!ex) -- callback(this, quit); -- })); -- } -+var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace); -+function Prop(owner, initCallback, cancellable) { -+ return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); - } --DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace) - --function MediaServer2Player() { -- this._init.apply(this, arguments); -+var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace); -+function MediaServer2(owner, initCallback, cancellable) { -+ return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); - } - --MediaServer2Player.prototype = { -- _init: function(owner) { -- this._owner = owner; -- DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); -- }, -- getMetadata: function(callback) { -- this.GetRemote('Metadata', Lang.bind(this, -- function(metadata, ex) { -- if (!ex) -- callback(this, metadata); -- })); -- }, -- getPlaybackStatus: function(callback) { -- this.GetRemote('PlaybackStatus', Lang.bind(this, -- function(status, ex) { -- if (!ex) -- callback(this, status); -- })); -- }, -- getRate: function(callback) { -- this.GetRemote('Rate', Lang.bind(this, -- function(rate, ex) { -- if (!ex) -- callback(this, rate); -- })); -- }, -- getPosition: function(callback) { -- this.GetRemote('Position', Lang.bind(this, -- function(position, ex) { -- if (!ex) -- callback(this, position); -- })); -- }, -- setPosition: function(value) { -- this.SetRemote('Position', value); -- }, -- getShuffle: function(callback) { -- this.GetRemote('Shuffle', Lang.bind(this, -- function(shuffle, ex) { -- if (!ex) -- callback(this, shuffle); -- })); -- }, -- setShuffle: function(value) { -- this.SetRemote('Shuffle', value); -- }, -- getVolume: function(callback) { -- this.GetRemote('Volume', Lang.bind(this, -- function(volume, ex) { -- if (!ex) -- callback(this, volume); -- })); -- }, -- setVolume: function(value) { -- this.SetRemote('Volume', parseFloat(value)); -- }, -- getRepeat: function(callback) { -- this.GetRemote('LoopStatus', Lang.bind(this, -- function(repeat, ex) { -- if (!ex) { -- if (repeat == "None") -- repeat = false -- else -- repeat = true -- callback(this, repeat); -- } -- })); -- }, -- setRepeat: function(value) { -- if (value) -- value = "Playlist" -- else -- value = "None" -- this.SetRemote('LoopStatus', value); -- }, -- getCanSeek: function(callback) { -- this.GetRemote('CanSeek', Lang.bind(this, -- function(canSeek, err) { -- if (!err) { -- callback(this, canSeek); -- } -- })); -- } -+var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace); -+function MediaServer2Player(owner, initCallback, cancellable) { -+ return new MediaServer2PlayerProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); - } --DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace) - - function TrackInfo() { - this._init.apply(this, arguments); -@@ -355,7 +198,6 @@ Player.prototype = { - _init: function(system_status_button, owner) { - PopupMenu.PopupMenuSection.prototype._init.call(this); - -- this.showPosition = true; // @todo: Get from settings - this._owner = owner; - this._system_status_button = system_status_button; - this._name = this._owner.split('.')[3]; -@@ -389,7 +231,7 @@ Player.prototype = { - this.infos_top.add_actor(this._artist.getActor()); - this.infos_bottom.add_actor(this._album.getActor()); - this.infos_top.add_actor(this._title.getActor()); -- -+ this.infos_bottom.add_actor(this._time.getActor()); - this._trackInfosTop.set_child(this.infos_top); - this._trackInfosBottom.set_child(this.infos_bottom); - ---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -@@ -414,45 +414,20 @@ - this._trackControls.set_child(this.controls); - this.addActor(this._trackControls); - -- this._seekControls = new St.Bin({style_class: 'sound-seek', x_align: St.Align.START}); -- this.seekControls = new St.BoxLayout({style_class: 'sound-seek-box'}); -- this.seekControls.add_actor(this._time.getActor()); -- -- this._positionSlider = new PopupMenu.PopupSliderMenuItem(0); -- this._positionSlider.connect('value-changed', Lang.bind(this, function(item) { -- let time = item._value * this._songLength; -- this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength)); -- })); -- this._positionSlider.connect('drag-end', Lang.bind(this, function(item) { -- let time = item._value * this._songLength; -- this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength)); -- this._wantedSeekValue = Math.round(time * 1000000); -- this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000); -- })); -- -- this.sliderBin = new St.Bin({style_class: 'sound-seek-slider'}); -- this.sliderBin.set_child(this._positionSlider.actor); -- this.seekControls.add_actor(this.sliderBin); -- this._seekControls.set_child(this.seekControls); -- this.addActor(this._seekControls); -- -- this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) { -- if (raise) { -- this._raiseButton = new ControlButton('go-up', -- Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); -- this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); -- this.controls.add_actor(this._raiseButton.getActor()); -- } -- })); -- -- this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) { -- if (quit) { -- this._quitButton = new ControlButton('window-close', -- Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); -- this.controls.add_actor(this._quitButton.getActor()); -- this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); -- } -- })); -+ let CanRaise = this._mediaServer.CanRaise; -+ let CanQuit = this._mediaServer.CanQuit; -+ if (CanRaise) { -+ this._raiseButton = new ControlButton('go-up', -+ Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); -+ this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); -+ this.controls.add_actor(this._raiseButton.getActor()); -+ } -+ if (CanQuit) { -+ this._quitButton = new ControlButton('window-close', -+ Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); -+ this.controls.add_actor(this._quitButton.getActor()); -+ this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); -+ } - - /* this players don't support seek */ - if (support_seek.indexOf(this._name) == -1) { -@@ -465,39 +440,23 @@ - this._getMetadata(); - this._currentTime = 0; - this._getPosition(); -- this._wantedSeekValue = 0; -- this._updatePositionSlider(); - -- this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { -+ this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { - if (value["PlaybackStatus"]) -- this._setStatus(iface, value["PlaybackStatus"]); -+ this._setStatus(value["PlaybackStatus"]); - if (value["Metadata"]) -- this._setMetadata(iface, value["Metadata"]); -- //qmmp -- if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -+ this._setMetadata(value["Metadata"]); -+ // qmmp -+ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { - if (value["playbackStatus"]) -- this._setStatus(iface, value["playbackStatus"]); -+ this._setStatus(value["playbackStatus"]); - if (value["metadata"]) -- this._setMetadata(sender, value["metadata"]); -- } -- })); -- -- this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { -- if (value > 0) { -- this._setPosition(value); -- } -- // Seek initiated by the position slider -- else if (this._wantedSeekValue > 0) { -- // Some broken gstreamer players (Banshee) reports always 0 -- // when the track is seeked so we set the position at the -- // value we set on the slider -- this._setPosition(this._wantedSeekValue); -+ this._setMetadata(value["metadata"]); - } -- // Seek value send by the player -- else -- this._setPosition(value); -+ })); - -- this._wantedSeekValue = 0; -+ this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { -+ this._setPosition(sender, value); - })); - - Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); - -@@ -512,45 +303,26 @@ Player.prototype = { - this._playerInfo.setText(this._getName() + " - " + _(status)); - }, - -- _updatePositionSlider: function(position) { -- this._mediaServerPlayer.getCanSeek(Lang.bind(this, function(sender, canSeek) { -- this._canSeek = canSeek; -- -- if (this._songLength == 0 || position == false) -- this._canSeek = false -- -- // Clem: The following code was commented out. When the next song started, it resulted in hiding the sound menu, making it hard for the user to repeatedly click on the next song button. -- // There's probably a better fix and this was not tested with players which don't support seeking, but it fixes the regression created by the slider (apparently when the slider is hidden it closes the menu) -- // if (this._playerStatus == "Playing" && this._canSeek && this.showPosition) -- // this._positionSlider.actor.show(); -- // else -- // this._positionSlider.actor.hide(); -- })); -- }, -- -- _setPosition: function(value) { -- if (value == null && this._playerStatus != 'Stopped') { -- this._updatePositionSlider(false); -- } -- else { -- this._currentTime = value / 1000000; -- this._updateTimer(); -- } -+ _setPosition: function(sender, value) { -+ this._stopTimer(); -+ this._currentTime = value / 1000000; -+ this._updateTimer(); -+ if (this._playerStatus == "Playing") -+ this._runTimer(); - }, - - _getPosition: function() { -- this._mediaServerPlayer.getPosition(Lang.bind(this, function(sender, value) { -- this._setPosition(value); -- })); -+ this._setPosition(this._mediaServerPlayer.Position); -+ Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); - }, - -- _setMetadata: function(sender, metadata) { -+ _setMetadata: function(metadata) { - if (metadata["mpris:length"]) { - // song length in secs -- this._songLength = metadata["mpris:length"] / 1000000; -+ this._songLength = metadata["mpris:length"].unpack() / 1000000; - // FIXME upstream - if (this._name == "quodlibet") -- this._songLength = metadata["mpris:length"] / 1000; -+ this._songLength = metadata["mpris:length"].unpack() / 1000; - // reset timer - this._stopTimer(); - if (this._playerStatus == "Playing") -@@ -559,26 +333,29 @@ Player.prototype = { - this._stopTimer(); - } - if (metadata["xesam:artist"]) -- this._artist.setLabel(metadata["xesam:artist"].toString()); -+ this._artist.setLabel(metadata["xesam:artist"].unpack()); - else - this._artist.setLabel(_("Unknown Artist")); - if (metadata["xesam:album"]) -- this._album.setLabel(metadata["xesam:album"].toString()); -+ this._album.setLabel(metadata["xesam:album"].unpack()); - else - this._album.setLabel(_("Unknown Album")); - if (metadata["xesam:title"]) -- this._title.setLabel(metadata["xesam:title"].toString()); -+ this._title.setLabel(metadata["xesam:title"].unpack()); - else - this._title.setLabel(_("Unknown Title")); -- -- if (metadata["mpris:trackid"]) { -- this._trackObj = metadata["mpris:trackid"]; -- } -+ /*if (metadata["mpris:trackid"]) { -+ this._trackId = { -+ _init: function() { -+ DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]); -+ } -+ } -+ }*/ - - let change = false; - if (metadata["mpris:artUrl"]) { -- if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) { -- this._trackCoverFile = metadata["mpris:artUrl"].toString(); -+ if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) { -+ this._trackCoverFile = metadata["mpris:artUrl"].unpack(); - change = true; - } - } -@@ -600,8 +377,7 @@ Player.prototype = { - cover.read_async(null, null, Lang.bind(this, this._onReadCover)); - } - else { -- cover_path = decodeURIComponent(this._trackCoverFile); -- cover_path = cover_path.replace("file://", ""); -+ cover_path = decodeURIComponent(this._trackCoverFile.substr(7)); - this._showCover(cover_path); - } - } -@@ -611,13 +387,10 @@ Player.prototype = { - }, - - _getMetadata: function() { -- this._mediaServerPlayer.getMetadata(Lang.bind(this, -- this._setMetadata -- )); -+ this._setMetadata(this._mediaServerPlayer.Metadata); - }, - -- _setStatus: function(sender, status) { -- this._updatePositionSlider(); -+ _setStatus: function(status) { - this._playerStatus = status; - if (status == "Playing") { - this._playButton.setIcon("media-playback-pause"); -@@ -631,53 +404,39 @@ Player.prototype = { - this._playButton.setIcon("media-playback-start"); - this._stopTimer(); - } -- - this._playerInfo.setImage("player-" + status.toLowerCase()); - this._setName(status); - }, - - _getStatus: function() { -- this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this, -- this._setStatus -- )); -+ this._setStatus(this._mediaServerPlayer.PlaybackStatus); - }, - - _updateRate: function() { -- this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) { -- this._rate = rate; -- })); -+ this._rate = this._mediaServerPlayer.Rate; - }, - - _updateTimer: function() { -- if (this.showPosition && this._canSeek) { -- if (!isNaN(this._currentTime) && !isNaN(this._songLength) && this._currentTime > 0) -- this._positionSlider.setValue(this._currentTime / this._songLength); -- else -- this._positionSlider.setValue(0); -- } - this._time.setLabel(this._formatTime(this._currentTime) + " / " + this._formatTime(this._songLength)); - }, - - _runTimer: function() { -- if (this._playerStatus == 'Playing') { -- this._timeoutId = Mainloop.timeout_add_seconds(1, Lang.bind(this, this._runTimer)); -- this._currentTime += 1; -- this._updateTimer(); -- } -+ /*if (!Tweener.resumeTweens(this)) { -+ Tweener.addTween(this, -+ { time: this._songLength - this._currentTime, -+ transition: 'linear', -+ onUpdate: Lang.bind(this, this._updateTimer) }); -+ }*/ - }, - - _pauseTimer: function() { -- if (this._timeoutId != 0) { -- Mainloop.source_remove(this._timeoutId); -- this._timeoutId = 0; -- } -- this._updateTimer(); -+ //Tweener.pauseTweens(this); - }, - - _stopTimer: function() { -+ /*Tweener.removeTweens(this); - this._currentTime = 0; -- this._pauseTimer(); -- this._updateTimer(); -+ this._updateTimer();*/ - }, - - _formatTime: function(s) { -@@ -771,7 +530,7 @@ MediaPlayerLauncher.prototype = { - }, - - activate: function (event) { -- this._menu.actor.hide(); -+ this._menu.actor.hide(); - this._app.activate_full(-1, event.get_time()); - return true; - } -@@ -799,7 +558,7 @@ MyApplet.prototype = { - this._players = {}; - // watch players - for (var p=0; p<compatible_players.length; p++) { -- DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false, -+ Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, - Lang.bind(this, this._addPlayer), - Lang.bind(this, this._removePlayer) - ); -@@ -930,7 +689,7 @@ MyApplet.prototype = { - return Object.keys(this._players).length; - }, - -- _addPlayer: function(owner) { -+ _addPlayer: function(connection, owner) { - // ensure menu is empty - this._cleanup(); - this._volumeControlShown = false; -@@ -945,12 +704,12 @@ MyApplet.prototype = { - this._readOutput(); - }, - -- _removePlayer: function(owner) { -+ _removePlayer: function(connection, owner) { - delete this._players[owner]; - this._cleanup(); - this._volumeControlShown = false; - for (owner in this._players) { -- this._addPlayer(owner); -+ this._addPlayer(connection, owner); - } - this.menu.emit('players-loaded', true); - -@@ -974,21 +733,21 @@ MyApplet.prototype = { - this._volumeControlShown = true; - - if (this._nbPlayers()==0){ -- this._availablePlayers = new Array(); -+ this._availablePlayers = new Array(); - let appsys = Cinnamon.AppSystem.get_default(); - let allApps = appsys.get_all(); - let listedDesktopFiles = new Array(); - for (let y=0; y<allApps.length; y++) { -- let app = allApps[y]; -- let entry = app.get_tree_entry(); -- let path = entry.get_desktop_file_path(); -- for (var p=0; p<compatible_players.length; p++) { -+ let app = allApps[y]; -+ let entry = app.get_tree_entry(); -+ let path = entry.get_desktop_file_path(); -+ for (var p=0; p<compatible_players.length; p++) { - let desktopFile = compatible_players[p]+".desktop"; -- if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) { -- this._availablePlayers.push(app); -+ if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) { -+ this._availablePlayers.push(app); - listedDesktopFiles.push(desktopFile); -- } -- } -+ } -+ } - } - - if (this._availablePlayers.length > 0){ -@@ -1137,19 +896,19 @@ MyApplet.prototype = { - this._mutedChanged (null, null, '_output'); - this._volumeChanged (null, null, '_output'); - let sinks = this._control.get_sinks(); -- this._selectDeviceItem.menu.removeAll(); -- for (let i = 0; i < sinks.length; i++) { -- let sink = sinks[i]; -- let menuItem = new PopupMenu.PopupMenuItem(sink.get_description()); -- if (sinks[i].get_id() == this._output.get_id()) { -- menuItem.setShowDot(true); -- } -- menuItem.connect('activate', Lang.bind(this, function() { -- log('Changing default sink to ' + sink.get_description()); -- this._control.set_default_sink(sink); -- })); -- this._selectDeviceItem.menu.addMenuItem(menuItem); -- } -+ this._selectDeviceItem.menu.removeAll(); -+ for (let i = 0; i < sinks.length; i++) { -+ let sink = sinks[i]; -+ let menuItem = new PopupMenu.PopupMenuItem(sink.get_description()); -+ if (sinks[i].get_id() == this._output.get_id()) { -+ menuItem.setShowDot(true); -+ } -+ menuItem.connect('activate', Lang.bind(this, function() { -+ log('Changing default sink to ' + sink.get_description()); -+ this._control.set_default_sink(sink); -+ })); -+ this._selectDeviceItem.menu.addMenuItem(menuItem); -+ } - } else { - this._outputSlider.setValue(0); - this.setIconName('audio-volume-muted-symbolic'); -diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js -index 0dcf74d..c2d152a 100644 ---- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js -@@ -1,6 +1,6 @@ - /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ - --const DBus = imports.dbus; -+const Gio = imports.gi.Gio; - const Gdk = imports.gi.Gdk; - const GLib = imports.gi.GLib; - const GnomeDesktop = imports.gi.GnomeDesktop; -@@ -22,13 +22,14 @@ let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ], - [ GnomeDesktop.RRRotation.ROTATION_180, N_("Upside-down") ] - ]; - --const XRandr2Iface = { -- name: 'org.gnome.SettingsDaemon.XRANDR_2', -- methods: [ -- { name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' }, -- ] --}; --let XRandr2 = DBus.makeProxyClass(XRandr2Iface); -+const XRandr2Iface = <interface name="org.gnome.SettingsDaemon.XRANDR_2"> -+<method name="ApplyConfiguration"> -+ <arg type="x" direction="in"/> -+ <arg type="x" direction="in"/> -+</method> -+</interface>; -+ -+const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface); - - function MyApplet(orientation, panel_height) { - this._init(orientation, panel_height); -@@ -48,7 +49,7 @@ MyApplet.prototype = { - this.menu = new Applet.AppletPopupMenu(this, orientation); - this.menuManager.addMenu(this.menu); - -- this._proxy = new XRandr2(DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR'); -+ this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR'); - - try { - this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() }); -diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js -index a2b61fd..e21d3a8 100644 ---- a/js/misc/gnomeSession.js -+++ b/js/misc/gnomeSession.js -@@ -1,20 +1,18 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; -+const Gio = imports.gi.Gio; - const Lang = imports.lang; - const Signals = imports.signals; - --const PresenceIface = { -- name: 'org.gnome.SessionManager.Presence', -- methods: [{ name: 'SetStatus', -- inSignature: 'u', -- outSignature: '' }], -- properties: [{ name: 'status', -- signature: 'u', -- access: 'readwrite' }], -- signals: [{ name: 'StatusChanged', -- inSignature: 'u' }] --}; -+const PresenceIface = <interface name="org.gnome.SessionManager.Presence"> -+<method name="SetStatus"> -+ <arg type="u" direction="in"/> -+</method> -+<property name="status" type="u" access="readwrite"/> -+<signal name="StatusChanged"> -+ <arg type="u" direction="out"/> -+</signal> -+</interface>; - - const PresenceStatus = { - AVAILABLE: 0, -@@ -23,104 +21,37 @@ const PresenceStatus = { - IDLE: 3 - }; - --function Presence() { -- this._init(); -+var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface); -+function Presence(initCallback, cancellable) { -+ return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager', -+ '/org/gnome/SessionManager/Presence', initCallback, cancellable); - } - --Presence.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this); -- }, -- -- getStatus: function(callback) { -- this.GetRemote('status', Lang.bind(this, -- function(status, ex) { -- if (!ex) -- callback(this, status); -- })); -- }, -- -- setStatus: function(status) { -- this.SetStatusRemote(status); -- } --}; --DBus.proxifyPrototype(Presence.prototype, PresenceIface); -- --// Note inhibitors are immutable objects, so they don't --// change at runtime (changes always come in the form --// of new inhibitors) --const InhibitorIface = { -- name: 'org.gnome.SessionManager.Inhibitor', -- properties: [{ name: 'app_id', -- signature: 's', -- access: 'readonly' }, -- { name: 'client_id', -- signature: 's', -- access: 'readonly' }, -- { name: 'reason', -- signature: 's', -- access: 'readonly' }, -- { name: 'flags', -- signature: 'u', -- access: 'readonly' }, -- { name: 'toplevel_xid', -- signature: 'u', -- access: 'readonly' }, -- { name: 'cookie', -- signature: 'u', -- access: 'readonly' }], --}; -- --function Inhibitor(objectPath) { -- this._init(objectPath); -+const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor"> -+<property name="app_id" type="s" access="read" /> -+<property name="client_id" type="s" access="read" /> -+<property name="reason" type="s" access="read" /> -+<property name="flags" type="u" access="read" /> -+<property name="toplevel_xid" type="u" access="read" /> -+<property name="cookie" type="u" access="read" /> -+</interface>; -+ -+var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface); -+function Inhibitor(objectPath, initCallback, cancellable) { -+ return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable); - } - --Inhibitor.prototype = { -- _init: function(objectPath) { -- DBus.session.proxifyObject(this, -- 'org.gnome.SessionManager', -- objectPath); -- this.isLoaded = false; -- this._loadingPropertiesCount = InhibitorIface.properties.length; -- for (let i = 0; i < InhibitorIface.properties.length; i++) { -- let propertyName = InhibitorIface.properties[i].name; -- this.GetRemote(propertyName, Lang.bind(this, -- function(value, exception) { -- if (exception) -- return; -- -- this[propertyName] = value; -- this._loadingPropertiesCount--; -- -- if (this._loadingPropertiesCount == 0) { -- this.isLoaded = true; -- this.emit('is-loaded'); -- } -- })); -- } -- }, --}; --DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface); --Signals.addSignalMethods(Inhibitor.prototype); -- -- --// Not the full interface, only the methods we use --const SessionManagerIface = { -- name: 'org.gnome.SessionManager', -- methods: [ -- { name: 'Logout', inSignature: 'u', outSignature: '' }, -- { name: 'Shutdown', inSignature: '', outSignature: '' }, -- { name: 'CanShutdown', inSignature: '', outSignature: 'b' } -- ] --}; -- --function SessionManager() { -- this._init(); -+const SessionManagerIface = <interface name="org.gnome.SessionManager"> -+<method name="Logout"> -+ <arg type="u" direction="in" /> -+</method> -+<method name="Shutdown" /> -+<method name="CanShutdown"> -+ <arg type="b" direction="out" /> -+</method> -+</interface>; -+ -+var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface); -+function SessionManager(initCallback, cancellable) { -+ return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable); - } -- --SessionManager.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager'); -- } --}; --DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface); -\ No newline at end of file -diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js -index befd142..f35f925 100644 ---- a/js/misc/modemManager.js -+++ b/js/misc/modemManager.js -@@ -1,6 +1,6 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; -+const Gio = imports.gi.Gio; - const Lang = imports.lang; - const Cinnamon = imports.gi.Cinnamon; - const Signals = imports.signals; -@@ -8,33 +8,43 @@ const Signals = imports.signals; - // The following are not the complete interfaces, just the methods we need - // (or may need in the future) - --const ModemGsmNetworkInterface = { -- name: 'org.freedesktop.ModemManager.Modem.Gsm.Network', -- methods: [ -- { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' }, -- { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' } -- ], -- properties: [ -- { name: 'AccessTechnology', signature: 'u', access: 'read' } -- ], -- signals: [ -- { name: 'SignalQuality', inSignature: 'u' }, -- { name: 'RegistrationInfo', inSignature: 'uss' } -- ] --}; --const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface); -- --const ModemCdmaInterface = { -- name: 'org.freedesktop.ModemManager.Modem.Cdma', -- methods: [ -- { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }, -- { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' } -- ], -- signals: [ -- { name: 'SignalQuality', inSignature: 'u' } -- ] --}; --const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface); -+const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> -+<method name="GetRegistrationInfo"> -+ <arg type="u" direction="out" /> -+ <arg type="s" direction="out" /> -+ <arg type="s" direction="out" /> -+</method> -+<method name="GetSignalQuality"> -+ <arg type="u" direction="out" /> -+</method> -+<property name="AccessTechnology" type="u" access="read" /> -+<signal name="SignalQuality"> -+ <arg type="u" direction="out" /> -+</signal> -+<signal name="RegistrationInfo"> -+ <arg type="u" direction="out" /> -+ <arg type="s" direction="out" /> -+ <arg type="s" direction="out" /> -+</signal> -+</interface>; -+ -+const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface); -+ -+const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma"> -+<method name="GetSignalQuality"> -+ <arg type="u" direction="out" /> -+</method> -+<method name="GetServingSystem"> -+ <arg type="u" direction="out" /> -+ <arg type="s" direction="out" /> -+ <arg type="u" direction="out" /> -+</method> -+<signal name="SignalQuality"> -+ <arg type="u" direction="out" /> -+</signal> -+</interface>; -+ -+const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface); - - let _providersTable; - function _getProvidersTable() { -@@ -50,17 +60,17 @@ function ModemGsm() { - - ModemGsm.prototype = { - _init: function(path) { -- this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path); -+ this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path); - - this.signal_quality = 0; - this.operator_name = null; - - // Code is duplicated because the function have different signatures -- this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) { -+ this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) { - this.signal_quality = quality; - this.emit('notify::signal-quality'); - })); -- this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) { -+ this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) { - this.operator_name = this._findOperatorName(name, code); - this.emit('notify::operator-name'); - })); -@@ -154,12 +164,13 @@ function ModemCdma() { - } - - ModemCdma.prototype = { -- _init: function(path) { -- this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path); -+ _init: function(path) { -+ this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path); - - this.signal_quality = 0; - this.operator_name = null; -- this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) { -+ this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) { -+ this.signal_quality = params[0]; - this.signal_quality = quality; - this.emit('notify::signal-quality'); - -diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js -index c471856..aec883f 100644 ---- a/js/misc/screenSaver.js -+++ b/js/misc/screenSaver.js -@@ -1,53 +1,48 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; - const Lang = imports.lang; -- --const ScreenSaverIface = { -- name: 'org.gnome.ScreenSaver', -- methods: [{ name: 'GetActive', -- inSignature: '', -- outSignature: 'b' }, -- { name: 'Lock', -- inSignature: '' }, -- { name: 'SetActive', -- inSignature: 'b' }], -- signals: [{ name: 'ActiveChanged', -- inSignature: 'b' }] --}; -+const Gio = imports.gi.Gio; -+ -+const ScreenSaverIface = <interface name="org.gnome.ScreenSaver"> -+<method name="GetActive"> -+ <arg type="b" direction="out" /> -+</method> -+<method name="Lock" /> -+<method name="SetActive"> -+ <arg type="b" direction="in" /> -+</method> -+<signal name="ActiveChanged"> -+ <arg type="b" direction="out" /> -+</signal> -+</interface>; -+ -+const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface); - - function ScreenSaverProxy() { -- this._init(); -+ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session, -+ g_interface_name: ScreenSaverInfo.name, -+ g_interface_info: ScreenSaverInfo, -+ g_name: 'org.gnome.ScreenSaver', -+ g_object_path: '/org/gnome/ScreenSaver', -+ g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | -+ Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); -+ self.init(null); -+ self.screenSaverActive = false; -+ -+ self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) { -+ self.screenSaverActive = isActive; -+ }); -+ self.connect('notify::g-name-owner', function() { -+ if (self.g_name_owner) { -+ self.GetActiveRemote(function(result, excp) { -+ if (result) { -+ let [isActive] = result; -+ self.screenSaverActive = isActive; -+ } -+ }); -+ } else -+ self.screenSaverActive = false; -+ }); -+ -+ return self; - } -- --ScreenSaverProxy.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, -- 'org.gnome.ScreenSaver', -- '/org/gnome/ScreenSaver'); -- -- DBus.session.watch_name('org.gnome.ScreenSaver', -- false, // do not launch a name-owner if none exists -- Lang.bind(this, this._onSSAppeared), -- Lang.bind(this, this._onSSVanished)); -- -- this.screenSaverActive = false; -- this.connect('ActiveChanged', -- Lang.bind(this, this._onActiveChanged)); -- }, -- -- _onSSAppeared: function(owner) { -- this.GetActiveRemote(Lang.bind(this, function(isActive) { -- this.screenSaverActive = isActive; -- })) -- }, -- -- _onSSVanished: function(oldOwner) { -- this.screenSaverActive = false; -- }, -- -- _onActiveChanged: function(object, isActive) { -- this.screenSaverActive = isActive; -- } --}; --DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface); -diff --git a/js/ui/appletManager.js b/js/ui/appletManager.js -index abf8136..830d80d 100644 ---- a/js/ui/appletManager.js -+++ b/js/ui/appletManager.js -@@ -7,7 +7,6 @@ const Cinnamon = imports.gi.Cinnamon; - const Main = imports.ui.main; - const Applet = imports.ui.applet; - const Extension = imports.ui.extension; --const DBus = imports.dbus; - - // Maps uuid -> metadata object - var appletMeta; -diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js -index fa73bfe..f29f9f3 100644 ---- a/js/ui/automountManager.js -+++ b/js/ui/automountManager.js -@@ -1,7 +1,6 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - - const Lang = imports.lang; --const DBus = imports.dbus; - const Mainloop = imports.mainloop; - const Gio = imports.gi.Gio; - const Params = imports.misc.params; -@@ -15,63 +14,57 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount'; - - const AUTORUN_EXPIRE_TIMEOUT_SECS = 10; - --const ConsoleKitSessionIface = { -- name: 'org.freedesktop.ConsoleKit.Session', -- methods: [{ name: 'IsActive', -- inSignature: '', -- outSignature: 'b' }], -- signals: [{ name: 'ActiveChanged', -- inSignature: 'b' }] --}; -+const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session"> -+<method name="isActive"> -+ <arg type="b" direction="out" /> -+</method> -+<method name="ActiveChanged"> -+ <arg type="b" direction="in" /> -+</method> -+</interface>; - --const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface); -+const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface); - --const ConsoleKitManagerIface = { -- name: 'org.freedesktop.ConsoleKit.Manager', -- methods: [{ name: 'GetCurrentSession', -- inSignature: '', -- outSignature: 'o' }] --}; -+const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager"> -+<method name="GetCurrentSession"> -+ <arg type="o" direction="out" /> -+</method> -+</interface>; - --function ConsoleKitManager() { -- this._init(); --}; -- --ConsoleKitManager.prototype = { -- _init: function() { -- this.sessionActive = true; -- -- DBus.system.proxifyObject(this, -- 'org.freedesktop.ConsoleKit', -- '/org/freedesktop/ConsoleKit/Manager'); -+const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface); - -- DBus.system.watch_name('org.freedesktop.ConsoleKit', -- false, // do not launch a name-owner if none exists -- Lang.bind(this, this._onManagerAppeared), -- Lang.bind(this, this._onManagerVanished)); -- }, -- -- _onManagerAppeared: function(owner) { -- this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession)); -- }, -- -- _onManagerVanished: function(oldOwner) { -- this.sessionActive = true; -- }, -- -- _onCurrentSession: function(session) { -- this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session); -- -- this._ckSession.connect -- ('ActiveChanged', Lang.bind(this, function(object, isActive) { -- this.sessionActive = isActive; -- })); -- this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) { -- this.sessionActive = isActive; -- })); -+function ConsoleKitManager() { -+ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system, -+ g_interface_name: ConsoleKitManagerInfo.name, -+ g_interface_info: ConsoleKitManagerInfo, -+ g_name: 'org.freedesktop.ConsoleKit', -+ g_object_path: '/org/freedesktop/ConsoleKit/Manager', -+ g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | -+ Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); -+ -+ self._updateSessionActive = function() { -+ if (self.g_name_owner) { -+ self.GetCurrentSessionRemote(function([session]) { -+ self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session); -+ -+ self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) { -+ self.sessionActive = isActive; -+ }); -+ self._ckSession.IsActiveRemote(function([isActive]) { -+ self.sessionActive = isActive; -+ }); -+ }); -+ } else { -+ self.sessionActive = true; -+ } - } --}; --DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface); -+ self.connect('notify::g-name-owner', -+ Lang.bind(self, self._updateSessionActive)); -+ -+ self._updateSessionActive(); -+ self.init(null); -+ return self; -+} - - function AutomountManager() { - this._init(); -@@ -85,9 +78,8 @@ AutomountManager.prototype = { - this.ckListener = new ConsoleKitManager(); - - this._ssProxy = new ScreenSaver.ScreenSaverProxy(); -- this._ssProxy.connect('ActiveChanged', -- Lang.bind(this, -- this._screenSaverActiveChanged)); -+ this._ssProxy.connectSignal('ActiveChanged', -+ Lang.bind(this, this._screenSaverActiveChanged)); - - this._volumeMonitor = Gio.VolumeMonitor.get(); - -@@ -110,7 +102,7 @@ AutomountManager.prototype = { - Mainloop.idle_add(Lang.bind(this, this._startupMountAll)); - }, - -- _screenSaverActiveChanged: function(object, isActive) { -+ _screenSaverActiveChanged: function(object, senderName, [isActive]) { - if (!isActive) { - this._volumeQueue.forEach(Lang.bind(this, function(volume) { - this._checkAndMountVolume(volume); -diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js -index 02cd4da..99b6fbe 100644 ---- a/js/ui/autorunManager.js -+++ b/js/ui/autorunManager.js -@@ -1,7 +1,6 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - - const Lang = imports.lang; --const DBus = imports.dbus; - const Gio = imports.gi.Gio; - const St = imports.gi.St; - -@@ -61,25 +60,19 @@ function startAppForMount(app, mount) { - - /******************************************/ - --const HotplugSnifferIface = { -- name: 'org.Cinnamon.HotplugSniffer', -- methods: [{ name: 'SniffURI', -- inSignature: 's', -- outSignature: 'as' }] --}; -- --const HotplugSniffer = function() { -- this._init(); --}; -+const HotplugSnifferIface = <interface name="org.Cinnamon.HotplugSniffer"> -+<method name="SniffURI"> -+ <arg type="s" direction="in" /> -+ <arg type="as" direction="out" /> -+</method> -+</interface>; - --HotplugSniffer.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, -+const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface); -+function HotplugSniffer() { -+ return new HotplugSnifferProxy(Gio.DBus.session, - 'org.Cinnamon.HotplugSniffer', - '/org/Cinnamon/HotplugSniffer'); -- }, --}; --DBus.proxifyPrototype(HotplugSniffer.prototype, HotplugSnifferIface); -+} - - function ContentTypeDiscoverer(callback) { - this._init(callback); -diff --git a/js/ui/calendar.js b/js/ui/calendar.js -index ff4777a..a97e2a9 100644 ---- a/js/ui/calendar.js -+++ b/js/ui/calendar.js -@@ -1,6 +1,5 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; - const Clutter = imports.gi.Clutter; - const Gio = imports.gi.Gio; - const Lang = imports.lang; -@@ -194,30 +193,34 @@ EmptyEventSource.prototype = { - }; - Signals.addSignalMethods(EmptyEventSource.prototype); - --const CalendarServerIface = { -- name: 'org.Cinnamon.CalendarServer', -- methods: [{ name: 'GetEvents', -- inSignature: 'xxb', -- outSignature: 'a(sssbxxa{sv})' }], -- signals: [{ name: 'Changed', -- inSignature: '' }] --}; -- --const CalendarServer = function () { -- this._init(); --}; -- --CalendarServer.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, 'org.Cinnamon.CalendarServer', '/org/Cinnamon/CalendarServer'); -- } --}; -- --DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface); -+const CalendarServerIface = <interface name="org.Cinnamon.CalendarServer"> -+<method name="GetEvents"> -+ <arg type="x" direction="in" /> -+ <arg type="x" direction="in" /> -+ <arg type="b" direction="in" /> -+ <arg type="a(sssbxxa{sv})" direction="out" /> -+</method> -+<signal name="Changed" /> -+</interface>; -+ -+const CalendarServerInfo = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface); -+ -+function CalendarServer() { -+ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session, -+ g_interface_name: CalendarServerInfo.name, -+ g_interface_info: CalendarServerInfo, -+ g_name: 'org.Cinnamon.CalendarServer', -+ g_object_path: '/org/Cinnamon/CalendarServer', -+ g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | -+ Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); -+ -+ self.init(null); -+ return self; -+} - - // an implementation that reads data from a session bus service --function DBusEventSource(owner) { -- this._init(owner); -+function DBusEventSource() { -+ this._init(); - } - - function _datesEqual(a, b) { -@@ -240,16 +243,18 @@ function _dateIntervalsOverlap(a0, a1, b0, b1) - - - DBusEventSource.prototype = { -- _init: function(owner) { -+ _init: function() { - this._resetCache(); - -- this._dbusProxy = new CalendarServer(owner); -- this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged)); -+ this._dbusProxy = new CalendarServer(); -+ this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged)); - -- DBus.session.watch_name('org.Cinnamon.CalendarServer', -- false, // do not launch a name-owner if none exists -- Lang.bind(this, this._onNameAppeared), -- Lang.bind(this, this._onNameVanished)); -+ this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() { -+ if (this._dbusProxy.g_name_owner) -+ this._onNameAppeared(); -+ else -+ this._onNameVanished(); -+ })); - }, - - _resetCache: function() { -@@ -272,7 +277,7 @@ DBusEventSource.prototype = { - this._loadEvents(false); - }, - -- _onEventsReceived: function(appointments) { -+ _onEventsReceived: function([appointments]) { - let newEvents = []; - if (appointments != null) { - for (let n = 0; n < appointments.length; n++) { -@@ -295,9 +300,9 @@ DBusEventSource.prototype = { - - _loadEvents: function(forceReload) { - if (this._curRequestBegin && this._curRequestEnd){ -- let callFlags = 0; -+ let callFlags = Gio.DBusCallFlags.NO_AUTO_START; - if (forceReload) -- callFlags |= DBus.CALL_FLAG_START; -+ callFlags = Gio.DBusCallFlags.NONE; - this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000, - this._curRequestEnd.getTime() / 1000, - forceReload, -diff --git a/js/ui/cinnamonDBus.js b/js/ui/cinnamonDBus.js -index 600e92f..5d4eb1c 100644 ---- a/js/ui/cinnamonDBus.js -+++ b/js/ui/cinnamonDBus.js -@@ -1,7 +1,7 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; - const Lang = imports.lang; -+const Gio = imports.gi.Gio; - - const Config = imports.misc.config; - const Flashspot = imports.ui.flashspot; -@@ -9,48 +9,53 @@ const Main = imports.ui.main; - const AppletManager = imports.ui.appletManager; - const DeskletManager = imports.ui.deskletManager; - --const CinnamonIface = { -- name: 'org.Cinnamon', -- methods: [{ name: 'Eval', -- inSignature: 's', -- outSignature: 'bs' -- }, -- { name: 'ScreenshotArea', -- inSignature: 'biiiibs', -- outSignature: '' -- }, -- { name: 'ScreenshotWindow', -- inSignature: 'bbbs', -- outSignature: '' -- }, -- { name: 'Screenshot', -- inSignature: 'bbs', -- outSignature: '' -- }, -- { -- name: 'FlashArea', -- inSignature: 'iiii', -- outSignature: '' -- }, -- { -- name: 'highlightApplet', -- inSignature: 'sb', -- outSignature: '' -- }, -- { -- name: 'activateCallback', -- inSignature: 'ssb', -- outSignature: '' -- } -- ], -- signals: [], -- properties: [{ name: 'OverviewActive', -- signature: 'b', -- access: 'readwrite' }, -- { name: 'CinnamonVersion', -- signature: 's', -- access: 'read' }] --}; -+ -+const CinnamonIface = <interface name="org.Cinnamon"> -+<method name="Eval"> -+ <arg type="s" direction="in" name="script" /> -+ <arg type="b" direction="out" name="success" /> -+ <arg type="s" direction="out" name="result" /> -+</method> -+<method name="ScreenshotArea"> -+include_cursor -+ <arg type="b" direction="in" name="include_cursor"/> -+ <arg type="i" direction="in" name="x"/> -+ <arg type="i" direction="in" name="y"/> -+ <arg type="i" direction="in" name="width"/> -+ <arg type="i" direction="in" name="height"/> -+ <arg type="b" direction="in" name="flash"/> -+ <arg type="s" direction="in" name="filename"/> -+</method> -+<method name="ScreenshotWindow"> -+ <arg type="b" direction="in" name="include_frame"/> -+ <arg type="b" direction="in" name="include_cursor"/> -+ <arg type="b" direction="in" name="flash"/> -+ <arg type="s" direction="in" name="filename"/> -+</method> -+<method name="Screenshot"> -+ <arg type="b" direction="in" name="include_frame"/> -+ <arg type="b" direction="in" name="flash"/> -+ <arg type="s" direction="in" name="filename"/> -+</method> -+<method name="FlashArea"> -+include_cursor -+ <arg type="i" direction="in" name="x"/> -+ <arg type="i" direction="in" name="y"/> -+ <arg type="i" direction="in" name="width"/> -+ <arg type="i" direction="in" name="height"/> -+</method> -+<method name="highlightApplet"> -+ <arg type="s" direction="in" /> -+ <arg type="b" direction="in" /> -+</method> -+<method name="activateCallback"> -+ <arg type="s" direction="in" /> -+ <arg type="s" direction="in" /> -+ <arg type="b" direction="in" /> -+</method> -+<property name="OverviewActive" type="b" access="readwrite" /> -+<property name="CinnamonVersion" type="s" access="read" /> -+</interface>; - - function Cinnamon() { - this._init(); -@@ -58,7 +63,8 @@ function Cinnamon() { - - Cinnamon.prototype = { - _init: function() { -- DBus.session.exportObject('/org/Cinnamon', this); -+ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this); -+ this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon'); - }, - - /** -@@ -215,5 +221,3 @@ Cinnamon.prototype = { - CinnamonVersion: Config.PACKAGE_VERSION - }; - --DBus.conformExport(Cinnamon.prototype, CinnamonIface); -- -diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index e909f5f..4f1f7d0 100644 ---- a/js/ui/endSessionDialog.js -+++ b/js/ui/endSessionDialog.js -@@ -18,19 +18,19 @@ - * 02110-1335, USA. - */ - --const DBus = imports.dbus; - const Lang = imports.lang; - const Signals = imports.signals; - - const AccountsService = imports.gi.AccountsService; - const Clutter = imports.gi.Clutter; -+const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; - const Gtk = imports.gi.Gtk; - const Pango = imports.gi.Pango; - const St = imports.gi.St; - const Cinnamon = imports.gi.Cinnamon; - --const GnomeSession = imports.misc.gnomeSession -+const GnomeSession = imports.misc.gnomeSession; - const ModalDialog = imports.ui.modalDialog; - const Tweener = imports.ui.tweener; - -@@ -40,20 +40,20 @@ const _ITEM_ICON_SIZE = 48; - const _DIALOG_ICON_SIZE = 32; - - const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2; -- --const EndSessionDialogIface = { -- name: 'org.gnome.SessionManager.EndSessionDialog', -- methods: [{ name: 'Open', -- inSignature: 'uuuao', -- outSignature: '' -- } -- ], -- signals: [{ name: 'Canceled', -- inSignature: '', -- }], -- properties: [] --}; -- -+const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessionDialog"> -+<method name="Open"> -+ <arg type="u" direction="in" /> -+ <arg type="u" direction="in" /> -+ <arg type="u" direction="in" /> -+ <arg type="ao" direction="in" /> -+</method> -+<signal name="ConfirmedLogout" /> -+<signal name="ConfirmedReboot" /> -+<signal name="ConfirmedShutdown" /> -+<signal name="Canceled" /> -+<signal name="Closed" /> -+</interface>; -+ - const logoutDialogContent = { - subjectWithUser: _("Log Out %s"), - subject: _("Log Out"), -@@ -230,8 +230,6 @@ function _setLabelText(label, text) { - function EndSessionDialog() { - if (_endSessionDialog == null) { - this._init(); -- DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog', -- this); - _endSessionDialog = this; - } - -@@ -328,6 +326,9 @@ EndSessionDialog.prototype = { - if (this._applicationList.get_children().length == 0) - scrollView.hide(); - })); -+ -+ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this); -+ this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog'); - }, - - _onDestroy: function() { -@@ -442,25 +443,19 @@ EndSessionDialog.prototype = { - - close: function() { - ModalDialog.ModalDialog.prototype.close.call(this); -- DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog', -- 'org.gnome.SessionManager.EndSessionDialog', -- 'Closed', '', []); -+ this._dbusImpl.emit_signal('Closed', null); - }, - - cancel: function() { - this._stopTimer(); -- DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog', -- 'org.gnome.SessionManager.EndSessionDialog', -- 'Canceled', '', []); -+ this._dbusImpl.emit_signal('Canceled', null); - this.close(global.get_current_time()); - }, - - _confirm: function(signal) { - this._fadeOutDialog(); - this._stopTimer(); -- DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog', -- 'org.gnome.SessionManager.EndSessionDialog', -- signal, '', []); -+ this._dbusImpl.emit_signal(signal, null); - }, - - _onOpened: function() { -@@ -512,39 +507,41 @@ EndSessionDialog.prototype = { - this._updateContent(); - }, - -- OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) { -+ OpenAsync: function(parameters, invocation) { -+ let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters; - this._totalSecondsToStayOpen = totalSecondsToStayOpen; - this._inhibitors = []; - this._applicationList.destroy_children(); - this._type = type; - -- if (!(this._type in DialogContent)) -- throw new DBus.DBusError('org.Cinnamon.ModalDialog.TypeError', -- "Unknown dialog type requested"); -+ if (!(this._type in DialogContent)) { -+ invocation.report_dbus_error('org.Cinnamon.ModalDialog.TypeError', -+ "Unknown dialog type requested"); -+ return; -+ } - - for (let i = 0; i < inhibitorObjectPaths.length; i++) { -- let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]); -+ let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) { -+ this._onInhibitorLoaded(proxy); -+ })); - -- inhibitor.connect('is-loaded', -- Lang.bind(this, function() { -- this._onInhibitorLoaded(inhibitor); -- })); - this._inhibitors.push(inhibitor); - } - - this._updateButtons(); - -- if (!this.open(timestamp)) -- throw new DBus.DBusError('org.Cinnamon.ModalDialog.GrabError', -- "Cannot grab pointer and keyboard"); -+ if (!this.open(timestamp)) { -+ invocation.report_dbus_error('org.Cinnamon.ModalDialog.GrabError', -+ "Cannot grab pointer and keyboard"); -+ return; -+ } - - this._updateContent(); - - let signalId = this.connect('opened', - Lang.bind(this, function() { -- callback(); -+ invocation.return_value(null); - this.disconnect(signalId); - })); - } - }; --DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface); -diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js -index f55cf93..69edb51 100644 ---- a/js/ui/keyboard.js -+++ b/js/ui/keyboard.js -@@ -2,7 +2,6 @@ - - const Caribou = imports.gi.Caribou; - const Clutter = imports.gi.Clutter; --const DBus = imports.dbus; - const Gdk = imports.gi.Gdk; - const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; -@@ -38,28 +37,27 @@ const PRETTY_KEYS = { - 'Alt_L': 'Alt' - }; - --const CaribouKeyboardIface = { -- name: 'org.gnome.Caribou.Keyboard', -- methods: [ { name: 'Show', -- inSignature: 'u', -- outSignature: '' -- }, -- { name: 'Hide', -- inSignature: 'u', -- outSignature: '' -- }, -- { name: 'SetCursorLocation', -- inSignature: 'iiii', -- outSignature: '' -- }, -- { name: 'SetEntryLocation', -- inSignature: 'iiii', -- outSignature: '' -- } ], -- properties: [ { name: 'Name', -- signature: 's', -- access: 'read' } ] --}; -+const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'> -+<method name='Show'> -+ <arg type='u' direction='in' /> -+</method> -+<method name='Hide'> -+ <arg type='u' direction='in' /> -+</method> -+<method name='SetCursorLocation'> -+ <arg type='i' direction='in' /> -+ <arg type='i' direction='in' /> -+ <arg type='i' direction='in' /> -+ <arg type='i' direction='in' /> -+</method> -+<method name='SetEntryLocation'> -+ <arg type='i' direction='in' /> -+ <arg type='i' direction='in' /> -+ <arg type='i' direction='in' /> -+ <arg type='i' direction='in' /> -+</method> -+<property name='Name' access='read' type='s' /> -+</interface>; - - function Key() { - this._init.apply(this, arguments); -@@ -199,7 +197,8 @@ function Keyboard() { - - Keyboard.prototype = { - _init: function () { -- DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this); -+ this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this); -+ this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard'); - - this.actor = null; - -@@ -541,7 +540,6 @@ Keyboard.prototype = { - return 'cinnamon'; - } - }; --DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface); - - function KeyboardSource() { - this._init.apply(this, arguments); -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 3446e7a..7523b6f 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -488,12 +488,14 @@ Chrome.prototype = { - - this._screenSaverActive = false; - this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy(); -- this._screenSaverProxy.connect('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged)); -- this._screenSaverProxy.GetActiveRemote(Lang.bind(this, -- function(result, err) { -- if (!err) -- this._onScreenSaverActiveChanged(this._screenSaverProxy, result); -- })); -+ this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) { -+ this._onScreenSaverActiveChanged(isActive); -+ })); -+ this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) { -+ if (!err) -+ this._onScreenSaverActiveChanged(result[0]); -+ })); -+ - - this._relayout(); - }, -diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js -index 72bba26..4d21797 100644 ---- a/js/ui/magnifierDBus.js -+++ b/js/ui/magnifierDBus.js -@@ -1,6 +1,6 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; -+const Gio = imports.gi.Gio; - const Main = imports.ui.main; - - const MAG_SERVICE_NAME = 'org.gnome.Magnifier'; -@@ -10,47 +10,85 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion'; - - // Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See: - // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml --const MagnifierIface = { -- name: MAG_SERVICE_NAME, -- methods: [ -- { name: 'setActive', inSignature: 'b', outSignature: '' }, -- { name: 'isActive', inSignature: '', outSignature: 'b' }, -- { name: 'showCursor', inSignature: '', outSignature: '' }, -- { name: 'hideCursor', inSignature: '', outSignature: '' }, -- { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' }, -- { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' }, -- { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' }, -- { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' }, -- { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' }, -- -- { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' }, -- { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' }, -- { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' }, -- { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' }, -- { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' }, -- { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' }, -- { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' }, -- { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' } -- ], -- signals: [], -- properties: [] --}; -+const MagnifierIface = <interface name={MAG_SERVICE_NAME}> -+<method name="setActive"> -+ <arg type="b" direction="in" /> -+</method> -+<method name="isActive"> -+ <arg type="b" direction="out" /> -+</method> -+<method name="showCursor" /> -+<method name="hideCursor" /> -+<method name="createZoomRegion"> -+ <arg type="d" direction="in" /> -+ <arg type="d" direction="in" /> -+ <arg type="ai" direction="in" /> -+ <arg type="ai" direction="in" /> -+ <arg type="o" direction="out" /> -+</method> -+<method name="addZoomRegion"> -+ <arg type="o" direction="in" /> -+ <arg type="b" direction="out" /> -+</method> -+<method name="getZoomRegions"> -+ <arg type="ao" direction="out" /> -+</method> -+<method name="clearAllZoomRegions" /> -+<method name="fullScreenCapable"> -+ <arg type="b" direction="out" /> -+</method> -+<method name="setCrosswireSize"> -+ <arg type="i" direction="in" /> -+</method> -+<method name="getCrosswireSize"> -+ <arg type="i" direction="out" /> -+</method> -+<method name="setCrosswireLength"> -+ <arg type="i" direction="in" /> -+</method> -+<method name="getCrosswireLength"> -+ <arg type="i" direction="out" /> -+</method> -+<method name="setCrosswireClip"> -+ <arg type="b" direction="in" /> -+</method> -+<method name="getCrosswireClip"> -+ <arg type="b" direction="out" /> -+</method> -+<method name="setCrosswireColor"> -+ <arg type="u" direction="in" /> -+</method> -+<method name="getCrosswireColor"> -+ <arg type="u" direction="out" /> -+</method> -+</interface>; - - // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded. See: - // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml --const ZoomRegionIface = { -- name: ZOOM_SERVICE_NAME, -- methods: [ -- { name: 'setMagFactor', inSignature: 'dd', outSignature: ''}, -- { name: 'getMagFactor', inSignature: '', outSignature: 'dd' }, -- { name: 'setRoi', inSignature: 'ai', outSignature: '' }, -- { name: 'getRoi', inSignature: '', outSignature: 'ai' }, -- { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' }, -- { name: 'moveResize', inSignature: 'ai', outSignature: '' } -- ], -- signals: [], -- properties: [] --}; -+const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}> -+<method name="setMagFactor"> -+ <arg type="d" direction="in" /> -+ <arg type="d" direction="in" /> -+</method> -+<method name="getMagFactor"> -+ <arg type="d" direction="out" /> -+ <arg type="d" direction="out" /> -+</method> -+<method name="setRoi"> -+ <arg type="ai" direction="in" /> -+</method> -+<method name="getRoi"> -+ <arg type="ai" direction="out" /> -+</method> -+<method name="shiftContentsTo"> -+ <arg type="i" direction="in" /> -+ <arg type="i" direction="in" /> -+ <arg type="b" direction="out" /> -+</method> -+<method name="moveResize"> -+ <arg type="ai" direction="in" /> -+</method> -+</interface>; - - // For making unique ZoomRegion DBus proxy object paths of the form: - // '/org/gnome/Magnifier/ZoomRegion/zoomer0', -@@ -64,7 +102,9 @@ function CinnamonMagnifier() { - CinnamonMagnifier.prototype = { - _init: function() { - this._zoomers = {}; -- DBus.session.exportObject(MAG_SERVICE_PATH, this); -+ -+ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this); -+ this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH); - }, - - /** -@@ -195,10 +235,10 @@ CinnamonMagnifier.prototype = { - Main.magnifier.clearAllZoomRegions(); - for (let objectPath in this._zoomers) { - let proxyAndZoomer = this._zoomers[objectPath]; -+ proxyAndZoomer.proxy.destroy(); - proxyAndZoomer.proxy = null; - proxyAndZoomer.zoomRegion = null; - delete this._zoomers[objectPath]; -- DBus.session.unexportObject(proxyAndZoomer); - } - this._zoomers = {}; - }, -@@ -300,8 +340,9 @@ function CinnamonMagnifierZoomRegion(zoomerObjectPath, zoomRegion) { - CinnamonMagnifierZoomRegion.prototype = { - _init: function(zoomerObjectPath, zoomRegion) { - this._zoomRegion = zoomRegion; -- DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath); -- DBus.session.exportObject(zoomerObjectPath, this); -+ -+ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this); -+ this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath); - }, - - /** -@@ -376,8 +417,9 @@ CinnamonMagnifierZoomRegion.prototype = { - moveResize: function(viewPort) { - let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] }; - this._zoomRegion.setViewPort(viewRect); -+ }, -+ -+ destroy: function() { -+ this._dbusImpl.unexport(); - } - }; -- --DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface); --DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface); -diff --git a/js/ui/main.js b/js/ui/main.js -index 99aee95..b602915 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -1,7 +1,6 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - - const Clutter = imports.gi.Clutter; --const DBus= imports.dbus; - const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; - const Gtk = imports.gi.Gtk; -@@ -199,11 +198,6 @@ function start() { - - cinnamonDBusService = new CinnamonDBus.Cinnamon(); - lookingGlassDBusService = new LookingGlassDBus.CinnamonLookingGlass(); -- // Force a connection now; dbus.js will do this internally -- // if we use its name acquisition stuff but we aren't right -- // now; to do so we'd need to convert from its async calls -- // back into sync ones. -- DBus.session.flush(); - - // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will - // also initialize CinnamonAppSystem first. CinnamonAppSystem -diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js -index 18d6615..8bed028 100644 ---- a/js/ui/messageTray.js -+++ b/js/ui/messageTray.js -@@ -1388,12 +1388,17 @@ function MessageTray() { - - MessageTray.prototype = { - _init: function() { -- this._presence = new GnomeSession.Presence(); -+ this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) { -+ this._onStatusChanged(proxy.status); -+ })); -+ - this._userStatus = GnomeSession.PresenceStatus.AVAILABLE; - this._busy = false; - this._backFromAway = false; -- this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged)); -- this._presence.getStatus(Lang.bind(this, this._onStatusChanged)); -+ this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) { -+ this._onStatusChanged(status); -+ })); -+ - - this._notificationBin = new St.Bin(); - this._notificationBin.hide(); -@@ -1548,7 +1553,7 @@ MessageTray.prototype = { - this._updateState(); - }, - -- _onStatusChanged: function(presence, status) { -+ _onStatusChanged: function(status) { - this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status); - this._userStatus = status; - -diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js -index bee8ffd..b037e07 100644 ---- a/js/ui/notificationDaemon.js -+++ b/js/ui/notificationDaemon.js -@@ -1,7 +1,7 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - - const Clutter = imports.gi.Clutter; --const DBus = imports.dbus; -+const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; - const Lang = imports.lang; - const Cinnamon = imports.gi.Cinnamon; -@@ -14,49 +14,52 @@ const Params = imports.misc.params; - - let nextNotificationId = 1; - --// Should really be defined in dbus.js --const BusIface = { -- name: 'org.freedesktop.DBus', -- methods: [{ name: 'GetConnectionUnixProcessID', -- inSignature: 's', -- outSignature: 'i' }] --}; -- --const Bus = function () { -- this._init(); --}; -- --Bus.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus'); -- } --}; -+// Should really be defined in Gio.js -+const BusIface = <interface name="org.freedesktop.DBus"> -+<method name="GetConnectionUnixProcessID"> -+ <arg type="s" direction="in" /> -+ <arg type="u" direction="out" /> -+</method> -+</interface>; -+ -+var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface); -+function Bus() { -+ return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus'); -+} - --DBus.proxifyPrototype(Bus.prototype, BusIface); -- --const NotificationDaemonIface = { -- name: 'org.freedesktop.Notifications', -- methods: [{ name: 'Notify', -- inSignature: 'susssasa{sv}i', -- outSignature: 'u' -- }, -- { name: 'CloseNotification', -- inSignature: 'u', -- outSignature: '' -- }, -- { name: 'GetCapabilities', -- inSignature: '', -- outSignature: 'as' -- }, -- { name: 'GetServerInformation', -- inSignature: '', -- outSignature: 'ssss' -- }], -- signals: [{ name: 'NotificationClosed', -- inSignature: 'uu' }, -- { name: 'ActionInvoked', -- inSignature: 'us' }] --}; -+const NotificationDaemonIface = <interface name="org.freedesktop.Notifications"> -+<method name="Notify"> -+ <arg type="s" direction="in"/> -+ <arg type="u" direction="in"/> -+ <arg type="s" direction="in"/> -+ <arg type="s" direction="in"/> -+ <arg type="s" direction="in"/> -+ <arg type="as" direction="in"/> -+ <arg type="a{sv}" direction="in"/> -+ <arg type="i" direction="in"/> -+ <arg type="u" direction="out"/> -+</method> -+<method name="CloseNotification"> -+ <arg type="u" direction="in"/> -+</method> -+<method name="GetCapabilities"> -+ <arg type="as" direction="out"/> -+</method> -+<method name="GetServerInformation"> -+ <arg type="s" direction="out"/> -+ <arg type="s" direction="out"/> -+ <arg type="s" direction="out"/> -+ <arg type="s" direction="out"/> -+</method> -+<signal name="NotificationClosed"> -+ <arg type="u"/> -+ <arg type="u"/> -+</signal> -+<signal name="ActionInvoked"> -+ <arg type="u"/> -+ <arg type="s"/> -+</signal> -+</interface>; - - const NotificationClosedReason = { - EXPIRED: 1, -@@ -88,7 +91,8 @@ function NotificationDaemon() { - - NotificationDaemon.prototype = { - _init: function() { -- DBus.session.exportObject('/org/freedesktop/Notifications', this); -+ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this); -+ this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications'); - - this._sources = []; - this._senderToPid = {}; -@@ -213,8 +217,8 @@ NotificationDaemon.prototype = { - return source; - }, - -- Notify: function(appName, replacesId, icon, summary, body, -- actions, hints, timeout) { -+ NotifyAsync: function(params, invocation) { -+ let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params; - let id; - - let rewrites = rewriteRules[appName]; -@@ -257,51 +261,55 @@ NotificationDaemon.prototype = { - } - this._notifications[id] = ndata; - -- let sender = DBus.getCurrentMessageContext().sender; -+ let sender = invocation.get_sender(); - let pid = this._senderToPid[sender]; - - let source = this._getSource(appName, pid, ndata, sender, null); - - if (source) { - this._notifyForSource(source, ndata); -- return id; -+ return invocation.return_value(GLib.Variant.new('(u)', [id])); - } - - if (replacesId) { - // There's already a pending call to GetConnectionUnixProcessID, - // which will see the new notification data when it finishes, - // so we don't have to do anything. -- return id; -+ return invocation.return_value(GLib.Variant.new('(u)', [id])); - } - -- this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, -- function (pid, ex) { -- // The app may have updated or removed the notification -- ndata = this._notifications[id]; -- if (!ndata) -- return; -- -- source = this._getSource(appName, pid, ndata, sender, null); -- -- // We only store sender-pid entries for persistent sources. -- // Removing the entries once the source is destroyed -- // would result in the entries associated with transient -- // sources removed once the notification is shown anyway. -- // However, keeping these pairs would mean that we would -- // possibly remove an entry associated with a persistent -- // source when a transient source for the same sender is -- // distroyed. -- if (!source.isTransient) { -- this._senderToPid[sender] = pid; -- source.connect('destroy', Lang.bind(this, -- function() { -- delete this._senderToPid[sender]; -- })); -- } -- this._notifyForSource(source, ndata); -- })); -+ this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) { -+ // The app may have updated or removed the notification -+ ndata = this._notifications[id]; -+ if (!ndata) -+ return; - -- return id; -+ if (excp) { -+ logError(excp, 'Call to GetConnectionUnixProcessID failed'); -+ return; -+ } -+ -+ let [pid] = result; -+ source = this._getSource(appName, pid, ndata, sender); -+ -+ // We only store sender-pid entries for persistent sources. -+ // Removing the entries once the source is destroyed -+ // would result in the entries associated with transient -+ // sources removed once the notification is shown anyway. -+ // However, keeping these pairs would mean that we would -+ // possibly remove an entry associated with a persistent -+ // source when a transient source for the same sender is -+ // distroyed. -+ if (!source.isTransient) { -+ this._senderToPid[sender] = pid; -+ source.connect('destroy', Lang.bind(this, function() { -+ delete this._senderToPid[sender]; -+ })); -+ } -+ this._notifyForSource(source, ndata); -+ })); -+ -+ return invocation.return_value(GLib.Variant.new('(u)', [id])); - }, - - _notifyForSource: function(source, ndata) { -@@ -441,17 +449,13 @@ NotificationDaemon.prototype = { - }, - - _emitNotificationClosed: function(id, reason) { -- DBus.session.emit_signal('/org/freedesktop/Notifications', -- 'org.freedesktop.Notifications', -- 'NotificationClosed', 'uu', -- [id, reason]); -+ this._dbusImpl.emit_signal('NotificationClosed', -+ GLib.Variant.new('(uu)', [id, reason])); - }, - - _emitActionInvoked: function(id, action) { -- DBus.session.emit_signal('/org/freedesktop/Notifications', -- 'org.freedesktop.Notifications', -- 'ActionInvoked', 'us', -- [id, action]); -+ this._dbusImpl.emit_signal('ActionInvoked', -+ GLib.Variant.new('(us)', [id, action])); - }, - - _onTrayIconAdded: function(o, icon) { -@@ -465,8 +469,6 @@ NotificationDaemon.prototype = { - } - }; - --DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface); -- - function Source(title, pid, sender, trayIcon) { - this._init(title, pid, sender, trayIcon); - } -@@ -481,15 +483,12 @@ Source.prototype = { - - this.pid = pid; - if (sender) -- // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for -- // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation, -- // we should save the id here and call unwatch_name() with it in destroy(). -- // Moving to GDBus is the work in progress: https://bugzilla.gnome.org/show_bug.cgi?id=648651 -- // and https://bugzilla.gnome.org/show_bug.cgi?id=622921 . -- DBus.session.watch_name(sender, -- false, -- null, -- Lang.bind(this, this._onNameVanished)); -+ this._nameWatcherId = Gio.DBus.session.watch_name(sender, -+ Gio.BusNameWatcherFlags.NONE, -+ null, -+ Lang.bind(this, this._onNameVanished)); -+ else -+ this._nameWatcherId = 0; - - this._setApp(); - if (this.app) -@@ -596,6 +595,10 @@ Source.prototype = { - }, - - destroy: function() { -+ if (this._nameWatcherId) { -+ Gio.DBus.session.unwatch_name(this._nameWatcherId); -+ this._nameWatcherId = 0; -+ } - MessageTray.Source.prototype.destroy.call(this); - } - }; -diff --git a/js/ui/scripting.js b/js/ui/scripting.js -index 42c4f6d..9163d29 100644 ---- a/js/ui/scripting.js -+++ b/js/ui/scripting.js -@@ -1,6 +1,5 @@ - // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - --const DBus = imports.dbus; - const Gio = imports.gi.Gio; - const Mainloop = imports.mainloop; - const Meta = imports.gi.Meta; -@@ -70,24 +69,21 @@ function waitLeisure() { - }; - } - --const PerfHelperIface = { -- name: 'org.Cinnamon.PerfHelper', -- methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' }, -- { name: 'WaitWindows', inSignature: '', outSignature: '' }, -- { name: 'DestroyWindows', inSignature: '', outSignature: ''}] --}; -- --const PerfHelper = function () { -- this._init(); --}; -- --PerfHelper.prototype = { -- _init: function() { -- DBus.session.proxifyObject(this, 'org.Cinnamon.PerfHelper', '/org/Cinnamon/PerfHelper'); -- } --}; -- --DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface); -+const PerfHelperIface = <interface name="org.gnome.Shell.PerfHelper"> -+<method name="CreateWindow"> -+ <arg type="i" direction="in" /> -+ <arg type="i" direction="in" /> -+ <arg type="b" direction="in" /> -+ <arg type="b" direction="in" /> -+</method> -+<method name="WaitWindows" /> -+<method name="DestroyWindows" /> -+</interface>; -+ -+var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface); -+function PerfHelper() { -+ return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper'); -+} - - let _perfHelper = null; - function _getPerfHelper() { --- -1.8.1.6 - - -From 135d2228bbf6d3b1be5f90e0e599cd3880e06d93 Mon Sep 17 00:00:00 2001 -From: dalcde <dalcde@yahoo.com.hk> -Date: Tue, 16 Apr 2013 16:58:30 +0800 -Subject: [PATCH 07/16] [GDBus][Sound/Power Applet] Fix dbus port issues - ---- - files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -index b6b2bcd..fad39ab 100644 ---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -@@ -212,7 +212,7 @@ MyApplet.prototype = { - this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this.menu.addSettingsAction(_("Power Settings"), 'power'); - -- this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged)); -+ this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged)); - this._devicesChanged(); - } - catch (e) { --- -1.8.1.6 - - -From 5880ce34538ec2791b5e58cc3ffc07e41c189c82 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Fri, 19 Apr 2013 19:09:18 -0400 -Subject: [PATCH 08/16] Fix gicon error - power applet - ---- - files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -index fad39ab..3a13eab 100644 ---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -@@ -323,7 +323,7 @@ MyApplet.prototype = { - let icon = this._proxy.Icon; - if (icon) { - let gicon = Gio.icon_new_for_string(icon); -- this.setGIcon(gicon); -+ this._applet_icon.gicon = gicon - this.actor.show(); - } else { - this.menu.close(); --- -1.8.1.6 - - -From 647bd58c93541acdba11cd11d586d2cb08a0a4eb Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Fri, 19 Apr 2013 19:44:33 -0400 -Subject: [PATCH 09/16] Remove unused - ---- - src/cinnamon-background-manager.c | 34 ---------------------------------- - 1 file changed, 34 deletions(-) - -diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c -index 9d95250..67427ed 100644 ---- a/src/cinnamon-background-manager.c -+++ b/src/cinnamon-background-manager.c -@@ -66,8 +66,6 @@ struct CinnamonBackgroundManagerPrivate - - G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT) - --static gpointer manager_object = NULL; -- - static gboolean - dont_draw_background (CinnamonBackgroundManager *manager) - { -@@ -223,36 +221,6 @@ struct CinnamonBackgroundManagerPrivate - } - - static void --draw_background_after_session_loads (CinnamonBackgroundManager *manager) --{ -- GError *error = NULL; -- GDBusProxyFlags flags; -- -- flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; -- manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, -- flags, -- NULL, /* GDBusInterfaceInfo */ -- "org.gnome.SessionManager", -- "/org/gnome/SessionManager", -- "org.gnome.SessionManager", -- NULL, /* GCancellable */ -- &error); -- if (manager->priv->proxy == NULL) { -- g_warning ("Could not listen to session manager: %s", -- error->message); -- g_error_free (error); -- return; -- } -- -- manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy, -- "g-signal", -- G_CALLBACK (on_session_manager_signal), -- manager); --} -- -- --static void - disconnect_screen_signals (CinnamonBackgroundManager *manager) - { - GdkDisplay *display; -@@ -312,8 +280,6 @@ struct CinnamonBackgroundManagerPrivate - G_CALLBACK (draw_background_changed), manager); - - setup_bg_and_draw_background (manager); -- //draw_background_after_session_loads (manager); -- - - return TRUE; - } --- -1.8.1.6 - - -From 7a8233638187d00798cf3a4b66a27d707eaec804 Mon Sep 17 00:00:00 2001 -From: dalcde <dalcde@yahoo.com.hk> -Date: Sat, 20 Apr 2013 15:42:13 +0800 -Subject: [PATCH 10/16] [GDBus][Power applet] Some fixes and cleanup - ---- - .../cinnamon/applets/power@cinnamon.org/applet.js | 52 ++++++---------------- - 1 file changed, 14 insertions(+), 38 deletions(-) - -diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -index 3a13eab..5f81d91 100644 ---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js -@@ -48,40 +48,11 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power"> - <method name="GetPrimaryDevice"> - <arg type="(susdut)" direction="out"/> - </method> --<signal name="PropertiesChanged"> -- <arg type="s"/> -- <arg type="a{sv}"/> -- <arg type="a[s]"/> --</signal> - <property name="Icon" type="s" access="read" /> - </interface>; - - const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); - --const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties"> --<method name="Get"> -- <arg type="s" direction="in"/> -- <arg type="s" direction="in"/> -- <arg type="v" direction="out"/> --</method> --<method name="GetAll"> -- <arg type="s" direction="in"/> -- <arg type="a{sv}" direction="out"/> --</method> --<method name="Set"> -- <arg type="s" direction="in"/> -- <arg type="s" direction="in"/> -- <arg type="v" direction="in"/> --</method> --<signal name="PropertiesChanged"> -- <arg type="s"/> -- <arg type="a{sv}"/> -- <arg type="a[s]"/> --</signal> --</interface>; -- --const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface); -- - function DeviceItem() { - this._init.apply(this, arguments); - } -@@ -156,8 +127,16 @@ MyApplet.prototype = { - this.menuManager.addMenu(this.menu); - - //this.set_applet_icon_symbolic_name('battery-missing'); -- this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); -- this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); -+ this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH, -+ Lang.bind(this, function(proxy, error) { -+ if (error) { -+ global.log(error.message); -+ -+ return; -+ } -+ this._proxy.connect('g-properties-changed', Lang.bind(this, this._devicesChanged)); -+ this._devicesChanged(); -+ })); - - let icon = this.actor.get_children()[0]; - this.actor.remove_actor(icon); -@@ -211,9 +190,6 @@ MyApplet.prototype = { - - this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this.menu.addSettingsAction(_("Power Settings"), 'power'); -- -- this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged)); -- this._devicesChanged(); - } - catch (e) { - global.logError(e); -@@ -245,14 +221,14 @@ MyApplet.prototype = { - }, - - _readPrimaryDevice: function() { -- this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) { -+ this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) { - if (error) { - this._hasPrimary = false; - this._primaryDeviceId = null; - this._batteryItem.actor.hide(); - return; - } -- let [device_id, device_type, icon, percentage, state, seconds] = device; -+ let [[device_id, device_type, icon, percentage, state, seconds]] = result; - if (device_type == UPDeviceType.BATTERY) { - this._hasPrimary = true; - let time = Math.round(seconds / 60); -@@ -290,7 +266,7 @@ MyApplet.prototype = { - }, - - _readOtherDevices: function() { -- this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) { -+ this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) { - this._deviceItems.forEach(function(i) { i.destroy(); }); - this._deviceItems = []; - -@@ -336,7 +312,7 @@ MyApplet.prototype = { - }, - - _updateLabel: function() { -- this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) { -+ this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) { - if (error) { - this._mainLabel.set_text(""); - return; --- -1.8.1.6 - - -From 1a74c4a4d010a6ddcd2350b1ea298710bc1c08b1 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Sat, 20 Apr 2013 10:59:54 -0400 -Subject: [PATCH 11/16] Move CLUTTER_DISABLE_XINPUT to session startup file - ---- - files/usr/bin/gnome-session-cinnamon | 2 +- - src/main.c | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon -index 315f135..56c37f5 100755 ---- a/files/usr/bin/gnome-session-cinnamon -+++ b/files/usr/bin/gnome-session-cinnamon -@@ -1,3 +1,3 @@ - #! /bin/sh --exec gnome-session --session cinnamon "$@" -+exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@" - -diff --git a/src/main.c b/src/main.c -index 9d37975..418fb60 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -257,9 +257,6 @@ - - g_option_context_free (ctx); - -- /* Disable XInput extension - required for 3.8 compatibility */ -- g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); -- - meta_plugin_type_register (gnome_cinnamon_plugin_get_type ()); - - /* Prevent meta_init() from causing gtk to load gail and at-bridge */ --- -1.8.1.6 - - -From dfa107fd874866da2f634c65a90e2c13a447464c Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Sat, 20 Apr 2013 12:23:29 -0400 -Subject: [PATCH 12/16] Add Xinput disable to cinnamon2d - ---- - files/usr/bin/cinnamon2d | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d -index 1eced99..7f42517 100755 ---- a/files/usr/bin/cinnamon2d -+++ b/files/usr/bin/cinnamon2d -@@ -1,2 +1,2 @@ - #!/bin/bash --CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@ -+CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@ --- -1.8.1.6 - - -From 28b39b2372a571ddcc1298f34f2d7e653f6b2e96 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Sat, 20 Apr 2013 12:29:43 -0400 -Subject: [PATCH 13/16] Fix session file - ---- - files/usr/bin/gnome-session-cinnamon | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon -index 56c37f5..31c9eff 100755 ---- a/files/usr/bin/gnome-session-cinnamon -+++ b/files/usr/bin/gnome-session-cinnamon -@@ -1,3 +1,3 @@ - #! /bin/sh --exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@" -+CLUTTER_DISABLE_XINPUT=1 exec gnome-session --session cinnamon "$@" - --- -1.8.1.6 - - -From aba3a7666d3679e5803862af07edc47e7b093b11 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Sat, 20 Apr 2013 12:36:45 -0400 -Subject: [PATCH 14/16] Add cinnamon3d command - ---- - files/usr/bin/cinnamon3d | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 files/usr/bin/cinnamon3d - -diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d -new file mode 100644 -index 0000000..4891783 ---- /dev/null -+++ b/files/usr/bin/cinnamon3d -@@ -0,0 +1,2 @@ -+#!/bin/bash -+CLUTTER_DISABLE_XINPUT=1 cinnamon $@ --- -1.8.1.6 - - -From 3e1cdf6d88ade9abe5a0b8773b565d345c01f2cb Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Sat, 20 Apr 2013 12:37:26 -0400 -Subject: [PATCH 15/16] Fix perms - ---- - files/usr/bin/cinnamon3d | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - mode change 100644 => 100755 files/usr/bin/cinnamon3d - -diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d -old mode 100644 -new mode 100755 --- -1.8.1.6 - - -From 7904eaf179918f4f97b328f2b5f340776544ca49 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Mon, 22 Apr 2013 18:27:39 -0400 -Subject: [PATCH 16/16] Sledgehammer merge of: - -f251f0b77d01cb9a80212b1dce2538c60a5bf59e - -Don't ask... ---- - .../share/cinnamon/applets/sound@cinnamon.org/applet.js | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -index c8427ac..a7b2e09 100644 ---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -@@ -53,8 +53,8 @@ const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player"> - - /* global values */ - let icon_path = "/usr/share/cinnamon/theme/"; --let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ]; --let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ]; -+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp"]; -+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ]; - /* dummy vars for translation */ - let x = _("Playing"); - x = _("Paused"); - -@@ -377,7 +384,8 @@ Player.prototype = { - cover.read_async(null, null, Lang.bind(this, this._onReadCover)); - } - else { -- cover_path = decodeURIComponent(this._trackCoverFile.substr(7)); -+ cover_path = decodeURIComponent(this._trackCoverFile); -+ cover_path = cover_path.replace("file://", ""); - this._showCover(cover_path); - } - } --- -1.8.1.6 - -From 1f209cec0fa0e9d12b3c29884302f4b8e70ff4c9 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Thu, 9 May 2013 11:48:08 -0400 -Subject: [PATCH] Fix notifications and other stuff - ---- - .../cinnamon/applets/sound@cinnamon.org/applet.js | 2 +- - js/ui/notificationDaemon.js | 7 +- - src/main.c | 169 ++++++++++++--------- - 3 files changed, 103 insertions(+), 75 deletions(-) - -diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js -index b037e07..58b2df3 100644 ---- a/js/ui/notificationDaemon.js -+++ b/js/ui/notificationDaemon.js -@@ -220,7 +220,12 @@ NotificationDaemon.prototype = { - NotifyAsync: function(params, invocation) { - let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params; - let id; -- -+ -+ for (let hint in hints) { -+ // unpack the variants -+ hints[hint] = hints[hint].deep_unpack(); -+ } -+ - let rewrites = rewriteRules[appName]; - if (rewrites) { - for (let i = 0; i < rewrites.length; i++) { -diff --git a/src/main.c b/src/main.c -index 418fb60..773fb65 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -34,99 +34,122 @@ - #define OVERRIDES_SCHEMA "org.cinnamon.overrides" - - static void -+cinnamon_dbus_acquire_name (GDBusProxy *bus, -+ guint32 request_name_flags, -+ guint32 *request_name_result, -+ gchar *name, -+ gboolean fatal) -+{ -+ GError *error = NULL; -+ GVariant *request_name_variant; -+ -+ if (!(request_name_variant = g_dbus_proxy_call_sync (bus, -+ "RequestName", -+ g_variant_new ("(su)", name, request_name_flags), -+ 0, /* call flags */ -+ -1, /* timeout */ -+ NULL, /* cancellable */ -+ &error))) -+ { -+ g_printerr ("failed to acquire %s: %s\n", name, error->message); -+ if (!fatal) -+ return; -+ exit (1); -+ } -+ g_variant_get (request_name_variant, "(u)", request_name_result); -+} -+ -+static void -+cinnamon_dbus_acquire_names (GDBusProxy *bus, -+ guint32 request_name_flags, -+ gchar *name, -+ gboolean fatal, ...) G_GNUC_NULL_TERMINATED; -+ -+static void -+cinnamon_dbus_acquire_names (GDBusProxy *bus, -+ guint32 request_name_flags, -+ gchar *name, -+ gboolean fatal, ...) -+{ -+ va_list al; -+ guint32 request_name_result; -+ va_start (al, fatal); -+ for (;;) -+ { -+ cinnamon_dbus_acquire_name (bus, -+ request_name_flags, -+ &request_name_result, -+ name, fatal); -+ name = va_arg (al, gchar *); -+ if (!name) -+ break; -+ fatal = va_arg (al, gboolean); -+ } -+ va_end (al); -+} -+ -+static void - cinnamon_dbus_init (gboolean replace) - { -+ GDBusConnection *session; -+ GDBusProxy *bus; - GError *error = NULL; -- DBusGConnection *session; -- DBusGProxy *bus; - guint32 request_name_flags; - guint32 request_name_result; - -- /** TODO: -- * In the future we should use GDBus for this. However, in -- * order to do that, we need to port all of the JavaScript -- * code. Otherwise, the name will be claimed on the wrong -- * connection. -- */ -- session = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); - -- bus = dbus_g_proxy_new_for_name (session, -- DBUS_SERVICE_DBUS, -- DBUS_PATH_DBUS, -- DBUS_INTERFACE_DBUS); -+ if (error) { -+ g_printerr ("Failed to connect to session bus: %s", error->message); -+ exit (1); -+ } - -- request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT; -+ bus = g_dbus_proxy_new_sync (session, -+ G_DBUS_PROXY_FLAGS_NONE, -+ NULL, /* interface info */ -+ "org.freedesktop.DBus", -+ "/org/freedesktop/DBus", -+ "org.freedesktop.DBus", -+ NULL, /* cancellable */ -+ &error); -+ -+ request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT; - if (replace) - request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING; -- if (!dbus_g_proxy_call (bus, "RequestName", &error, -- G_TYPE_STRING, CINNAMON_DBUS_SERVICE, -- G_TYPE_UINT, request_name_flags, -- G_TYPE_INVALID, -- G_TYPE_UINT, &request_name_result, -- G_TYPE_INVALID)) -- { -- g_printerr ("failed to acquire org.Cinnamon: %s\n", error->message); -- exit (1); -- } -+ -+ cinnamon_dbus_acquire_name (bus, -+ request_name_flags, -+ &request_name_result, -+ CINNAMON_DBUS_SERVICE, TRUE); - if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER - || request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER)) - { -- g_printerr ("%s already exists on bus and --replace not specified\n", -- CINNAMON_DBUS_SERVICE); -+ g_printerr (CINNAMON_DBUS_SERVICE " already exists on bus and --replace not specified\n"); - exit (1); - } - -- /* Also grab org.gnome.Panel to replace any existing panel process */ -- if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING, -- "org.gnome.Panel", G_TYPE_UINT, -- DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, -- G_TYPE_INVALID, G_TYPE_UINT, -- &request_name_result, G_TYPE_INVALID)) -- { -- g_print ("failed to acquire org.gnome.Panel: %s\n", error->message); -- exit (1); -- } -- -- /* ...and the org.gnome.Magnifier service. -- */ -- if (!dbus_g_proxy_call (bus, "RequestName", &error, -- G_TYPE_STRING, MAGNIFIER_DBUS_SERVICE, -- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, -- G_TYPE_INVALID, -- G_TYPE_UINT, &request_name_result, -- G_TYPE_INVALID)) -- { -- g_print ("failed to acquire %s: %s\n", MAGNIFIER_DBUS_SERVICE, error->message); -- /* Failing to acquire the magnifer service is not fatal. Log the error, -- * but keep going. */ -- } -- -- /* ...and the org.freedesktop.Notifications service; we always -- * specify REPLACE_EXISTING to ensure we kill off -- * notification-daemon if it was running. -+ /* -+ * We always specify REPLACE_EXISTING to ensure we kill off -+ * the existing service if it was running. - */ -- if (!dbus_g_proxy_call (bus, "RequestName", &error, -- G_TYPE_STRING, "org.freedesktop.Notifications", -- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, -- G_TYPE_INVALID, -- G_TYPE_UINT, &request_name_result, -- G_TYPE_INVALID)) -- { -- g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message); -- } -+ request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE; - -+ cinnamon_dbus_acquire_names (bus, -+ request_name_flags, -+ /* Also grab org.gnome.Panel to replace any existing panel process */ -+ "org.gnome.Panel", TRUE, -+ /* ...and the org.gnome.Magnifier service. */ -+ MAGNIFIER_DBUS_SERVICE, FALSE, -+ /* ...and the org.freedesktop.Notifications service. */ -+ "org.freedesktop.Notifications", FALSE, -+ NULL); - /* ...and the on-screen keyboard service */ -- if (!dbus_g_proxy_call (bus, "RequestName", &error, -- G_TYPE_STRING, "org.gnome.Caribou.Keyboard", -- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING, -- G_TYPE_INVALID, -- G_TYPE_UINT, &request_name_result, -- G_TYPE_INVALID)) -- { -- g_print ("failed to acquire org.gnome.Caribou.Keyboard: %s\n", error->message); -- } -- -+ cinnamon_dbus_acquire_name (bus, -+ DBUS_NAME_FLAG_REPLACE_EXISTING, -+ &request_name_result, -+ "org.gnome.Caribou.Keyboard", FALSE); - g_object_unref (bus); -+ g_object_unref (session); - } - - static void --- -1.8.1.6 - ---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -@@ -801,7 +801,7 @@ - this._players = {}; - // watch players - for (var p=0; p<compatible_players.length; p++) { -- DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false, -+ Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, - Lang.bind(this, this._addPlayer), - Lang.bind(this, this._removePlayer) - ); --- -1.8.1.6
\ No newline at end of file diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch deleted file mode 100644 index 17f5af616..000000000 --- a/community/cinnamon/idle-dim.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js ---- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js 2013-04-30 18:01:56.000000000 +0200 -+++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js 2013-05-02 19:32:12.934254811 +0200 -@@ -9,8 +9,7 @@ - - /* constants */ - const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power"; --const DimSettingsAc = "idle-dim-ac"; --const DimSettingsBattery = "idle-dim-battery"; -+const DimSettings = "idle-dim"; - const PowerBusName = 'org.gnome.SettingsDaemon'; - const PowerObjectPath = '/org/gnome/SettingsDaemon/Power'; - -@@ -116,10 +115,8 @@ - - this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings")); - -- let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc); -- this._settingsMenu.menu.addMenuItem(dimSwitchAc); -- let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery); -- this._settingsMenu.menu.addMenuItem(dimSwitchBattery); -+ let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings); -+ this._settingsMenu.menu.addMenuItem(dimSwitch); - - //initial update. - //We have to wait until dbus calls back to decide whether to display brightness controls. -@@ -145,7 +142,7 @@ - this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - } - -- this.menu.addSettingsAction(_("Settings"), "screen"); -+ this.menu.addSettingsAction(_("Settings"), "screensaver"); - })); - } - catch (e) { diff --git a/community/cinnamon/keyboard_applet.patch b/community/cinnamon/keyboard_applet.patch deleted file mode 100644 index 6b3694086..000000000 --- a/community/cinnamon/keyboard_applet.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/applet.js b/applet.js ---- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js -@@ -1,9 +1,10 @@ - const Applet = imports.ui.applet; --const Gkbd = imports.gi.Gkbd; - const Lang = imports.lang; --const Cinnamon = imports.gi.Cinnamon; -+const Gio = imports.gi.Gio; -+const GLib = imports.gi.GLib; - const St = imports.gi.St; - const Gtk = imports.gi.Gtk; -+const GnomeDesktop = imports.gi.GnomeDesktop; - const Main = imports.ui.main; - const PopupMenu = imports.ui.popupMenu; - const Util = imports.misc.util; -@@ -15,11 +16,12 @@ - LayoutMenuItem.prototype = { - __proto__: PopupMenu.PopupBaseMenuItem.prototype, - -- _init: function(config, id, indicator, long_name) { -+ _init: function(ipsettings, id, index, indicator, long_name) { - PopupMenu.PopupBaseMenuItem.prototype._init.call(this); - -- this._config = config; -+ this._ipsettings = ipsettings; - this._id = id; -+ this._index = index; - this.label = new St.Label({ text: long_name }); - this.indicator = indicator; - this.addActor(this.label); -@@ -28,7 +30,7 @@ - - activate: function(event) { - PopupMenu.PopupBaseMenuItem.prototype.activate.call(this); -- this._config.lock_group(this._id); -+ this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index)); - } - }; - -@@ -54,18 +56,18 @@ - this._layoutItems = [ ]; - - this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags"); -- this._config = Gkbd.Configuration.get(); -- this._config.connect('changed', Lang.bind(this, this._syncConfig)); -- this._config.connect('group-changed', Lang.bind(this, this._syncGroup)); -+ this._xkbInfo = new GnomeDesktop.XkbInfo(); -+ this._ipsettings = new Gio.Settings({ schema: 'org.gnome.desktop.input-sources' }); -+ this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig)); -+ this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup)); - global.settings.connect('changed::keyboard-applet-use-flags', Lang.bind(this, this._reload_settings)); -- this._config.start_listen(); - - this._syncConfig(); - - this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() { - Main.overview.hide(); -- Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]); -+ Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]); - })); - this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() { - Main.overview.hide(); -@@ -98,7 +100,6 @@ - }, - - _reload_settings: function() { -- this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags"); - this._syncConfig(); - }, - -@@ -127,8 +128,8 @@ - _syncConfig: function() { - this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags"); - -- let groups = this._config.get_group_names(); -- if (groups.length > 1) { -+ let sources = this._ipsettings.get_value('sources'); -+ if (sources.n_children() > 1) { - this.actor.show(); - } else { - this.menu.close(); -@@ -141,25 +142,29 @@ - for (let i = 0; i < this._labelActors.length; i++) - this._labelActors[i].destroy(); - -- let short_names = this._adjustGroupNames(this._config.get_short_group_names()); -- - this._selectedLayout = null; - this._layoutItems = [ ]; - this._labelActors = [ ]; -- for (let i = 0; i < groups.length; i++) { -- let icon_name = this._config.get_group_name(i); -+ for (let i = 0; i < sources.n_children(); i++) { -+ let [type, id] = sources.get_child_value(i).deep_unpack(); -+ let displayName = id; -+ let shortName = id; -+ let xkbLayout = id; -+ if (type == 'xkb') { -+ [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id); -+ } // TODO: errorhandling, handle 'ibus' -+ let icon_name = xkbLayout; // FIXME: Really? - let actor; - if (this._showFlags) - actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' }); - else -- actor = new St.Label({ text: short_names[i] }); -- let item = new LayoutMenuItem(this._config, i, actor, groups[i]); -- item._short_group_name = short_names[i]; -+ actor = new St.Label({ text: shortName }); -+ let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName); - item._icon_name = icon_name; - this._layoutItems.push(item); - this.menu.addMenuItem(item, i); - -- let shortLabel = new St.Label({ text: short_names[i] }); -+ let shortLabel = new St.Label({ text: shortName }); - this._labelActors.push(shortLabel); - } - -@@ -167,17 +172,17 @@ - }, - - _syncGroup: function() { -- let selected = this._config.get_current_group(); -+ let current = this._ipsettings.get_uint('current'); - - if (this._selectedLayout) { - this._selectedLayout.setShowDot(false); - this._selectedLayout = null; - } - -- let item = this._layoutItems[selected]; -+ let item = this._layoutItems[current]; - item.setShowDot(true); - -- let selectedLabel = this._labelActors[selected]; -+ let selectedLabel = this._labelActors[current]; - - if (this._showFlags) { - this.set_applet_icon_name(item._icon_name); diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch deleted file mode 100644 index 1254a7ce4..000000000 --- a/community/cinnamon/switch-applications.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py ---- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py 2013-04-15 15:55:01.000000000 +0200 -+++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py 2013-04-24 21:19:49.262020614 +0200 -@@ -43,8 +43,8 @@ - # Cinnamon stuff - [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"], - [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"], -- [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"], -- [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"], -+ [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"], -+ [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"], - [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"], - [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"], - -diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js ---- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js 2013-04-15 15:55:01.000000000 +0200 -+++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js 2013-04-24 21:21:22.447677094 +0200 -@@ -131,11 +131,11 @@ - Lang.bind(this, this._showWorkspaceSwitcher)); - Meta.keybindings_set_custom_handler('switch-to-workspace-down', - Lang.bind(this, this._showWorkspaceSwitcher)); -- Meta.keybindings_set_custom_handler('switch-windows', -+ Meta.keybindings_set_custom_handler('switch-applications', - Lang.bind(this, this._startAppSwitcher)); - Meta.keybindings_set_custom_handler('switch-group', - Lang.bind(this, this._startAppSwitcher)); -- Meta.keybindings_set_custom_handler('switch-windows-backward', -+ Meta.keybindings_set_custom_handler('switch-applications-backward', - Lang.bind(this, this._startAppSwitcher)); - Meta.keybindings_set_custom_handler('switch-group-backward', - Lang.bind(this, this._startAppSwitcher)); diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD new file mode 100644 index 000000000..7c6439e20 --- /dev/null +++ b/community/cjs/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=cjs +pkgver=2.0.0 +pkgrel=1 +pkgdesc="Javascript Bindings for Cinnamon" +arch=(i686 x86_64) +url="https://github.com/linuxmint/cjs" +license=(GPL) +depends=(cairo gobject-introspection js185 dbus-glib) +makedepends=(gnome-common) +options=('!libtool') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz") +sha256sums=('2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a') + +build() { + cd $pkgname-$pkgver + + # Python2 fix + sed -i 's|#! /usr/bin/env python|#! /usr/bin/env python2|' \ + scripts/make-tests + + ./autogen.sh --prefix=/usr --disable-static --libexecdir=/usr/lib + make +} + +check() { + cd $pkgname-$pkgver + # Needs a display + make -k check || : +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index a3d3256fe..0a244388f 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90010 2013-05-06 19:36:25Z foutrelis $ +# $Id: PKGBUILD 97670 2013-09-27 06:38:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=2.3.6 -pkgrel=5 +pkgver=3.0.0 +pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') url="http://clanlib.org/" @@ -11,24 +11,24 @@ license=('zlib') depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl') makedepends=('doxygen' 'graphviz' 'mesa') options=('!libtool') -source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('aa037a8a6297fb0b2efd927b1b15e8de') +source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz) +md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3') build() { cd ${srcdir}/ClanLib-${pkgver} - ./configure --prefix=/usr --enable-docs --disable-clanGL1 + ./autogen.sh + ./configure --prefix=/usr make - # Somehow this breaks. :( - #make html + make html } package() { cd ${srcdir}/ClanLib-${pkgver} make DESTDIR=${pkgdir} install - #make DESTDIR=${pkgdir} install-html + make DESTDIR=${pkgdir} install-html install -d ${pkgdir}/usr/share/licenses/${pkgname} install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD index 61359b1c2..973420ee6 100644 --- a/community/classpath/PKGBUILD +++ b/community/classpath/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 59865 2011-12-01 13:10:18Z spupykin $ +# $Id: PKGBUILD 97832 2013-09-30 10:02:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tardo <tardo@nagi-fanboi.net> # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com> pkgname=classpath pkgver=0.98 -pkgrel=4 +pkgrel=5 pkgdesc="A free replacement for Sun's proprietary core Java class libraries." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/classpath/" license=('GPL') depends=('gtk2>=2.8' 'libxtst' 'libsm') -makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'openjdk6') +makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment') optdepends=('file' 'gconf') source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz) md5sums=('90c6571b8b0309e372faa0f9f6255ea9') @@ -30,6 +30,10 @@ EOF ./configure --prefix=/usr --disable-Werror --disable-plugin make EXAMPLESDIR= +} + +package() { + cd $srcdir/$pkgname-$pkgver make EXAMPLESDIR= DESTDIR=$pkgdir install rm -f $pkgdir/usr/bin/gappletviewer diff --git a/community/clusterssh/ChangeLog b/community/clusterssh/ChangeLog deleted file mode 100644 index f0d985454..000000000 --- a/community/clusterssh/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2009-12-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package moved to [community] - * version 3.28 - 39 votes in AUR diff --git a/community/clusterssh/PKGBUILD b/community/clusterssh/PKGBUILD deleted file mode 100644 index c457b6e6b..000000000 --- a/community/clusterssh/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 67467 2012-03-11 21:44:43Z lcarlier $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Macfly <mmacfly@gmail.com> -# Contributor: Duncan Ferguson <duncan_ferguson@users.sourceforge.net> - -pkgname=clusterssh -pkgver=3.28 -pkgrel=3 -pkgdesc="Cluster SSH opens terminal windows with connections to specified hosts and an administration console." -arch=('i686' 'x86_64' 'mips64el') -url="http://clusterssh.sourceforge.net/" -license=('GPL') -depends=('perl-tk' 'perl-x11-protocol' 'xterm') -source=(http://downloads.sourceforge.net/project/$pkgname/1.%20ClusterSSH%20Series%203/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('11e012329d2c62e1f7b17f3ac517769a') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index ef4c77b4b..b611c8908 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 94872 2013-08-01 06:54:46Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 97815 2013-09-30 02:36:29Z xyne $ +# Maintainer: Xyne <ca dot archlinux at xyne, backwards> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.5.0 -pkgrel=3 +pkgrel=4 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' - 'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack') +makedepends=( + 'faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' 'libcdio-paranoia' + 'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack' +) optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' @@ -24,23 +27,32 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libmp4v2: for mp4 input plugin support' 'libmpcdec: for musepack input plugin support' 'libvorbis: for vorbis input plugin support' + 'libcdio-paranoia: for cdio support' 'opusfile: for opus input plugin support' 'wavpack: for wavpack input plugin support') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2 - cmus-2.5.0-opus-support.patch) + cmus-2.5.0-opus-support.patch + cdio-git.patch) sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b' - '5e524f54d565dfa30760562c223bc0e2e8ed00a0') + '5e524f54d565dfa30760562c223bc0e2e8ed00a0' + '77738acc7d4e71f6d396a5cd464dbbce0168b6b7') + +prepare() { + cd "$srcdir/$pkgname-v$pkgver" + # Inherited from Bart or earlier. + patch -Np1 -i "$srcdir/cmus-2.5.0-opus-support.patch" + # Include changes from git for compatibility with new cdio. + patch -N -i "$srcdir/cdio-git.patch" +} build() { - cd $srcdir/$pkgname-v$pkgver - patch -Np1 -i $srcdir/cmus-2.5.0-opus-support.patch + cd "$srcdir/$pkgname-v$pkgver" ./configure prefix=/usr make } package() { - cd $srcdir/$pkgname-v$pkgver - make DESTDIR=$pkgdir install - - install -Dm 644 contrib/_cmus $pkgdir/usr/share/zsh/site-functions/_cmus + cd "$srcdir/$pkgname-v$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 contrib/_cmus "$pkgdir"/usr/share/zsh/site-functions/_cmus } diff --git a/community/cmus/cdio-git.patch b/community/cmus/cdio-git.patch new file mode 100644 index 000000000..8c549bee7 --- /dev/null +++ b/community/cmus/cdio-git.patch @@ -0,0 +1,137 @@ +*** cdio.c 2012-11-07 08:46:17.000000000 +0000 +--- cmus-git/src/cmus/cdio.c 2013-09-30 02:21:10.518785946 +0000 +*************** +*** 1,5 **** + /* +! * Copyright 2011 Various Authors + * Copyright 2011 Johannes Weißl + * + * Based on cdda.c from XMMS2. +--- 1,5 ---- + /* +! * Copyright 2011-2013 Various Authors + * Copyright 2011 Johannes Weißl + * + * Based on cdda.c from XMMS2. +*************** +*** 27,35 **** + #include "comment.h" + #include "discid.h" + +- #include <cdio/cdda.h> + #include <cdio/cdio.h> + #include <cdio/logging.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +--- 27,40 ---- + #include "comment.h" + #include "discid.h" + + #include <cdio/cdio.h> + #include <cdio/logging.h> ++ #if LIBCDIO_VERSION_NUM >= 90 ++ #include <cdio/paranoia/cdda.h> ++ #else ++ #include <cdio/cdda.h> ++ #endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +*************** +*** 352,375 **** + GROWING_KEYVALS(c); + const char *artist = NULL, *albumartist = NULL, *album = NULL, + *title = NULL, *genre = NULL, *comment = NULL; +! const cdtext_t *cdtext_track, *cdtext_album; + #ifdef HAVE_CDDB + cddb_conn_t *cddb_conn = NULL; + cddb_disc_t *cddb_disc = NULL; + #endif + char buf[64]; + +! cdtext_track = cdio_get_cdtext(priv->cdio, priv->track); +! if (cdtext_track) { +! char * const *field = cdtext_track->field; + artist = field[CDTEXT_PERFORMER]; + title = field[CDTEXT_TITLE]; + genre = field[CDTEXT_GENRE]; + comment = field[CDTEXT_MESSAGE]; + } +! cdtext_album = cdio_get_cdtext(priv->cdio, 0); +! if (cdtext_album) { +! char * const *field = cdtext_album->field; + album = field[CDTEXT_TITLE]; + albumartist = field[CDTEXT_PERFORMER]; + if (!artist) +--- 357,403 ---- + GROWING_KEYVALS(c); + const char *artist = NULL, *albumartist = NULL, *album = NULL, + *title = NULL, *genre = NULL, *comment = NULL; +! int track_comments_found = 0; +! const cdtext_t *cdt; + #ifdef HAVE_CDDB + cddb_conn_t *cddb_conn = NULL; + cddb_disc_t *cddb_disc = NULL; + #endif + char buf[64]; + +! #if LIBCDIO_VERSION_NUM >= 90 +! cdt = cdio_get_cdtext(priv->cdio); +! if (cdt) { +! artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track); +! title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track); +! genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track); +! comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track); +! +! if (title) +! track_comments_found = 1; +! +! album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0); +! albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0); +! if (!artist) +! artist = albumartist; +! if (!genre) +! genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0); +! if (!comment) +! comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0); +! } +! #else +! cdt = cdio_get_cdtext(priv->cdio, priv->track); +! if (cdt) { +! track_comments_found = 1; +! char * const *field = cdt->field; + artist = field[CDTEXT_PERFORMER]; + title = field[CDTEXT_TITLE]; + genre = field[CDTEXT_GENRE]; + comment = field[CDTEXT_MESSAGE]; + } +! cdt = cdio_get_cdtext(priv->cdio, 0); +! if (cdt) { +! char * const *field = cdt->field; + album = field[CDTEXT_TITLE]; + albumartist = field[CDTEXT_PERFORMER]; + if (!artist) +*************** +*** 379,387 **** + if (!comment) + comment = field[CDTEXT_MESSAGE]; + } + + #ifdef HAVE_CDDB +! if (!cdtext_track && cddb_url && cddb_url[0]) { + cddb_track_t *cddb_track; + track_t i_tracks = cdio_get_num_tracks(priv->cdio); + track_t i_first_track = cdio_get_first_track_num(priv->cdio); +--- 407,416 ---- + if (!comment) + comment = field[CDTEXT_MESSAGE]; + } ++ #endif + + #ifdef HAVE_CDDB +! if (!track_comments_found && cddb_url && cddb_url[0]) { + cddb_track_t *cddb_track; + track_t i_tracks = cdio_get_num_tracks(priv->cdio); + track_t i_first_track = cdio_get_first_track_num(priv->cdio); diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index 4446a1c6f..e75c1a7a9 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,23 +1,24 @@ -#$Id: PKGBUILD 96694 2013-09-03 03:45:40Z dwallace $ +#$Id: PKGBUILD 96945 2013-09-09 02:20:31Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.17 -pkgrel=1 +pkgver=1.18 +pkgrel=2 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('dbus-core' 'iptables' 'glib2' 'gnutls') +depends=('dbus-core' 'iptables' 'gnutls' 'glib2') conflicts=('openresolv') optdepends=('bluez: Support for Bluetooth devices' - 'wpa_supplicant: For WiFi devices') -makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') + 'wpa_supplicant: For WiFi devices' + 'pptpclient: for ppp support') +makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp') options=('!libtool') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('21ab8945f84b2ebf5f60bc8591fecdfd' +md5sums=('cd696bf74512eb644cef6e983ba6c94f' 'a8d22ee089fb0ed725130d16ad393047') prepare(){ @@ -33,6 +34,7 @@ build() { --sbindir=/usr/bin \ --with-systemdunitdir=/usr/lib/systemd/system \ --enable-threads \ + --enable-pptp \ --enable-openconnect \ --enable-vpnc \ --enable-openvpn \ diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD deleted file mode 100644 index 2eb1d370c..000000000 --- a/community/consonance/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 82327 2013-01-15 11:34:58Z allan $ -# Maintainer: Jonathan Steel <mail at jsteel dot org> -# Contributor: Auguste Pop <auguste [at] gmail [dot] com> -# Contributor: boenki <boenki at gmx dot de> -# Contributor: sujith_m82 <m.sujith@gmail.com> - -pkgname=consonance -pkgver=0.5.1 -pkgrel=10 -pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption" -arch=('i686' 'x86_64' 'mips64el') -url="http://sites.google.com/site/consonancemanager" -license=('GPL') -depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libmad' - 'libcdio-paranoia' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3' - 'taglib') -install=$pkgname.install -source=($url/releases-1/$pkgname-$pkgver.tar.gz - libnotify.patch - cdio-includes.patch) -md5sums=('2a195dd2314f7b65cc57cc871a4c5a47' - 'caa1e8b41723950fd926bfefccbbd8ac' - '239b451ba8795f8c287e994a7e32d859') - -build() { - cd "$srcdir"/$pkgname-$pkgver - - patch -Np1 -i "$srcdir"/libnotify.patch - patch -Np1 -i "$srcdir"/cdio-includes.patch - - ./configure --prefix=/usr - - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - - make DESTDIR="$pkgdir" install -} diff --git a/community/consonance/cdio-includes.patch b/community/consonance/cdio-includes.patch deleted file mode 100644 index c570468b1..000000000 --- a/community/consonance/cdio-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr consonance-0.5.1.orig/src/cdda.h consonance-0.5.1/src/cdda.h ---- consonance-0.5.1.orig/src/cdda.h 2013-01-14 05:14:54.000000000 +0200 -+++ consonance-0.5.1/src/cdda.h 2013-01-14 05:15:16.000000000 +0200 -@@ -18,7 +18,7 @@ - #ifndef CDDA_H - #define CDDA_H - --#include <cdio/cdda.h> -+#include <cdio/paranoia/cdda.h> - #include <cdio/cd_types.h> - - struct con_cdda_decoder { diff --git a/community/consonance/consonance.install b/community/consonance/consonance.install deleted file mode 100644 index f1474aee3..000000000 --- a/community/consonance/consonance.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() -{ - usr/bin/update-desktop-database -q -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - post_install -} diff --git a/community/consonance/libnotify.patch b/community/consonance/libnotify.patch deleted file mode 100644 index f59acbfd9..000000000 --- a/community/consonance/libnotify.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/statusicon.c b/src/statusicon.c -index f72e808..04efa58 100644 ---- a/src/statusicon.c -+++ b/src/statusicon.c -@@ -47,11 +47,10 @@ void show_osd(struct con_win *cwin) - - /* Create notification instance */ - -- osd = notify_notification_new_with_status_icon( -+ osd = notify_notification_new( - cwin->cstate->curr_mobj->tags->title, - (const gchar *)body, -- NULL, -- GTK_STATUS_ICON(cwin->status_icon)); -+ gtk_status_icon_get_icon_name(GTK_STATUS_ICON(cwin->status_icon))); - notify_notification_set_timeout(osd, OSD_TIMEOUT); - - /* Add album art if set */ diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index c2147b97c..0337063b1 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 95471 2013-08-12 20:28:10Z eric $ +# $Id: PKGBUILD 97491 2013-09-21 18:36:28Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen pkgver=0.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') url="http://converseen.sourceforge.net/" license=('GPL3') -depends=('imagemagick' 'qt4' 'libwmf' 'openexr') +depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index f1b3f07b7..7f645a576 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 95268 2013-08-08 11:40:15Z jelle $ +# $Id: PKGBUILD 97709 2013-09-27 18:17:34Z jelle $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck pkgver=1.61 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') -depends=('qt4') +depends=('qt5-base') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('fd81635612ba74a90b0ebe6d4c8a520826cc077c') @@ -20,7 +20,7 @@ build() { cd gui export HAVE_RULES=yes - qmake-qt4 + qmake make } diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD deleted file mode 100644 index 73b770b48..000000000 --- a/community/credentials-preferences/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 87397 2013-03-30 21:57:57Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=credentials-preferences -_pkgname=credentials-control-center -pkgver=0.1.5 -pkgrel=1 -pkgdesc="Control panel for configuring online account credentials and settings" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/gnome-control-center-signon" -license=('GPL' 'LGPL') -depends=('libaccounts-glib' 'libsignon-glib' 'gtk3') -makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool') -options=('!libtool') -install=$pkgname.install -source=(https://launchpad.net/gnome-control-center-signon/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.xz - http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz) -md5sums=('deaa290c89dffee5198f3f0f6f2e1fe1' - '702d6b39136e10ba6dfad0afd300b2af') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - # Install updated language files - rename $_pkgname- '' ../po/$_pkgname-*.po - mv -f -t po ../po/* - printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS - - # Fix helper script - sed -i 's/test/test -e/' online-accounts-preferences.in - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community/credentials-preferences/credentials-preferences.install b/community/credentials-preferences/credentials-preferences.install deleted file mode 100644 index 2c455e952..000000000 --- a/community/credentials-preferences/credentials-preferences.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 39ec847af..a2193f3d4 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95472 2013-08-12 20:28:12Z eric $ +# $Id: PKGBUILD 97492 2013-09-21 18:36:29Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=9 +pkgrel=10 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/cuneiform-linux" @@ -33,7 +33,7 @@ build() { } check() { - ldd ${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform | grep Magick >/dev/null + ldd "${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform" | grep Magick >/dev/null } package() { diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD index f4442f467..aea11bda9 100644 --- a/community/curlftpfs/PKGBUILD +++ b/community/curlftpfs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65667 2012-02-21 20:28:52Z cbrannon $ +# $Id: PKGBUILD 97936 2013-10-01 16:49:40Z bpiotrowski $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Philip Nilsson <leffeman@gmail.com> pkgname=curlftpfs pkgver=0.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl." url="http://curlftpfs.sourceforge.net/" license=('GPL') diff --git a/community/curseofwar/PKGBUILD b/community/curseofwar/PKGBUILD new file mode 100644 index 000000000..c8f11cba7 --- /dev/null +++ b/community/curseofwar/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 97452 2013-09-20 12:51:17Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: ziggi <xziggix@gmail.com> + +pkgname=curseofwar +pkgver=1.2.0 +pkgrel=1 +pkgdesc='Fast-paced RTS/Action game with ncurses interface' +arch=('x86_64' 'i686') +url='https://github.com/a-nikolaev/curseofwar/wiki' +license=('GPL') +depends=('ncurses') +makedepends=('gcc') +source=("https://github.com/a-nikolaev/curseofwar/archive/v$pkgver.tar.gz") +sha256sums=('91b7781e26341faa6b6999b6baf6e74ef532fa94303ab6a2bf9ff6d614a3f670') + +build() { + cd "$pkgname-$pkgver" + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index f2bbb332d..705a89271 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 94303 2013-07-19 15:21:00Z spupykin $ +# $Id: PKGBUILD 97018 2013-09-10 13:41:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.2.2 +pkgver=1.2.3 _pkgver=1.2 -pkgrel=2 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('df2a2b02d6d855cfd8f1cf77c7e12995') +md5sums=('7eaa89aa5257b5f61cc7462db08ce164') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 0b0580c28..d91d6f79a 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 96731 2013-09-03 16:12:39Z spupykin $ +# $Id: PKGBUILD 97976 2013-10-02 13:30:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.4 +pkgver=3.1.7 pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') + 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git') optdepends=('libldap: for LDAP authentication' 'libsieve: for dbmail-sieve' 'python2-mysql2pgsql: migrate from MySQL to PostreSQL') @@ -20,51 +20,45 @@ backup=(etc/xinetd.d/dbmail-imapd etc/xinetd.d/dbmail-pop3d etc/xinetd.d/dbmail-lmtpd etc/xinetd.d/dbmail-timsieved) -source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz - dbmail.tmpfiles - dbmail-imapd.service - dbmail-lmtpd.service - dbmail-pop3d.service - dbmail-timsieved.service - dbmail-imapd.xinetd - dbmail-lmtpd.xinetd - dbmail-pop3d.xinetd - dbmail-timsieved.xinetd - "boundary.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=fd742e39b13ec45e4ecf2e175113a6a0120af27b" - "crlf.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=17a2e61917ae64b1f20039f49b70b9130b678c87") -md5sums=('0090bb7998469e963d2eb49b7d16ea3f' - 'c4b5793c5422b62a675d4c66ff7e9300' - '5a6297cb03c8d0b424f978ea1d7402de' - '070db88538af9833f003f4cb516d337b' - '422f0399f97a780b7cab84443e8f429a' - '15c7d367d4242aebac5f87649a2250aa' +#source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz" +source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1" + "dbmail-imapd.xinetd" + "dbmail-lmtpd.xinetd" + "dbmail-pop3d.xinetd" + "dbmail-timsieved.xinetd" + "dbmail-6-sieve.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=92b98094a01eda5efe3ba3080e529482d08945a2" + "dbmail-7-systemd.diff") +md5sums=('SKIP' '890de13361afbdf4fed12d6d7eb53e66' '961593658cd596297d03d25eb9c9e98f' '4cb764894abd3914802e90602bf90a0c' 'e78dc86355f9aaf24590bc7c6611162f' - 'e9f9c1140e77e3714fd2c3905b1760f1' - 'c86c4c2a4e9171ae8c0ad5692262b393') + 'b1063893dd0e74bc0ddee454bb65bf01' + 'a781a4ebe2dd75ed635c9b4a239b38d8') prepare() { - cd $srcdir/dbmail-${pkgver/_/-}/ - patch -p1 <$srcdir/boundary.patch - patch -p1 <$srcdir/crlf.patch + cd $srcdir/dbmail-${pkgver}/ + patch -p1 <$srcdir/dbmail-6-sieve.patch + patch -Rp1 <$srcdir/dbmail-7-systemd.diff + aclocal + automake --add-missing + autoreconf } build() { - cd $srcdir/dbmail-${pkgver/_/-}/ + cd $srcdir/dbmail-${pkgver}/ + automake [ -f Makefile ] || ./configure \ --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ - --with-ldap --with-sieve + --with-ldap --with-sieve \ + --enable-systemd --enable-manpages make } package() { - cd $srcdir/dbmail-${pkgver/_/-}/ + cd $srcdir/dbmail-${pkgver}/ make DESTDIR=$pkgdir install - (cd man && make && make install DESTDIR=$pkgdir) - mkdir $pkgdir/etc install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ @@ -72,9 +66,6 @@ package() { cp dbmail.schema $pkgdir/usr/share/dbmail/ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do - install -Dm0644 $srcdir/$i.service $pkgdir/usr/lib/systemd/system/$i.service install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i done - - install -Dm0644 $srcdir/dbmail.tmpfiles $pkgdir/usr/lib/tmpfiles.d/dbmail.conf } diff --git a/community/dbmail/dbmail-2.2.10-pam-support.patch b/community/dbmail/dbmail-2.2.10-pam-support.patch deleted file mode 100644 index 805a7f609..000000000 --- a/community/dbmail/dbmail-2.2.10-pam-support.patch +++ /dev/null @@ -1,251 +0,0 @@ -diff -wbBur dbmail-2.2.10/configure.in dbmail-2.2.10.pam/configure.in ---- dbmail-2.2.10/configure.in 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/configure.in 2008-09-18 16:43:04.000000000 +0400 -@@ -78,6 +78,13 @@ - - AC_SUBST(CRYPTLIB) - -+dnl Check for PAM -+AC_SUBST(PAMLIBS,"") -+AC_CHECK_HEADERS(security/pam_appl.h, -+ [AC_CHECK_LIB(pam,pam_start, -+ [AC_DEFINE(HAVE_PAM,1,[Define if you have PAN including devel headers]) -+ PAMLIBS="-lpam"],,)]) -+ - AC_SUBST(MYSQLLIB) - AC_SUBST(MYSQLALIB) - AC_SUBST(MYSQLLTLIB) -diff -wbBur dbmail-2.2.10/dbmail-user.c dbmail-2.2.10.pam/dbmail-user.c ---- dbmail-2.2.10/dbmail-user.c 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/dbmail-user.c 2008-09-18 16:43:04.000000000 +0400 -@@ -157,7 +157,7 @@ - "md5", "md5-raw", "md5sum", "md5sum-raw", - "md5-hash", "md5-hash-raw", "md5-digest", "md5-digest-raw", - "md5-base64", "md5-base64-raw", "md5base64", "md5base64-raw", -- "shadow", "", NULL -+ "shadow", "pam", "", NULL - }; - - /* These must correspond to the easy text names. */ -@@ -166,7 +166,7 @@ - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, - MD5_BASE64, MD5_BASE64_RAW, MD5_BASE64, MD5_BASE64_RAW, -- SHADOW, PLAINTEXT, PWTYPE_NULL -+ SHADOW, PWTYPE_PAM, PLAINTEXT, PWTYPE_NULL - }; - - memset(pw, 0, 50); -@@ -251,6 +251,12 @@ - *enctype = "crypt"; - } - break; -+#ifdef HAVE_PAM -+ case PWTYPE_PAM: -+ null_strncpy(pw, passwd, 49); -+ *enctype = "pam"; -+ break; -+#endif - default: - qerrorf("Error: password type not supported [%s].\n", - passwdtype); -diff -wbBur dbmail-2.2.10/dbmail-user.h dbmail-2.2.10.pam/dbmail-user.h ---- dbmail-2.2.10/dbmail-user.h 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/dbmail-user.h 2008-09-18 16:43:04.000000000 +0400 -@@ -34,7 +34,7 @@ - typedef enum { - PLAINTEXT = 0, PLAINTEXT_RAW, CRYPT, CRYPT_RAW, - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, -- MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_NULL -+ MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_PAM, PWTYPE_NULL - } pwtype_t; - - int mkpassword(const char * const user, const char * const passwd, -diff -wbBur dbmail-2.2.10/modules/authsql.c dbmail-2.2.10.pam/modules/authsql.c ---- dbmail-2.2.10/modules/authsql.c 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/modules/authsql.c 2008-09-18 16:43:04.000000000 +0400 -@@ -27,6 +27,19 @@ - #include "dbmail.h" - #define THIS_MODULE "auth" - -+#ifdef HAVE_PAM -+#include <security/pam_appl.h> -+ -+#ifndef DEFAULT_DBMAIL_PAM_SERVICE -+#define DEFAULT_DBMAIL_PAM_SERVICE "dbmail" -+#endif -+ -+#ifndef DEFAULT_DBMAIL_PAM_TTL -+#define DEFAULT_DBMAIL_PAM_TTL 60 -+#endif -+ -+#endif -+ - extern db_param_t _db_params; - #define DBPFX _db_params.pfx - -@@ -49,17 +62,80 @@ - */ - static int __auth_query(const char *thequery); - -+#ifdef HAVE_PAM -+ -+static char *pam_password = NULL; /* Workaround for Solaris 2.6 brokenness */ -+static pam_handle_t *pamh = NULL; -+static int pam_ttl = DEFAULT_DBMAIL_PAM_TTL; -+static char *pam_service = DEFAULT_DBMAIL_PAM_SERVICE; -+static time_t pamh_created = 0; -+/* -+ * A simple "conversation" function returning the supplied password. -+ * Has a bit to much error control, but this is my first PAM application -+ * so I'd rather check everything than make any mistakes. The function -+ * expects a single converstation message of type PAM_PROMPT_ECHO_OFF. -+ */ -+static int -+password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) -+{ -+ if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) { -+ TRACE(TRACE_ERROR, "Unexpected PAM converstaion '%d/%s'", msg[0]->msg_style, msg[0]->msg); -+ return PAM_CONV_ERR; -+ } -+ if (!appdata_ptr) { -+ /* Workaround for Solaris 2.6 where the PAM library is broken -+ * and does not pass appdata_ptr to the conversation routine -+ */ -+ appdata_ptr = pam_password; -+ } -+ if (!appdata_ptr) { -+ TRACE(TRACE_ERROR, "ERROR: No password available to password_converstation!"); -+ return PAM_CONV_ERR; -+ } -+ *resp = calloc(num_msg, sizeof(struct pam_response)); -+ if (!*resp) { -+ TRACE(TRACE_ERROR, "Out of memory!"); -+ return PAM_CONV_ERR; -+ } -+ (*resp)[0].resp = strdup((char *) appdata_ptr); -+ (*resp)[0].resp_retcode = 0; -+ -+ return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR); -+} -+ -+static struct pam_conv conv = -+{ -+ &password_conversation, -+ NULL -+}; -+ -+#endif -+ -+ - int auth_connect() - { - /* this function is only called after a connection has been made - * if, in the future this is not the case, db.h should export a - * function that enables checking for the database connection - */ -+#ifdef HAVE_PAM -+ -+#endif - return 0; - } - - int auth_disconnect() - { -+#ifdef HAVE_PAM -+ int retval=PAM_SUCCESS; -+ if (pamh) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ pamh = NULL; -+ TRACE(TRACE_ERROR, "failed to release PAM authenticator"); -+ } -+ } -+#endif - return 0; - } - -@@ -458,7 +534,71 @@ - is_validated = (strncmp(md5str, query_result, 32) == 0) ? 1 : 0; - g_free(md5str); - } -+#ifdef HAVE_PAM -+ else if (strcasecmp(query_result, "pam") == 0) { -+ int retval=0; -+ TRACE(TRACE_DEBUG, "validating using pam for user [%s] pass:[%s]",real_username,password); -+ conv.appdata_ptr = (char *) password; -+ pam_password= password; -+ if (pam_ttl == 0) { -+ /* Create PAM connection */ -+ retval = pam_start(pam_service, real_username, &conv, &pamh); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_ERROR, "failed to create PAM authenticator"); -+ goto pam_error; -+ } -+ } else if (!pamh || (time(NULL) - pamh_created) >= pam_ttl || pamh_created > time(NULL)) { -+ /* Close previous PAM connection */ -+ if (pamh) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_WARNING, "failed to release PAM authenticator"); -+ } -+ pamh = NULL; -+ } -+ /* Initialize persistent PAM connection */ -+ retval = pam_start(pam_service, "dbmail@", &conv, &pamh); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_ERROR, "failed to create PAM authenticator"); -+ goto pam_error; -+ } -+ pamh_created = time(NULL); -+ } -+ retval = PAM_SUCCESS; -+ if (pam_ttl != 0) { -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_USER, real_username); -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_CONV, &conv); -+ } -+ if (retval == PAM_SUCCESS) -+ retval = pam_authenticate(pamh, 0); -+ if (retval == PAM_SUCCESS ) //&& !no_acct_mgmt -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_SUCCESS) { -+ is_validated=1; -+ } else { -+pam_error: -+ is_validated=0; -+ } -+ /* cleanup */ -+ retval = PAM_SUCCESS; -+#ifdef PAM_AUTHTOK -+ if (pam_ttl != 0) { -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_AUTHTOK, NULL); -+ } -+#endif -+ if (pam_ttl == 0 || retval != PAM_SUCCESS) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_WARNING, "failed to release PAM authenticator\n"); -+ } -+ pamh = NULL; -+ } - -+ } -+#endif - if (is_validated) { - db_user_log_login(*user_idnr); - } else { -diff -wbBur dbmail-2.2.10/modules/Makefile.am dbmail-2.2.10.pam/modules/Makefile.am ---- dbmail-2.2.10/modules/Makefile.am 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/modules/Makefile.am 2008-09-18 16:44:53.000000000 +0400 -@@ -60,7 +60,7 @@ - - # This one is always built. - libauth_sql_la_SOURCES = authsql.c --libauth_sql_la_LIBADD = @CRYPTLIB@ -+libauth_sql_la_LIBADD = @CRYPTLIB@ @PAMLIBS@ - - if LDAP - libauth_ldap_la_SOURCES = authldap.c diff --git a/community/dbmail/dbmail-7-systemd.diff b/community/dbmail/dbmail-7-systemd.diff new file mode 100644 index 000000000..097949694 --- /dev/null +++ b/community/dbmail/dbmail-7-systemd.diff @@ -0,0 +1,176 @@ +diff -wbBurN dbmail.git/configure.in dbmail-3.1.5/configure.in +--- dbmail.git/configure.in 2013-09-05 18:07:48.661707165 +0400 ++++ dbmail-3.1.5/configure.in 2013-09-09 15:05:17.639600103 +0400 +@@ -44,10 +44,6 @@ + AS_HELP_STRING([--enable-manpages], [Enable building and installation of man pages])) + AM_CONDITIONAL(MANPAGES, [ test "$enable_manpages" = "yes" ]) + +-AC_ARG_ENABLE([systemd], +- AS_HELP_STRING([--enable-systemd], [Enable systemd support])) +-AM_CONDITIONAL(SYSTEMD, [ test "$enable_systemd" = "yes" ]) +- + AC_PROG_CC + AC_COMPILE_WARNINGS + AC_C_CONST +@@ -82,8 +78,9 @@ + AC_SUBST(DM_STATEDIR) + AC_SUBST(DM_PKGLIBDIR) + AC_SUBST(DM_PWD) ++ + AC_PROG_LIBTOOL + +-AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile systemd/Makefile) ++AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile) + + DM_MSG_CONFIGURE_RESULTS +diff -wbBurN dbmail.git/systemd/dbmail-imapd.service.in dbmail-3.1.5/systemd/dbmail-imapd.service.in +--- dbmail.git/systemd/dbmail-imapd.service.in 2013-09-05 18:07:48.711707166 +0400 ++++ dbmail-3.1.5/systemd/dbmail-imapd.service.in 1970-01-01 03:00:00.000000000 +0300 +@@ -1,11 +0,0 @@ +-[Unit] +-Description=DBMail Imap Server +-After=syslog.target network.target mysqld.service postgresql.service +- +-[Service] +-Type=forking +-PIDFile=@piddir@/dbmail-imapd.pid +-ExecStart=@sbindir@/dbmail-imapd -p @piddir@/dbmail-imapd.pid +- +-[Install] +-WantedBy=multi-user.target +diff -wbBurN dbmail.git/systemd/dbmail-lmtpd.service.in dbmail-3.1.5/systemd/dbmail-lmtpd.service.in +--- dbmail.git/systemd/dbmail-lmtpd.service.in 2013-09-05 18:07:48.711707166 +0400 ++++ dbmail-3.1.5/systemd/dbmail-lmtpd.service.in 1970-01-01 03:00:00.000000000 +0300 +@@ -1,11 +0,0 @@ +-[Unit] +-Description=DBMail LMTP Server +-After=syslog.target network.target mysqld.service postgresql.service +- +-[Service] +-Type=forking +-PIDFile=@piddir@/dbmail-lmtpd.pid +-ExecStart=@sbindir@/dbmail-lmtpd -p @piddir@/dbmail-lmtpd.pid +- +-[Install] +-WantedBy=multi-user.target +diff -wbBurN dbmail.git/systemd/dbmail-pop3d.service.in dbmail-3.1.5/systemd/dbmail-pop3d.service.in +--- dbmail.git/systemd/dbmail-pop3d.service.in 2013-09-05 18:07:48.711707166 +0400 ++++ dbmail-3.1.5/systemd/dbmail-pop3d.service.in 1970-01-01 03:00:00.000000000 +0300 +@@ -1,11 +0,0 @@ +-[Unit] +-Description=DBMail pop3 Server +-After=syslog.target network.target mysqld.service postgresql.service +- +-[Service] +-Type=forking +-PIDFile=@piddir@/dbmail-pop3d.pid +-ExecStart=@sbindir@/dbmail-pop3d -p @piddir@/dbmail-pop3d.pid +- +-[Install] +-WantedBy=multi-user.target +diff -wbBurN dbmail.git/systemd/dbmail-timsieved.service.in dbmail-3.1.5/systemd/dbmail-timsieved.service.in +--- dbmail.git/systemd/dbmail-timsieved.service.in 2013-09-05 18:07:48.711707166 +0400 ++++ dbmail-3.1.5/systemd/dbmail-timsieved.service.in 1970-01-01 03:00:00.000000000 +0300 +@@ -1,11 +0,0 @@ +-[Unit] +-Description=DBMail Sieve Server +-After=syslog.target network.target mysqld.service postgresql.service +- +-[Service] +-Type=forking +-PIDFile=@piddir@/dbmail-timsieved.pid +-ExecStart=@sbindir@/dbmail-timsieved -p @piddir@/dbmail-timsieved.pid +- +-[Install] +-WantedBy=multi-user.target +diff -wbBurN dbmail.git/systemd/dbmail.tmpfiles.in dbmail-3.1.5/systemd/dbmail.tmpfiles.in +--- dbmail.git/systemd/dbmail.tmpfiles.in 2013-09-05 18:07:48.711707166 +0400 ++++ dbmail-3.1.5/systemd/dbmail.tmpfiles.in 1970-01-01 03:00:00.000000000 +0300 +@@ -1 +0,0 @@ +-d @piddir@ 0755 nobody nobody - +diff -wbBurN dbmail.git/systemd/Makefile.am dbmail-3.1.5/systemd/Makefile.am +--- dbmail.git/systemd/Makefile.am 2013-09-07 16:12:34.840475834 +0400 ++++ dbmail-3.1.5/systemd/Makefile.am 1970-01-01 03:00:00.000000000 +0300 +@@ -1,68 +0,0 @@ +-# Copyright (C) 1999-2004 IC & S dbmail@ic-s.nl +-# Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl +-# +-# This program is free software; you can redistribute it and/or +-# modify it under the terms of the GNU General Public License +-# as published by the Free Software Foundation; either +-# version 2 of the License, or (at your option) any later +-# version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +- +- +-EXTRA_DIST = dbmail-imapd.service.in dbmail-lmtpd.service.in dbmail-pop3d.service.in dbmail-timsieved.service.in +-SYSTEMD_UNIT_DIR = /usr/lib/systemd/system +-SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d +-PID_DIR=/run/dbmail +- +-if SYSTEMD +-install-systemd: dbmail-imapd.service dbmail-lmtpd.service dbmail-pop3d.service dbmail-timsieved.service dbmail.tmpfiles +- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) +- $(INSTALL_DATA) dbmail-imapd.service \ +- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service +- $(INSTALL_DATA) dbmail-lmtpd.service \ +- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service +- $(INSTALL_DATA) dbmail-pop3d.service \ +- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service +- $(INSTALL_DATA) dbmail-timsieved.service \ +- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service +- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_TMPFILES_DIR) +- $(INSTALL_DATA) dbmail.tmpfiles \ +- $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.conf +- +-uninstall-systemd: +- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service +- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service +- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service +- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service +- rm -f $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.tmpfiles +- +-SUFFIXES=.service.in .service .tmpfiles.in .tmpfiles +- +-.service.in.service: +- $(AM_V_GEN)sed \ +- -e 's|[@]sbindir[@]|$(sbindir)|g' \ +- -e 's|[@]piddir[@]|$(PID_DIR)|g' \ +- < $< > $@-t && \ +- mv $@-t $@ +- +-.tmpfiles.in.tmpfiles: +- $(AM_V_GEN)sed \ +- -e 's|[@]piddir[@]|$(PID_DIR)|g' \ +- < $< > $@-t && \ +- mv $@-t $@ +- +-else +-install-systemd: +-uninstall-systemd: +-endif +- +-install-data-local: install-systemd +-uninstall-local: uninstall-systemd +diff -wbBurN dbmail.git/Makefile.am dbmail-3.1.5/Makefile.am +--- dbmail.git/Makefile.am 2013-09-04 19:00:55.000000000 +0400 ++++ dbmail-3.1.5/Makefile.am 2013-09-09 15:14:22.549612297 +0400 +@@ -6,10 +6,6 @@ + SUBDIRS += man + endif + +-if SYSTEMD +-SUBDIRS += systemd +-endif +- + testall: + CK_FORK=no make check + imaptest user=testuser1 pass=test port=10143 host=localhost test=test-scripts/imap diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service deleted file mode 100644 index bc3319fd0..000000000 --- a/community/dbmail/dbmail-imapd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=DBMail Imap Server -After=syslog.target network.target mysqld.service postgresql.service - -[Service] -Type=forking -PIDFile=/run/dbmail/dbmail-imapd.pid -ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid - -[Install] -WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service deleted file mode 100644 index 570ba1ec7..000000000 --- a/community/dbmail/dbmail-lmtpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=DBMail LMTP Server -After=syslog.target network.target mysqld.service postgresql.service - -[Service] -Type=forking -PIDFile=/run/dbmail/dbmail-lmtpd.pid -ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid - -[Install] -WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service deleted file mode 100644 index edfa2570a..000000000 --- a/community/dbmail/dbmail-pop3d.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=DBMail pop3 Server -After=syslog.target network.target mysqld.service postgresql.service - -[Service] -Type=forking -PIDFile=/run/dbmail/dbmail-pop3d.pid -ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid - -[Install] -WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service deleted file mode 100644 index 32623e038..000000000 --- a/community/dbmail/dbmail-timsieved.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=DBMail Sieve Server -After=syslog.target network.target mysqld.service postgresql.service - -[Service] -Type=forking -PIDFile=/run/dbmail/dbmail-timsieved.pid -ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid - -[Install] -WantedBy=multi-user.target diff --git a/community/dbmail/dbmail.tmpfiles b/community/dbmail/dbmail.tmpfiles deleted file mode 100644 index 4b97c91f5..000000000 --- a/community/dbmail/dbmail.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/dbmail 0755 nobody nobody - diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD deleted file mode 100644 index a78b95e27..000000000 --- a/community/dee/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 87044 2013-03-26 11:49:37Z foutrelis $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=dee -pkgver=1.0.14 -pkgrel=5 -pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/dee" -license=('LGPL') -depends=('glib2' 'icu') -makedepends=('python2' 'gobject-introspection' 'vala') -options=('!libtool') -source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('473b4181e26538af0fb753255da7945c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # Install GI overrides for python 3 as well - install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" - ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py" -} diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD index f5d469c9f..664239641 100644 --- a/community/deja-dup/PKGBUILD +++ b/community/deja-dup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87385 2013-03-30 14:36:30Z bgyorgy $ +# $Id: PKGBUILD 97723 2013-09-27 20:25:48Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=deja-dup -pkgver=26.0 +pkgver=28.0 pkgrel=1 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend" arch=('i686' 'x86_64' 'mips64el') @@ -10,25 +10,24 @@ url="https://launchpad.net/deja-dup" license=('GPL') depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils') makedepends=('vala' 'intltool' 'itstool' 'nautilus') -optdepends=('nautilus: backup extension' +optdepends=('gnome-keyring: save passwords' + 'nautilus: backup extension' 'python2-boto: Amazon S3 backend' - 'python2-oauthlib: Ubuntu One backend' 'ubuntuone-client: Ubuntu One backend') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz - libsecret-1.vapi) -md5sums=('0430bbf03deac852651599a979a4cc32' - '27ca0a3c9efbe93e86ef563c77f6ddf3') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz) +md5sums=('480516869f49813880f2bbb35700c9af') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Python2 fix - sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala + sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala +} - # Add missing Vala API file - cp "$srcdir/libsecret-1.vapi" "vapi/libsecret-1.vapi" +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-schemas-compile --without-unity diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index f8c5d7b76..95bed66d6 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96324 2013-08-25 17:11:08Z dicebot $ +# $Id: PKGBUILD 97970 2013-10-02 11:26:53Z dicebot $ # Maintainer: Mihails Strasunse <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> @@ -10,7 +10,7 @@ pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools') groups=('dlang' 'dlang-dmd') pkgbase=dmd pkgver=2.063.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.dlang.org" makedepends=('git' 'gcc' 'make') @@ -82,6 +82,7 @@ package_dmd() { package_libphobos-devel() { pkgdesc="The Phobos standard library for D programming language. Modules and static library." depends=("dmd") + provides=("d-runtime=$pkgver" "d-stdlib=$pkgver") license=("custom") install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD index a4efe727a..8fc4d9fcc 100644 --- a/community/dnscrypt-proxy/PKGBUILD +++ b/community/dnscrypt-proxy/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 94587 2013-07-27 15:21:05Z fyan $ +# $Id: PKGBUILD 97435 2013-09-20 02:21:56Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Techlive Zheng <techlivezheng at gmail dot com> # Contributor: peace4all <markspost at rocketmail dot com> pkgname=dnscrypt-proxy -pkgver=1.3.2 -pkgrel=1 +pkgver=1.3.3 +pkgrel=2 pkgdesc="A tool for securing communications between a client and a DNS resolver" arch=('i686' 'x86_64') url="http://dnscrypt.org/" -license=('custom') +license=('custom:ISC') depends=(libsodium) source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2 conf.d.file @@ -34,6 +34,6 @@ package() { rm -rf "$pkgdir"/usr/{lib/*.{l,}a,include} } -sha512sums=('969219c5655ca7bcb8cbfb79d9dae9b27a79489bae7451e6e478ab5cee1bc22f0dc1758e9ff51ac2e80ec4230e6fe4eaba3a5ff98c3ddbde8d9dc24a51050bab' +sha512sums=('c8e9484485f060aa90a36ef097506b1042348c85b74d0e5bfdeefa8bf8f80e42ae79d4568f524bb6de0754b125ed4f4b39a177f6fdee9e4616e7d0c3641aec0b' '2271eab1baf1a7192a8daaa1b271c24a3a3fa498432ac99c2e4fb3c939590f09aab582427ae874fce7969ece365ccb7a2e946566e5a0c650d93c34d23b536b61' - '33e8f95c38a10a9e05aadeb369616f6dfaa8b32bc28b9f8ab9ae29dfc3b03514442e7172b1f52c56665317b61cad7d130a0e1dc00d6aceaa59eb465e63d079bc') + 'bfff47fc9a515a26d835e08dfeeffba07ff66b09fd887df6c961802c2f8d584f9cd05e83bdcd7ccc274215744e4a05a328aec96152dee70e2fdfe12e12b390d3') diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.service b/community/dnscrypt-proxy/dnscrypt-proxy.service index 5e30d888e..5d38fd908 100644 --- a/community/dnscrypt-proxy/dnscrypt-proxy.service +++ b/community/dnscrypt-proxy/dnscrypt-proxy.service @@ -5,13 +5,8 @@ After=network.target #Before=pdnsd.service [Service] -Type=forking -PIDFile=/var/run/dnscrypt-proxy.pid EnvironmentFile=/etc/conf.d/dnscrypt-proxy -ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid -ExecStart=/usr/bin/dnscrypt-proxy --daemonize \ - --pidfile=/var/run/dnscrypt-proxy.pid \ - --logfile=/var/log/dnscrypt-proxy.log \ +ExecStart=/usr/bin/dnscrypt-proxy \ --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \ --user=${DNSCRYPT_USER} Restart=on-abort diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD index 26392438f..69da7343c 100644 --- a/community/dosbox/PKGBUILD +++ b/community/dosbox/PKGBUILD @@ -1,48 +1,54 @@ -# $Id: PKGBUILD 90018 2013-05-06 19:36:46Z foutrelis $ -# Maintainer: Jaroslav Lichtblau +# $Id: PKGBUILD 98144 2013-10-06 16:29:33Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> # Contributor: James Rayner <james@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=dosbox pkgver=0.74 -pkgrel=5 -pkgdesc="Emulator with builtin DOS for running DOS Games" +pkgrel=6 +pkgdesc='Emulator with builtin DOS for running DOS Games' arch=('i686' 'x86_64' 'mips64el') -url="http://dosbox.sourceforge.net/" +url='http://dosbox.sourceforge.net/' license=('GPL') depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu') -makedepends=('mesa' 'gendesk') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' - 'gcc46.patch') -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '3fba2e3c7c43290319b2928f40ed30e5') - -build(){ +makedepends=('mesa-libgl' 'gendesk') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + dosbox.png + gcc46.patch) +sha256sums=('13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05' + '491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b' + 'f4848d22982b47d1f123ff2c68493460e93aca593ea4a122d69d08625755359c') + +prepare() { cd "$srcdir" - gendesk - cd "${pkgname}-${pkgver}" + gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/gcc46.patch" sed -i 's/png_check_sig/png_sig_cmp/' configure - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox + + ./configure --prefix=/usr --sysconfdir=/etc/dosbox make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - # install docs, make does not install them +# install docs, make does not install them install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video - install -Dm644 "${srcdir}/${pkgname}.png" \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -Dm644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 "$srcdir/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" } + +# vim:set ts=2 sw=2 et: diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index 366cfdf1c..18bccd8f3 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,11 +1,11 @@ # vim:set ft=sh: -# $Id: PKGBUILD 94328 2013-07-20 16:51:21Z idevolder $ +# $Id: PKGBUILD 97499 2013-09-22 18:09:18Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') -pkgver=0.5.6 +pkgver=0.5.7 _helpver=0.5.5 pkgrel=1 url="http://doublecmd.sourceforge.net/" @@ -23,7 +23,7 @@ source=( "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" ) -sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5' +sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343' '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') build() { diff --git a/community/drbd/01-remove-old-sanity-check.diff b/community/drbd/01-remove-old-sanity-check.diff deleted file mode 100644 index 04edb7571..000000000 --- a/community/drbd/01-remove-old-sanity-check.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: Lars Ellenberg <lars.ellenberg@linbit.com> -Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100) -Subject: build: remove old sanity check to allow build against linux 3.1 -X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf - -build: remove old sanity check to allow build against linux 3.1 ---- - -diff --git a/drbd/Makefile b/drbd/Makefile -index 0985340..7a09603 100644 ---- a/drbd/Makefile -+++ b/drbd/Makefile -@@ -90,11 +90,6 @@ else - endif - endif - -- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3) -- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),) -- $(error "won't compile with this kernel version") -- endif -- - .PHONY: drbd.o default all greeting clean kbuild install dep tags - - drbd.o: greeting kbuild diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index bb150a493..c0b476d33 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90502 2013-05-12 23:31:07Z seblu $ +# $Id: PKGBUILD 97092 2013-09-12 13:47:56Z seblu $ # Maintainer: Sébastien Luttringer pkgname=drbd -pkgver=8.4.2 -pkgrel=2 +pkgver=8.4.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' @@ -12,7 +12,7 @@ depends=('perl' 'bash') source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz" "$pkgname.service") backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('b081f1046adda1d51ba351c40a8b1107' +md5sums=('0c54a69603fa28b41de5fb33e03fd9e8' '7dc909b5895c0b5289d3ee0581d7d333') prepare() { diff --git a/community/dtach/PKGBUILD b/community/dtach/PKGBUILD index dcf0617b4..56a24394b 100644 --- a/community/dtach/PKGBUILD +++ b/community/dtach/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65661 2012-02-21 20:25:45Z cbrannon $ +# $Id: PKGBUILD 97940 2013-10-01 16:51:03Z bpiotrowski $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Adam Vogt <vogt.adam@gmail.com> pkgname=dtach pkgver=0.8 -pkgrel=5 +pkgrel=6 pkgdesc="emulates the detach feature of screen" arch=('i686' 'x86_64' 'mips64el') url="http://dtach.sourceforge.net/" diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD new file mode 100644 index 000000000..b092a0b07 --- /dev/null +++ b/community/dub/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Mihails Strasuns <public@dicebot.lv> +# Contributor: Moritz Maxeiner <moritz@ucworks.org> +pkgname=dub +pkgver=0.9.18 +pkgrel=1 +pkgdesc="Developer package manager for D programming language" +arch=('i686' 'x86_64') +url="https://github.com/rejectedsoftware/dub" +license=('MIT') +makedepends=('dmd' 'libphobos-devel' 'git') +depends=('d-compiler' 'd-runtime' 'curl') +source=("git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver") +sha256sums=('SKIP') + +build() +{ + cd "${srcdir}/${pkgname}" + GITVER=$(git describe) || GITVER=unknown + echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d + dmd -ofbin/dub -g -debug -w -Isource -L-lcurl @build-files.txt +} + +package() +{ + cd "${srcdir}/${pkgname}" + install -D -m755 bin/dub "${pkgdir}/usr/bin/dub" + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" +} diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD index 685aca8c0..6a6cda0f3 100644 --- a/community/dvdisaster/PKGBUILD +++ b/community/dvdisaster/PKGBUILD @@ -1,21 +1,27 @@ -# $Id: PKGBUILD 70165 2012-05-01 03:12:33Z ebelanger $ +# $Id: PKGBUILD 97061 2013-09-12 03:38:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=dvdisaster pkgver=0.72.4 -pkgrel=1.1 +pkgrel=2 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches" arch=('i686' 'x86_64' 'mips64el') url="http://www.dvdisaster.com/" license=('GPL') -depends=('gtk2') +depends=('gtk2' 'hicolor-icon-theme') options=('!makeflags') -source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2 dvdisaster.desktop) +install=dvdisaster.install +source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2{,.gpg}) sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972' - 'a802dfcee3aa35bdc4b0b5ecabcf32760cd8b992') + 'SKIP') + +prepare() { + cd ${pkgname}-${pkgver} + sed -i 's/dvdisaster48/dvdisaster/' contrib/dvdisaster.desktop +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --mandir=/usr/share/man --docdir=/usr/share/doc \ --localedir=/usr/share/locale \ @@ -24,12 +30,12 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make BUILDROOT="${pkgdir}" install rm -f "${pkgdir}/usr/bin/dvdisaster-uninstall.sh" - install -D -m 644 "${srcdir}/dvdisaster.desktop" \ - "${pkgdir}/usr/share/applications/dvdisaster.desktop" - install -D -m 644 icons/create.png \ - "${pkgdir}/usr/share/pixmaps/dvdisaster.png" + install -D -m 644 contrib/dvdisaster.desktop "${pkgdir}/usr/share/applications/dvdisaster.desktop" + for i in 16 24 32 48 64 ; do + install -D -m 644 contrib/dvdisaster${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/dvdisaster.png" + done } diff --git a/community/dvdisaster/dvdisaster.desktop b/community/dvdisaster/dvdisaster.desktop deleted file mode 100644 index 061a53846..000000000 --- a/community/dvdisaster/dvdisaster.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=dvdisaster -GenericName=DVD Recovery Tool -Icon=dvdisaster -Name=dvdisaster -StartupNotify=true -Terminal=false -Type=Application -Categories=AudioVideo;GTK; diff --git a/community/dvdisaster/dvdisaster.install b/community/dvdisaster/dvdisaster.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community/dvdisaster/dvdisaster.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD deleted file mode 100644 index 5585c5fc8..000000000 --- a/community/ekg/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 94723 2013-07-29 16:25:52Z bpiotrowski $ -# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> - -pkgname=ekg -pkgver=1.8rc2 -pkgrel=1.2 -pkgdesc="A text-mode Gadu-Gadu client" -arch=('i686' 'x86_64' 'mips64el') -url="http://ekg.chmurka.net/" -license=('GPL') -depends=('libjpeg' 'aspell' 'python2' 'giflib' 'libgadu') -source=(http://ekg.chmurka.net/$pkgname-$pkgver.tar.gz) -md5sums=('f697c711da91ddf57c882114539e92fe') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's#gg%s#ekg%s#' src/ekg.c - ./configure --prefix=/usr --with-pthread --enable-aspell --with-python - make -} - -package() { - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/include $pkgdir/usr/lib -} diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD deleted file mode 100644 index 8e6fd4c8c..000000000 --- a/community/ekg2/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 96537 2013-08-31 09:41:14Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Mateusz Herych <heniekk@gmail.com> - -pkgname=ekg2 -pkgver=0.3.1 -pkgrel=8 -pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client' -arch=('i686' 'x86_64' 'mips64el') -url="http://ekg2.org/" -license=('GPL') -depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') -optdepends=('xosd: xosd support' - 'sqlite: sqlite support' - 'gtk2: gtk support') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz - ekg2-0.3.1-giflib5.patch) -md5sums=('68fc05b432c34622df6561eaabef5a40' - 'e5855316bf7e9b456ebabb7cb9340e98') - -prepare() { - cd $pkgname-$pkgver - sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - patch -Np1 -i ../ekg2-0.3.1-giflib5.patch -} - -build() { - cd $pkgname-$pkgver - - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/ekg2 \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ - --without-gpg \ - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod - rm -rf "$pkgdir"/usr/libexec - chmod -R 755 "$pkgdir"/usr/lib/perl5 - chmod +s "$pkgdir"/usr/lib/ekg2/ioctld -} diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch deleted file mode 100644 index d11b1ecec..000000000 --- a/community/ekg2/ekg2-0.3.1-giflib5.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c ---- a/plugins/gg/commands.c 2011-03-17 18:08:11.000000000 +0100 -+++ b/plugins/gg/commands.c 2013-08-31 11:31:42.521377436 +0200 -@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname, - GifFileType *file; - int fd; - fd = open(fname, O_RDONLY); -+ int giferror; - if (fd == -1) { - snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname); - goto err; - } - -- if (!(file = DGifOpenFileHandle(fd))) { -+ if (!(file = DGifOpenFileHandle(fd, giferror))) { - snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", -- GifLastError()); -+ GifErrorString(giferror)); - goto err2; - } - -@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname, - } - - if (DGifSlurp(file) != GIF_OK) { -- snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError()); -+ snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR)); - goto err3; - } - diff --git a/community/emelfm2/PKGBUILD b/community/emelfm2/PKGBUILD index 23356156b..cbacf0464 100644 --- a/community/emelfm2/PKGBUILD +++ b/community/emelfm2/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 83138 2013-01-27 16:13:32Z pierre $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 97298 2013-09-16 17:59:16Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: contrasutra pkgname=emelfm2 -pkgver=0.8.2 -pkgrel=1.1 +pkgver=0.9.0 +pkgrel=1 pkgdesc="A file manager that implements the popular two-pane design" arch=('i686' 'x86_64' 'mips64el') url="http://emelfm2.net/" depends=('gtk2') license=('GPL3') source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d4498285ae77f0d524ce9be11d50a0aae9569e5f') +sha1sums=('322089d0f08d0de80f49313b7912ff5b970adbf3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD index dd4e13bc1..f46c9696e 100644 --- a/community/emerillon/PKGBUILD +++ b/community/emerillon/PKGBUILD @@ -2,7 +2,7 @@ pkgname=emerillon pkgver=0.1.90 -pkgrel=4 +pkgrel=5 pkgdesc="Map viewer for OpenStreetMap" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/emerillon/" @@ -18,7 +18,11 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile + --disable-static --disable-schemas-compile --disable-maintainer-mode + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/community/epic4/PKGBUILD b/community/epic4/PKGBUILD index a7c2cd106..9e691eef6 100644 --- a/community/epic4/PKGBUILD +++ b/community/epic4/PKGBUILD @@ -1,41 +1,44 @@ -# $Id: PKGBUILD 67602 2012-03-13 13:59:58Z lcarlier $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 98155 2013-10-06 18:44:32Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Mateusz Herych <heniekk@gmail.com> +# Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Chris Brannon <cmbrannon (at) cox.net> pkgname=epic4 -pkgver=2.10.1 -pkgrel=3 +pkgver=2.10.2 +pkgrel=1 pkgdesc="It's a new direction in ircII development" arch=('i686' 'x86_64' 'mips64el') url="http://www.epicsol.org/" license=('custom') depends=('openssl' 'ncurses' 'tcl' 'perl') +options=('!emptydirs') source=(ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/$pkgname-$pkgver.tar.gz) -md5sums=('6f08a04494d0f5543b5f8f3c1ac56d11') +sha256sums=('019e8b9709d806a47c8981e78830ebef132ad2350180d034d1ec2af0582dd249') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr \ +#to avoid build fail + unset CPPFLAGS + + ./configure --prefix=/usr \ --mandir=/usr/share/man \ --with-ssl \ --with-ipv6 \ --with-perl \ --with-tcl - make + make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver - make prefix=${pkgdir}/usr install + make prefix=${pkgdir}/usr \ + libexecdir=${pkgdir}/usr/bin \ + mandir=${pkgdir}/usr/share/man install - install -D -m 644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/COPYRIGHT - mkdir -p ${pkgdir}/usr/lib/$pkgname - mv ${pkgdir}/usr/libexec/wserv4 $pkgdir/usr/lib/$pkgname - rm -rf ${pkgdir}/usr/libexec + install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/COPYRIGHT } - diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 2f08af3bc..a3ddb47b3 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95691 2013-08-15 17:07:39Z arodseth $ +# $Id: PKGBUILD 97433 2013-09-19 22:16:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang-nox -pkgver=R16B01 -pkgrel=2 +pkgver=R16B02 +pkgrel=1 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') url='http://www.erlang.org/' @@ -21,8 +21,8 @@ optdepends=('erlang-unixodbc: database support' 'lksctp-tools: for SCTP support') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' - '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2') +sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85' + 'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789') build() { cd "otp_src_${pkgver/_1/}" diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 6cfb2265d..d965c6cf0 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96358 2013-08-26 11:47:54Z arodseth $ +# $Id: PKGBUILD 97431 2013-09-19 21:08:56Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,8 +8,8 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R16B01 -pkgrel=2 +pkgver=R16B02 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://www.erlang.org/' license=('custom') @@ -19,14 +19,14 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" 'epmd.service' 'epmd.socket' 'epmd.conf') -sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' - '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2' +sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85' + 'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789' 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34' '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2') build() { - cd "$srcdir/otp_src_${pkgver/_1/}" + cd "otp_src_${pkgver/_1/}" ./configure --prefix=/usr --enable-smp-support --with-odbc make @@ -41,7 +41,7 @@ package_erlang() { provides=('erlang-nox') conflicts=('erlang-nox') - cd "$srcdir/otp_src_${pkgver/_1/}" + cd "otp_src_${pkgver/_1/}" make DESTDIR="$pkgdir" install diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD index 8c7c59029..55a5f5584 100644 --- a/community/esmtp/PKGBUILD +++ b/community/esmtp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=esmtp pkgver=1.2 -pkgrel=5 +pkgrel=6 pkgdesc="An easy SMTP forwarder." arch=('i686' 'x86_64' 'mips64el') url='http://esmtp.sourceforge.net' @@ -14,6 +14,7 @@ depends=('libesmtp' 'openssl') optdepends=('liblockfile: for esmtp-wrapper script' 'procmail: for local mail delivery') provides=('smtp-forwarder') +conflicts=('smtp-forwarder') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('79a9c1f9023d53f35bb82bf446150a72') diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index e8646e4d6..4dee9d221 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $ +# $Id: PKGBUILD 97482 2013-09-21 10:35:04Z jelle $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') -pkgver=0.7.6 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.github.com/ettercap/" license=('GPL') depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet') makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2') options=('!libtool' '!makeflags' '!emptydirs') -source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy") -md5sums=('7c5f5e1fd4002afdfd13765ef92866e1' - '51ae9f08e37a0621b3caeedb8e4d47d7' - '473867a0ee6da9cfb048b3d332c3d71f') +source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz") +md5sums=('067514bb53ff76b81d578676e2048319') + build() { cd "${srcdir}" @@ -24,13 +23,13 @@ build() { cd ${pkgbase}-${pkgver} mkdir build cd build - cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ + cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../ make cd "$srcdir"/${pkgbase}-${pkgver}-gtk mkdir build cd build - cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ + cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../ make } @@ -45,7 +44,7 @@ package_ettercap() { package_ettercap-gtk() { pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend" - depends+=('gtk2' 'polkit') + depends+=('gtk2') backup=('etc/ettercap/etter.conf') conflicts=('ettercap') provides=('ettercap') @@ -56,18 +55,18 @@ package_ettercap-gtk() { cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" - install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" +#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" +#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" # Install policy file - install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" + #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" # We need rename the original script - mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" + #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap - echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap - chmod 755 ${pkgdir}/usr/bin/ettercap + #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap + #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap + #chmod 755 ${pkgdir}/usr/bin/ettercap } diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop deleted file mode 100644 index 71f8c8ce8..000000000 --- a/community/ettercap/ettercap.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Ettercap -Comment=Nework sniffer/analyser -Exec=ettercap -G -Icon=ettercap -Terminal=false -Type=Application -Categories=Network; diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy deleted file mode 100644 index 7908d7232..000000000 --- a/community/ettercap/org.archlinux.pkexec.ettercap.policy +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> -<policyconfig> - - <action id="org.archlinux.pkexec.ettercap"> - <message>Authentication is required to run Ettercap</message> - <icon_name>ettercap</icon_name> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> - <allow_active>auth_admin</allow_active> - </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate> - <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> - </action> - -</policyconfig> diff --git a/community/evilwm/LICENSE b/community/evilwm/LICENSE deleted file mode 100644 index 6778ede8c..000000000 --- a/community/evilwm/LICENSE +++ /dev/null @@ -1,40 +0,0 @@ -LICENCE - -evilwm 1.1 -Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk> - -This is free software. You can do what you want to it, but if it -breaks something, you get to pay for the counselling. The code was -originally based on aewm, so this is distributed under the same terms, -which follow. - - -AEWM LICENCE - -Copyright (c) 1998-2000 Decklin Foster. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS -OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE -HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM. - -You are granted permission to copy, publish, distribute, and/or sell -copies of this program and any modified versions or derived works, -provided that this copyright and notice are not removed or altered. - -Portions of the code were based on 9wm, which contains this license: - -> 9wm is free software, and is Copyright (c) 1994 by David Hogan. -> Permission is granted to all sentient beings to use this software, -> to make copies of it, and to distribute those copies, provided -> that: -> -> (1) the copyright and licence notices are left intact -> (2) the recipients are aware that it is free software -> (3) any unapproved changes in functionality are either -> (i) only distributed as patches -> or (ii) distributed as a new program which is not called 9wm -> and whose documentation gives credit where it is due -> (4) the author is not held responsible for any defects -> or shortcomings in the software, or damages caused by it. -> -> There is no warranty for this software. Have a nice day. diff --git a/community/evilwm/PKGBUILD b/community/evilwm/PKGBUILD deleted file mode 100644 index 3b7c0784c..000000000 --- a/community/evilwm/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=evilwm -pkgver=1.1.0 -pkgrel=1.2 -pkgdesc="A minimalist but usable window manager for the X Window System." -arch=('i686' 'x86_64' 'mips64el') -url="http://evilwm.sourceforge.net" -license=('custom') -depends=('libxrandr') -source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('5f14cc3019320860c85bb07c60a76bd7' - '0941ad3e96597ef75c6310f43a0342a0') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install - install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 36d13afa3..2eaf2f2cf 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94068 2013-07-13 16:36:05Z stativ $ +# $Id: PKGBUILD 97703 2013-09-27 17:44:03Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=8 -pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +pkgrel=9 +pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" license=('GPL') diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index a3977275c..d6e3a5743 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ license=('GPL3') depends=('curl' 'bash') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('e715b53883a7f9e3fc5942c78618dbdf' +md5sums=('6938cff329e7965593f270747e94539f' 'SKIP') build() { diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD index e3dfa3770..62d65d3be 100644 --- a/community/fbv/PKGBUILD +++ b/community/fbv/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 94921 2013-08-01 07:01:11Z bpiotrowski $ +# $Id: PKGBUILD 98028 2013-10-04 09:54:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aectann <aectann@infoline.su> pkgname=fbv pkgver=1.0b -pkgrel=7 +pkgrel=8 pkgdesc="FrameBuffer image viewer" arch=('i686' 'x86_64' 'mips64el') url="http://s-tech.elsat.net.pl/fbv/" license=('GPL') -depends=('libpng' 'libungif' 'libjpeg') +depends=('libpng' 'giflib' 'libjpeg') source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz giflib-5.0.patch) md5sums=('3e466375b930ec22be44f1041e77b55d' @@ -18,7 +18,7 @@ md5sums=('3e466375b930ec22be44f1041e77b55d' build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man - sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf + sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lgif|' Make.conf sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c patch -Np1 -i ../giflib-5.0.patch make diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD index 842c10c81..b9f2718f1 100644 --- a/community/fceux/PKGBUILD +++ b/community/fceux/PKGBUILD @@ -1,44 +1,40 @@ -# $Id: PKGBUILD 93772 2013-07-10 07:27:12Z bpiotrowski $ +# $Id: PKGBUILD 97759 2013-09-28 13:37:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contriutor: Eric Belanger <eric@archlinux.org> # Contributor: Jo Christian Bergskås <jcberg@gmail.com> pkgname=fceux -pkgver=2.2.1.1 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 url='http://www.fceux.com/' pkgdesc='Fast and ultra-compatible NES/Famicom emulator' arch=('x86_64' 'i686' 'mips64el') license=('GPL') -depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl') +depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl' 'shared-mime-info') makedepends=('scons' 'mesa-libgl' 'glu') -optdepends=('xchm: for viewing the manual') -install="$pkgname.install" -source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/2.2.1%20src/$pkgname-$pkgver.src.tar.gz") -sha256sums=('afb0b3b8e1d2eea40c59777ef538b69b16164ae53c406106e541099534db828c') +install='fceux.install' +source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz") +sha256sums=('804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - msg2 'Compiling...' scons } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - msg2 'Packaging binaries, data and man-pages...' - scons install --prefix="$pkgdir/usr" + scons install -i --prefix="$pkgdir/usr" - msg2 'Packaging documentation...' - install -Dm644 "src/drivers/win/help/$pkgname.chm" \ - "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm" + # scons install creates usr/share/pixmaps as a regular file, wtf? + rm -f "$pkgdir/usr/share/pixmaps" + + install -d "$pkgdir/usr/share/doc/$pkgname" cp -r documentation/* "$pkgdir/usr/share/doc/$pkgname/" - # Removing manpages that are already placed in the right location - rm -f "$pkgdir/usr/share/doc/$pkgname/*.6" install -Dm644 changelog.txt "$pkgdir/usr/share/doc/$pkgname/" - msg2 'Packaging desktop shortcut and icon...' + # desktop shortcut install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 "$pkgname.png" \ diff --git a/community/fceux/fceux.install b/community/fceux/fceux.install index ad97d7bab..6af331ec0 100644 --- a/community/fceux/fceux.install +++ b/community/fceux/fceux.install @@ -1,13 +1,15 @@ -post_upgrade() { +post_install() { update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +# xdg-icon-resource forceupdate --theme hicolor &> /dev/null } -post_install() { - post_upgrade +post_upgrade() { + post_install } post_remove() { - post_upgrade + post_install } # vim:set ts=2 sw=2 et: diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index f814fd257..bc714998a 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96696 2013-09-03 03:55:15Z fyan $ +# $Id: PKGBUILD 97633 2013-09-26 06:11:29Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> @@ -14,7 +14,7 @@ pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.11.1522.102 _patchver=${pkgver}.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/mozc/" license=('custom') diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index e4a06047b..3a75e6938 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 94235 2013-07-17 12:26:33Z fyan $ +# $Id: PKGBUILD 97747 2013-09-28 08:49:25Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') -pkgver=4.2.8.1 -pkgrel=2 +pkgver=4.2.8.3 +pkgrel=1 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') url="http://fcitx-im.org" @@ -23,6 +23,7 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc \ -DFORCE_OPENCC=ON \ -DFORCE_PRESAGE=ON \ -DFORCE_ENCHANT=ON \ @@ -102,7 +103,7 @@ package_fcitx-gtk3() { } package_fcitx-qt4() { - pkgdesc='QT4 IM Module for fcitx' + pkgdesc='Qt4 IM Module for fcitx' depends=('qt4' "fcitx>=$pkgver") replaces=('fcitx-qt') provides=('fcitx-qt') @@ -118,4 +119,4 @@ package_fcitx-qt4() { make DESTDIR="${pkgdir}" install } -sha512sums=('981e07830693b9525f8f8c7f18579477c066a19ae9358d8aa96ae5439cc3d40f7af2ad24b8cbd24410a5472d002a02eccb8c9d042019cd8459fd094e302d5a72') +sha512sums=('93c7aa5209f344e1e89addb1dca7a76cde884e4467c0db5f79e758ea8ffb0fe1207ba1c507fb6574fe8223fa873ed5d1dd44835b70cf9254f5149df8e242e92d') diff --git a/community/fcrackzip/ChangeLog b/community/fcrackzip/ChangeLog deleted file mode 100644 index 811f87d4f..000000000 --- a/community/fcrackzip/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/fcrackzip/PKGBUILD b/community/fcrackzip/PKGBUILD index e46ebb839..4cd7f756a 100644 --- a/community/fcrackzip/PKGBUILD +++ b/community/fcrackzip/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 67610 2012-03-13 14:10:18Z lcarlier $ +# $Id: PKGBUILD 97775 2013-09-29 15:22:35Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Maintainer: Daenyth <Daenyth+Arch at gmail dot com> +# Contributor: Daenyth <Daenyth+Arch at gmail dot com> pkgname=fcrackzip pkgver=1.0 -pkgrel=3 -pkgdesc="A zip file password cracker" +pkgrel=4 +pkgdesc='Zip file password cracker' arch=('i686' 'x86_64' 'mips64el') url="http://oldhome.schmorp.de/marc/$pkgname.html" license=('GPL') -depends=(glibc) -source=(http://oldhome.schmorp.de/marc/data/$pkgname-$pkgver.tar.gz) -md5sums=('254941f51759f9425965f4b05fe7ac2c') +depends=('glibc') +source=("http://oldhome.schmorp.de/marc/data/$pkgname-$pkgver.tar.gz") +sha256sums=('4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "$pkgname-$pkgver" - make DESTDIR=${pkgdir} install - mv ${pkgdir}/usr/bin/zipinfo ${pkgdir}/usr/bin/fzipinfo + make DESTDIR="$pkgdir" install + mv "$pkgdir/usr/bin/zipinfo" "$pkgdir/usr/bin/fzipinfo" } + +# vim:set ts=2 sw=2 et: diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD index cbae5b25e..86e64c544 100644 --- a/community/fdupes/PKGBUILD +++ b/community/fdupes/PKGBUILD @@ -1,29 +1,35 @@ -# $Id: PKGBUILD 90262 2013-05-10 16:06:17Z jelle $ -# Maintainer: Daenyth <Daenyth+Arch at gmail dot com> +# $Id: PKGBUILD 97904 2013-10-01 01:21:32Z xyne $ +# Maintainer: Xyne <ca dot archlinux at xyne, backwards> +# Contributor: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Chris Winter <twidds at gmail dot com> pkgname=fdupes pkgver=1.51 -pkgrel=1 +pkgrel=2 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fdupes/" license=('MIT') depends=(glibc) source=(http://fdupes.googlecode.com/files/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('47d0410c90c9e51e450933ba35a32b62' - '47f17890218f832f870bf7a02eaeb017') +sha256sums=('87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881' + '6300e5a838d8a0f08b412742cb755c22708970aef420dbad5dc65ca7de677e39') build() { - cd $srcdir/$pkgname-$pkgver - + cd "$srcdir/$pkgname-$pkgver" make PREFIX=/usr } -package(){ - cd $srcdir/$pkgname-$pkgver - - install -d ${pkgdir}/usr/{share/man/man1,bin} - make PREFIX=$pkgdir/usr DESTDIR=${pkgdir}/usr/bin INSTALLDIR=${pkgdir}/usr/bin MAN_DIR=${pkgdir}/usr/share/man/man1 install - install -D -m644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +package(){ + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir"/usr/{share/man/man1,bin} + make \ + PREFIX="$pkgdir/usr" \ + DESTDIR="$pkgdir/usr/bin" \ + INSTALLDIR="$pkgdir"/usr/bin \ + MAN_DIR="$pkgdir"/usr/share/man/man1 \ + install + install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim: set ts=2 sw=2 et: diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD deleted file mode 100755 index 872078081..000000000 --- a/community/ffmpegsource/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 94878 2013-08-01 06:54:52Z bpiotrowski $ -# Maintainer: Maxime Gauduin <alucryd@gmail.com> - -pkgname=ffmpegsource -pkgver=755 -pkgrel=1 -pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/ffmpegsource/" -license=('MIT') -depends=('ffmpeg') -makedepends=('svn') -options=('!libtool') -source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/" - 'autoconf.patch') -sha256sums=('SKIP' - '2cfa7d2e0219a5c8df9a50fe2460a1a1e6b69df10e6d9eee1d723766e62535e7') - -pkgver() { - cd "${SRCDEST}"/${pkgname} - - svnversion | tr -d [A-z] -} - -prepare() { - cd "${srcdir}"/${pkgname} - - patch -Np1 -i ../autoconf.patch -} - -build() { - cd "${srcdir}"/${pkgname} - - ./autogen.sh --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd "${srcdir}"/${pkgname} - - make DESTDIR="${pkgdir}" install - - install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource - install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE -} - -# vim: ts=2 sw=2 et: diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch deleted file mode 100755 index 2ed0d0f6e..000000000 --- a/community/ffmpegsource/autoconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc - - dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css - --INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h -+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h - - lib_LTLIBRARIES = src/core/libffms2.la - src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD new file mode 100644 index 000000000..bb2c78517 --- /dev/null +++ b/community/ffms2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 97223 2013-09-15 13:32:52Z alucryd $$ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> + +pkgname=ffms2 +pkgver=2.19 +pkgrel=1 +pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" +arch=('i686' 'x86_64') +url="https://github.com/FFMS/ffms2" +license=('MIT') +depends=('ffmpeg') +replaces=('ffmpegsource') +options=('!libtool') +source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz") +sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --enable-shared --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING +} + +# vim: ts=2 sw=2 et: diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 61709421f..d38942ee4 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94473 2013-07-25 13:17:05Z spupykin $ +# $Id: PKGBUILD 97537 2013-09-23 17:38:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear -pkgver=2.10.0 -pkgrel=4 +pkgver=2.12.0 +pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') @@ -16,7 +16,7 @@ options=('!makeflags') #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('ae7fc8d1e446c5d1fe2aa82ee41dcac5') +md5sums=('23e2de5f311f4cbe94ec3386736ee8a5') build() { cd $srcdir/flightgear-$pkgver diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 568c14d97..7f7684b4c 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 85346 2013-03-01 10:30:37Z andrea $ +# $Id: PKGBUILD 97998 2013-10-02 21:37:00Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat -pkgver=4.1 -pkgrel=7 +pkgver=4.2 +pkgrel=3 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt4' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu') -makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa') +depends=('arpack' 'fftw' 'glu' 'portaudio' 'qtwebkit') +makedepends=('cmake' 'python2' 'suitesparse') install=freemat.install -source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz - build-fix.patch) -md5sums=('929d31e2310feaff5d380fc2f7b4d1a2' - '2d11a28aa2a7df89c4618ed1c4be5973') +source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz) +md5sums=('ace147e49273ae935d363da8e2a56d4d') build() { cd $srcdir/FreeMat-$pkgver-Source @@ -24,7 +22,6 @@ build() { rm -f CMakeCache.txt find . -type f -name '*.moc.cpp' -exec rm -f {} \; find . -type f -name 'add.so' -exec rm -f {} \; - patch -p1 <$srcdir/build-fix.patch echo >libs/libMatC/CJitFuncClang.hpp echo >libs/libMatC/CJitFuncClang.cpp diff --git a/community/freemat/build-fix.patch b/community/freemat/build-fix.patch deleted file mode 100644 index c1ea63088..000000000 --- a/community/freemat/build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp ---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp 2011-11-27 04:27:43.000000000 +0400 -+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp 2012-01-20 19:07:48.000000000 +0400 -@@ -20,6 +20,7 @@ - #include <qimage.h> - #include <qpainter.h> - #include <QtOpenGL> -+#include <GL/glu.h> - #include <math.h> - #include "IEEEFP.hpp" - diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 164d97d3b..83a269fb7 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $ +# $Id: PKGBUILD 96844 2013-09-06 12:39:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" diff --git a/community/freeradius/freeradius.install b/community/freeradius/freeradius.install index cb7590e77..8ec764b81 100644 --- a/community/freeradius/freeradius.install +++ b/community/freeradius/freeradius.install @@ -5,13 +5,17 @@ post_install() { touch var/log/radius/radius.log chown -R radiusd:radiusd var/log/radius/radius.log - [ -d etc/raddb ] || cp -a etc/raddb.default etc/raddb + [ -d etc/raddb ] || { + cp -a etc/raddb.default etc/raddb + chown -R radiusd:radiusd etc/raddb + } - true + systemd-tmpfiles --create freeradius.conf } post_remove() { userdel radiusd - groupdel radiusd - true + grep "^radiusd:" etc/group >/dev/null && groupdel radiusd + systemd-tmpfiles --create freeradius.conf + echo "-- You may want to remove /var/lib/radiusd and /etc/raddb" } diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 024423a26..112481899 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94879 2013-08-01 06:54:53Z bpiotrowski $ +# $Id: PKGBUILD 97610 2013-09-25 13:56:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Free RDP client" arch=('i686' 'x86_64' 'mips64el') url="http://freerdp.sourceforge.net" @@ -16,13 +16,16 @@ conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz - ffmpeg2.0.patch) + ffmpeg2.0.patch + patch_numblock.patch) md5sums=('c260051a94caff590def5caa4fcf59d6' - '1260eecf01ea5212e2db8ac9c5e7fa6d') + '1260eecf01ea5212e2db8ac9c5e7fa6d' + 'ac581d445ded7cdbd59082a48d9c28ac') prepare() { cd $srcdir/FreeRDP-$pkgver patch -Np1 -i ../ffmpeg2.0.patch + patch -Np1 -i ../patch_numblock.patch } build() { diff --git a/community/freerdp/patch_numblock.patch b/community/freerdp/patch_numblock.patch new file mode 100644 index 000000000..62a23d582 --- /dev/null +++ b/community/freerdp/patch_numblock.patch @@ -0,0 +1,12 @@ +diff -u -r -N old/include/freerdp/kbd/vkcodes.h new/include/freerdp/kbd/vkcodes.h +--- old/include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200 ++++ new/include/freerdp/kbd/vkcodes.h 2013-09-19 12:45:51.621005583 +0200 +@@ -434,7 +434,7 @@ + { 0x00, 0, "VK_SEPARATOR" , NULL }, + { 0x4A, 0, "VK_SUBTRACT" , "KPSU" }, + { 0x53, 0, "VK_DECIMAL" , "KPDL" }, +- { 0x35, 0, "VK_DIVIDE" , "KPDV" }, ++ { 0x35, 1, "VK_DIVIDE" , "KPDV" }, + { 0x3B, 0, "VK_F1" , "FK01" }, + { 0x3C, 0, "VK_F2" , "FK02" }, + { 0x3D, 0, "VK_F3" , "FK03" }, diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD deleted file mode 100644 index 537141a1c..000000000 --- a/community/fssos-nsvs/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $ -# Maintainer: Dale Blount <dale@archlinux.org> - -pkgname=fssos-nsvs -pkgver=0.5 -pkgrel=11 -pkgdesc="NSVS for FSSOS" -arch=('i686' 'x86_64' 'mips64el') -url="http://fssos.sourceforge.net/" -license=('GPL') -depends=('bash' 'mariadb') -backup=('etc/nsvsd.conf') -options=('!libtool' '!makeflags') -install=$pkgname.install -source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz" - 'nsvsd.service') -md5sums=('3f17c2f6339f1a322b712b467023d825' - '9c791d2086e13f774548d9d6ba2cf9d5') - -build() { - cd nsvs-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin - make CFLAGS="${CFLAGS} -D_GNU_SOURCE" -} - -package() { - cd nsvs-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service" -} diff --git a/community/fssos-nsvs/fssos-nsvs.install b/community/fssos-nsvs/fssos-nsvs.install deleted file mode 100644 index 253ae64d2..000000000 --- a/community/fssos-nsvs/fssos-nsvs.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - if [ -z "`grep '^nsvsd::' /etc/group`" ]; then - groupadd -g 83 nsvsd - fi - if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then - useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - userdel nsvsd &> /dev/null - groupdel nsvsd &> /dev/null -} diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service deleted file mode 100644 index 8c3d12b67..000000000 --- a/community/fssos-nsvs/nsvsd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Name Service Via Sockets Daemon - -[Service] -ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf - -[Install] -WantedBy=multi-user.target diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD index 5934b338e..9e7f12efd 100644 --- a/community/garmindev/PKGBUILD +++ b/community/garmindev/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 58914 2011-11-20 11:01:56Z jlichtblau $ +# $Id: PKGBUILD 97782 2013-09-29 17:08:41Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> pkgname=garmindev pkgver=0.3.4 -pkgrel=5 +pkgrel=6 pkgdesc="Garmin Device Drivers for QlandkarteGT" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" license=('GPL') -depends=('libusb') +depends=('libusb-compat') makedepends=('cmake') changelog=$pkgname.changelog install=$pkgname.install diff --git a/community/garmindev/garmindev.changelog b/community/garmindev/garmindev.changelog index ef19de70d..64bb867ea 100644 --- a/community/garmindev/garmindev.changelog +++ b/community/garmindev/garmindev.changelog @@ -1,3 +1,6 @@ +2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * garmindev 0.3.4-6 install file update FS#36141 + 2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * garmindev 0.3.4-5 * udev rule updated for Linux 3.1.1 diff --git a/community/garmindev/garmindev.install b/community/garmindev/garmindev.install index 691e9370d..24c51e51d 100644 --- a/community/garmindev/garmindev.install +++ b/community/garmindev/garmindev.install @@ -3,6 +3,8 @@ cat << EOF Note: ==> In case you experience access permission error for the attached Garmin GPS device, ==> see http://wiki.openstreetmap.org/wiki/USB_Garmin_on_GNU/Linux for more details. -==> Disable garmin_gps module in /etc/rc.conf and see included example udev rule. +==> Disable garmin_gps module and see included example udev rule: +==> echo "blacklist garmin_gps" > /etc/modprobe.d/garmindev.conf +==> cd /etc/udev/rules.d ; ln -s /usr/share/garmindev/51-garmin.rules 51-garmin.rules EOF } diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 31230ed9b..34a1a0d52 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.1 -pkgrel=2 +pkgrel=6 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -69,9 +69,10 @@ build() package_gdc() { - depends=('libmpc' 'zlib') + depends=('gcc' 'binutils') optdepends=('libgphobos-devel: D standard library, GDC version') - description="Compiler for D programming language wich uses gcc backend" + provides=("d-compiler") + 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 +80,8 @@ package_gdc() package_libgphobos-devel() { - description="Standard library for D programming language, GDC port" + pkgdesc="Standard library for D programming language, GDC port" + provides=("d-runtime" "d-stdlib") depends=('gdc') # druntime @@ -93,5 +95,4 @@ package_libgphobos-devel() cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a - install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a } diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD index 7b8b90f54..4fdcbe03c 100755 --- a/community/geary/PKGBUILD +++ b/community/geary/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 89890 2013-05-04 23:09:02Z alucryd $ +# $Id: PKGBUILD 98024 2013-10-04 08:12:31Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor : sebikul <sebikul@gmail.com> # Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=geary -pkgver=0.3.1 -pkgrel=4 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A lightweight email client for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') url="http://www.yorba.org/projects/geary/" license=('GPL3') -depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3') +depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee' 'libnotify' 'libunique3' 'webkitgtk3') makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala') -install=${pkgname}.install +install="${pkgname}.install" source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed') +sha256sums=('eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-{desktop-update,icon-update,schemas-compile} + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF' make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver}/build make DESTDIR="${pkgdir}" install } diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog index 29717fa61..e5b3226a9 100644 --- a/community/geda-gaf/ChangeLog +++ b/community/geda-gaf/ChangeLog @@ -1,3 +1,11 @@ +2013-09-17 Kyle Keen <keenerd@gmail.com> + * 1.8.1-3 + - Update url + +2013-06-04 Bartłomiej Piotrowski <barthalion@gmail.com> + * 1.8.1-2 + - ??? + 2012-01-19 Kyle Keen <keenerd@gmail.com> * 1.8.1-1 - Version bump diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index ebe9d1365..6fb9a1e0a 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -1,13 +1,14 @@ +# $Id: PKGBUILD 97320 2013-09-17 11:15:31Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=geda-gaf pkgver=1.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" arch=('i686' 'x86_64' 'mips64el') -url="http://www.gpleda.org" +url="http://geda-project.org/" license=('GPL') depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme') makedepends=('pkgconfig' 'perlxml' 'flex' 'gawk') diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 0041e3414..6dff065ec 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92909 2013-06-18 13:47:52Z heftig $ +# $Id: PKGBUILD 98198 2013-10-07 12:11:31Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,21 +6,21 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') license=(GPL) url="http://live.gnome.org/GeditPlugins" depends=(gedit python-dbus) -makedepends=(intltool gnome-doc-utils vte3 libgit2-glib) +makedepends=(intltool gnome-doc-utils vte3 libgit2-glib itstool) optdepends=('gucharmap: for charmap plugin' 'vte3: for embedded terminal' 'libgit2-glib: for git plugin') options=('!libtool' '!emptydirs') install=gedit-plugins.install -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80') +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz") +sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd') build() { cd $pkgname-$pkgver diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index 753284cd4..c8b0d9211 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 96278 2013-08-23 11:35:11Z arodseth $ +# $Id: PKGBUILD 97501 2013-09-22 21:35:55Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gendesk -pkgver=0.5.3 +pkgver=0.5.5 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') @@ -12,17 +12,17 @@ makedepends=('go') depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('f6f2db255bd5ea978c00f165cfd8e298a1427ec79e7ec265d50b84a8d45d0144' +sha256sums=('52a13d3952f0c00a65f05d01a9ca0fc1f5337f3379ff6017aafb686e5caf0942' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" go build } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png" diff --git a/community/gerbv/ChangeLog b/community/gerbv/ChangeLog index 3653de9c5..b23801ba3 100644 --- a/community/gerbv/ChangeLog +++ b/community/gerbv/ChangeLog @@ -1,3 +1,7 @@ +2013-07-24 Kyle Keen <keenerd@gmail.com> + * 2.6.1-1 + - Version bump + 2011-12-31 Kyle Keen <keenerd@gmail.com> * 2.6.0-1 - Version bump diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD index e5666533a..6ac556b08 100644 --- a/community/gerbv/PKGBUILD +++ b/community/gerbv/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 61469 2012-01-01 00:58:06Z kkeen $ +# $Id: PKGBUILD 97318 2013-09-17 10:57:59Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=gerbv -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="An open source Gerber file (RS-274X only) viewer" -url="http://gerbv.gpleda.org/" +#url="http://gerbv.gpleda.org/" +url="http://gerbv.geda-project.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gtk2' 'shared-mime-info' 'hicolor-icon-theme') optdepends=('gdk-pixbuf: export of images' 'cairo: for better graphics') +makedepends=('cvs' 'gettext') +# cvs for autopoint install=$pkgname.install -source=("http://downloads.sourceforge.net/gerbv/$pkgname-$pkgver.tar.gz") -md5sums=('44a37dd202bc60fab54cbc298a477572') +source=("http://downloads.sourceforge.net/gerbv/$pkgname-$pkgver.tar.gz" + "reautopointissues.diff") +md5sums=('9a8af19574025fb15f987c3df610f8ae' + '55c3aac2af1f99a88dfa7b1508594e49') build () { cd "$srcdir/$pkgname-$pkgver" + # remove patches on 2.6.2 + patch -Np1 -i ../reautopointissues.diff + ./autogen.sh + sed -i 's|am_aux_dir=`cd $ac_aux_dir|am_aux_dir=`cd $srcdir|' configure ./configure --prefix=/usr \ --disable-update-desktop-database make diff --git a/community/gerbv/reautopointissues.diff b/community/gerbv/reautopointissues.diff new file mode 100644 index 000000000..1f0b83a7f --- /dev/null +++ b/community/gerbv/reautopointissues.diff @@ -0,0 +1,4118 @@ +diff --git a/po/ru.po b/po/ru.po +new file mode 100644 +index 0000000..1cc07ec +--- /dev/null ++++ b/po/ru.po +@@ -0,0 +1,3144 @@ ++# Gerbv Russian translation ++# Copyright (C) 2012 gEDA Developers ++# This file is distributed under the same license as the Gerbv package. ++# ++# Sergey Alyoshin <alyoshin.s@gmail.com>, 2012, 2013 ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: gerbv 2.6A ru\n" ++"Report-Msgid-Bugs-To: gerbv-devel@lists.sourceforge.net\n" ++"POT-Creation-Date: 2013-08-25 23:16+0400\n" ++"PO-Revision-Date: 2013-08-25 23:20+0400\n" ++"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" ++"Language-Team: gEDA user <geda-user@delorie.com>\n" ++"Language: ru\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#: src/attribute.c:305 ++#, c-format ++msgid "%s(): malloc failed for an array of size %d\n" ++msgstr "%s(): не удалось выделить память для массива размера %d\n" ++ ++#: src/attribute.c:323 ++msgid "gerbv" ++msgstr "Gerbv" ++ ++#: src/attribute.c:341 ++#, c-format ++msgid "%s(): Adding attribute #%d\n" ++msgstr "%s(): добавление атрибута №%d\n" ++ ++#: src/attribute.c:507 ++#, c-format ++msgid "%s: unknown type of HID attribute\n" ++msgstr "%s: неизвестный тип HID-атрибута\n" ++ ++#: src/authors.c:2 ++msgid "Andreas Andersson aka Pitch" ++msgstr "Andreas Andersson aka Pitch" ++ ++#: src/authors.c:3 ++msgid "Trevor Blackwell" ++msgstr "Trevor Blackwell" ++ ++#: src/authors.c:4 ++msgid "Stuart Brorson " ++msgstr "Stuart Brorson" ++ ++#: src/authors.c:5 ++msgid "David Carr" ++msgstr "David Carr" ++ ++#: src/authors.c:6 ++msgid "Anders Eriksson" ++msgstr "Anders Eriksson" ++ ++#: src/authors.c:7 ++msgid "Juergen Haas" ++msgstr "Juergen Haas" ++ ++#: src/authors.c:8 ++msgid "Julian Lamb " ++msgstr "Julian Lamb" ++ ++#: src/authors.c:9 ++msgid "Dan McMahill " ++msgstr "Dan McMahill" ++ ++#: src/authors.c:10 ++msgid "Tomasz Motylewski" ++msgstr "Tomasz Motylewski" ++ ++#: src/authors.c:11 ++msgid "Stefan Petersen" ++msgstr "Stefan Petersen" ++ ++#: src/authors.c:12 ++msgid "Joost Witteveen" ++msgstr "Joost Witteveen" ++ ++#: src/authors.c:13 ++msgid "Joerg Wunsch" ++msgstr "Joerg Wunsch" ++ ++#: src/authors.c:14 ++msgid "... and many others." ++msgstr "... и многие другие." ++ ++#: src/bugs.c:2 ++msgid "Currently KNOWN BUGS" ++msgstr "Известные ошибки" ++ ++#: src/bugs.c:4 ++msgid "All OS:" ++msgstr "Для всех ОС:" ++ ++#: src/bugs.c:6 ++msgid "" ++"If layer orientation modified with rotation and rendering mode is 'Fast' or" ++msgstr "" ++"Если для слоя выполнен поворот и выбрано «Быстрое» или «Искл. ИЛИ» " ++"отображение" ++ ++#: src/bugs.c:7 ++msgid "" ++"'Fast, with XOR' (GDK rendering) rectangular and oval apertures are not " ++"rotated" ++msgstr "" ++"(режим GDK), то прямоугольные и овальные апертуры не будут повёрнуты и " ++ ++#: src/bugs.c:8 ++msgid "and not correctly displayed." ++msgstr "будут отображены некорректно." ++ ++#: src/bugs.c:10 ++msgid "" ++"Reporting about macro parameters (obtained via analyze -> analyze visible" ++msgstr "" ++"Данные о макропараметрах (получаемые по «Анализ → Анализировать видимые" ++ ++#: src/bugs.c:11 ++msgid "Gerber layers, and found in the Aperture definitions tab) incorrectly" ++msgstr "" ++"слои Gerber», и отображаемые во вкладке «Определение апертур») не " ++"соответствуют" ++ ++#: src/bugs.c:12 ++msgid "reports the macro parameters found." ++msgstr "найденным макропараметрам." ++ ++#: src/callbacks.c:84 ++msgid "Gerbv Project" ++msgstr "Проект Gerbv" ++ ++#: src/callbacks.c:152 ++msgid "No layers are currently loaded. A layer must be loaded first." ++msgstr "Не открыто ни одного слоя." ++ ++#: src/callbacks.c:189 ++msgid "Do you want to close any open layers and start a new project?" ++msgstr "Закрыть все открытые слои и начать новый проект?" ++ ++#: src/callbacks.c:190 ++msgid "" ++"Starting a new project will cause all currently open layers to be closed. " ++"Any unsaved changes will be lost." ++msgstr "" ++"Все открытые слои будут закрыты. Все не сохранённые изменения будут потеряны." ++ ++#: src/callbacks.c:224 ++msgid "Do you want to close any open layers and load an existing project?" ++msgstr "Закрыть все открытые слои и открыть существующий проект?" ++ ++#: src/callbacks.c:225 ++msgid "" ++"Loading a project will cause all currently open layers to be closed. Any " ++"unsaved changes will be lost." ++msgstr "" ++"При открытии проекта все текущие слои будут закрыты. Все не сохранённые " ++"изменения будут потеряны." ++ ++#: src/callbacks.c:232 ++msgid "Open project file..." ++msgstr "Открыть файл проекта" ++ ++#: src/callbacks.c:248 src/callbacks.c:534 ++msgid "All" ++msgstr "Все" ++ ++#: src/callbacks.c:289 ++msgid "Open Gerber, drill, or pick & place file(s)..." ++msgstr "Открыть файлы Gerber, сверловки или расположения" ++ ++#: src/callbacks.c:358 ++msgid "Gerbv cannot export this file type" ++msgstr "Gerbv не может экспортировать этот формат файла" ++ ++#: src/callbacks.c:400 ++msgid "Unknown Layer type for merge\n" ++msgstr "Неизвестный тип слоя для объединения\n" ++ ++#: src/callbacks.c:403 ++msgid "Looking for matching files\n" ++msgstr "Поиск соответствующих файлов\n" ++ ++#: src/callbacks.c:408 ++#, c-format ++msgid "Adding '%s'\n" ++msgstr "Добавление «%s»\n" ++ ++#: src/callbacks.c:418 ++msgid "Not Enough Files of same type to merge\n" ++msgstr "Недостаточно слоёв одного типа для объединения\n" ++ ++#: src/callbacks.c:421 ++msgid "Now merging files\n" ++msgstr "Объединение файлов\n" ++ ++#: src/callbacks.c:455 ++msgid "No layer is currently selected" ++msgstr "Слой не выделен" ++ ++#: src/callbacks.c:456 ++msgid "Please select a layer and try again." ++msgstr "Выберите слой и попробуйте снова." ++ ++#: src/callbacks.c:479 src/interface.c:337 ++msgid "Save project as..." ++msgstr "Сохранить проект как..." ++ ++#: src/callbacks.c:481 ++msgid "Export PS file as..." ++msgstr "Экспортировать в формат PS" ++ ++#: src/callbacks.c:483 ++msgid "Export PDF file as..." ++msgstr "Экспортировать в формат PDF" ++ ++#: src/callbacks.c:485 ++msgid "Export SVG file as..." ++msgstr "Экспортировать в формат SVG" ++ ++#: src/callbacks.c:487 ++msgid "Export PNG file as..." ++msgstr "Экспортировать в формат PNG" ++ ++#: src/callbacks.c:488 ++msgid "DPI:" ++msgstr "DPI:" ++ ++#: src/callbacks.c:492 src/callbacks.c:494 ++msgid "DPI value, autoscaling if 0" ++msgstr "Значение DPI, 0 для автомасштабирования" ++ ++#: src/callbacks.c:498 ++msgid "Export RS-274X file as..." ++msgstr "Экспортировать в формат RS-274X" ++ ++#: src/callbacks.c:500 ++msgid "Export Excellon drill file as..." ++msgstr "Экспортировать в формат Excellon" ++ ++#: src/callbacks.c:502 ++msgid "Export RS-274Xm file as..." ++msgstr "Экспортировать объединение в формат RS-274X" ++ ++#: src/callbacks.c:504 ++msgid "Export Excellon drillm file as..." ++msgstr "Экспортировать объединение в формат Excellon" ++ ++#: src/callbacks.c:506 ++msgid "Save layer as..." ++msgstr "Сохранить слой как..." ++ ++#: src/callbacks.c:610 ++#, c-format ++msgid "Merged visible gerber layers and placed in '%s'\n" ++msgstr "Видимые слои Gerber объединены и сохранены в «%s»\n" ++ ++#: src/callbacks.c:619 ++#, c-format ++msgid "Merged visible drill layers and placed in '%s'\n" ++msgstr "Видимые слои сверловки объединены и сохранены в «%s»\n" ++ ++#: src/callbacks.c:814 src/callbacks.c:1255 ++msgid "General information\n" ++msgstr "Общая информация\n" ++ ++#: src/callbacks.c:816 src/callbacks.c:1257 ++#, c-format ++msgid " Active layer count = %d\n" ++msgstr " Видимых слоёв: %d\n" ++ ++#: src/callbacks.c:820 ++msgid "Files processed" ++msgstr "Обработанный слой" ++ ++#: src/callbacks.c:821 ++msgid "Layer number" ++msgstr "Номер слоя" ++ ++#: src/callbacks.c:834 ++msgid "" ++"\n" ++"\n" ++"No Gerber files active (visible)!\n" ++msgstr "" ++"\n" ++"\n" ++"Нет видимых слоёв Gerber!\n" ++ ++#: src/callbacks.c:837 ++msgid "" ++"\n" ++"\n" ++"No errors found in active Gerber file(s)!\n" ++msgstr "" ++"\n" ++"\n" ++"В видимых слоях Gerber ошибок не найдено!\n" ++ ++#: src/callbacks.c:840 ++msgid "" ++"\n" ++"\n" ++"Errors found in active Gerber file(s):\n" ++msgstr "" ++"\n" ++"\n" ++"Найдены ошибки в видимых слоях Gerber:\n" ++ ++#: src/callbacks.c:847 src/callbacks.c:1287 ++msgid "FATAL: " ++msgstr "ФАТАЛЬНАЯ ОШИБКА: " ++ ++#: src/callbacks.c:850 src/callbacks.c:1290 ++msgid "ERROR: " ++msgstr "ОШИБКА: " ++ ++#: src/callbacks.c:853 src/callbacks.c:1293 ++msgid "WARNING: " ++msgstr "Предупреждение: " ++ ++#: src/callbacks.c:856 src/callbacks.c:1296 ++msgid "NOTE: " ++msgstr "Замечание: " ++ ++#: src/callbacks.c:860 src/callbacks.c:1300 ++#, c-format ++msgid " Layer %d: %s %s" ++msgstr " Слой %d: %s %s" ++ ++#: src/callbacks.c:876 src/callbacks.c:1313 ++msgid "G code statistics (all active layers)\n" ++msgstr "Статистика G-кодов на видимых слоях\n" ++ ++#: src/callbacks.c:878 src/callbacks.c:958 src/callbacks.c:981 ++#: src/callbacks.c:1001 src/callbacks.c:1315 src/callbacks.c:1359 ++#: src/callbacks.c:1424 ++msgid "<code> = <number of incidences>\n" ++msgstr "<код> = <количество>\n" ++ ++#: src/callbacks.c:882 ++msgid "Move" ++msgstr "Переход" ++ ++#: src/callbacks.c:886 src/callbacks.c:1323 ++msgid "1X linear interpolation" ++msgstr "1× линейная интерполяция" ++ ++#: src/callbacks.c:890 src/callbacks.c:1327 ++msgid "CW interpolation" ++msgstr "Интерполяция по часовой стрелки" ++ ++#: src/callbacks.c:894 src/callbacks.c:1331 ++msgid "CCW interpolation" ++msgstr "Интерполяция против часовой стрелки" ++ ++#: src/callbacks.c:898 ++msgid "Comment/ignore block" ++msgstr "Блок комментария" ++ ++#: src/callbacks.c:902 ++msgid "10X linear interpolation" ++msgstr "10× линейная интерполяция" ++ ++#: src/callbacks.c:906 ++msgid "0.1X linear interpolation" ++msgstr "0.1× линейная интерполяция" ++ ++#: src/callbacks.c:910 ++msgid "0.01X linear interpolation" ++msgstr "0.01× линейная интерполяция" ++ ++#: src/callbacks.c:914 ++msgid "Poly fill on" ++msgstr "Заполненный полигон" ++ ++#: src/callbacks.c:918 ++msgid "Poly fill off" ++msgstr "Незаполненный полигон" ++ ++#: src/callbacks.c:922 ++msgid "Tool prepare" ++msgstr "Подготовка инструмента" ++ ++#: src/callbacks.c:926 ++msgid "Flash prepare" ++msgstr "Подготовка экспозиции" ++ ++#: src/callbacks.c:930 ++msgid "Units = inches" ++msgstr "Единицы изменения: дюймы" ++ ++#: src/callbacks.c:934 ++msgid "Units = mm" ++msgstr "Единицы измерения: мм" ++ ++#: src/callbacks.c:938 ++msgid "Disable 360 circ. interpolation" ++msgstr "Откл. 360° интерполяции" ++ ++#: src/callbacks.c:942 ++msgid "Enable 360 circ. interpolation" ++msgstr "Вкл. 360° интерполяции" ++ ++#: src/callbacks.c:946 src/callbacks.c:1343 ++msgid "Absolute units" ++msgstr "Абсолютные единицы" ++ ++#: src/callbacks.c:950 src/callbacks.c:1347 ++msgid "Incremental units" ++msgstr "Инкрементальные единицы" ++ ++#: src/callbacks.c:952 src/callbacks.c:1353 ++#, c-format ++msgid "Unknown G codes = %d\n" ++msgstr "Неизвестные G-коды: %d\n" ++ ++#: src/callbacks.c:956 ++msgid "D code statistics (all active layers)\n" ++msgstr "Статистика D-кодов на видимых слоях\n" ++ ++#: src/callbacks.c:962 ++msgid "Exposure on" ++msgstr "Вкл. экспозиции" ++ ++#: src/callbacks.c:966 ++msgid "Exposure off" ++msgstr "Откл. экспозиции" ++ ++#: src/callbacks.c:970 ++msgid "Flash aperture" ++msgstr "Апертура экспозиции" ++ ++#: src/callbacks.c:972 ++#, c-format ++msgid "Undefined D codes = %d\n" ++msgstr "Неопределённые D-коды: %d\n" ++ ++#: src/callbacks.c:975 ++#, c-format ++msgid "D code Errors = %d\n" ++msgstr "Ошибки D-кодов: %d\n" ++ ++#: src/callbacks.c:979 src/callbacks.c:1357 ++msgid "M code statistics (all active layers)\n" ++msgstr "Статистика M-кодов на видимых слоях\n" ++ ++#: src/callbacks.c:985 ++msgid "Program start" ++msgstr "Начало программы" ++ ++#: src/callbacks.c:989 ++msgid "Program stop" ++msgstr "Останов программы" ++ ++#: src/callbacks.c:993 ++msgid "Program end" ++msgstr "Конец программы" ++ ++#: src/callbacks.c:995 src/callbacks.c:1417 ++#, c-format ++msgid "Unknown M codes = %d\n" ++msgstr "Неизвестные M-коды: %d\n" ++ ++#: src/callbacks.c:999 src/callbacks.c:1422 ++msgid "Misc code statistics (all active layers)\n" ++msgstr "Статистика прочих кодов на видимых слоях\n" ++ ++#: src/callbacks.c:1013 src/callbacks.c:1429 ++#, c-format ++msgid "Unknown codes = %d\n" ++msgstr "Неизвестные коды: %d\n" ++ ++#: src/callbacks.c:1020 ++msgid "No aperture definitions found in Gerber file(s)!\n" ++msgstr "Нет определения апертур в слоях Gerber!\n" ++ ++#: src/callbacks.c:1023 ++msgid "Apertures defined in Gerber file(s) (by layer)\n" ++msgstr "Апертуры определённые в слоях Gerber\n" ++ ++#: src/callbacks.c:1026 ++msgid "Layer" ++msgstr "Слой" ++ ++#: src/callbacks.c:1027 ++msgid "D code" ++msgstr "D-код" ++ ++#: src/callbacks.c:1028 ++msgid "Aperture" ++msgstr "Апертура" ++ ++#: src/callbacks.c:1029 ++msgid "Param[0]" ++msgstr "Параметр[0]" ++ ++#: src/callbacks.c:1030 ++msgid "Param[1]" ++msgstr "Параметр[1]" ++ ++#: src/callbacks.c:1031 ++msgid "Param[2]" ++msgstr "Параметр[2]" ++ ++#: src/callbacks.c:1052 ++msgid "No apertures used in Gerber file(s)!\n" ++msgstr "Нет используемых апертур в видимых слоях Gerber!\n" ++ ++#: src/callbacks.c:1058 ++msgid "Apertures used in Gerber file(s) (all active layers)\n" ++msgstr "Используемые апертуры в видимых слоях Gerber\n" ++ ++#: src/callbacks.c:1060 ++msgid "<aperture code> = <number of uses>\n" ++msgstr "<код апертуры> = <используемое количество>\n" ++ ++#: src/callbacks.c:1074 ++#, c-format ++msgid "" ++"\n" ++"Total number of aperture uses: %d\n" ++msgstr "" ++"\n" ++"Всего используемых апертур: %d\n" ++ ++#: src/callbacks.c:1079 ++msgid "Gerber codes report" ++msgstr "Отчёт по кодам Gerber" ++ ++#: src/callbacks.c:1190 src/callbacks.c:1531 ++msgid "General" ++msgstr "Общая информация" ++ ++#: src/callbacks.c:1194 src/callbacks.c:1535 ++msgid "G codes" ++msgstr "G-коды" ++ ++#: src/callbacks.c:1198 ++msgid "D codes" ++msgstr "D-коды" ++ ++#: src/callbacks.c:1202 src/callbacks.c:1539 ++msgid "M codes" ++msgstr "M-коды" ++ ++#: src/callbacks.c:1206 src/callbacks.c:1543 ++msgid "Misc. codes" ++msgstr "Прочие коды" ++ ++#: src/callbacks.c:1210 ++msgid "Aperture definitions" ++msgstr "Определение апертур" ++ ++#: src/callbacks.c:1214 ++msgid "Aperture usage" ++msgstr "Использование апертур" ++ ++#: src/callbacks.c:1261 ++msgid "" ++"\n" ++"\n" ++"Files processed:\n" ++msgstr "" ++"\n" ++"\n" ++"Обработаны слои:\n" ++ ++#: src/callbacks.c:1274 ++msgid "" ++"\n" ++"\n" ++"No drill files active (visible)!\n" ++msgstr "" ++"\n" ++"\n" ++"Нет видимых слоёв сверловки!\n" ++ ++#: src/callbacks.c:1277 ++msgid "" ++"\n" ++"\n" ++"No errors found in active drill file(s)!\n" ++msgstr "" ++"\n" ++"\n" ++"В видимых слоях сверловки ошибок не найдено.\n" ++ ++#: src/callbacks.c:1280 ++msgid "" ++"\n" ++"\n" ++"Errors found in active drill file(s):\n" ++msgstr "" ++"\n" ++"\n" ++"Найдены ошибки в следующих слоях сверловки:\n" ++ ++#: src/callbacks.c:1319 ++msgid "Rout mode" ++msgstr "Холостой ход" ++ ++#: src/callbacks.c:1335 ++msgid "Variable dwell" ++msgstr "Переменная задержка" ++ ++#: src/callbacks.c:1339 ++msgid "Drill mode" ++msgstr "Режим сверловки" ++ ++#: src/callbacks.c:1351 ++msgid "Zero set" ++msgstr "Установка нуля" ++ ++#: src/callbacks.c:1363 ++msgid "End of program" ++msgstr "Конец программы" ++ ++#: src/callbacks.c:1367 ++msgid "End of pattern" ++msgstr "Конец комбинации" ++ ++#: src/callbacks.c:1371 ++msgid "Tool tip check" ++msgstr "Проверка инструмента" ++ ++#: src/callbacks.c:1375 src/callbacks.c:1383 ++msgid "Begin pattern" ++msgstr "Начало комбинации" ++ ++#: src/callbacks.c:1379 ++msgid "End program rewind" ++msgstr "Конец программы со сбросом" ++ ++#: src/callbacks.c:1387 ++msgid "Long message" ++msgstr "Длинное сообщение" ++ ++#: src/callbacks.c:1391 ++msgid "Operator message" ++msgstr "Сообщение оператора" ++ ++#: src/callbacks.c:1395 ++msgid "Begin program header" ++msgstr "Начало заголовка программы" ++ ++#: src/callbacks.c:1399 ++msgid "Metric units" ++msgstr "Метрические единицы измерения" ++ ++#: src/callbacks.c:1403 ++msgid "English units" ++msgstr "Английские единицы измерения" ++ ++#: src/callbacks.c:1407 ++msgid "End program header" ++msgstr "Конец заголовка программы" ++ ++#: src/callbacks.c:1411 src/callbacks.c:1415 ++msgid "Canned text" ++msgstr "Высверленный текст" ++ ++#: src/callbacks.c:1426 ++#, c-format ++msgid "comments = %d\n" ++msgstr "комментарии: %d\n" ++ ++#: src/callbacks.c:1435 ++msgid "Repeat hole" ++msgstr "повтор" ++ ++#: src/callbacks.c:1443 ++msgid "Drills used (all active layers)\n" ++msgstr "Используемые отверстия на видимых слоях\n" ++ ++#: src/callbacks.c:1445 ++msgid "Drill no." ++msgstr "№ отв." ++ ++#: src/callbacks.c:1445 ++msgid "Dia." ++msgstr "Диаметр" ++ ++#: src/callbacks.c:1445 src/drill.c:187 ++msgid "Units" ++msgstr "Единицы измерения" ++ ++#: src/callbacks.c:1445 ++msgid "Count" ++msgstr "Количество" ++ ++#: src/callbacks.c:1458 ++#, c-format ++msgid "Total drill count %d\n" ++msgstr "Всего отверстий: %d\n" ++ ++#: src/callbacks.c:1467 ++msgid "Drill file codes report" ++msgstr "Отчёт по кодам сверловки" ++ ++#: src/callbacks.c:1547 ++msgid "Drills used" ++msgstr "Используемые отверстия" ++ ++#: src/callbacks.c:1594 ++msgid "Do you want to close all open layers and quit the program?" ++msgstr "Закрыть все открытые слои и выйти из программы?" ++ ++#: src/callbacks.c:1595 ++msgid "Quitting the program will cause any unsaved changes to be lost." ++msgstr "Выход из программы приведёт к потере всех не сохранённых изменений." ++ ++#. TRANSLATORS: Replace this string with your names, one name per line. ++#: src/callbacks.c:1618 ++msgid "translator-credits" ++msgstr "Сергей Алёшин <alyoshin.s@gmail.com>" ++ ++#: src/callbacks.c:1620 ++#, c-format ++msgid "" ++"gerbv -- a Gerber (RS-274/X) viewer.\n" ++"\n" ++"This is gerbv version %s\n" ++"Compiled on %s at %s\n" ++"\n" ++"gerbv is part of the gEDA Project.\n" ++"\n" ++"For more information see:\n" ++" gEDA homepage: http://geda-project.org/\n" ++" gEDA Wiki: http://wiki.geda-project.org/" ++msgstr "" ++"Gerbv — просмотр файлов Gerber (RS-274/X).\n" ++"\n" ++"Версия программы %s\n" ++"Собрана %s в %s\n" ++"Gerbv является частью проекта gEDA.\n" ++"\n" ++"Для дальнейшей информации, см.:\n" ++" Домашняя страница gEDA: http://geda-project.org/\n" ++" gEDA Wiki: http://wiki.geda-project.org/" ++ ++#: src/callbacks.c:1631 ++msgid "" ++"gerbv -- a Gerber (RS-274/X) viewer.\n" ++"\n" ++"Copyright (C) 2000-2007 Stefan Petersen\n" ++"\n" ++"This program is free software: you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation, either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++"\n" ++"This program is distributed in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++"\n" ++"You should have received a copy of the GNU General Public License\n" ++"along with this program. If not, see <http://www.gnu.org/licenses/>." ++msgstr "" ++"Gerbv — просмотр файлов Gerber (RS-274/X)\n" ++"\n" ++"Copyright © 2000—2007 Stefan Petersen\n" ++"\n" ++"Это свободное программное обеспечение: вы можете распространять и/или\n" ++"изменять его на условиях универсальной общественной лицензии (GPL) GNU,\n" ++"опубликованной фондом свободного программного обеспечения (FSF), версии 2\n" ++"или (по вашему усмотрению) более поздней версии.\n" ++"\n" ++"Эта программа распространяется в надежде, что она будет полезна,\n" ++"но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; в том числе БЕЗ ГАРАНТИИ ПРИГОДНОСТИ ДЛЯ\n" ++"ПРОДАЖИ или БЕЗ ГАРАНТИИ ПРИГОДНОСТИ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. Для\n" ++"подробностей см. лицензию GNU GPL.\n" ++"\n" ++"Вы должны были получить копию лицензии GNU GPL вместе с этой программой\n" ++"Если вы её не получили, см. <http://www.gnu.org/licenses/>." ++ ++#: src/callbacks.c:1650 ++msgid "Gerbv" ++msgstr "Gerbv" ++ ++#: src/callbacks.c:1679 ++msgid "About Gerbv" ++msgstr "О программе" ++ ++#: src/callbacks.c:1706 ++msgid "Known bugs in gerbv" ++msgstr "Известные ошибки в Gerbv" ++ ++#: src/callbacks.c:2056 src/callbacks.c:3071 ++msgid "" ++"Click to select objects in the current layer. Middle click and drag to pan." ++msgstr "Выделите объекты в текущем слое. Средняя кнопка для масштабирования." ++ ++#: src/callbacks.c:2064 ++msgid "Click and drag to pan. Right click and drag to zoom." ++msgstr "Перетащите для прокрутки. Правая кнопка для масштабирования." ++ ++#: src/callbacks.c:2072 ++msgid "Click and drag to zoom in. Shift+click to zoom out." ++msgstr "Перетащите для увеличения. Удерживайте клавишу Shift для уменьшения." ++ ++#: src/callbacks.c:2080 ++msgid "Click and drag to measure a distance." ++msgstr "Перетащите для измерения расстояния." ++ ++#: src/callbacks.c:2256 ++msgid "Select a color" ++msgstr "Выберите цвет" ++ ++#: src/callbacks.c:2370 ++msgid "Unknown" ++msgstr "Неизвестный тип" ++ ++#: src/callbacks.c:2374 ++msgid "This file type does not currently have any editable features" ++msgstr "В настоящее время этот формат не имеет изменяемых свойств" ++ ++#: src/callbacks.c:2375 ++msgid "" ++"Format editing is currently only supported for Excellon drill file formats." ++msgstr "Изменение формата возможно только для сверловки Excellon." ++ ++#: src/callbacks.c:2385 ++msgid "This layer has changed!" ++msgstr "Слой изменён!" ++ ++#: src/callbacks.c:2386 ++msgid "" ++"Editing the file type will reload the layer, destroying your changes. Click " ++"OK to edit the file type and destroy your changes, or Cancel to leave." ++msgstr "" ++"Изменение формата файла приведёт к перезагрузке слоя и потере всех его " ++"изменений. При нажатии OK изменения будут потеряны." ++ ++#: src/callbacks.c:2401 ++msgid "Edit file format" ++msgstr "Изменить формат" ++ ++#: src/callbacks.c:2409 ++#, c-format ++msgid "%s(): Reloading layer\n" ++msgstr "%s(): перезагрузка слоя\n" ++ ++#: src/callbacks.c:2633 src/callbacks.c:2834 ++msgid "No object is currently selected" ++msgstr "Нет выделенных объектов" ++ ++#: src/callbacks.c:2634 ++msgid "" ++"Objects must be selected using the pointer tool before you can view the " ++"object properties." ++msgstr "Объект должен быть выделен для просмотра его свойств." ++ ++#: src/callbacks.c:2658 ++msgid "<unnamed layer>" ++msgstr "<безымянный>" ++ ++#: src/callbacks.c:2664 ++msgid "<unlabeled net>" ++msgstr "<безымянное>" ++ ++#: src/callbacks.c:2669 ++msgid "Object type: Polygon\n" ++msgstr "Тип объекта: полигон\n" ++ ++#: src/callbacks.c:2683 ++msgid "Object type: Line\n" ++msgstr "Тип объекта: линия\n" ++ ++#: src/callbacks.c:2689 ++msgid "Object type: Arc\n" ++msgstr "Тип объекта: дуга\n" ++ ++#: src/callbacks.c:2698 ++msgid "Object type: Unknown\n" ++msgstr "Тип объекта: неизвестный\n" ++ ++#: src/callbacks.c:2701 ++msgid " Exposure: On\n" ++msgstr " Экспозиция: вкл.\n" ++ ++#: src/callbacks.c:2705 ++#, c-format ++msgid " Start location: (%g, %g)\n" ++msgstr " Начало: %g; %g\n" ++ ++#: src/callbacks.c:2707 ++#, c-format ++msgid " Stop location: (%g, %g)\n" ++msgstr " Конец: %g; %g\n" ++ ++#: src/callbacks.c:2711 ++#, c-format ++msgid " Length: %g (sum: %g)\n" ++msgstr " Длина: %g (сумма: %g)\n" ++ ++#: src/callbacks.c:2714 src/callbacks.c:2726 ++#, c-format ++msgid " Layer name: %s\n" ++msgstr " Слой: %s\n" ++ ++#: src/callbacks.c:2715 src/callbacks.c:2727 ++#, c-format ++msgid " Net label: %s\n" ++msgstr " Соединение: %s\n" ++ ++#: src/callbacks.c:2716 src/callbacks.c:2728 ++#, c-format ++msgid " In file: %s\n" ++msgstr " Файл: %s\n" ++ ++#: src/callbacks.c:2720 ++msgid "Object type: Flashed aperture\n" ++msgstr "Тип объекта: апертура экспозиции\n" ++ ++#: src/callbacks.c:2724 ++#, c-format ++msgid " Location: (%g, %g)\n" ++msgstr " Расположение: %g; %g\n" ++ ++#: src/callbacks.c:2752 src/callbacks.c:2768 ++#, c-format ++msgid "Benchmark(): Starting redraw #%d\n" ++msgstr "Проверка производительности: начало перерисовки №%d\n" ++ ++#: src/callbacks.c:2755 src/callbacks.c:2776 ++#, c-format ++msgid "Elapsed time = %ld seconds\n" ++msgstr "Затраченное время: %ld с\n" ++ ++#: src/callbacks.c:2757 ++#, c-format ++msgid "" ++"FAST (=GDK) mode benchmark: %d redraws in %ld seconds (%g redraws/second)\n" ++msgstr "" ++"Проверка производительности БЫСТРОГО (GDK) режима: %d отрисовок за %ld с (%g " ++"отрисовок/c)\n" ++ ++#: src/callbacks.c:2778 ++#, c-format ++msgid "" ++"NORMAL (=Cairo) mode benchmark: %d redraws in %ld seconds (%g redraws/" ++"second)\n" ++msgstr "" ++"Проверка производительности ОБЫЧНОГО (Cairo) режима: %d отрисовок за %ld с " ++"(%g отрисовок/c)\n" ++ ++#: src/callbacks.c:2792 ++msgid "Full zoom benchmarks\n" ++msgstr "Проверка производительности полного увеличения\n" ++ ++#: src/callbacks.c:2796 ++msgid "x5 zoom benchmarks\n" ++msgstr "Проверка производительности x5 увеличения\n" ++ ++#: src/callbacks.c:2835 ++msgid "" ++"Objects must be selected using the pointer tool before they can be deleted." ++msgstr "Для того чтобы удалить объекты, они должны быть выделены указателем" ++ ++#: src/callbacks.c:2847 ++msgid "Do you want to permanently delete the selected objects?" ++msgstr "Удалить выделенные объекты?" ++ ++#: src/callbacks.c:2848 ++msgid "" ++"Gerbv currently has no undo function, so this action cannot be undone. This " ++"action will not change the saved file unless you save the file afterwards." ++msgstr "" ++"В настоящее время Gerbv не имеет функции отмены, поэтому это действие нельзя " ++"будет отменить. Файл не будет изменён, если изменения не будут сохранены." ++ ++#: src/callbacks.c:3040 ++#, c-format ++msgid "(%8.2f, %8.2f)" ++msgstr "(%.2f; %.2f)" ++ ++#: src/callbacks.c:3044 ++#, c-format ++msgid "(%8.3f, %8.3f)" ++msgstr "(%.3f; %.3f)" ++ ++#: src/callbacks.c:3048 ++#, c-format ++msgid "(%4.5f, %4.5f)" ++msgstr "(%.4f; %.5f)" ++ ++#: src/callbacks.c:3064 ++msgid "No object selected. Objects can only be selected in the active layer." ++msgstr "" ++"Нет выделенных объектов. Они могут быть выделены только на видимом слое." ++ ++#: src/callbacks.c:3076 ++msgid "1 object is currently selected" ++msgstr "Выделен 1 объект" ++ ++#: src/callbacks.c:3081 ++#, c-format ++msgid "%d object are currently selected" ++msgid_plural "%d objects are currently selected" ++msgstr[0] "Выделен %d объект" ++msgstr[1] "Выделено %d объекта" ++msgstr[2] "Выделено %d объектов" ++ ++#: src/callbacks.c:3313 ++msgid "No objects are currently selected" ++msgstr "Нет выделенных объектов" ++ ++#: src/callbacks.c:3387 ++#, c-format ++msgid "Measured distance: %8.2f mils (%8.2f x, %8.2f y)" ++msgstr "Расстояние: %.2f мил (x: %.2f; y: %.2f)" ++ ++#: src/callbacks.c:3392 ++#, c-format ++msgid "Measured distance: %8.3f mms (%8.3f x, %8.3f y)" ++msgstr "Расстояние: %.3f мм (x: %.3f; y: %.3f)" ++ ++#: src/callbacks.c:3397 ++#, c-format ++msgid "Measured distance: %4.5f inches (%4.5f x, %4.5f y)" ++msgstr "Расстояние: %.5f дюйм (x: %.5f; y: %.5f)" ++ ++#: src/callbacks.c:3562 ++#, c-format ++msgid "Fatal error : %s\n" ++msgstr "Фатальная ошибка: %s\n" ++ ++#: src/callbacks.c:3626 ++#, c-format ++msgid " Aperture used: D%d\n" ++msgstr " Апертура: D%d\n" ++ ++#: src/callbacks.c:3627 ++#, c-format ++msgid " Aperture type: %s\n" ++msgstr " Тип апертуры: %s\n" ++ ++#: src/callbacks.c:3631 ++#, c-format ++msgid " Diameter: %g\n" ++msgstr " Диаметр: %g\n" ++ ++#: src/callbacks.c:3636 ++#, c-format ++msgid " Dimensions: %gx%g\n" ++msgstr " Размер: %g×%g\n" ++ ++#: src/csv.c:167 src/csv.c:288 ++#, c-format ++msgid "%d: unexpected quote in element" ++msgstr "%d: неожиданная кавычка в элементе" ++ ++#: src/csv.c:198 ++#, c-format ++msgid "%d: bad end quote in element" ++msgstr "%d: ошибочная закрывающая кавычка в элементе" ++ ++#: src/csv.c:319 ++#, c-format ++msgid "%d: bad end quote in element " ++msgstr "%d: ошибочная закрывающая кавычка в элементе " ++ ++#: src/draw-gdk.c:572 src/draw.c:317 ++msgid "Drawing simplified aperture macros:\n" ++msgstr "Отрисовка макроса упрощённой апертуры:\n" ++ ++#: src/draw-gdk.c:578 ++msgid " Circle\n" ++msgstr " Круг\n" ++ ++#: src/draw-gdk.c:582 ++msgid " Outline\n" ++msgstr " Контур\n" ++ ++#: src/draw-gdk.c:586 ++msgid " Polygon\n" ++msgstr " Полигон\n" ++ ++#: src/draw-gdk.c:590 ++msgid " Moire\n" ++msgstr " Муар\n" ++ ++#: src/draw-gdk.c:594 ++msgid " Thermal\n" ++msgstr " Термобарьер\n" ++ ++#: src/draw-gdk.c:598 ++msgid " Line 20\n" ++msgstr " Линия 20\n" ++ ++#: src/draw-gdk.c:602 ++msgid " Line 21\n" ++msgstr " Линия 21\n" ++ ++#: src/draw-gdk.c:606 ++msgid " Line 22\n" ++msgstr " Линия 22\n" ++ ++#: src/draw-gdk.c:609 ++msgid "Unknown simplified aperture macro" ++msgstr "Неизвестный макрос упрощённой апертуры" ++ ++#: src/draw-gdk.c:1116 ++msgid "Linear != x1\n" ++msgstr "Линейный != ×1\n" ++ ++#: src/draw-gdk.c:1219 src/draw.c:954 ++msgid "Unknown aperture type\n" ++msgstr "Неизвестный тип апертуры\n" ++ ++#: src/draw-gdk.c:1224 src/draw.c:962 ++msgid "Unknown aperture state\n" ++msgstr "Неизвестное состояние апертуры\n" ++ ++#: src/drill.c:155 src/interface.c:1862 ++msgid "None" ++msgstr "Нет" ++ ++#: src/drill.c:157 ++msgid "Leading" ++msgstr "Спереди" ++ ++#: src/drill.c:159 ++msgid "Trailing" ++msgstr "Сзади" ++ ++#: src/drill.c:165 src/drill.c:1125 src/drill.c:1207 ++msgid "inch" ++msgstr "дюймы" ++ ++#: src/drill.c:172 src/drill.c:1125 src/drill.c:1207 src/interface.c:1094 ++msgid "mm" ++msgstr "мм" ++ ++#: src/drill.c:179 ++msgid "autodetect" ++msgstr "Автоопределение" ++ ++#: src/drill.c:179 ++msgid "Try to autodetect the file format" ++msgstr "Попытаться автоматически определить формат" ++ ++#: src/drill.c:183 ++msgid "zero_supression" ++msgstr "Отбрасывать нули" ++ ++#: src/drill.c:183 ++msgid "Zero supression" ++msgstr "Отбрасывать нули" ++ ++#: src/drill.c:187 ++msgid "units" ++msgstr "Единицы измерения" ++ ++#: src/drill.c:197 ++msgid "digits" ++msgstr "Цифры" ++ ++#: src/drill.c:197 ++msgid "" ++"Number of digits. For trailing zero supression, this is the number of " ++"digits before the decimal point. Otherwise this is the number of digits " ++"after the decimal point." ++msgstr "" ++"Количество цифр перед десятичной точкой, при отбрасывании нулей сзади; и " ++"после, при отбрасывании спереди." ++ ++#: src/drill.c:241 ++msgid "malloc curr_net->next failed\n" ++msgstr "Ошибка выделения памяти для curr_net->next\n" ++ ++#: src/drill.c:324 src/gerber.c:770 src/pick-and-place.c:582 ++msgid "malloc image failed\n" ++msgstr "Ошибка выделения памяти для изображения\n" ++ ++#: src/drill.c:352 ++msgid "malloc stats failed\n" ++msgstr "Ошибка выделения памяти для статуса\n" ++ ++#: src/drill.c:358 ++msgid "malloc state failed\n" ++msgstr "Ошибка выделения памяти для состояния\n" ++ ++#: src/drill.c:362 src/drill_stats.c:314 src/pick-and-place.c:587 ++msgid "malloc format failed\n" ++msgstr "Ошибка выделения памяти\n" ++ ++#: src/drill.c:417 src/drill.c:431 src/drill.c:727 src/drill.c:730 ++#: src/drill.c:763 ++#, c-format ++msgid "Undefined header line = '%s'\n" ++msgstr "Неопределённая строка заголовка «%s»\n" ++ ++#: src/drill.c:447 ++msgid "Rout mode data is not supported\n" ++msgstr "Данные режима быстрого позиционирования не поддерживаются\n" ++ ++#: src/drill.c:462 src/gerber.c:1488 ++msgid "Unexpected EOF found.\n" ++msgstr "Неожиданный код конца файла.\n" ++ ++#: src/drill.c:510 src/drill.c:517 ++msgid "Found junk after INCH command\n" ++msgstr "Ненужный текст после команды INCH\n" ++ ++#: src/drill.c:561 ++msgid "" ++"End of Excellon header reached but no leading/trailing zero handling " ++"specified.\n" ++msgstr "" ++"В заголовке файла Excellon не указана обработка ведущих/младших нулей.\n" ++ ++#: src/drill.c:565 ++msgid "Assuming leading zeros.\n" ++msgstr "Предполагаются ведущие нули.\n" ++ ++#: src/drill.c:575 ++msgid "M71 code found but no METRIC specification in header.\n" ++msgstr "Найден код M71, но в заголовке не указано METRIC.\n" ++ ++#: src/drill.c:579 ++msgid "Assuming all tool sizes are MM.\n" ++msgstr "Предполагается размер всех инструментов в мм.\n" ++ ++#: src/drill.c:620 ++#, c-format ++msgid "Message embedded in drill file: '%s'\n" ++msgstr "Текст встроенный в файл сверловки: «%s»\n" ++ ++#: src/drill.c:644 ++msgid "Undefined M code found.\n" ++msgstr "Неопределённый M-код.\n" ++ ++#: src/drill.c:653 ++msgid "R codes are not allowed in the header.\n" ++msgstr "R-коды не допустимы в заголовке.\n" ++ ++#: src/drill.c:715 ++msgid "Drill file sets spindle speed -- ignoring.\n" ++msgstr "Пропуск установки скорости шпинделя в файле сверловки.\n" ++ ++#: src/drill.c:759 ++msgid "Undefined codes found in header.\n" ++msgstr "Неопределённые коды в заголовке.\n" ++ ++#: src/drill.c:772 ++#, c-format ++msgid "Undefined character '%c' [0x%02x] found inside data, ignoring\n" ++msgstr "Пропуск неопределённого символа ‘%c’ [0x%02x] в данных\n" ++ ++#: src/drill.c:784 ++msgid "No EOF found in drill file.\n" ++msgstr "В файле сверловки отсутствует код конца файла.\n" ++ ++#: src/drill.c:870 ++msgid "malloc buf failed while checking for drill file.\n" ++msgstr "Ошибка выделения памяти при проверке является ли файл сверловкой.\n" ++ ++#: src/drill.c:989 ++#, c-format ++msgid "Tool change stop switch found: %s\n" ++msgstr "Смена инструмента: %s\n" ++ ++#: src/drill.c:1007 ++msgid "Orcad bug: Junk text found in place of tool definition.\n" ++msgstr "Ошибка Orcad: ненужный текст вместо определения инструмента.\n" ++ ++#: src/drill.c:1010 ++#, c-format ++msgid "Junk text = %s\n" ++msgstr "Ненужный текст: %s\n" ++ ++#: src/drill.c:1020 ++msgid "Ignorning junk text.\n" ++msgstr "Пропуск ненужного текста.\n" ++ ++#: src/drill.c:1034 ++#, c-format ++msgid "Drill number out of bounds: %d.\n" ++msgstr "Номер отверстия %d не входит в границы.\n" ++ ++#: src/drill.c:1065 ++#, c-format ++msgid "Read a drill of diameter %g inches.\n" ++msgstr "Прочитано отверстие диаметром %g дюймов.\n" ++ ++#: src/drill.c:1071 ++msgid "Assuming units are mils.\n" ++msgstr "Предполагаются единицы измерения мил.\n" ++ ++#: src/drill.c:1081 ++#, c-format ++msgid "Unreasonable drill size found for drill %d: %g\n" ++msgstr "Бессмысленный размер отверстия %d: %g\n" ++ ++#: src/drill.c:1097 ++#, c-format ++msgid "Found redefinition of drill %d.\n" ++msgstr "Переопределение отверстия %d.\n" ++ ++#: src/drill.c:1108 src/drill.c:1163 ++msgid "malloc tool failed\n" ++msgstr "Ошибка выделения памяти для инструмента\n" ++ ++#: src/drill.c:1150 ++msgid "Unexpected EOF encountered header of drill file.\n" ++msgstr "Неожиданный код конца файла в заголовке файла сверловки.\n" ++ ++#: src/drill.c:1182 ++#, c-format ++msgid "Tool %02d used without being defined\n" ++msgstr "Инструмент %02d используется без определения\n" ++ ++#: src/drill.c:1188 ++#, c-format ++msgid "Setting a default size of %g\"\n" ++msgstr "Установка размера по умолчанию %g\"\n" ++ ++#: src/drill.c:1237 ++msgid "Unexpected EOF found while parsing M code.\n" ++msgstr "Неожиданный код конца файла при разборе M-кода.\n" ++ ++#: src/drill.c:1391 ++msgid "Found junk after METRIC command\n" ++msgstr "Ненужный текст после команды METRIC\n" ++ ++#: src/drill.c:1431 ++msgid "Unexpected EOF found while parsing G code.\n" ++msgstr "Неожиданный код конца файла при разборе G-кода.\n" ++ ++#: src/drill.c:1605 ++#, c-format ++msgid "" ++"%s(): omit_zeros == GERBV_OMIT_ZEROS_TRAILING but fmt = %d.\n" ++"This should never have happened\n" ++msgstr "" ++"%s(): omit_zeros == GERBV_OMIT_ZEROS_TRAILING но fmt = %d.\n" ++"Этого никогда не должно случиться\n" ++ ++#: src/drill.c:1620 ++#, c-format ++msgid "%s(): wantdigits = %d which exceeds the maximum allowed size\n" ++msgstr "%s(): wantdigits = %d превышает максимально допустимое значение\n" ++ ++#: src/drill.c:1675 ++#, c-format ++msgid "%s(): Unhandled fmt ` %d\n" ++msgstr "%s(): формат %d не обработан\n" ++ ++#: src/drill_stats.c:68 ++msgid "malloc drill_list failed\n" ++msgstr "Ошибка выделения памяти для списка отверстий сверловки\n" ++ ++#: src/drill_stats.c:74 src/drill_stats.c:469 src/gerb_stats.c:68 ++#: src/gerb_stats.c:290 ++msgid "malloc error_list failed\n" ++msgstr "Ошибка выделения памяти для списка ошибок\n" ++ ++#: src/drill_stats.c:199 ++#, c-format ++msgid "Broken tool detect %s (layer %d)" ++msgstr "Обнаружена неисправность инструмента %s (слой %d)" ++ ++#: src/dynload.c:49 ++#, c-format ++msgid "scheme load-extension: %s: %s" ++msgstr "scheme расширение для загрузки: %s: %s" ++ ++#: src/dynload.c:79 ++#, c-format ++msgid "Error loading scheme extension \"%s\": %s\n" ++msgstr "Ошибка загрузки расширения scheme «%s»: %s\n" ++ ++#: src/dynload.c:90 ++#, c-format ++msgid "Error initializing scheme module \"%s\": %s\n" ++msgstr "Ошибка инициализации модуля scheme «%s»: %s\n" ++ ++#: src/export-drill.c:56 src/export-rs274x.c:217 ++#, c-format ++msgid "Can't open file for writing: %s\n" ++msgstr "Невозможно открыть файл «%s» для записи\n" ++ ++#: src/exportimage.c:97 ++#, c-format ++msgid "Exporting error to file \"%s\"\n" ++msgstr "Ошибка экспорта в файл «%s»\n" ++ ++#: src/gerb_file.c:182 ++msgid "Failed to read integer" ++msgstr "Ошибка чтения целого числа" ++ ++#: src/gerb_file.c:208 ++msgid "Failed to read double" ++msgstr "Ошибка чтения вещественного числа двойной точности" ++ ++#: src/gerb_image.c:100 src/gerb_image.c:272 src/gerb_image.c:325 ++#, c-format ++msgid "unknown" ++msgstr "неизвестный тип" ++ ++#: src/gerb_image.c:248 ++#, c-format ++msgid "linearX1" ++msgstr "линейная×1" ++ ++#: src/gerb_image.c:251 ++#, c-format ++msgid "linearX10" ++msgstr "линейная×10" ++ ++#: src/gerb_image.c:254 ++#, c-format ++msgid "linearX01" ++msgstr "линейная×01" ++ ++#: src/gerb_image.c:257 ++#, c-format ++msgid "linearX001" ++msgstr "линейная×001" ++ ++#: src/gerb_image.c:260 ++#, c-format ++msgid "CW circular" ++msgstr "круговая по часовой" ++ ++#: src/gerb_image.c:263 ++#, c-format ++msgid "CCW circular" ++msgstr "круговая против часовой" ++ ++#: src/gerb_image.c:266 ++#, c-format ++msgid "polygon area start" ++msgstr "начало полигональной области" ++ ++#: src/gerb_image.c:269 ++#, c-format ++msgid "polygon area end" ++msgstr "конец полигональной области" ++ ++#: src/gerb_image.c:281 ++#, c-format ++msgid "..state off" ++msgstr "..выключенное состояние" ++ ++#: src/gerb_image.c:284 ++#, c-format ++msgid "..state on" ++msgstr "..включенное состояние" ++ ++#: src/gerb_image.c:287 ++#, c-format ++msgid "..state flash" ++msgstr "..состояние экспозиции" ++ ++#: src/gerb_image.c:290 ++#, c-format ++msgid "..state unknown" ++msgstr "..состояние неизвестно" ++ ++#: src/gerb_image.c:303 ++#, c-format ++msgid "Apertures:\n" ++msgstr "Апертуры:\n" ++ ++#: src/gerb_image.c:307 ++#, c-format ++msgid " Aperture no:%d is an " ++msgstr "Апертура №%d — " ++ ++#: src/gerb_image.c:310 ++#, c-format ++msgid "circle" ++msgstr "круг" ++ ++#: src/gerb_image.c:313 ++#, c-format ++msgid "rectangle" ++msgstr "прямоугольник" ++ ++#: src/gerb_image.c:316 ++#, c-format ++msgid "oval" ++msgstr "овал" ++ ++#: src/gerb_image.c:319 ++#, c-format ++msgid "polygon" ++msgstr "полигон" ++ ++#: src/gerb_image.c:322 ++#, c-format ++msgid "macro" ++msgstr "макрос" ++ ++#: src/gerb_image.c:337 ++#, c-format ++msgid "(%f,%f)->(%f,%f) with %d (" ++msgstr "(%f,%f)->(%f,%f) с %d (" ++ ++#: src/gerb_stats.c:74 src/gerb_stats.c:376 ++msgid "malloc aperture_list failed\n" ++msgstr "Ошибка выделения памяти для списка апертур\n" ++ ++#: src/gerb_stats.c:80 ++msgid "malloc D_code_list failed\n" ++msgstr "Ошибка выделения памяти для списка D-кодов\n" ++ ++#: src/gerb_stats.c:434 ++msgid "malloc D_list failed\n" ++msgstr "Ошибка выделения памяти для списка D-кодов\n" ++ ++#: src/gerb_stats.c:476 ++msgid "Undefined aperture number called out in D code.\n" ++msgstr "В D-коде указан неизвестный номер апертуры.\n" ++ ++#: src/gerber.c:179 ++msgid "Unknown M code found.\n" ++msgstr "Неизвестный M-код.\n" ++ ++#: src/gerber.c:489 ++#, c-format ++msgid "" ++"Found undefined D code D%d in file\n" ++"%s\n" ++msgstr "Неопределённый D-код D%d в файле «%s»\n" ++ ++#: src/gerber.c:723 ++#, c-format ++msgid "Found unknown character (whitespace?) [%d]%c\n" ++msgstr "Неизвестный символ (пробел?) [%d]%c\n" ++ ++#: src/gerber.c:775 ++msgid "malloc gerbv_stats failed\n" ++msgstr "Ошибка выделения памяти для структуры статистики\n" ++ ++#: src/gerber.c:792 ++#, c-format ++msgid "File %s is missing Gerber EOF code.\n" ++msgstr "Файл «%s» не содержит код конца Gerber-файла.\n" ++ ++#: src/gerber.c:833 ++msgid "malloc buf failed while checking for rs274x.\n" ++msgstr "Ошибка выделения памяти при проверке RS274X.\n" ++ ++#: src/gerber.c:927 ++msgid "malloc buf failed while checking for rs274d.\n" ++msgstr "Ошибка выделения памяти при проверке RS274D.\n" ++ ++#: src/gerber.c:1060 ++#, c-format ++msgid "" ++"Found aperture D%d out of bounds while parsing G code in file\n" ++"%s\n" ++msgstr "Апертура D%d превышает границы при разборе G-кода в файле «%s»\n" ++ ++#: src/gerber.c:1069 ++#, c-format ++msgid "" ++"Found unexpected code after G54 in file\n" ++"%s\n" ++msgstr "Неизвестный код после G54 в файле «%s»\n" ++ ++#: src/gerber.c:1109 ++#, c-format ++msgid "" ++"Encountered unknown G code G%d in file\n" ++"%s\n" ++msgstr "Неизвестный G-код G%d в файле «%s»\n" ++ ++#: src/gerber.c:1115 ++#, c-format ++msgid "Ignorning unknown G code G%d\n" ++msgstr "Пропуск неизвестного G-кода G%d\n" ++ ++#: src/gerber.c:1145 ++#, c-format ++msgid "" ++"Found invalid D00 code in file\n" ++"%s\n" ++msgstr "Недопустимый код D00 в файле «%s»\n" ++ ++#: src/gerber.c:1173 ++#, c-format ++msgid "" ++"Found out of bounds aperture D%d in file\n" ++"%s\n" ++msgstr "Превышающая границы апертура D%d в файле «%s»\n" ++ ++#: src/gerber.c:1211 ++#, c-format ++msgid "" ++"Encountered unknown M code M%d in file\n" ++"%s\n" ++msgstr "Неизвестный M-код M%d в файле «%s»\n" ++ ++#: src/gerber.c:1218 ++#, c-format ++msgid "Ignorning unknown M code M%d\n" ++msgstr "Пропуск неизвестного M-кода M%d\n" ++ ++#: src/gerber.c:1252 src/gerber.c:1271 src/gerber.c:1290 src/gerber.c:1614 ++#, c-format ++msgid "" ++"Unexpected EOF found in file\n" ++"%s\n" ++msgstr "Неожиданный код конца файла в «%s»\n" ++ ++#: src/gerber.c:1320 ++#, c-format ++msgid "" ++"EagleCad bug detected: Undefined handling of zeros in format code in file\n" ++"%s\n" ++msgstr "Ошибка EagleCad: формат не определяет обработку нулей в файле «%s»\n" ++ ++#: src/gerber.c:1327 ++msgid "Defaulting to omitting leading zeros.\n" ++msgstr "Пропуск ведущих нулей, по умолчанию.\n" ++ ++#: src/gerber.c:1345 ++#, c-format ++msgid "" ++"Invalid coordinate type defined in format code in file\n" ++"%s\n" ++msgstr "Недопустимый тип координат в коде формата файла «%s»\n" ++ ++#: src/gerber.c:1352 ++msgid "Defaulting to absolute coordinates.\n" ++msgstr "Установка по умолчанию абсолютных координат.\n" ++ ++#: src/gerber.c:1382 src/gerber.c:1393 src/gerber.c:1406 src/gerber.c:1417 ++#, c-format ++msgid "" ++"Illegal format size %c in file\n" ++"%s\n" ++msgstr "Недопустимый размер формата %c в файле «%s»\n" ++ ++#: src/gerber.c:1428 ++#, c-format ++msgid "" ++"Illegal format statement [%c] in file\n" ++"%s\n" ++msgstr "Недопустимое выражение формата [%c] в файле «%s»\n" ++ ++#: src/gerber.c:1435 ++msgid "Ignoring invalid format statement.\n" ++msgstr "Пропуск недопустимого выражения формата.\n" ++ ++#: src/gerber.c:1471 ++#, c-format ++msgid "Wrong character in mirror:%c\n" ++msgstr "Недопустимый символ зеркального отражения: %c\n" ++ ++#: src/gerber.c:1500 ++#, c-format ++msgid "Illegal unit: %c%c\n" ++msgstr "Недопустимые единицы измерения: %c%c\n" ++ ++#: src/gerber.c:1520 ++#, c-format ++msgid "Wrong character in offset: %c\n" ++msgstr "Недопустимый символ в смещении: %c\n" ++ ++#: src/gerber.c:1549 ++#, c-format ++msgid "" ++"In file %s,\n" ++"included file %s cannot be found\n" ++msgstr "В файле «%s» не может быть найден включённый файл «%s»\n" ++ ++#: src/gerber.c:1559 ++msgid "" ++"Parser encountered more than 10 levels of include file recursion which is " ++"not allowed by the RS-274X spec\n" ++msgstr "" ++"Более чем 10 уровней рекурсии включения файлов не допускается спецификацией " ++"RS-274X\n" ++ ++#: src/gerber.c:1582 ++#, c-format ++msgid "" ++"In file %s,\n" ++"wrong character in image offset %c\n" ++msgstr "В файле «%s» недопустимый символ %c смещения изображения\n" ++ ++#: src/gerber.c:1638 ++#, c-format ++msgid "" ++"In file %s,\n" ++"unknown input code (IC): %c%c\n" ++msgstr "В файле «%s» неизвестный входной код (IC): %c%c\n" ++ ++#: src/gerber.c:1680 ++#, c-format ++msgid "" ++"In file %s,\n" ++"wrong character in image justify:%c\n" ++msgstr "В файле «%s» недопустимый символ выравнивания изображения: %c\n" ++ ++#: src/gerber.c:1699 ++#, c-format ++msgid "" ++"In file %s,\n" ++"unexpected EOF while reading image polarity (IP)\n" ++msgstr "" ++"В файле «%s» неожиданный код конца файла при чтении полярности изображения " ++"(IP)\n" ++ ++#: src/gerber.c:1715 ++#, c-format ++msgid "Unknown polarity: %c%c%c\n" ++msgstr "Неизвестная полярность: %c%c%c\n" ++ ++#: src/gerber.c:1734 ++#, c-format ++msgid "Image rotation must be 0, 90, 180 or 270 (is actually %d)\n" ++msgstr "" ++"Изображение должно быть повёрнуто на 0°, 90°, 180° или 270° (указано %d°)\n" ++ ++#: src/gerber.c:1765 src/gerber.c:1770 ++#, c-format ++msgid "" ++"In file %s,\n" ++"aperture number out of bounds: %d\n" ++msgstr "В файле «%s» номер апертуры выходит за границы: %d\n" ++ ++#: src/gerber.c:1790 ++#, c-format ++msgid "" ++"In file %s,\n" ++"failed to parse aperture macro\n" ++msgstr "В файле «%s» ошибка разбора макроса апертуры\n" ++ ++#: src/gerber.c:1815 ++#, c-format ++msgid "" ++"In file %s,\n" ++"unknown Layer Polarity: %c\n" ++msgstr "В файле «%s» неизвестная полярность слоя: %c\n" ++ ++#: src/gerber.c:1838 ++#, c-format ++msgid "" ++"In file %s,\n" ++"knockout must supply a polarity (C, D, or *)\n" ++msgstr "Врезка должна содержать полярность (C, D или *) в файле «%s»\n" ++ ++#: src/gerber.c:1884 ++#, c-format ++msgid "" ++"In file %s,\n" ++"unknown variable in knockout" ++msgstr "Неизвестная переменная врезки в файле «%s»" ++ ++#: src/gerber.c:1921 ++#, c-format ++msgid "" ++"In file %s,\n" ++"step-and-repeat parameter error\n" ++msgstr "" ++"Ошибка параметра многократного экспонирования с шаговым перемещением в файле " ++"«%s»\n" ++ ++#: src/gerber.c:1950 ++#, c-format ++msgid "" ++"In file %s,\n" ++"error in layer rotation command\n" ++msgstr "Ошибка в команде поворота слоя в файле «%s»\n" ++ ++#: src/gerber.c:1960 ++#, c-format ++msgid "" ++"In file %s,\n" ++"unknown RS-274X extension found %%%c%c%%\n" ++msgstr "В файле «%s» найдено неизвестное расширение RS-274X %%%c%c%%\n" ++ ++#: src/gerber.c:2048 ++msgid "aperture NULL in simplify aperture macro\n" ++msgstr "Отсутствует апертура в макросе упрощения апертуры\n" ++ ++#: src/gerber.c:2051 ++msgid "aperture->amacro NULL in simplify aperture macro\n" ++msgstr "Отсутствует структура amacro в макросе упрощения апертуры\n" ++ ++#: src/gerber.c:2056 ++msgid "malloc stack failed\n" ++msgstr "Ошибка выделения памяти для стека\n" ++ ++#: src/gerber.c:2075 src/gerber.c:2080 src/gerber.c:2082 src/gerber.c:2087 ++#: src/gerber.c:2089 src/gerber.c:2094 src/gerber.c:2096 src/gerber.c:2101 ++#: src/gerber.c:2103 ++msgid "Tried to pop an empty stack" ++msgstr "Попытка удаления из пустого стека" ++ ++#: src/gerber.c:2168 ++#, c-format ++msgid "" ++"Number of parameters to aperture macro (%d) are more than gerbv is able to " ++"store (%d)\n" ++msgstr "" ++"Количество параметров макроса апертуры (%d) больше чем допускает Gerbv (%d)\n" ++ ++#: src/gerber.c:2307 ++#, c-format ++msgid "" ++"Found AD code with no following 'D' in file\n" ++"%s\n" ++msgstr "AD-код без последующего ‘D’ в файле «%s»\n" ++ ++#: src/gerber.c:2329 ++#, c-format ++msgid "" ++"Invalid aperture definition in file\n" ++"%s\n" ++msgstr "Недопустимое определение апертуры в файле «%s»\n" ++ ++#: src/gerber.c:2377 ++#, c-format ++msgid "" ++"In file %s,\n" ++"maximum number of allowed parameters exceeded in aperture %d\n" ++msgstr "" ++"В файле «%s» превышено максимальное количество параметров для апертуры %d\n" ++ ++#: src/gerber.c:2398 ++#, c-format ++msgid "Failed to read all parameters exceeded in aperture %d\n" ++msgstr "Не удалось прочитать все параметры апертуры %d\n" ++ ++#: src/gerber.c:2473 ++msgid "Unknow quadrant value while converting to cw\n" ++msgstr "Неизвестное значение квадранта при преобразовании по часовой стрелке\n" ++ ++#: src/gerber.c:2498 src/gerber.c:2544 ++#, c-format ++msgid "Strange quadrant: %d\n" ++msgstr "Неизвестный квадрант: %d\n" ++ ++#: src/gerber.c:2548 ++#, c-format ++msgid "Negative width [%f] in quadrant %d [%f][%f]\n" ++msgstr "Отрицательная ширина (%f) в квадранте %d [%f][%f]\n" ++ ++#: src/gerber.c:2552 ++#, c-format ++msgid "Negative height [%f] in quadrant %d [%f][%f]\n" ++msgstr "Отрицательная высота (%f) в квадранте %d [%f][%f]\n" ++ ++#: src/gerbv.c:185 src/gerbv.c:204 src/main.c:247 ++#, c-format ++msgid "could not read %s[%d]\n" ++msgstr "Невозможно прочитать «%s»[%d]\n" ++ ++#: src/gerbv.c:328 ++msgid "Missing netlist - aborting file read\n" ++msgstr "Список соединений отсутствует, чтение файла прервано\n" ++ ++#: src/gerbv.c:336 ++msgid "Missing format in file...trying to load anyways\n" ++msgstr "Формат файла отсутствует, загрузка продолжена\n" ++ ++#: src/gerbv.c:338 ++msgid "Missing apertures/drill sizes...trying to load anyways\n" ++msgstr "Размеры апертур/отверстий отсутствуют, загрузка продолжена\n" ++ ++#: src/gerbv.c:344 ++msgid "Missing info...trying to load anyways\n" ++msgstr "Информация отсутствует, загрузка продолжена\n" ++ ++#: src/gerbv.c:428 src/gerbv.c:522 ++#, c-format ++msgid "Trying to open %s:%s\n" ++msgstr "Открытие «%s»: %s\n" ++ ++#: src/gerbv.c:464 ++msgid "Most likely found a RS-274D file...trying to open anyways\n" ++msgstr "Вероятно, файл RS-274D... открытие\n" ++ ++#: src/gerbv.c:475 ++#, c-format ++msgid "%s: Unknown file type.\n" ++msgstr "Неизвестный тип файла «%s»\n" ++ ++#: src/gerbv.c:489 ++msgid " (top)" ++msgstr " (верх)" ++ ++#: src/gerbv.c:506 ++msgid " (bottom)" ++msgstr " (низ)" ++ ++#: src/gerbv.c:880 src/project.c:373 src/project.c:422 src/project.c:432 ++#, c-format ++msgid "%s(): malloc failed\n" ++msgstr "%s(): ошибка выделения памяти\n" ++ ++#: src/interface.c:57 ++msgid "Gerbv -- gEDA's Gerber Viewer" ++msgstr "Gerbv — gEDA просмотр Gerber-файлов" ++ ++#: src/interface.c:73 ++#, c-format ++msgid "%s version %s: %s" ++msgstr "%s версии %s: %s" ++ ++#: src/interface.c:310 ++msgid "_File" ++msgstr "_Файл" ++ ++#: src/interface.c:321 src/interface.c:862 ++msgid "Close all layers and start a new project" ++msgstr "Закрыть все слои и начать новый проект" ++ ++#: src/interface.c:324 ++msgid "_Open project..." ++msgstr "_Открыть проект..." ++ ++#: src/interface.c:326 ++msgid "Open an existing Gerbv project" ++msgstr "Открыть существующий проект Gerbv" ++ ++#: src/interface.c:330 ++msgid "Save project" ++msgstr "Сохранить проект" ++ ++#: src/interface.c:332 src/interface.c:874 ++msgid "Save the current project" ++msgstr "Сохранить текущий проект" ++ ++#: src/interface.c:339 ++msgid "Save the current project to a new file" ++msgstr "Сохранить текущий проект в указанный файл" ++ ++#: src/interface.c:347 ++msgid "Reload all layers" ++msgstr "Перезагрузить все слои" ++ ++#: src/interface.c:355 ++msgid "Open _layer(s)..." ++msgstr "Открыть с_лой..." ++ ++#: src/interface.c:358 src/interface.c:995 ++msgid "Open Gerber, drill, or pick and place file(s)" ++msgstr "Открыть файлы Gerber, сверловки или расположения" ++ ++#: src/interface.c:360 ++msgid "_Save active layer" ++msgstr "_Сохранить активный слой" ++ ++#: src/interface.c:362 ++msgid "Save the active layer" ++msgstr "Сохранить активный слой" ++ ++#: src/interface.c:366 ++msgid "Save active layer _as..." ++msgstr "Сохранить _активный слой как..." ++ ++#: src/interface.c:368 ++msgid "Save the active layer to a new file" ++msgstr "Сохранить активный слой в указанный файл" ++ ++#: src/interface.c:377 ++msgid "_Export" ++msgstr "_Экспорт" ++ ++#: src/interface.c:379 ++msgid "Export all visible layers to a new format" ++msgstr "Экспортировать видимые слои в указанный формат" ++ ++#: src/interface.c:387 ++msgid "P_NG..." ++msgstr "P_NG..." ++ ++#: src/interface.c:389 ++msgid "Export project to a PNG file..." ++msgstr "Экспортировать проект в формат PNG" ++ ++#: src/interface.c:391 ++msgid "P_DF..." ++msgstr "P_DF..." ++ ++#: src/interface.c:393 ++msgid "Export project to a PDF file..." ++msgstr "Экспортировать проект в формат PDF" ++ ++#: src/interface.c:395 ++msgid "_SVG..." ++msgstr "_SVG..." ++ ++#: src/interface.c:397 ++msgid "Export project to a SVG file" ++msgstr "Экспортировать проект в формат SVG" ++ ++#: src/interface.c:399 ++msgid "_PostScript..." ++msgstr "_PostScript..." ++ ++#: src/interface.c:401 ++msgid "Export project to a PostScript file" ++msgstr "Экспортировать проект в формат PostScript" ++ ++#: src/interface.c:403 ++msgid "RS-274X (_Gerber)..." ++msgstr "RS-274X (_Gerber)..." ++ ++#: src/interface.c:405 ++msgid "Export layer to a RS-274X (Gerber) file" ++msgstr "Экспортировать проект в формат RS-274X (Gerber)" ++ ++#: src/interface.c:407 ++msgid "_Excellon drill..." ++msgstr "Сверловка _Excellon... " ++ ++#: src/interface.c:409 ++msgid "Export layer to an Excellon drill file" ++msgstr "Экспортировать проект в формат сверловки Excellon)" ++ ++#: src/interface.c:411 ++msgid "RS-274X Merge (Gerber)..." ++msgstr "Объединить в RS-274X (Gerber)..." ++ ++#: src/interface.c:413 ++msgid "Export (merge visible gerber layers) to a RS-274X (Gerber) file" ++msgstr "" ++"Экспортировать проект в формат RS-274X (Gerber), объединив видимые слои " ++"Gerber" ++ ++#: src/interface.c:415 ++msgid "Excellon drill Merge..." ++msgstr "Объединить в сверловку Excellon..." ++ ++#: src/interface.c:417 ++msgid "Export (merge visible drill layers) to an Excellon drill file" ++msgstr "" ++"Экспортировать проект в формат сверловки Excellon, объединив видимые слои " ++"сверловки" ++ ++#: src/interface.c:426 ++msgid "_Print..." ++msgstr "_Печать..." ++ ++#: src/interface.c:434 src/interface.c:881 ++msgid "Print the visible layers" ++msgstr "Печатать видимые слои" ++ ++#: src/interface.c:443 ++msgid "Quit Gerbv" ++msgstr "Выйти из Gerbv" ++ ++#: src/interface.c:447 ++msgid "_Edit" ++msgstr "_Правка" ++ ++#: src/interface.c:456 ++msgid "Display _properties of selected object(s)" ++msgstr "_Свойства объектов" ++ ++#: src/interface.c:458 ++msgid "Examine the properties of the selected object" ++msgstr "Показать свойства выделенных объектов" ++ ++#: src/interface.c:463 ++msgid "_Delete selected object(s)" ++msgstr "_Удалить объекты" ++ ++#: src/interface.c:465 ++msgid "Delete selected objects" ++msgstr "Удалить выделенные объекты" ++ ++#: src/interface.c:494 ++msgid "_View" ++msgstr "_Вид" ++ ++#: src/interface.c:502 ++msgid "Fullscr_een" ++msgstr "Во в_есь экран" ++ ++#: src/interface.c:504 ++msgid "Toggle between fullscreen and normal view" ++msgstr "Переключить между полноэкранным и обычным режимами" ++ ++#: src/interface.c:508 ++msgid "Show _Toolbar" ++msgstr "_Панель инструментов" ++ ++#: src/interface.c:510 ++msgid "Toggle visibility of the toolbar" ++msgstr "Показать панель инструментов" ++ ++#: src/interface.c:514 ++msgid "Show _Sidepane" ++msgstr "_Боковая панель" ++ ++#: src/interface.c:516 ++msgid "Toggle visibility of the sidepane" ++msgstr "Показать боковую панель" ++ ++#: src/interface.c:524 ++msgid "Toggle layer _visibility" ++msgstr "Изменить _видимость слоя" ++ ++#: src/interface.c:532 ++msgid "Toggle visibility of layer 1" ++msgstr "№1" ++ ++#: src/interface.c:536 ++msgid "Toggle visibility of layer 2" ++msgstr "№2" ++ ++#: src/interface.c:540 ++msgid "Toggle visibility of layer 3" ++msgstr "№3" ++ ++#: src/interface.c:544 ++msgid "Toggle visibility of layer 4" ++msgstr "№4" ++ ++#: src/interface.c:548 ++msgid "Toggle visibility of layer 5" ++msgstr "№5" ++ ++#: src/interface.c:552 ++msgid "Toggle visibility of layer 6" ++msgstr "№6" ++ ++#: src/interface.c:556 ++msgid "Toggle visibility of layer 7" ++msgstr "№7" ++ ++#: src/interface.c:560 ++msgid "Toggle visibility of layer 8" ++msgstr "№8" ++ ++#: src/interface.c:564 ++msgid "Toggle visibility of layer 9" ++msgstr "№9" ++ ++#: src/interface.c:568 ++msgid "Toggle visibility of layer 10" ++msgstr "№10" ++ ++#: src/interface.c:578 src/interface.c:888 ++msgid "Zoom in" ++msgstr "Увеличить" ++ ++#: src/interface.c:583 src/interface.c:892 ++msgid "Zoom out" ++msgstr "Уменьшить" ++ ++#: src/interface.c:587 src/interface.c:896 ++msgid "Zoom to fit all visible layers in the window" ++msgstr "Масштабировать для отображения видимых слоёв на всё окно" ++ ++#: src/interface.c:595 ++msgid "Change background color" ++msgstr "Изменить цвет фона" ++ ++#: src/interface.c:596 ++msgid "Change the background color" ++msgstr "Изменить цвет фона" ++ ++#: src/interface.c:602 ++msgid "_Rendering" ++msgstr "_Отображение" ++ ++#: src/interface.c:612 ++msgid "_Fast" ++msgstr "_Быстрое" ++ ++#: src/interface.c:616 ++msgid "Fast (_XOR)" ++msgstr "_Искл. ИЛИ" ++ ++#: src/interface.c:620 ++msgid "_Normal" ++msgstr "_Обычное" ++ ++#: src/interface.c:624 ++msgid "High _Quality" ++msgstr "_Качественное" ++ ++#: src/interface.c:630 ++msgid "malloc for rendering type synchronization failed.\n" ++msgstr "ошибка выделения памяти для элемента типа отображения.\n" ++ ++#: src/interface.c:641 ++msgid "U_nits" ++msgstr "_Единицы измерения" ++ ++#: src/interface.c:651 ++msgid "mi_l" ++msgstr "ми_л" ++ ++#: src/interface.c:655 ++msgid "_mm" ++msgstr "_мм" ++ ++#: src/interface.c:659 ++msgid "_in" ++msgstr "_дюймы" ++ ++#: src/interface.c:665 ++msgid "malloc for display unit synchronization failed.\n" ++msgstr "ошибка выделения памяти для элемента единиц измерения.\n" ++ ++#: src/interface.c:673 ++msgid "_Layer" ++msgstr "_Слой" ++ ++#: src/interface.c:681 ++msgid "Toggle _visibility" ++msgstr "Изменить ви_димость" ++ ++#: src/interface.c:682 ++msgid "Toggles the visibility of the layer currently selected in the sidepane" ++msgstr "Изменить видимость выделенного слоя" ++ ++#: src/interface.c:685 ++msgid "All o_n" ++msgstr "В_ключить все" ++ ++#: src/interface.c:686 ++msgid "Turn on visibility of all layers" ++msgstr "Включить видимость всех слоёв" ++ ++#: src/interface.c:691 ++msgid "All _off" ++msgstr "В_ыключить все" ++ ++#: src/interface.c:692 ++msgid "Turn off visibility of all layers" ++msgstr "Выключить видимость всех слоёв" ++ ++#: src/interface.c:697 ++msgid "_Invert color" ++msgstr "_Инвертировать" ++ ++#: src/interface.c:698 ++msgid "" ++"Invert the display polarity of the layer currently selected in the sidepane" ++msgstr "Инвертировать полярность выделенного слоя" ++ ++#: src/interface.c:701 ++msgid "_Change color" ++msgstr "Изменить _цвет" ++ ++#: src/interface.c:703 ++msgid "" ++"Change the display color of the layer currently selected in the sidepane" ++msgstr "Изменить цвет выделенного слоя" ++ ++#: src/interface.c:711 ++msgid "_Reload layer" ++msgstr "_Перезагрузить слой" ++ ++#: src/interface.c:712 ++msgid "Reload the layer from disk" ++msgstr "Перезагрузить данные слоя из файла" ++ ++#: src/interface.c:717 ++msgid "_Modify orientation" ++msgstr "Изменить с_лой" ++ ++#: src/interface.c:719 ++msgid "" ++"Translate, scale, rotate, or mirror the layer currently selected in the " ++"sidepane" ++msgstr "Переместить, масштабировать, повернуть или отразить выделенный слой" ++ ++#: src/interface.c:721 ++msgid "Edit file _format" ++msgstr "Изменить _формат" ++ ++#: src/interface.c:722 ++msgid "" ++"View and edit the numerical format used to parse this layer currently " ++"selected in the sidepane" ++msgstr "" ++"Просмотр и изменение формата используемого для слоя выделенного в боковой " ++"панели" ++ ++#: src/interface.c:730 ++msgid "Move u_p" ++msgstr "Перенести в_верх" ++ ++#: src/interface.c:731 src/interface.c:1009 ++msgid "Move the layer currently selected in the sidepane one step up" ++msgstr "Перенести выделенный слой выше" ++ ++#: src/interface.c:737 ++msgid "Move dow_n" ++msgstr "Перенести в_низ" ++ ++#: src/interface.c:738 src/interface.c:1002 ++msgid "Move the layer currently selected in the sidepane one step down" ++msgstr "Перенести выделенный слой ниже" ++ ++#: src/interface.c:744 ++msgid "_Delete" ++msgstr "_Удалить" ++ ++#: src/interface.c:746 src/interface.c:1016 ++msgid "Remove the layer currently selected in the sidepane" ++msgstr "Удалить выделенный слой" ++ ++#: src/interface.c:757 ++msgid "_Analyze" ++msgstr "_Анализ" ++ ++#: src/interface.c:766 ++msgid "Analyze visible _Gerber layers" ++msgstr "_Gerber" ++ ++#: src/interface.c:768 ++msgid "" ++"Examine a detailed anaylsis of the contents of all visible Gerber layers" ++msgstr "Выполнить детальный анализ содержимого всех видимых слоёв Gerber" ++ ++#: src/interface.c:771 ++msgid "Analyze visible _drill layers" ++msgstr "_Сверловки" ++ ++#: src/interface.c:773 ++msgid "Examine a detailed anaylsis of the contents of all visible drill layers" ++msgstr "Выполнить детальный анализ содержимого всех видимых слоёв сверловки" ++ ++#: src/interface.c:776 ++msgid "_Benchmark (1 min)" ++msgstr "_Производительности (1 мин)" ++ ++#: src/interface.c:778 ++msgid "" ++"Benchmark different rendering methods. Will make the application " ++"unresponsive for 1 minute!" ++msgstr "" ++"Проверить производительность различных способов отрисовки. Программа не " ++"будет отвечать в течение одной минуты!" ++ ++#: src/interface.c:787 ++msgid "_Tools" ++msgstr "_Инструменты" ++ ++#: src/interface.c:794 ++msgid "_Pointer Tool" ++msgstr "_Указатель" ++ ++#: src/interface.c:799 src/interface.c:920 ++msgid "Select objects on the screen" ++msgstr "Выделить объекты на экране" ++ ++#: src/interface.c:800 ++msgid "Pa_n Tool" ++msgstr "_Прокрутка" ++ ++#: src/interface.c:805 src/interface.c:926 ++msgid "Pan by left clicking and dragging" ++msgstr "Выполнить прокрутку перетаскиванием" ++ ++#: src/interface.c:807 ++msgid "_Zoom Tool" ++msgstr "_Масштаб" ++ ++#: src/interface.c:812 src/interface.c:934 ++msgid "Zoom by left clicking or dragging" ++msgstr "Масштабировать щелчком или перетаскиванием" ++ ++#: src/interface.c:814 ++msgid "_Measure Tool" ++msgstr "_Измерение" ++ ++#: src/interface.c:819 src/interface.c:941 ++msgid "Measure distances on the screen" ++msgstr "Измерить расстояние на экране" ++ ++#: src/interface.c:821 ++msgid "_Help" ++msgstr "_Помощь" ++ ++#: src/interface.c:835 ++msgid "_About Gerbv..." ++msgstr "_О программе..." ++ ++#: src/interface.c:837 ++msgid "View information about gerbv" ++msgstr "Показать информацию о Gerbv" ++ ++#: src/interface.c:841 ++msgid "Known _bugs in this version..." ++msgstr "_Известные ошибки в этой версии..." ++ ++#: src/interface.c:844 ++msgid "View list of known gerbv bugs" ++msgstr "Показать список известных ошибок в Gerbv" ++ ++#: src/interface.c:866 ++msgid "Open a previously saved gerbv project" ++msgstr "Открыть предыдущий сохранённый проект Gerbv" ++ ++#: src/interface.c:870 ++msgid "Reload all layers in project" ++msgstr "Перезагрузить все слои в проекте" ++ ++#: src/interface.c:966 ++msgid "Rendering: " ++msgstr "Отображение: " ++ ++#: src/interface.c:972 ++msgid "Fast" ++msgstr "Быстрое" ++ ++#: src/interface.c:973 ++msgid "Fast, with XOR" ++msgstr "Быстрое искл. ИЛИ" ++ ++#: src/interface.c:974 ++msgid "Normal" ++msgstr "Обычное" ++ ++#: src/interface.c:975 ++msgid "High quality" ++msgstr "Качественное" ++ ++#: src/interface.c:1018 ++msgid "Layers" ++msgstr "Слои" ++ ++#: src/interface.c:1041 ++msgid "Messages" ++msgstr "Журнал" ++ ++#: src/interface.c:1093 ++msgid "mil" ++msgstr "мил" ++ ++#: src/interface.c:1095 ++msgid "in" ++msgstr "дюймы" ++ ++#: src/interface.c:1646 src/interface.c:1739 ++msgid "Do not show this dialog again." ++msgstr "Больше не показывать этот диалог." ++ ++#: src/interface.c:1779 ++msgid "Modify layer orientation" ++msgstr "Изменить слой" ++ ++#: src/interface.c:1794 ++msgid "<span weight=\"bold\">Translation</span>" ++msgstr "<span weight=\"bold\">Перемещение</span>" ++ ++#: src/interface.c:1803 ++msgid "X (mils):" ++msgstr "X, мил:" ++ ++#: src/interface.c:1804 ++msgid "Y (mils):" ++msgstr "Y, мил:" ++ ++#: src/interface.c:1809 ++msgid "X (mms):" ++msgstr "X, мм:" ++ ++#: src/interface.c:1810 ++msgid "Y (mms):" ++msgstr "Y, мм:" ++ ++#: src/interface.c:1815 ++msgid "X (inches):" ++msgstr "X, дюймы:" ++ ++#: src/interface.c:1816 ++msgid "Y (inches):" ++msgstr "Y, дюймы:" ++ ++#: src/interface.c:1834 ++msgid "<span weight=\"bold\">Scale</span>" ++msgstr "<span weight=\"bold\">Масштаб</span>" ++ ++#: src/interface.c:1838 ++msgid "X direction:" ++msgstr "X-направление:" ++ ++#: src/interface.c:1841 ++msgid "Y direction:" ++msgstr "Y-направление:" ++ ++#: src/interface.c:1854 ++msgid "<span weight=\"bold\">Rotation</span>" ++msgstr "<span weight=\"bold\">Поворот</span>" ++ ++#: src/interface.c:1858 ++msgid "Rotation (degrees): " ++msgstr "Поворот: " ++ ++#: src/interface.c:1863 ++msgid "90 deg CCW" ++msgstr "90°" ++ ++#: src/interface.c:1864 ++msgid "180 deg CCW" ++msgstr "180°" ++ ++#: src/interface.c:1865 ++msgid "270 deg CCW" ++msgstr "270°" ++ ++#: src/interface.c:1885 ++msgid "<span weight=\"bold\">Mirroring</span>" ++msgstr "<span weight=\"bold\">Отражение</span>" ++ ++#: src/interface.c:1889 ++msgid "About X axis:" ++msgstr "Ось X:" ++ ++#: src/interface.c:1896 ++msgid "About Y axis:" ++msgstr "Ось Y:" ++ ++#: src/main.c:178 ++#, c-format ++msgid "Opening project = %s\n" ++msgstr "Открывается проект %s\n" ++ ++#: src/main.c:217 ++#, c-format ++msgid "could not read file: %s\n" ++msgstr "Невозможно прочитать файл «%s»\n" ++ ++#: src/main.c:244 src/main.c:317 ++msgid "malloc gerbvProject->project failed\n" ++msgstr "Ошибка выделения памяти для gerbvProject->project\n" ++ ++#: src/main.c:297 ++msgid "Failed to write project\n" ++msgstr "Ошибка при сохранении проекта\n" ++ ++#: src/main.c:390 ++#, c-format ++msgid "Not handled option %s\n" ++msgstr "Необработанный параметр %s\n" ++ ++#: src/main.c:396 ++msgid "Width" ++msgstr "Ширина" ++ ++#: src/main.c:400 ++#, c-format ++msgid "Split X and Y parameters with an x\n" ++msgstr "Параметры X и Y должны быть разделены символом x\n" ++ ++#: src/main.c:407 ++msgid "Height" ++msgstr "Высота" ++ ++#: src/main.c:436 ++#, c-format ++msgid "You must specify the border in the format <alpha>.\n" ++msgstr "Для границы должно быть указано значение.\n" ++ ++#: src/main.c:440 ++#, c-format ++msgid "Specified border is not recognized.\n" ++msgstr "Указанное значение границы не распознано.\n" ++ ++#: src/main.c:445 ++#, c-format ++msgid "Specified border is smaller than zero!\n" ++msgstr "Указанное значение границы меньше нуля!\n" ++ ++#: src/main.c:452 ++#, c-format ++msgid "" ++"You must give an resolution in the format <DPI_XxDPI_Y> or <DPI_X_and_Y>.\n" ++msgstr "" ++"Разрешение должно быть указано в формате <DPI_XxDPI_Y> или <DPI_по_X_и_Y>.\n" ++ ++#: src/main.c:456 ++#, c-format ++msgid "Specified resolution is not recognized.\n" ++msgstr "Указанное значение разрешения не распознано.\n" ++ ++#: src/main.c:466 ++#, c-format ++msgid "Specified resolution should be greater than 0.\n" ++msgstr "Указанное значение разрешения должно быть больше нуля.\n" ++ ++#: src/main.c:473 ++#, c-format ++msgid "You must give an origin in the format <lower_left_X x lower_left_Y>.\n" ++msgstr "" ++"Начало координат должно быть указано в формате <X x Y> координаты левой " ++"нижней точки.\n" ++ ++#: src/main.c:477 ++#, c-format ++msgid "Specified origin is not recognized.\n" ++msgstr "Указанное значение начала координат не распознано.\n" ++ ++#: src/main.c:484 ++#, c-format ++msgid "gerbv version %s\n" ++msgstr "Gerbv версии %s\n" ++ ++#: src/main.c:485 ++#, c-format ++msgid "" ++"Copyright (C) 2001 -- 2008 by Stefan Petersen\n" ++"and the respective original authors listed in the source files.\n" ++msgstr "" ++"Copyright © 2001—2008 Stefan Petersen\n" ++"и соответствующие оригинальные авторы указанные в файлах исходных кодов.\n" ++ ++#: src/main.c:493 ++#, c-format ++msgid "You must give an background color in the hex-format <#RRGGBB>.\n" ++msgstr "Цвет фона должен быть указан в шестнадцатеричном формате <#RRGGBB>.\n" ++ ++#: src/main.c:497 src/main.c:517 ++#, c-format ++msgid "Specified color format is not recognized.\n" ++msgstr "Указанный формат значения цвета не распознан.\n" ++ ++#: src/main.c:504 ++#, c-format ++msgid "Specified color values should be between 00 and FF.\n" ++msgstr "Указанные значение цветов должны быть от 00 до FF.\n" ++ ++#: src/main.c:513 ++#, c-format ++msgid "" ++"You must give an foreground color in the hex-format <#RRGGBB> or " ++"<#RRGGBBAA>.\n" ++msgstr "" ++"Цвет элементов должен быть указан в шестнадцатеричном формате <#RRGGBB> или " ++"<#RRGGBBAA>.\n" ++ ++#: src/main.c:531 ++#, c-format ++msgid "Specified color values should be between 0x00 (0) and 0xFF (255).\n" ++msgstr "Указанное значение цвета должно быть от 0x00 (0) до 0xFF (255).\n" ++ ++#: src/main.c:545 ++#, c-format ++msgid "You must give the initial rotation angle\n" ++msgstr "Должен быть указан угол начального поворота\n" ++ ++#: src/main.c:551 ++msgid "Rotate" ++msgstr "Поворот" ++ ++#: src/main.c:555 ++#, c-format ++msgid "Failed parsing rotate value\n" ++msgstr "Невозможно разобрать значение поворота\n" ++ ++#: src/main.c:561 ++#, c-format ++msgid "You must give the axis to mirror about\n" ++msgstr "Должна быть указана ось для отражения\n" ++ ++#: src/main.c:571 ++#, c-format ++msgid "Failed parsing mirror axis\n" ++msgstr "Невозможно разобрать ось для отражения\n" ++ ++#: src/main.c:577 ++#, c-format ++msgid "You must give a filename to send log to\n" ++msgstr "Должно быть указано имя файла для журнала\n" ++ ++#: src/main.c:585 ++#, c-format ++msgid "You must give a filename to export to.\n" ++msgstr "Должно быть указано имя файла для экспорта.\n" ++ ++#: src/main.c:592 ++#, c-format ++msgid "You must give a project filename\n" ++msgstr "Должно быть указано имя файла проекта.\n" ++ ++#: src/main.c:599 ++#, c-format ++msgid "You must give a filename to read the tools from.\n" ++msgstr "Должно быть указано имя файла инструментов.\n" ++ ++#: src/main.c:603 ++#, c-format ++msgid "*** ERROR processing tools file \"%s\".\n" ++msgstr "*** ОШИБКА обработки файла инструментов «%s».\n" ++ ++#: src/main.c:604 ++#, c-format ++msgid "" ++"Make sure all lines of the file are formatted like this:\n" ++"T01 0.024\n" ++"T02 0.032\n" ++"T03 0.040\n" ++"...\n" ++"*** EXITING to prevent erroneous display.\n" ++msgstr "" ++"Удостоверьтесь, что все строки этого файла имеют похожий формат:\n" ++"T01 0.024\n" ++"T02 0.032\n" ++"T03 0.040\n" ++"...\n" ++"*** ВЫХОД для предотвращения ошибочного отображения.\n" ++ ++#: src/main.c:612 ++#, c-format ++msgid "You must give a translation in the format <X,Y>.\n" ++msgstr "Сдвиг должен быть задан в формате <X,Y>.\n" ++ ++#: src/main.c:616 ++#, c-format ++msgid "The translation format is not recognized.\n" ++msgstr "Указанный формат сдвига не распознан.\n" ++ ++#: src/main.c:633 ++#, c-format ++msgid "You must give a window size in the format <width x height>.\n" ++msgstr "Размер окна должен быть указан в формате <ширина x высота>.\n" ++ ++#: src/main.c:637 ++#, c-format ++msgid "Specified window size is not recognized.\n" ++msgstr "Указанный формат значения размера окна не распознан.\n" ++ ++#: src/main.c:643 ++#, c-format ++msgid "Specified window size is out of bounds.\n" ++msgstr "Указанный размер окна вне допустимых границ.\n" ++ ++#: src/main.c:650 ++#, c-format ++msgid "You must supply an export type.\n" ++msgstr "Должен быть указан тип формата для экспорта.\n" ++ ++#: src/main.c:676 ++#, c-format ++msgid "Unrecognized export type.\n" ++msgstr "Тип экспорта не распознан.\n" ++ ++#: src/main.c:686 ++#, c-format ++msgid "" ++"Usage: gerbv [OPTIONS...] [FILE...]\n" ++"\n" ++"Available options:\n" ++" -B, --border=<b> Border around the image in percent of the\n" ++" width/height. Defaults to 5%%.\n" ++" -D, --dpi=<XxY>or<R> Resolution (Dots per inch) for the output\n" ++" bitmap. With the format <XxY>, different\n" ++" resolutions for X- and Y-direction are " ++"used.\n" ++" With the format <R>, both are the same.\n" ++" -O, --origin=<XxY> Use the specified coordinates (in " ++"inches).\n" ++" for the lower left corner.\n" ++" -V, --version Print version of gerbv.\n" ++" -a, --antialias Use antialiasing for generated bitmap " ++"output.\n" ++" -b, --background=<hex> Use background color <hex> (like " ++"#RRGGBB).\n" ++" -f, --foreground=<hex> Use foreground color <hex> (like #RRGGBB " ++"or\n" ++" #RRGGBBAA for setting the alpha).\n" ++" Use multiple -f flags to set the color " ++"for\n" ++" multiple layers.\n" ++" -r, --rotate=<degree> Set initial orientation for all layers.\n" ++" -m, --mirror=<axis> Set initial mirroring axis (X or Y).\n" ++" -h, --help Print this help message.\n" ++" -l, --log=<logfile> Send error messages to <logfile>.\n" ++" -o, --output=<filename> Export to <filename>.\n" ++" -p, --project=<prjfile> Load project file <prjfile>.\n" ++" -W, --window_inch=<WxH> Window size in inches <WxH> for the\n" ++" exported image.\n" ++" -w, --window=<WxH> Window size in pixels <WxH> for the\n" ++" exported image. Autoscales to fit\n" ++" if no resolution is specified. If a\n" ++" resolution is specified, it will clip.\n" ++" -t, --tools=<toolfile> Read Excellon tools from file <toolfile>.\n" ++" -T, --translate=<X,Y> Translate the image by <X,Y> (useful for\n" ++" arranging panels). Use multiple -T flags\n" ++" for multiple layers.\n" ++" -x, --export=<png/pdf/ps/svg/ Export a rendered picture to a file with\n" ++" rs274x/drill> the specified format.\n" ++msgstr "" ++"Использование: gerbv [ПАРАМЕТРЫ...] [ФАЙЛ...]\n" ++"\n" ++"Допустимые параметры:\n" ++" -B, --border=<b> Граница вокруг изображения в процентах от " ++"ширины\n" ++" или высоты, по умолчанию 5%%.\n" ++" -D, --dpi=<XxY>или<R> Разрешение (в точках на дюйм) выводимого\n" ++" изображения. Различные разрешения по X- и\n" ++" Y-направлению задаются в формате <XxY>.\n" ++" Для задания одинакового разрешения " ++"используется\n" ++" формат <R>.\n" ++" -O, --origin=<XxY> Использовать указанные координаты (в дюймах) " ++"для\n" ++" начала координат (левый нижний угол).\n" ++" -V, --version Отобразить версию Gerbv.\n" ++" -a, --antialias Использовать сглаживание для выводимых " ++"изображений.\n" ++" -b, --background=<hex> Цвет фона в шестнадцатеричном виде в формате\n" ++" #RRGGBB.\n" ++" -f, --foreground=<hex> Цвет элементов в шестнадцатеричном виде в " ++"формате\n" ++" #RRGGBB. Используйте повторно для задания " ++"цвета\n" ++" каждого следующего слоя.\n" ++" -r, --rotate=<градусы> Задать начальный поворот для всех слоёв.\n" ++" -m, --mirror=<оси> Задать начальное отражение по осям X или Y.\n" ++" -h, --help Отобразить эту справку.\n" ++" -l, --log=<лог-файл> Отправлять сообщения об ошибках в файл <лог-" ++"файл>.\n" ++" -o, --output=<имя-файла> Экспортировать в файл <имя-файла>.\n" ++" -p, --project=<файл-проекта> Открыть проект из фала <файл-проекта>.\n" ++" -W, --window_inch=<ШxВ> Размер окна в дюймах <ШxВ> для экспортируемого\n" ++" изображения.\n" ++" -w, --window=<ШxВ> Размер окна в пикселях <ШxВ> для " ++"экспортируемого\n" ++" изображения. Если разрешение не указано, то\n" ++" выполняется масштабирование, иначе, " ++"изображение\n" ++" обрезается.\n" ++" -t, --tools=<файл-инструментов> Использовать <файл-инструментов> для " ++"задания\n" ++" инструментов Excellon.\n" ++" -T, --translate=<X,Y> Переместить изображение на <X,Y> (для " ++"выравнивания\n" ++" слоёв панели друг с другом). Используйте " ++"повторно\n" ++" для каждого следующего слоя.\n" ++" -x, --export=<png/pdf/ps/ Экспортировать изображение в файл указанного\n" ++" svg/rs274x/drill> формата.\n" ++ ++#: src/main.c:722 ++#, c-format ++msgid "" ++"Usage: gerbv [OPTIONS...] [FILE...]\n" ++"\n" ++"Available options:\n" ++" -B<b> Border around the image in percent of the\n" ++" width/height. Defaults to 5%%.\n" ++" -D<XxY>or<R> Resolution (Dots per inch) for the output\n" ++" bitmap. With the format <XxY>, different\n" ++" resolutions for X- and Y-direction are used.\n" ++" With the format <R>, both are the same.\n" ++" -O<XxY> Use the specified coordinates (in inches)\n" ++" for the lower left corner.\n" ++" -V Print version of gerbv.\n" ++" -a Use antialiasing for generated bitmap output.\n" ++" -b<hexcolor>\t Use background color <hexcolor> (like #RRGGBB).\n" ++" -f<hexcolor> Use foreground color <hexcolor> (like #RRGGBB or\n" ++" #RRGGBBAA for setting the alpha).\n" ++" Use multiple -f flags to set the color for\n" ++" multiple layers.\n" ++" -r<degree> Set initial orientation for all layers.\n" ++" -m<axis> Set initial mirroring axis (X or Y).\n" ++" -h Print this help message.\n" ++" -l<logfile> Send error messages to <logfile>.\n" ++" -o<filename> Export to <filename>.\n" ++" -p<prjfile> Load project file <prjfile>.\n" ++" -W<WxH> Window size in inches <WxH> for the\n" ++" exported image.\n" ++" -w<WxH> Window size in pixels <WxH> for the\n" ++" exported image. Autoscales to fit\n" ++" if no resolution is specified. If a\n" ++" resolution is specified, it will clip.\n" ++" exported image.\n" ++" -t<toolfile> Read Excellon tools from file <toolfile>\n" ++" -T<X,Y> Translate the image by <X,Y> (useful for\n" ++" arranging panels). Use multiple -T flags\n" ++" for multiple layers.\n" ++" -x <png/pdf/ps/svg/ Export a rendered picture to a file with\n" ++" rs274x/drill> the specified format.\n" ++msgstr "" ++"Использование: gerbv [ПАРАМЕТРЫ...] [ФАЙЛ...]\n" ++"\n" ++"Допустимые параметры:\n" ++" -B<b> Граница вокруг изображения в процентах от " ++"ширины\n" ++" или высоты, по умолчанию 5%%.\n" ++" -D<XxY>или<R> Разрешение (в точках на дюйм) выводимого\n" ++" изображения. Различные разрешения по X- и\n" ++" Y-направлению задаются в формате <XxY>.\n" ++" Для задания одинакового разрешения " ++"используется\n" ++" формат <R>.\n" ++" -O<XxY> Использовать указанные координаты (в дюймах) " ++"для\n" ++" начала координат (левый нижний угол).\n" ++" -V Отобразить версию Gerbv.\n" ++" -a Использовать сглаживание для выводимых " ++"изображений.\n" ++" -b<hex> Цвет фона в шестнадцатеричном виде в формате\n" ++" #RRGGBB.\n" ++" -f<hex> Цвет элементов в шестнадцатеричном виде в " ++"формате\n" ++" #RRGGBB. Используйте повторно для задания " ++"цвета\n" ++" каждого следующего слоя.\n" ++" -r<градусы> Задать начальный поворот для всех слоёв.\n" ++" -m<оси> Задать начальное отражение по осям X или Y.\n" ++" -h Отобразить эту справку.\n" ++" -l<лог-файл> Отправлять сообщения об ошибках в файл <лог-" ++"файл>.\n" ++" -o<имя-файла> Экспортировать в файл <имя-файла>.\n" ++" -p<файл-проекта> Открыть проект из фала <файл-проекта>.\n" ++" -W<ШxВ> Размер окна в дюймах <ШxВ> для экспортируемого\n" ++" изображения.\n" ++" -w<ШxВ> Размер окна в пикселях <ШxВ> для " ++"экспортируемого\n" ++" изображения. Если разрешение не указано, то\n" ++" выполняется масштабирование, иначе, " ++"изображение\n" ++" обрезается.\n" ++" -t<файл-инструментов> Использовать <файл-инструментов> для задания\n" ++" инструментов Excellon.\n" ++" -T<X,Y> Переместить изображение на <X,Y> (для " ++"выравнивания\n" ++" слоёв панели друг с другом). Используйте " ++"повторно\n" ++" для каждого следующего слоя.\n" ++" -x<png/pdf/ps/ Экспортировать изображение в файл указанного\n" ++" svg/rs274x/drill> формата.\n" ++ ++#: src/main.c:763 ++#, c-format ++msgid "Not handled option [%d=%c]\n" ++msgstr "Необработанный параметр [%d=%c]\n" ++ ++#: src/main.c:774 ++#, c-format ++msgid "Loading project %s...\n" ++msgstr "Открывается проект %s...\n" ++ ++#: src/main.c:950 src/main.c:968 ++#, c-format ++msgid "A valid file was not loaded.\n" ++msgstr "Не был загружен допустимый файл.\n" ++ ++#: src/pick-and-place.c:449 ++msgid "malloc buf failed while checking for pick-place file.\n" ++msgstr "Ошибка выделения памяти при проверке является ли файл расположением.\n" ++ ++#: src/pick-and-place.c:594 ++msgid "malloc pick_place_stats failed\n" ++msgstr "Ошибка выделения памяти для статистики расположения\n" ++ ++#: src/project.c:256 ++msgid "Color parameter not a vector\n" ++msgstr "Параметр цвета не является вектором\n" ++ ++#: src/project.c:260 ++msgid "Color vector of incorrect length\n" ++msgstr "Недопустимая длина вектора цвета\n" ++ ++#: src/project.c:270 ++msgid "Illegal color in projectfile\n" ++msgstr "Недопустимый цвет в файле проекта\n" ++ ++#: src/project.c:495 ++msgid "define-layer!: Too few arguments\n" ++msgstr "define-layer(): слишком мало аргументов\n" ++ ++#: src/project.c:503 ++msgid "define-layer!: Layer number missing/incorrect\n" ++msgstr "define-layer(): номер слоя пропущен или недопустим\n" ++ ++#: src/project.c:528 ++msgid "define-layer!:non-symbol found, ignoring\n" ++msgstr "define-layer(): пропуск не символа\n" ++ ++#: src/project.c:552 ++msgid "Argument to inverted must be #t or #f\n" ++msgstr "Аргумент для инвертирования должен быть #t или #f\n" ++ ++#: src/project.c:560 ++msgid "Argument to visible must be #t or #f\n" ++msgstr "Аргумент для видимости должен быть #t или #f\n" ++ ++#: src/project.c:578 ++#, c-format ++msgid "%s(): realloc failed\n" ++msgstr "%s(): ошибка перевыделения памяти\n" ++ ++#: src/project.c:641 ++#, c-format ++msgid "%s(): WARNING: HID_Mixed is not yet supported\n" ++msgstr "%s(): предупреждение: HID_Mixed ещё не поддерживается\n" ++ ++#: src/project.c:650 ++#, c-format ++msgid "%s(): Unknown attribute type: \"%s\"\n" ++msgstr "%s(): неизвестный тип атрибута «%s»\n" ++ ++#: src/project.c:678 ++msgid "set-render-type!: Too few arguments\n" ++msgstr "set-render-type(): слишком мало аргументов\n" ++ ++#: src/project.c:702 ++msgid "gerbv-file-version!: Too few arguments\n" ++msgstr "gerbv-file-version(): слишком мало аргументов\n" ++ ++#: src/project.c:714 ++#, c-format ++msgid "" ++"The project file you are attempting to load has specified that it\n" ++"uses project file version \"%s\" but this string is not\n" ++"a valid version. Gerbv will attempt to load the file using\n" ++"version \"%s\". You may experience unexpected results.\n" ++msgstr "" ++"В загружаемом файле проекта указана недействительная версия «%s».\n" ++"Gerbv попытается загрузить этот файл как версии «%s». Могут быть\n" ++"получены неожиданные результаты.\n" ++ ++#: src/project.c:723 ++#, c-format ++msgid "%s(): Read a project file version of %s (%d)\n" ++msgstr "%s(): чтение файла проекта версии %s (%d)\n" ++ ++#: src/project.c:724 ++#, c-format ++msgid " Translated back to \"%s\"\n" ++msgstr " Перевод обратно к «%s»\n" ++ ++#: src/project.c:732 ++#, c-format ++msgid "" ++"The project file you are attempting to load is version \"%s\"\n" ++"but this copy of gerbv is only capable of loading project files\n" ++"using version \"%s\" or older. You may experience unexpected results." ++msgstr "" ++"Версия загружаемого файла проекта «%s», но эта версия Gerbv способна\n" ++"загружать файлы проектов версий «%s» или старше. Могут быть получены\n" ++"неожиданные результаты." ++ ++#: src/project.c:751 ++#, c-format ++msgid "" ++"The project file you are attempting to load is version \"%s\"\n" ++"which is an unknown version.\n" ++"You may experience unexpected results." ++msgstr "" ++"Версия «%s» загружаемого файла проекта неизвестна.\n" ++"Могут быть получены неожиданные результаты." ++ ++#: src/project.c:824 src/project.c:829 ++#, c-format ++msgid "Failed to read %s\n" ++msgstr "Невозможно прочитать «%s»\n" ++ ++#: src/project.c:837 ++msgid "Couldn't init scheme\n" ++msgstr "Невозможно инициализировать scheme\n" ++ ++#: src/project.c:845 ++#, c-format ++msgid "Problem loading init.scm (%s)\n" ++msgstr "Проблема при загрузке init.scm: %s\n" ++ ++#: src/project.c:852 ++#, c-format ++msgid "Couldn't open %s (%s)\n" ++msgstr "Невозможно открыть «%s»: %s\n" ++ ++#: src/project.c:872 ++#, c-format ++msgid "Couldn't open project file %s (%s)\n" ++msgstr "Невозможно открыть файл проекта «%s»: %s\n" ++ ++#: src/project.c:916 ++#, c-format ++msgid "Couldn't save project %s\n" ++msgstr "Невозможно сохранить проект %s\n" ++ ++#: src/project.c:986 ++#, c-format ++msgid "%s(): WARNING: HID_Mixed is not yet supported.\n" ++msgstr "%s(): предупреждение: HID_Mixed ещё не поддерживается.\n" ++ ++#: src/project.c:996 ++#, c-format ++msgid "%s: unknown type of HID attribute (%d)\n" ++msgstr "%s: неизвестный тип HID-атрибута (%d)\n" ++ ++#: src/render.c:159 ++#, c-format ++msgid "Illegal zoom direction %d\n" ++msgstr "Недопустимый тип масштабирования %d\n" ++ ++#: src/tooltable.c:57 ++#, c-format ++msgid "*** WARNING: Strange tool \"%s\" ignored.\n" ++msgstr "*** Предупреждение: проигнорирован неизвестный инструмент «%s».\n" ++ ++#: src/tooltable.c:61 ++#, c-format ++msgid "*** WARNING: No tool number in \"%s\".\n" ++msgstr "*** Предупреждение: отсутствуют номера инструментов в «%s».\n" ++ ++#: src/tooltable.c:71 ++#, c-format ++msgid "*** WARNING: Can't parse tool number in \"%s\".\n" ++msgstr "*** Предупреждение: невозможно разобрать номера инструментов в «%s».\n" ++ ++#: src/tooltable.c:88 ++#, c-format ++msgid "*** WARNING: Tool T%02d diameter is impossible.\n" ++msgstr "*** Предупреждение: невозможен инструмент диаметром T%02d.\n" ++ ++#: src/tooltable.c:92 ++#, c-format ++msgid "*** WARNING: Tool T%02d diameter is very small - are you sure?\n" ++msgstr "*** Предупреждение: слишком малый диаметр T%02d инструмента.\n" ++ ++#: src/tooltable.c:97 ++#, c-format ++msgid "*** ERROR: Tool T%02d is already defined.\n" ++msgstr "*** ОШИБКА: инструмент T%02d уже определён.\n" ++ ++#: src/tooltable.c:98 ++#, c-format ++msgid "*** Exiting because this is a HOLD error at any board house.\n" ++msgstr "*** Выход, так как любой изготовитель плат считает это ошибкой.\n" ++ ++#: src/tooltable.c:121 ++#, c-format ++msgid "*** ERROR: Failed to open file \"%s\" to read.\n" ++msgstr "*** ОШИБКА: невозможно открыть для чтения файл «%s».\n" +diff --git a/configure.ac b/configure.ac +index ba65be5..346c9f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,6 +40,28 @@ AM_GNU_GETTEXT + AM_GNU_GETTEXT_VERSION([0.16]) + #AX_DESKTOP_I18N + ++dnl man-page internationalization ++AC_PATH_PROG([po4a_gettextize],[po4a-gettextize]) ++AC_PATH_PROG([po4a_translate],[po4a-translate]) ++if test -z "$po4a_gettextize" -o -z "$po4a_translate" ; then ++ AC_MSG_WARN([po4a was not found. If you want to change and compile \ ++internationalized documentation, please install po4a]) ++else ++ have_po4a=yes ++fi ++ ++dnl po4a depend on nsgmls ++AC_PATH_PROG([nsgmls],[nsgmls]) ++if test -z "$nsgmls" ; then ++ AC_MSG_WARN([nsgmls was not found. If you want to change and compile \ ++internationalized documentation, please install sp]) ++else ++ have_nsgmls=yes ++fi ++ ++AM_CONDITIONAL(HAVE_PO4A, ++ test "x$have_po4a" = "xyes" -a "x$have_nsgmls" = "xyes") ++ + ############################################################ + # + # Checks for cygwin/mingw32 +diff --git a/man/Makefile.am b/man/Makefile.am +index 4870e71..0be0ca4 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -19,8 +19,19 @@ + ## along with this program; if not, write to the Free Software + ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA + ++if HAVE_PO4A + man_MANS = gerbv.1 gerbv.ru.1 +-PO_FILES= gerbv.ru.1.in.po ++else ++man_MANS = gerbv.1 ++ ++all: ++ @ echo ++ @ echo "WARNING: missing po4a or sp (nsgmls). Rerun configure and" \ ++ "check for 'checking for po4a-*' and 'checking for nsgmls'" ++ @ echo ++endif ++ ++PO_FILES = gerbv.ru.1.in.po + + MOSTLYCLEANFILES = *~ + CLEANFILES = *~ *.pot $(man_MANS) +@@ -35,15 +46,15 @@ SUFFIXES = .1 .1.in .in .in.po + + # .in << .in.po + .in.po.in: +- po4a-translate -k 70 -M UTF-8 -f man -m gerbv.1.in -p $< -l $@ ++ $(po4a_translate) -k 70 -M UTF-8 -f man -m gerbv.1.in -p $< -l $@ + + $(PO_FILES): gerbv.1.in.pot +- msgmerge --width=76 $@ $< -o $@.new ++ $(MSGMERGE) --width=76 $@ $< -o $@.new + mv $@.new $@ + + gerbv.1.in.pot: gerbv.1.in +- po4a-gettextize -M UTF-8 -f man -m $< -p $@ ++ $(po4a_gettextize) -M UTF-8 -f man -m $< -p $@ + + update-po: +- @touch gerbv.1.in.pot +- make $(PO_FILES) ++ @ touch -c gerbv.1.in.pot ++ $(MAKE) $(PO_FILES) + +diff --git a/man/gerbv.ru.1.in.po b/man/gerbv.ru.1.in.po +new file mode 100644 +index 0000000..0e0ed7e +--- /dev/null ++++ b/man/gerbv.ru.1.in.po +@@ -0,0 +1,853 @@ ++# Translation of man 1 gerbv to Russian ++# ++# This file is distributed under the same license as the gerbv package. ++# ++# Sergey Alyoshin <alyoshin.s@gmail.com>, 2012, 2013 ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: gerbv man ru\n" ++"POT-Creation-Date: 2013-08-03 14:08+0400\n" ++"PO-Revision-Date: 2013-08-03 14:09+0400\n" ++"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" ++"Language-Team: LANGUAGE <LL@li.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. type: TH ++#: gerbv.1.in:1 ++#, no-wrap ++msgid "gerbv" ++msgstr "gerbv" ++ ++#. type: TH ++#: gerbv.1.in:1 ++#, no-wrap ++msgid "Jule 13, 2013" ++msgstr "13 июля 2013" ++ ++#. type: TH ++#: gerbv.1.in:1 ++#, no-wrap ++msgid "Version" ++msgstr "Версия" ++ ++#. type: TH ++#: gerbv.1.in:1 ++#, no-wrap ++msgid "@version@" ++msgstr "@version@" ++ ++#. type: SH ++#: gerbv.1.in:2 ++#, no-wrap ++msgid "NAME" ++msgstr "НАЗВАНИЕ" ++ ++#. type: Plain text ++#: gerbv.1.in:4 ++msgid "gerbv - Gerber Viewer" ++msgstr "gerbv — просмотр Gerber-файлов" ++ ++#. type: SH ++#: gerbv.1.in:4 ++#, no-wrap ++msgid "SYNOPSIS" ++msgstr "ОБЗОР" ++ ++#. type: Plain text ++#: gerbv.1.in:6 ++msgid "B<gerbv [OPTIONS] [gerberfile[s]]>" ++msgstr "B<gerbv [ПАРАМЕТРЫ] [gerber-файл[ы]]>" ++ ++#. type: SH ++#: gerbv.1.in:6 ++#, no-wrap ++msgid "DESCRIPTION" ++msgstr "ОПИСАНИЕ" ++ ++#. type: Plain text ++#: gerbv.1.in:13 ++msgid "" ++"I<gerbv> is a viewer for RS274-X, commonly known as Gerber, files. RS274-" ++"X files are generated from different PCB CAD programs and are used in the " ++"printed circuit board manufacturing process. I<gerbv> also supports " ++"Excellon/NC drill files as well as XY (centroid) files produced by the " ++"program PCB (http://pcb.geda-project.org/)." ++msgstr "" ++"I<gerbv> — это программа для просмотра файлов RS274-X, более известных " ++"как Gerber. Файлы RS274-X создаются различными программами " ++"автоматизированного проектирования печатных плат и используются при их " ++"изготовлении на производстве. I<gerbv> также поддерживает файлы сверловки " ++"Excellon/NC drill и файлы расположения (координаты центров элементов), " ++"создаваемые программой PCB (http://pcb.geda-project.org/)." ++ ++#. type: SH ++#: gerbv.1.in:14 ++#, no-wrap ++msgid "OPTIONS" ++msgstr "ПАРАМЕТРЫ" ++ ++#. type: Plain text ++#: gerbv.1.in:19 ++msgid "" ++"B<Warning!> On some platforms, which hasn't long option available, only " ++"short options are available." ++msgstr "" ++"B<Внимание!> На некоторых платформах, не имеющих поддержку длинных " ++"параметров, доступны только короткие параметры." ++ ++#. type: SS ++#: gerbv.1.in:20 ++#, no-wrap ++msgid "gerbv General options:" ++msgstr "Общие параметры gerbv:" ++ ++#. type: Plain text ++#: gerbv.1.in:23 ++msgid "B<-V|--version> Print the version number of gerbv and exit." ++msgstr "B<-V|--version> Вывести версию gerbv и выйти." ++ ++#. type: TP ++#: gerbv.1.in:23 ++#, no-wrap ++msgid "B<-h|--help>" ++msgstr "B<-h|--help>" ++ ++#. type: Plain text ++#: gerbv.1.in:26 ++msgid "Print a brief usage guide and exit." ++msgstr "Вывести краткое руководство и выйти." ++ ++#. type: TP ++#: gerbv.1.in:26 ++#, no-wrap ++msgid "B<-bE<lt>hexE<gt>|--background=E<lt>hexE<gt>>" ++msgstr "B<-bE<lt>hexE<gt>|--background=E<lt>hexE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:30 ++msgid "" ++"Use background color E<lt>hexE<gt>. E<lt>hexE<gt> is specified as an html-" ++"color code, e.g. #FF0000 for Red." ++msgstr "" ++"Задать цвет фона E<lt>hexE<gt>. Код цвета E<lt>hexE<gt> должен быть " ++"указан как в HTML, например, #FF0000 для красного." ++ ++#. type: TP ++#: gerbv.1.in:30 ++#, no-wrap ++msgid "B<-fE<lt>hexE<gt>|--foreground=E<lt>hexE<gt>>" ++msgstr "B<-fE<lt>hexE<gt>|--foreground=E<lt>hexE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:36 ++msgid "" ++"Use foreground color E<lt>hexE<gt>. E<lt>hexE<gt> is specified as an html-" ++"color code, e.g. #00FF00 for Green. If a user also wants to set the alpha " ++"(rendering with Cairo) it can be specified as an #RRGGBBAA code. Use " ++"multiple -f flags to set the color for multiple layers." ++msgstr "" ++"Задать цвет элементов E<lt>hexE<gt>. Код цвета E<lt>hexE<gt> должен быть " ++"указан как в HTML, например, #00FF00 для зелёного. Прозрачность (при " ++"отображении средствами Cairo) указывается в виде кода #RRGGBBAA (A — " ++"alpha). Для задания цвета нескольких слоёв используйте флаг -f несколько " ++"раз." ++ ++#. type: TP ++#: gerbv.1.in:36 ++#, no-wrap ++msgid "B<-l\\ E<lt>filenameE<gt>|--log=E<lt>filenameE<gt>>" ++msgstr "B<-l\\ E<lt>имя-файлаE<gt>|--log=E<lt>имя-файлаE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:39 ++msgid "" ++"All error messages etc are stored in a file with filename " ++"I<E<lt>filenameE<gt>>." ++msgstr "Записывать все сообщения об ошибках в файл I<E<lt>имя-файлаE<gt>>." ++ ++#. type: TP ++#: gerbv.1.in:39 ++#, no-wrap ++msgid "B<-t\\ E<lt>filenameE<gt>|--tools=E<lt>filenameE<gt>>" ++msgstr "B<-t\\ E<lt>имя-файлаE<gt>|--tools=E<lt>имя-файлаE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:42 ++msgid "Read Excellon tools from the file I<E<lt>filenameE<gt>>." ++msgstr "Прочитать инструменты Excellon из файла I<E<lt>имя-файлаE<gt>>." ++ ++#. type: TP ++#: gerbv.1.in:42 ++#, no-wrap ++msgid "B<-p\\ E<lt>project\\ filenameE<gt>|--project=E<lt>project\\ filenameE<gt>>" ++msgstr "B<-p\\ E<lt>имя-файла\\ проектаE<gt>|--project=E<lt>имя-файла\\ проектаE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:46 ++msgid "" ++"Load a stored project. Please note that the project file must be stored " ++"in the same directory as the gerber files." ++msgstr "" ++"Загрузить проект. Заметьте, что файл проекта должен находиться в том же " ++"каталоге, что и файлы Gerber." ++ ++#. type: SS ++#: gerbv.1.in:47 ++#, no-wrap ++msgid "gerbv Export-specific options:" ++msgstr "Параметры экспорта gerbv:" ++ ++#. type: Plain text ++#: gerbv.1.in:49 ++msgid "The following commands can be used in combination with the -x flag:" ++msgstr "Вместе с флагом -x могут быть использованы следующие команды:" ++ ++#. type: TP ++#: gerbv.1.in:49 ++#, no-wrap ++msgid "B<-BE<lt>bE<gt>|--border=E<lt>bE<gt>>" ++msgstr "B<-BE<lt>bE<gt>|--border=E<lt>bE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:53 ++msgid "" ++"Set the border around the image E<lt>bE<gt> percent of the width and " ++"height. Default E<lt>bE<gt> is 5%." ++msgstr "" ++"Установить рамку вокруг изображения размером E<lt>bE<gt> процентов от " ++"ширины и высоты. По умолчанию, E<lt>bE<gt> равно 5%." ++ ++#. type: TP ++#: gerbv.1.in:53 ++#, no-wrap ++msgid "B<-DE<lt>XxYE<gt>orE<lt>RE<gt>|--dpi=E<lt>XxYE<gt>orE<lt>RE<gt>>" ++msgstr "B<-DE<lt>XxYE<gt>илиE<lt>RE<gt>|--dpi=E<lt>XxYE<gt>илиE<lt>RE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:59 ++msgid "" ++"Resolution (Dots per inch) for the output bitmap. Use E<lt>XxYE<gt> for " ++"different resolutions for the width and height (only when compiled with " ++"Cairo as render engine). Use E<lt>RE<gt> to have the same resolution in " ++"both directions. Defaults to 72 DPI in both directions." ++msgstr "" ++"Разрешение (в точках на дюйм, DPI) выводимого bitmap-изображения. Для " ++"различного разрешения по ширине и высоте используйте E<lt>XxYE<gt> " ++"(только при сборке с Cairo). Используйте E<lt>RE<gt> для одинакового " ++"разрешения по двум измерениям. По умолчанию, E<lt>RE<gt> равно 72 DPI." ++ ++#. type: TP ++#: gerbv.1.in:59 ++#, no-wrap ++msgid "B<-TE<lt>X,YE<gt>|--translate=E<lt>X,YE<gt>>" ++msgstr "B<-TE<lt>X,YE<gt>|--translate=E<lt>X,YE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:63 ++msgid "" ++"Translate the image by the distance E<lt>X,YE<gt>. Use multiple -T flags " ++"to translate multiple files." ++msgstr "" ++"Переместить изображение на расстояние E<lt>X,YE<gt>. Для задания " ++"перемещения нескольких слоёв используйте флаг -T несколько раз." ++ ++#. type: TP ++#: gerbv.1.in:63 ++#, no-wrap ++msgid "B<-OE<lt>XxYE<gt>|--origin=E<lt>XxYE<gt>>" ++msgstr "B<-OE<lt>XxYE<gt>|--origin=E<lt>XxYE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:67 ++msgid "" ++"Set the lower left corner of the exported image to coordinate " ++"E<lt>XxYE<gt>. Coordinates are in inches." ++msgstr "" ++"Установить координаты E<lt>XxYE<gt> левого нижнего угла экспортируемого " ++"изображения. Значение в дюймах." ++ ++#. type: TP ++#: gerbv.1.in:67 ++#, no-wrap ++msgid "B<-a|--antialias>" ++msgstr "B<-a|--antialias>" ++ ++#. type: Plain text ++#: gerbv.1.in:70 ++msgid "Use antialiasing for the generated output-bitmap." ++msgstr "Использовать антиалиасинг для выходного bitmap-файла." ++ ++#. type: TP ++#: gerbv.1.in:70 ++#, no-wrap ++msgid "B<-o\\ E<lt>filenameE<gt>|--output=E<lt>filenameE<gt>>" ++msgstr "B<-o\\ E<lt>имя-файлаE<gt>|--output=E<lt>имя-файлаE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:73 ++msgid "Export to E<lt>filenameE<gt>." ++msgstr "Экспортировать в файл E<lt>имя-файлаE<gt>." ++ ++#. type: TP ++#: gerbv.1.in:73 ++#, no-wrap ++msgid "B<-WE<lt>WxHE<gt>|--window_inch=E<lt>WxHE<gt>>" ++msgstr "B<-WE<lt>ШxВE<gt>|--window_inch=E<lt>ШxВE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:76 ++msgid "Window size in inches E<lt>WxHE<gt> for the exported image." ++msgstr "Размер окна в дюймах E<lt>ШxВE<gt> для экспортируемого изображения." ++ ++#. type: TP ++#: gerbv.1.in:76 ++#, no-wrap ++msgid "B<-wE<lt>WxHE<gt>|--window=WxHE<gt>>" ++msgstr "B<-wE<lt>ШxВE<gt>|--window=E<lt>ШxВE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:82 ++msgid "" ++"Window size in pixels E<lt>WxHE<gt> for the exported image. Autoscales to " ++"fit if no resolution is specified (note that the default 72 DPI also " ++"changes in that case). If a resolution is specified, it will clip the " ++"image to this size." ++msgstr "" ++"Размер окна E<lt>ШxВE<gt> в пикселях экспортируемого изображения. Если " ++"разрешение не указано, то выполняется масштабирование (заметьте, что в " ++"этом случае разрешение по умолчанию 72 DPI также изменяется). Если " ++"разрешение указано, то изображение обрезается." ++ ++#. type: TP ++#: gerbv.1.in:82 ++#, no-wrap ++msgid "B<-xE<lt>png/pdf/ps/svg/rs274x/drillE<gt>|--export=E<lt>png/pdf/ps/svg/rs274x/drillE<gt>>" ++msgstr "B<-xE<lt>png/pdf/ps/svg/rs274x/drillE<gt>|--export=E<lt>png/pdf/ps/svg/rs274x/drillE<gt>>" ++ ++#. type: Plain text ++#: gerbv.1.in:85 ++msgid "Export to a file and set the format for the output file." ++msgstr "Экспортировать в файл и установить формат выходного файла." ++ ++#. type: SS ++#: gerbv.1.in:86 ++#, no-wrap ++msgid "GTK Options" ++msgstr "Параметры GTK" ++ ++#. type: Plain text ++#: gerbv.1.in:89 ++msgid "B<--gtk-module=>I<MODULE> Load an additional GTK module" ++msgstr "B<--gtk-module=>I<МОДУЛЬ> Загрузить дополнительный модуль GTK" ++ ++#. type: TP ++#: gerbv.1.in:89 ++#, no-wrap ++msgid "B<--g-fatal-warnings>" ++msgstr "B<--g-fatal-warnings>" ++ ++#. type: Plain text ++#: gerbv.1.in:92 ++msgid "Make all warnings fatal" ++msgstr "Сделать все предупреждения фатальными" ++ ++#. type: TP ++#: gerbv.1.in:92 ++#, no-wrap ++msgid "B<--gtk-debug=>I<FLAGS>" ++msgstr "B<--gtk-debug=>I<ФЛАГИ>" ++ ++#. type: Plain text ++#: gerbv.1.in:95 ++msgid "GTK debugging flags to set" ++msgstr "Установить флаги отладки GTK" ++ ++#. type: TP ++#: gerbv.1.in:95 ++#, no-wrap ++msgid "B<--gtk-no-debug=>I<FLAGS>" ++msgstr "B<--gtk-no-debug=>I<ФЛАГИ>" ++ ++#. type: Plain text ++#: gerbv.1.in:98 ++msgid "GTK debugging flags to unset" ++msgstr "Снять флаги отладки GTK" ++ ++#. type: TP ++#: gerbv.1.in:98 ++#, no-wrap ++msgid "B<--gdk-debug=>I<FLAGS>" ++msgstr "B<--gdk-debug=>I<ФЛАГИ>" ++ ++#. type: Plain text ++#: gerbv.1.in:101 ++msgid "GDK debugging flags to set" ++msgstr "Установить флаги отладки GDK" ++ ++#. type: TP ++#: gerbv.1.in:101 ++#, no-wrap ++msgid "B<--gdk-no-debug=>I<FLAGS>" ++msgstr "B<--gdk-no-debug=>I<ФЛАГИ>" ++ ++#. type: Plain text ++#: gerbv.1.in:104 ++msgid "GDK debugging flags to unset" ++msgstr "Снять флаги отладки GDK" ++ ++#. type: TP ++#: gerbv.1.in:104 ++#, no-wrap ++msgid "B<--display=>I<DISPLAY>" ++msgstr "B<--display=>I<ДИСПЛЕЙ>" ++ ++#. type: Plain text ++#: gerbv.1.in:107 ++msgid "X display to use" ++msgstr "Использовать X-дисплей" ++ ++#. type: TP ++#: gerbv.1.in:107 ++#, no-wrap ++msgid "B<--sync>" ++msgstr "B<--sync>" ++ ++#. type: Plain text ++#: gerbv.1.in:110 ++msgid "Make X call synchronous" ++msgstr "Сделать синхронными X-вызовы" ++ ++#. type: TP ++#: gerbv.1.in:110 ++#, no-wrap ++msgid "B<--no-xshm>" ++msgstr "B<--no-xshm>" ++ ++#. type: Plain text ++#: gerbv.1.in:113 ++msgid "Don't use X shared memory extension" ++msgstr "Не использовать расширение разделяемой памяти X" ++ ++#. type: TP ++#: gerbv.1.in:113 ++#, no-wrap ++msgid "B<--name=>I<NAME>" ++msgstr "B<--name=>I<НАЗВАНИЕ>" ++ ++#. type: Plain text ++#: gerbv.1.in:116 ++msgid "Program name as used by the window manager" ++msgstr "Название программы используемое оконным менеджером" ++ ++#. type: TP ++#: gerbv.1.in:116 ++#, no-wrap ++msgid "B<--class=>I<CLASS>" ++msgstr "B<--class=>I<КЛАСС>" ++ ++#. type: Plain text ++#: gerbv.1.in:119 ++msgid "Program class as used by the window manager" ++msgstr "Класс программы используемый оконным менеджером" ++ ++#. type: SH ++#: gerbv.1.in:120 ++#, no-wrap ++msgid "GENERAL" ++msgstr "ОБЩИЕ ЗАМЕЧАНИЯ" ++ ++#. type: Plain text ++#: gerbv.1.in:123 ++msgid "" ++"When you start gerbv you can give the files to be loaded on the command " ++"line, either as each file separated with a space or by using wildcards." ++msgstr "" ++"Вы можете указать в командной строке файлы для открытия в I<gerbv> при " ++"запуске: или все файлы разделённые пробелами, или применяя в названии " ++"файлов шаблоны." ++ ++#. type: Plain text ++#: gerbv.1.in:129 ++msgid "" ++"The user interface is graphical. Simply press and drag middle mouse " ++"button (scroll wheel) and the image will pan as you move the mouse. To " ++"manipulate a layer, right-click on one of the rightmost list items. That " ++"will bring up a pop-up menu where you can select what you want to do with " ++"that layer (reload file, change color, etc)." ++msgstr "" ++"Gerbv использует графический пользовательский интерфейс. Для прокрутки " ++"перемещайте мышь удерживая среднюю кнопку (колесо прокрутки) или " ++"используйте инструмент Прокрутка. Для изменения свойств слоя выберите " ++"название слоя и откройте контекстное меню правой кнопкой мыши, через " ++"которое можно изменить цвет слоя, перезагрузить слой и т.д." ++ ++#. type: Plain text ++#: gerbv.1.in:132 ++msgid "" ++"If you hold the mouse button over one the rightmost button a tooltips " ++"will show you the name of the file loaded on that layer." ++msgstr "" ++"При удержании курсора мыши над названием слоя появится всплывающая " ++"подсказка с именем файла, который соответствует этому слою." ++ ++#. type: SH ++#: gerbv.1.in:134 ++#, no-wrap ++msgid "ACTIVATION AND DEACTIVATION OF LAYERS" ++msgstr "ВКЛЮЧЕНИЕ И ВЫКЛЮЧЕНИЕ СЛОЁВ" ++ ++#. type: Plain text ++#: gerbv.1.in:137 ++msgid "" ++"You can load several files at one time. You can then turn displaying of " ++"the layers on and off by clicking on one of check boxes near the layer " ++"names." ++msgstr "" ++"Несколько файлов могут быть загружены одновременно. Отображение слоёв " ++"выключается и включается галочкой рядом с названием слоя." ++ ++#. type: Plain text ++#: gerbv.1.in:141 ++msgid "" ++"You can also control this from the keyboard. Press Ctrl, enter the number " ++"on the layer you want activate/deactivate on the numerical keypad and " ++"then release the Ctrl key." ++msgstr "" ++"Отображением слоёв можно управлять с клавиатуры. Удерживая Ctrl, нажмите " ++"номер слоя на клавиатуре и отпустите Ctrl." ++ ++#. type: SH ++#: gerbv.1.in:142 ++#, no-wrap ++msgid "ZOOMING" ++msgstr "МАСШТАБИРОВАНИЕ" ++ ++#. type: Plain text ++#: gerbv.1.in:150 ++msgid "" ++"Zooming can be handled by either menu choices, keypressing or mouse " ++"scroll wheel. If you press z you will zoom in and if you press Shift+z (i." ++"e. Z) you will zoom out. Scroll wheel works if you enabled that in your X " ++"server and mapped it to button 4 and 5. You can make the image fit by " ++"pressing f (there is also a menu alternative for this). If Pan, Zoom, or " ++"Measure Tool is selected you can press right mouse button for zoom in, " ++"and if you press Shift and right mouse button you will zoom out." ++msgstr "" ++"Масштабирование может быть выполнено через меню, клавиатуру или колесо " ++"мыши. Для увеличения нажмите клавишу z и Shift+z (т.е. Z) для уменьшения. " ++"Колесо прокрутки мыши также используется для масштабирования. Для " ++"масштаба наилучшего заполнения нажмите клавишу f или используйте меню. " ++"Если выбраны инструменты Прокрутка, Масштаб или Измерение, то для " ++"увеличения можно использовать правую кнопку мыши, а для уменьшения правую " ++"кнопку мыши с удерживаемой клавишей Shift." ++ ++#. type: Plain text ++#: gerbv.1.in:158 ++msgid "" ++"You can also do zooming by outline. Select Zoom Tool, press mouse button, " ++"draw, release. The dashed line shows how the zooming will be dependent on " ++"the resolution of the window. The non-dashed outline will show what you " ++"actually selected. If you change your mind when started to mark outline, " ++"you can always abort by pressing escape. By holding down the Shift key " ++"when you press the mouse button, you will select an area where the point " ++"you started at will be the center of your selection." ++msgstr "" ++"Для увеличения контуром выберите инструмент Масштаб, нажмите кнопку мыши " ++"и, удерживая её, укажите контур. Пунктирная линия отображает зависимость " ++"масштабирования от разрешения окна. Сплошная линия соответствует " ++"указанному контуру. Отменить указание контура можно клавишей Esc. Для " ++"указания контура относительно центра, удерживайте нажатой клавишу Shift." ++ ++#. type: SH ++#: gerbv.1.in:159 ++#, no-wrap ++msgid "MEASUREMENTS" ++msgstr "ИЗМЕРЕНИЕ" ++ ++#. type: Plain text ++#: gerbv.1.in:164 ++msgid "" ++"You can do measurement on the image displayed. Select Measure Tool, the " ++"cursor changes to a plus. By using left mouse button you can draw the " ++"lines that you want to measure. The result of the last measurement is " ++"also displayed on the statusbar. All measurements are in the drawing " ++"until you select other Tool." ++msgstr "" ++"Для измерения элементов изображения слоя выберите инструмент Измерение " ++"(курсор изменится на перекрестие), нажмите левую кнопку мыши для точки " ++"начала измерения и, удерживая её, укажите точку окончания измерения. " ++"Результат в выбранных единицах измерения отображается в строке статуса. " ++"Линия измерения отображается до тех пор, пока не выбран другой инструмент." ++ ++#. type: Plain text ++#: gerbv.1.in:168 ++msgid "" ++"The statusbar shows the current mouse position on the layer in the same " ++"coordinates as in the file. I.e. if you have (0,0) in the middle of the " ++"image in the gerber files, the statusbar will show (0,0) at the same " ++"place." ++msgstr "" ++"Текущие координаты указателя мыши (соответствующие координатам в файле) " ++"отображаются в строке статуса в выбранных единицах измерения. Т.е. если " ++"центр изображения Gerber-файла имеет координаты (0; 0), то в этом месте " ++"изображения слоя в строке статуса будут отображены координаты (0; 0)." ++ ++#. type: SH ++#: gerbv.1.in:169 ++#, no-wrap ++msgid "SUPERIMPOSING" ++msgstr "НАЛОЖЕНИЕ" ++ ++#. type: Plain text ++#: gerbv.1.in:173 ++msgid "" ++"When you load several Gerber files, you can display them \"on top of each " ++"other\", i.e. superimposing. The general way to display them are that " ++"upper layers cover the layers beneath, which is called copy (GTK+ terms)." ++msgstr "" ++"Если открыто несколько файлов, вы можете отображать слои \"один поверх " ++"другого\", т.е. наложением. По умолчанию верхний слой закрывает собой " ++"нижние слои." ++ ++#. type: Plain text ++#: gerbv.1.in:178 ++msgid "" ++"The other ways selectable are and, or, xor and invert. They map directly " ++"to corresponding functions in GTK. In GTK they are described as: \"For " ++"colored images, only GDK_COPY, GDK_XOR and GDK_INVERT are generally " ++"useful. For bitmaps, GDK_AND and GDK_OR are also useful.\"" ++msgstr "" ++"Также можно выбрать отображение исключающим ИЛИ (XOR) или инвертированным " ++"из контекстного меню слоя." ++ ++#. type: SH ++#: gerbv.1.in:179 ++#, no-wrap ++msgid "PROJECTS" ++msgstr "ПРОЕКТЫ" ++ ++#. type: Plain text ++#: gerbv.1.in:184 ++msgid "" ++"gerbv can also handle projects. A project consist of bunch of loaded " ++"layers with their resp. color and the background color. The easiest way " ++"to create a project is to load all files you want into the layer you " ++"want, set all the colors etc and do a \"Save Project As...\"." ++msgstr "" ++"gerbv может работать с проектами. Файл проекта состоит из списка слоёв, " ++"их цвета и цвета фона. Для создания файла проекта, откройте желаемые " ++"файлы, организуйте порядок слоёв, задайте их цвет и выберите пункт меню " ++"\"Сохранить проект как...\"" ++ ++#. type: Plain text ++#: gerbv.1.in:187 ++msgid "" ++"You load a project either from the menu bar or by using the commandline " ++"switches -p or --project." ++msgstr "" ++"Загрузить проект можно через меню или параметром командной строки -p или " ++"--project." ++ ++#. type: Plain text ++#: gerbv.1.in:190 ++msgid "" ++"Currently there is a limit in that the project file must be in the same " ++"directory as the gerber files to be loaded." ++msgstr "" ++"В настоящее время существует ограничение: файл проекта должен " ++"располагаться в том же каталоге, что и загружаемые gerber-файлы." ++ ++#. type: SH ++#: gerbv.1.in:191 ++#, no-wrap ++msgid "SCHEME" ++msgstr "SCHEME" ++ ++#. type: Plain text ++#: gerbv.1.in:199 ++msgid "" ++"The project files are simple Scheme programs that is interpreted by a " ++"built in Scheme interpreter. The Scheme interpreter is TinyScheme and " ++"needs a Scheme program called init.scm to initialize itself. The search " ++"path for init.scm is (in the following order) @scmdir@, the directory " ++"with the executable gerbv, the directory gerbv was invoked from and " ++"finally according to the environment variable GERBV_SCHEMEINIT." ++msgstr "" ++"Файл проекта это сценарий Scheme, обрабатываемый встроенным Scheme-" ++"интерпретатором TinyScheme. Для инициализации TinyScheme необходим файл " ++"init.scm, поиск расположения которого выполняется в следующей " ++"последовательности: @scmdir@, каталог исполняемого файла gerbv, каталог " ++"запуска gerbv, значение переменной окружения GERBV_SCHEMEINIT." ++ ++#. type: SH ++#: gerbv.1.in:200 ++#, no-wrap ++msgid "TOOLS FILE" ++msgstr "ФАЙЛ ИНСТРУМЕНТОВ" ++ ++#. type: Plain text ++#: gerbv.1.in:205 ++msgid "" ++"Not every Excellon drill file is self-sufficient. Some CADs produce .drd " ++"files where tools are only referenced, but never defined (such as what " ++"diameter of the tool is.) Eagle CAD is one of such CADs, and there are " ++"more since many board houses require Tools files." ++msgstr "" ++"Не все файлы Excellon самодостаточны. Некоторые программы " ++"автоматизированного проектирования создают файлы \".drd\" содержащие " ++"только обозначение инструментов, а не их определение (т.е. не указывают " ++"их диаметр). Eagle — одна из таких программ, но есть и другие, поэтому " ++"многие производители печатных плат требуют файлы инструментов." ++ ++#. type: Plain text ++#: gerbv.1.in:208 ++msgid "" ++"A Tools file is a plain text file which you create in an editor. Each " ++"line of the file describes one tool (the name and the diameter, in " ++"inches):" ++msgstr "" ++"Файл инструментов — это обычный текстовый файл, который можно создать в " ++"текстовом редакторе. Каждая строка файла описывает один инструмент " ++"(название и диаметр в дюймах):" ++ ++#. type: Plain text ++#: gerbv.1.in:213 ++#, no-wrap ++msgid "" ++"\tT01 0.024\n" ++"\tT02 0.040\n" ++"\t...\n" ++msgstr "" ++"\tT01 0.024\n" ++"\tT02 0.040\n" ++"\t...\n" ++ ++#. type: Plain text ++#: gerbv.1.in:219 ++msgid "" ++"These are the same tools (T01 etc.) that are used in the Drill file. A " ++"standard practice with Eagle is to create an empty Tools file, run the " ++"CAM processor, and the error report tells you which tools you \"forgot" ++"\". Then you put these tools into the file and rerun the CAM processor." ++msgstr "" ++"Это те же инструменты (T01 и т.д.), которые используются в файле " ++"сверловки. Обычная практика в Eagle — создавать пустой файл инструментов, " ++"запускать CAM-обработчик и по сообщениям об ошибках выяснять какие " ++"инструменты \"отсутствуют\". Затем эти инструменты добавляются в файл и " ++"CAM-процессор запускается повторно." ++ ++#. type: Plain text ++#: gerbv.1.in:225 ++msgid "" ++"You load a tool file by using the commandline switches -t or --tools. " ++"The file can have any name you wish, but Eagle expects the file type to " ++"be \".drl\", so it makes sense to keep it this way. Some board houses are " ++"still using CAM software from DOS era, so you may want to excercise " ++"caution before going beyond the 8.3 naming convention." ++msgstr "" ++"Для загрузки файла инструментов используйте флаг командной строки -t или " ++"--tools. Имя файла может быть любым (Eagle предполагает расширение \".drl" ++"\" для таких файлов). Некоторые производители печатных плат до сих пор " ++"используют программное обеспечение из эры DOS, что может накладывать " ++"ограничение 8.3 на длину имён файлов." ++ ++#. type: Plain text ++#: gerbv.1.in:235 ++msgid "" ++"When I<gerbv> reads the Tools file it also checks that there are no " ++"duplicate definitions of tools. This does happen from time to time as you " ++"edit the file by hand, especially if you, during design, add or remove " ++"parts from the board and then have to add new tools into the Tools file. " ++"The duplicate tools are a very serious error which will stop (HOLD) your " ++"board until you fix the Tools file and maybe the Excellon file. I<gerbv> " ++"will detect duplicate tools if they are present, and will exit " ++"immediately to indicate such a fatal error in a very obvious way. A " ++"message will also be printed to standard error." ++msgstr "" ++"При чтении файла инструментов I<gerbv> проверяет отсутствие повторяющихся " ++"определений инструментов. Это может случиться при редактировании файла " ++"инструментов вручную. Повторяющиеся определения инструментов — серьёзная " ++"ошибка, которая приостановит производство вашей печатной платы до " ++"исправления файла инструментов и, возможно, файла сверловки Excellon. При " ++"обнаружении повторяющихся определений инструментов I<gerbv> немедленно " ++"сообщает об ошибке и завершает работу." ++ ++#. type: Plain text ++#: gerbv.1.in:240 ++msgid "" ++"If your Excellon file does not contain tool definitions then I<gerbv> " ++"will preconfigure the tools by deriving the diameter of the drill bit " ++"from the tool number. This is probably not what you want, and you will " ++"see warnings printed on the console." ++msgstr "" ++"Если файл Excellon не содержит определения инструментов, то I<gerbv> " ++"установит диаметр инструментов по номеру инструмента. Вероятно, это не " ++"то, что вы хотите, поэтому будет выведено предупреждение." ++ ++#. type: SH ++#: gerbv.1.in:241 ++#, no-wrap ++msgid "ENVIRONMENT" ++msgstr "ОКРУЖЕНИЕ" ++ ++#. type: IP ++#: gerbv.1.in:242 ++#, no-wrap ++msgid "GERBV_SCHEMEINIT" ++msgstr "GERBV_SCHEMEINIT" ++ ++#. type: Plain text ++#: gerbv.1.in:245 ++msgid "" ++"Defines where the init.scm file is stored. Used by scheme interpreter, " ++"which is used by the project reader." ++msgstr "" ++"Задаёт расположение файла init.scm, используемого Scheme-интерпретатором " ++"для чтения файла проекта." ++ ++#. type: SH ++#: gerbv.1.in:246 ++#, no-wrap ++msgid "AUTHOR" ++msgstr "АВТОРЫ" ++ ++#. type: Plain text ++#: gerbv.1.in:251 ++#, no-wrap ++msgid "" ++"Stefan Petersen (spetm at users.sourceforge.net): Overall hacker and project leader\n" ++"Andreas Andersson (e92_aan at e.kth.se): Drill file support and general hacking\n" ++"Anders Eriksson (aenfaldor at users.sourceforge.net): X and GTK+ ideas and hacking\n" ++msgstr "" ++"Stefan Petersen (spetm at users.sourceforge.net):\n" ++"\tобщее программирование и ведение проекта\n" ++"Andreas Andersson (e92_aan at e.kth.se):\n" ++"\tподдержка файла сверловки и общее программирование\n" ++"Anders Eriksson (aenfaldor at users.sourceforge.net):\n" ++"\tидеи X и GTK+ и программирование\n" ++ ++#. type: SH ++#: gerbv.1.in:252 ++#, no-wrap ++msgid "COPYRIGHT" ++msgstr "COPYRIGHT" ++ ++#. type: Plain text ++#: gerbv.1.in:255 ++#, no-wrap ++msgid "Copyright \\(co 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Stefan Petersen\n" ++msgstr "Copyright \\(co 2001—2008 Stefan Petersen\n" ++ ++#. type: Plain text ++#: gerbv.1.in:257 ++#, no-wrap ++msgid "" ++"This document can be freely redistributed according to the terms of the \n" ++"GNU General Public License version 2.0\n" ++msgstr "" ++"Данный документ может свободно распространяться в соответствии с \n" ++"требованиями GNU Универсальной общественной лицензии (GPL) версии 2.0\n" +-- +1.7.10.4 + +diff --git a/autogen.sh b/autogen.sh +index 3a589dd..11598b5 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -80,7 +80,7 @@ acl_ver=`aclocal --version | awk '{print $NF; exit}'` + echo " $acl_ver" + + echo "Running aclocal..." +-aclocal $ACLOCAL_FLAGS || exit 1 ++aclocal -I m4 $ACLOCAL_FLAGS || exit 1 + echo "... done with aclocal." + + ############################################################################ +diff --git a/configure.ac b/configure.ac +index 2826ed6..f8c3e4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,7 @@ AC_CONFIG_SRCDIR([src/gerbv.c]) + AC_GNU_SOURCE + AC_PREREQ([2.59]) + AM_INIT_AUTOMAKE([1.9]) ++AC_CONFIG_MACRO_DIR([m4]) + + dnl Create a configuration header + AM_CONFIG_HEADER([config.h]) + diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index b8491a756..325cb37d5 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 81849 2013-01-02 03:07:05Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 97794 2013-09-29 19:22:18Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="C++ library for symbolic calculations" arch=('i686' 'x86_64' 'mips64el') url='http://www.ginac.de/' license=('GPL') depends=('cln') makedepends=('transfig' 'doxygen' 'texlive-bin') -source=(http://www.ginac.de/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c93913c4c543874b2ade4f0390030641be7e0c41') install=${pkgname}.install +source=(http://www.ginac.de/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0f34d255024b3fb258e44da84f9e82dfb3dc9bc15f0999b7a18204a730663bde') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static - make } diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD index 906690383..6afffeccb 100644 --- a/community/glabels/PKGBUILD +++ b/community/glabels/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 79126 2012-10-30 23:07:20Z heftig $ +# $Id: PKGBUILD 98190 2013-10-07 12:08:24Z jgc $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=glabels pkgver=3.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Creating labels and business cards the very easy way" arch=('i686' 'x86_64' 'mips64el') url="http://glabels.org/" license=('GPL' 'LGPL') -depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') +depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') makedepends=('barcode' 'intltool' 'gnome-doc-utils') options=('!libtool') install=$pkgname.install diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 7b0cecc9e..80f832fe0 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96501 2013-08-30 19:17:19Z svenstaro $ +# $Id: PKGBUILD 98064 2013-10-05 08:59:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,7 +7,7 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') makedepends=('mesa' 'cmake' 'doxygen') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('35a3ef5e0a8137e6984c5fb892edb06c') +md5sums=('623977c096b28c25528e3c958e9fb3fd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index bb691a69f..001cbc542 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 94024 2013-07-13 12:32:26Z svenstaro $ +# $Id: PKGBUILD 97732 2013-09-28 07:17:42Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.24.0 -pkgrel=2 +pkgver=1.24.1 +pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz) -sha256sums=('83ff79610ffdede48536c0d07d5288ad84ec26c86aa2aa1db98b46abdebbdcc2') +sha256sums=('eae586be8d3fc36ee80e5ca0ef5d877e76d346cbfe451c9abff5be27692030d1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD index b0dfe7f6a..b9f46d36f 100644 --- a/community/gloox/PKGBUILD +++ b/community/gloox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93658 2013-07-08 11:17:28Z spupykin $ +# $Id: PKGBUILD 97518 2013-09-23 16:14:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gloox -pkgver=1.0.2 +pkgver=1.0.6 pkgrel=1 pkgdesc="C++ libraries for development of Jabber client/component/server" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') license=("GPL") depends=('libidn' 'gnutls') source=(http://camaya.net/download/gloox-$pkgver.tar.bz2) -md5sums=('4c446ee186406c3b3a24402418127faa') +md5sums=('80ba7fa1220913a9f67bf6f3183aafbd') build() { cd $srcdir/gloox-$pkgver diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 956c5997d..b5465c5b7 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93486 2013-07-04 10:12:04Z spupykin $ +# $Id: PKGBUILD 97134 2013-09-13 13:41:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.6.1 +pkgver=1.5.7.0 pkgrel=1 arch=("i686" "x86_64" "mips64el") url="http://gmic.sourceforge.net" @@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") -md5sums=('06545a7c2f73b55b0d35e5f5544dce88' +md5sums=('76e4cc4847afb7fe8afa4d7f8690d4dc' '120319b0d6c81c5af186abe2281b79ca') prepare() { diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch deleted file mode 100644 index fa31e720b..000000000 --- a/community/gnome-applets/01_battstat_upower.patch +++ /dev/null @@ -1,622 +0,0 @@ -From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001 -From: Joachim Breitner <mail@joachim-breitner.de> -Date: Mon, 5 Jul 2010 12:20:04 +0200 -Subject: [PATCH] [battstat applet] upower support - -As HAL is being deprecated, the battstat applet is adjusted to talk to -upower, using libupower-glib. (Bug #607254) ---- - battstat/Makefile.am | 6 +- - battstat/battstat-upower.c | 330 +++++++++++++++++++++++++++++++++++++++++ - battstat/battstat-upower.h | 33 ++++ - battstat/battstat_applet.c | 7 +- - battstat/docs/C/battstat.xml | 18 ++- - battstat/docs/de/battstat.xml | 22 +++- - battstat/docs/eu/battstat.xml | 20 ++- - battstat/power-management.c | 66 +++++++-- - configure.in | 22 +++ - 9 files changed, 493 insertions(+), 31 deletions(-) - create mode 100644 battstat/battstat-upower.c - create mode 100644 battstat/battstat-upower.h - -Index: gnome-applets-3.4.1/battstat/Makefile.am -=================================================================== ---- gnome-applets-3.4.1.orig/battstat/Makefile.am 2012-04-13 19:02:29.000000000 +0200 -+++ gnome-applets-3.4.1/battstat/Makefile.am 2012-04-19 00:28:17.246029051 +0200 -@@ -27,6 +27,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(HAL_CFLAGS) \ -+ $(UPOWER_CFLAGS) \ - $(APMINC) \ - $(ACPIINC) \ - $(WARN_CFLAGS) \ -@@ -48,13 +49,17 @@ - acpi-freebsd.c \ - acpi-freebsd.h \ - battstat-hal.c \ -- battstat-hal.h -+ battstat-hal.h \ -+ battstat-upower.c \ -+ battstat-upower.h - - - battstat_applet_2_LDADD = \ - $(GNOME_APPLETS_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(HAL_LIBS) \ -+ $(UPOWER_LIBS) \ -+ $(LIBM) \ - $(APMLIB) - - schemasdir = @GCONF_SCHEMA_FILE_DIR@ -Index: gnome-applets-3.4.1/battstat/battstat-upower.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-applets-3.4.1/battstat/battstat-upower.c 2012-04-19 00:28:17.246029051 +0200 -@@ -0,0 +1,301 @@ -+/* -+ * Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de> -+ * -+ * Based on battstat-hal.c: -+ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ * -+ * $Id$ -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_UPOWER -+ -+#include <upower.h> -+#include <math.h> -+ -+#include "battstat-upower.h" -+ -+static UpClient *upc; -+static void (*status_updated_callback) (void); -+ -+ -+/* status_updated_callback() can not be called directly because at the time of -+ * the device-remove signal, the device is not actually removed from the list -+ * of devices known to the up_client object (see libupower-glib/up-client.c in -+ * upower). Waiting for the next idle timer works around this issue and has has -+ * the additionaly benefit of possibly running status_updated_callback only -+ * once when several events happen very soon after each other. -+ */ -+static gboolean status_update_scheduled; -+ -+static gboolean -+update_status_idle (gpointer junk) -+{ -+ if (status_updated_callback) -+ status_updated_callback (); -+ -+ return status_update_scheduled = FALSE; -+} -+ -+static void -+schedule_status_callback (void) -+{ -+ if (status_update_scheduled) -+ return; -+ -+ status_update_scheduled = TRUE; -+ g_idle_add (update_status_idle, NULL); -+} -+ -+static void -+device_cb (UpClient *client, UpDevice *device, gpointer user_data) { -+ schedule_status_callback(); -+} -+ -+/* ---- public functions ---- */ -+ -+char * -+battstat_upower_initialise (void (*callback) (void)) -+{ -+ status_updated_callback = callback; -+ -+ if( upc != NULL ) -+ return g_strdup( "Already initialised!" ); -+ -+ if( (upc = up_client_new() ) == NULL ) -+ goto error_out; -+ -+ if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) { -+ goto error_shutdownclient; -+ } -+ -+ g_signal_connect_after( upc, "device-changed", device_cb, NULL ); -+ g_signal_connect_after( upc, "device-added", device_cb, NULL ); -+ g_signal_connect_after( upc, "device-removed", device_cb, NULL ); -+ -+ return NULL; -+ -+error_shutdownclient: -+ g_object_unref( upc ); -+ upc = NULL; -+ -+error_out: -+ return "Can not initialize upower"; -+} -+ -+void -+battstat_upower_cleanup( void ) -+{ -+ if( upc == NULL ) -+ return; -+ -+ g_object_unref( upc ); -+ upc = NULL; -+} -+ -+#include "battstat.h" -+ -+/* This function currently exists to allow the multiple batteries supported -+ * by the upower backend to appear as a single composite battery device (since -+ * at the current time this is all that battstat supports). -+ * -+ * This entire function is filled with logic to make multiple batteries -+ * appear as one "composite" battery. Comments included as appropriate. -+ * -+ * For more information about some of the assumptions made in the following -+ * code please see the following mailing list post and the resulting thread: -+ * -+ * http://lists.freedesktop.org/archives/hal/2005-July/002841.html -+ */ -+void -+battstat_upower_get_battery_info( BatteryStatus *status ) -+{ -+ -+ GPtrArray *devices = up_client_get_devices( upc ); -+ -+ /* The calculation to get overall percentage power remaining is as follows: -+ * -+ * Sum( Current charges ) / Sum( Full Capacities ) -+ * -+ * We can't just take an average of all of the percentages since this -+ * doesn't deal with the case that one battery might have a larger -+ * capacity than the other. -+ * -+ * In order to do this calculation, we need to keep a running total of -+ * current charge and full capacities. -+ */ -+ double current_charge_total = 0, full_capacity_total = 0; -+ -+ /* Record the time remaining as reported by upower. This is used in the event -+ * that the system has exactly one battery (since, then, upower is capable -+ * of providing an accurate time remaining report and we should trust it.) -+ */ -+ gint64 remaining_time = 0; -+ -+ /* The total (dis)charge rate of the system is the sum of the rates of -+ * the individual batteries. -+ */ -+ double rate_total = 0; -+ -+ /* We need to know if we should report the composite battery as present -+ * at all. The logic is that if at least one actual battery is installed -+ * then the composite battery will be reported to exist. -+ */ -+ int present = 0; -+ -+ /* We need to know if we are on AC power or not. Eventually, we can look -+ * at the AC adaptor upower devices to determine that. For now, we assume that -+ * if any battery is discharging then we must not be on AC power. Else, by -+ * default, we must be on AC. -+ */ -+ int on_ac_power = 1; -+ -+ /* Finally, we consider the composite battery to be "charging" if at least -+ * one of the actual batteries in the system is charging. -+ */ -+ int charging = 0; -+ -+ /* For each physical battery bay... */ -+ int i; -+ for( i = 0; i < devices->len; i++ ) -+ { -+ UpDevice *upd = g_ptr_array_index( devices, i ); -+ -+ int type, state; -+ double current_charge, full_capacity, rate; -+ gint64 time_to_full, time_to_empty; -+ -+ g_object_get( upd, -+ "kind", &type, -+ "state", &state, -+ "energy", ¤t_charge, -+ "energy-full", &full_capacity, -+ "energy-rate", &rate, -+ "time-to-full", &time_to_full, -+ "time-to-empty", &time_to_empty, -+ NULL ); -+ -+ /* Only count batteries here */ -+ -+ if (type != UP_DEVICE_KIND_BATTERY) -+ continue; -+ -+ /* At least one battery present -> composite battery is present. */ -+ present++; -+ -+ /* At least one battery charging -> composite battery is charging. */ -+ if( state == UP_DEVICE_STATE_CHARGING ) -+ charging = 1; -+ -+ /* At least one battery is discharging -> we're not on AC. */ -+ if( state == UP_DEVICE_STATE_DISCHARGING ) -+ on_ac_power = 0; -+ -+ /* Sum the totals for current charge, design capacity, (dis)charge rate. */ -+ current_charge_total += current_charge; -+ full_capacity_total += full_capacity; -+ rate_total += rate; -+ -+ /* Record remaining time too, incase this is the only battery. */ -+ remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full); -+ } -+ -+ if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) ) -+ { -+ /* Either no battery is present or something has gone horribly wrong. -+ * In either case we must return that the composite battery is not -+ * present. -+ */ -+ status->present = FALSE; -+ status->percent = 0; -+ status->minutes = -1; -+ status->on_ac_power = TRUE; -+ status->charging = FALSE; -+ -+ g_ptr_array_unref( devices ); -+ return; -+ } -+ -+ /* Else, our composite battery is present. */ -+ status->present = TRUE; -+ -+ /* As per above, overall charge is: -+ * -+ * Sum( Current charges ) / Sum( Full Capacities ) -+ */ -+ status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5; -+ -+ if( present == 1 ) -+ { -+ /* In the case of exactly one battery, report the time remaining figure -+ * from upower directly since it might have come from an authorative source -+ * (ie: the PMU or APM subsystem). -+ * -+ * upower gives remaining time in seconds with a 0 to mean that the -+ * remaining time is unknown. Battstat uses minutes and -1 for -+ * unknown time remaining. -+ */ -+ -+ if( remaining_time == 0 ) -+ status->minutes = -1; -+ else -+ status->minutes = (remaining_time + 30) / 60; -+ } -+ /* Rest of cases to deal with multiple battery systems... */ -+ else if( !on_ac_power && rate_total != 0 ) -+ { -+ /* Then we're discharging. Calculate time remaining until at zero. */ -+ -+ double remaining; -+ -+ remaining = current_charge_total; -+ remaining /= rate_total; -+ status->minutes = (int) floor( remaining * 60.0 + 0.5 ); -+ } -+ else if( charging && rate_total != 0 ) -+ { -+ /* Calculate time remaining until charged. For systems with more than -+ * one battery, this code is very approximate. The assumption is that if -+ * one battery reaches full charge before the other that the other will -+ * start charging faster due to the increase in available power (similar -+ * to how a laptop will charge faster if you're not using it). -+ */ -+ -+ double remaining; -+ -+ remaining = full_capacity_total - current_charge_total; -+ if( remaining < 0 ) -+ remaining = 0; -+ remaining /= rate_total; -+ -+ status->minutes = (int) floor( remaining * 60.0 + 0.5 ); -+ } -+ else -+ { -+ /* On AC power and not charging -or- rate is unknown. */ -+ status->minutes = -1; -+ } -+ -+ /* These are simple and well-explained above. */ -+ status->charging = charging; -+ status->on_ac_power = on_ac_power; -+ -+ g_ptr_array_unref( devices ); -+} -+ -+#endif /* HAVE_UPOWER */ -Index: gnome-applets-3.4.1/battstat/battstat-upower.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-applets-3.4.1/battstat/battstat-upower.h 2012-04-19 00:28:17.254029051 +0200 -@@ -0,0 +1,33 @@ -+/* -+ * Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de> -+ * -+ * Based on battstat-hal.h: -+ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ * -+ * $Id$ -+ */ -+ -+#ifndef _battstat_upower_h_ -+#define _battstat_upower_h_ -+ -+char *battstat_upower_initialise (void (*) (void)); -+void battstat_upower_cleanup (void); -+ -+#include "battstat.h" -+void battstat_upower_get_battery_info (BatteryStatus *status); -+ -+#endif /* _battstat_upower_h_ */ -Index: gnome-applets-3.4.1/battstat/battstat_applet.c -=================================================================== ---- gnome-applets-3.4.1.orig/battstat/battstat_applet.c 2012-04-13 19:02:29.000000000 +0200 -+++ gnome-applets-3.4.1/battstat/battstat_applet.c 2012-04-19 00:28:17.254029051 +0200 -@@ -1188,9 +1188,12 @@ - - char *comments = g_strdup_printf ("%s\n\n%s", - _("This utility shows the status of your laptop battery."), -- power_management_using_hal () ? -+ power_management_using_upower () ? -+ /* true */ _("upower backend enabled.") : -+ (power_management_using_hal () ? - /* true */ _("HAL backend enabled.") : -- /* false */ _("Legacy (non-HAL) backend enabled.")); -+ /* false */ _("Legacy (non-HAL) backend enabled.") -+ )); - - gtk_show_about_dialog( NULL, - "version", VERSION, -Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml -=================================================================== ---- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml 2012-04-15 15:49:58.000000000 +0200 -+++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml 2012-04-19 00:28:17.254029051 +0200 -@@ -226,10 +226,13 @@ - <title>Power Management Backends</title> - - <para> -- The battery monitor supports a number of power management backends. If it -- is available, the monitor will attempt to use the freedesktop.org -- <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware Abstraction -- Layer)</ulink>. If it is unavailable or unsupported on your platform, the -+ The battery monitor supports a number of power management backends. -+ If it is available, the monitor will attempt to use the freedesktop.org -+ <ulink url="http://upower.freedesktop.org/">upower</ulink> interface. -+ If it is unavailable or unsupported on your platform, it will fall back -+ to the freedesktop.org -+ <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware -+ Abstraction Layer)</ulink>. If that is also not availble, the - battery monitor will attempt direct access to the power management system. - </para> - <para> -@@ -410,10 +413,10 @@ - <sect2 id="battstat-troubleshooting-backends"> - <title>Determining the backend</title> - <para> -- If you are using the Hardware Abstraction Layer -- (see <xref linkend="battstat-power-backends"/>) then that will be -- indicated in the about dialog by placing a star next to the author of the -- HAL backend. -+ If you are using the upower interface, or the the Hardware -+ Abstraction Layer (see <xref linkend="battstat-power-backends"/>) then -+ that will be indicated in the about dialog by placing a star next to the -+ author of the HAL backend. - <figure id="battstat-credits-hal"> - <title>Check you're using the HAL backend</title> - <screenshot> -Index: gnome-applets-3.4.1/battstat/power-management.c -=================================================================== ---- gnome-applets-3.4.1.orig/battstat/power-management.c 2012-04-13 19:02:29.000000000 +0200 -+++ gnome-applets-3.4.1/battstat/power-management.c 2012-04-19 00:28:17.254029051 +0200 -@@ -41,6 +41,7 @@ - - #include "battstat.h" - #include "battstat-hal.h" -+#include "battstat-upower.h" - - #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! " \ - "Make sure the ACPI subsystem is working and " \ -@@ -66,6 +67,9 @@ - #ifdef HAVE_HAL - static int using_hal; - #endif -+#ifdef HAVE_UPOWER -+static int using_upower; -+#endif - - /* - * What follows is a series of platform-specific apm_readinfo functions -@@ -390,6 +394,14 @@ - return NULL; - } - -+#ifdef HAVE_UPOWER -+ if( using_upower ) -+ { -+ battstat_upower_get_battery_info( status ); -+ return NULL; -+ } -+#endif -+ - #ifdef HAVE_HAL - if( using_hal ) - { -@@ -430,27 +442,36 @@ - const char * - power_management_initialise (int no_hal, void (*callback) (void)) - { -+ char *err; -+ err = g_strdup( ":(" ); - #ifdef __linux__ - struct stat statbuf; - #endif --#ifdef HAVE_HAL -- char *err; -+#ifdef HAVE_UPOWER -+ err = battstat_upower_initialise (callback); - -- if( no_hal ) -- err = g_strdup( ":(" ); -- else -- err = battstat_hal_initialise (callback); -- -- -- if( err == NULL ) /* HAL is up */ -+ if( err == NULL ) /* UPOWER is up */ - { - pm_initialised = 1; -- using_hal = TRUE; -+ using_upower = TRUE; - return NULL; -+ } -+#endif -+ -+#ifdef HAVE_HAL -+ if(! no_hal ) { -+ err = battstat_hal_initialise (callback); -+ -+ if( err == NULL ) /* HAL is up */ -+ { -+ pm_initialised = 1; -+ using_hal = TRUE; -+ return NULL; -+ } - } -- else -- /* fallback to legacy methods */ -- g_free( err ); -+ -+ /* fallback to legacy methods */ -+ g_free( err ); - #endif - - #ifdef __linux__ -@@ -498,6 +519,15 @@ - void - power_management_cleanup( void ) - { -+#ifdef HAVE_UPOWER -+ if( using_upower ) -+ { -+ battstat_upower_cleanup(); -+ pm_initialised = 1; -+ return; -+ } -+#endif -+ - #ifdef HAVE_HAL - if( using_hal ) - { -@@ -525,6 +555,16 @@ - } - - int -+power_management_using_upower( void ) -+{ -+#ifdef HAVE_UPOWER -+ return using_upower; -+#else -+ return 0; -+#endif -+} -+ -+int - power_management_using_hal( void ) - { - #ifdef HAVE_HAL -Index: gnome-applets-3.4.1/configure.in -=================================================================== ---- gnome-applets-3.4.1.orig/configure.in 2012-04-15 15:45:36.000000000 +0200 -+++ gnome-applets-3.4.1/configure.in 2012-04-19 00:28:17.254029051 +0200 -@@ -23,6 +23,7 @@ - LIBWNCK_REQUIRED=2.91.0 - LIBNOTIFY_REQUIRED=0.7 - HAL_REQUIRED=0.5.3 -+UPOWER_REQUIRED=0.9.4 - DBUS_REQUIRED=1.1.2 - DBUS_GLIB_REQUIRED=0.74 - PYGOBJECT_REQUIRED=2.26 -@@ -223,6 +224,30 @@ - AC_SUBST(HAL_CFLAGS) - AC_SUBST(HAL_LIBS) - -+dnl -- check for libupower-glib (optional) -------------------------------------------- -+UPOWER_CFLAGS= -+UPOWER_LIBS= -+AC_ARG_WITH(upower,[ --without-upower build without upower support]) -+ -+if test "x$with_upower" != xno; then -+ PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, -+ HAVE_UPOWER="yes", -+ HAVE_UPOWER="no") -+ -+ LT_LIB_M -+ if test "x$HAVE_UPOWER" = "xyes"; then -+ AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available]) -+ fi -+else -+ AC_MSG_WARN(["upower support disabled"]) -+fi -+ -+AC_SUBST(UPOWER_CFLAGS) -+AC_SUBST(UPOWER_LIBS) -+AC_SUBST(LIBM) -+ -+ -+ - dnl -- check for gucharmap (optional) ----------------------------------------- - - PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED], -@@ -739,5 +764,6 @@ - Using DBUS: $HAVE_DBUS - Using NetworkManager: $HAVE_NETWORKMANAGER - Using HAL: $HAVE_HAL -+ Using UPOWER: $HAVE_UPOWER - Enabling IPv6: $have_ipv6 - " >&2 diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD deleted file mode 100644 index a9b2165c5..000000000 --- a/community/gnome-applets/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 88683 2013-04-21 22:16:53Z heftig $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-applets -pkgver=3.5.92 -pkgrel=3 -pkgdesc="Small applications for the GNOME panel" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('cpupower' 'gucharmap' 'gstreamer0.10-base-plugins' 'gnome-panel' 'libgtop' 'upower') -makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian') -url="https://live.gnome.org/GnomeApplets" -install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-applets-cpupower.patch - disable-gweather-applet.patch - fix-autoconf.patch - 01_battstat_upower.patch) -sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83' - '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65' - '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8' - '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4' - '364c9264c76721b42e85eecc48443852ead1bd730d9de937dd2ae00889db836a') - -build() { - cd "$pkgname-$pkgver" - - sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/* - - # Use cpupower instead of cpufreq - patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch" - - # Add UPower support - patch -Np1 -i "$srcdir/01_battstat_upower.patch" - - # Disable gweather applet, because it's not compatible with libgweather 3.8 - patch -Np1 -i "$srcdir/disable-gweather-applet.patch" - - # Fix build - patch -Np1 -i "$srcdir/fix-autoconf.patch" - - # Turn off unneeded warnings - CFLAGS="$CFLAGS -w" - - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static --disable-schemas-install --disable-scrollkeeper \ - --enable-mixer-applet \ - PYTHON=/usr/bin/python2 - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas - rm -r "$pkgdir"/etc/gconf -} diff --git a/community/gnome-applets/disable-gweather-applet.patch b/community/gnome-applets/disable-gweather-applet.patch deleted file mode 100644 index 26f7e4d6b..000000000 --- a/community/gnome-applets/disable-gweather-applet.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in ---- gnome-applets-3.5.92.orig/configure.in 2012-09-20 03:07:34.000000000 +0200 -+++ gnome-applets-3.5.92/configure.in 2013-04-09 10:39:54.214243015 +0200 -@@ -251,7 +251,7 @@ - - dnl -- check for libgweather (required for gweather applet) ------------------ - build_libgweather_applets=false --PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED, -+PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7, - build_libgweather_applets=true, - AC_MSG_WARN([libgweather not found. Not building the weather applet.])) - AC_SUBST(LIBGWEATHER_CFLAGS) diff --git a/community/gnome-applets/fix-autoconf.patch b/community/gnome-applets/fix-autoconf.patch deleted file mode 100644 index fc36c743c..000000000 --- a/community/gnome-applets/fix-autoconf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in ---- gnome-applets-3.5.92.orig/configure.in 2012-09-20 03:07:34.000000000 +0200 -+++ gnome-applets-3.5.92/configure.in 2013-04-09 09:48:48.427334056 +0200 -@@ -4,7 +4,7 @@ - AC_INIT(gnome-applets, 3.5.92) - AC_PREREQ(2.59) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) - AC_CONFIG_MACRO_DIR(m4) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/community/gnome-applets/gnome-applets-cpupower.patch b/community/gnome-applets/gnome-applets-cpupower.patch deleted file mode 100644 index 134a617fc..000000000 --- a/community/gnome-applets/gnome-applets-cpupower.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in ---- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400 -+++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400 -@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr - LIBCPUFREQ_LIBS= - if test "x$have_libcpufreq" = "xyes"; then - AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.]) -- LIBCPUFREQ_LIBS=-lcpufreq -+ LIBCPUFREQ_LIBS=-lcpupower - fi - AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes) - AC_SUBST(LIBCPUFREQ_LIBS) diff --git a/community/gnome-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install deleted file mode 100644 index e3441e722..000000000 --- a/community/gnome-applets/gnome-applets.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gnome-applets - -post_install() { - gconfpkg --install ${pkgname} - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall ${pkgname} -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch deleted file mode 100644 index c06949310..000000000 --- a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a5b951654b856d899e8c6a4116b4ccc4f18aac91 Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha <jbicha@ubuntu.com> -Date: Sun, 24 Feb 2013 17:22:29 -0500 -Subject: [PATCH] Add the GNOME Flashback session - -This was removed from gnome-session 3.7.4 so let's it add it back here -(under new name) - -https://bugzilla.gnome.org/show_bug.cgi?id=694625 ---- - data/Makefile.am | 18 +++++++++++++++++- - data/gnome-flashback.desktop.in | 7 +++++++ - data/gnome-flashback.session.desktop.in | 3 +++ - po/POTFILES.in | 2 ++ - 4 files changed, 29 insertions(+), 1 deletion(-) - create mode 100644 data/gnome-flashback.desktop.in - create mode 100644 data/gnome-flashback.session.desktop.in - -diff --git a/data/Makefile.am b/data/Makefile.am -index 83f82e2..84e1954 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml) - - @GSETTINGS_RULES@ - -+sessiondir = $(datadir)/gnome-session/sessions -+session_in_files = gnome-flashback.session.desktop.in -+session_DATA = $(session_in_files:.session.desktop.in=.session) -+ -+xsessiondir = $(datadir)/xsessions -+xsession_in_files = gnome-flashback.desktop.in -+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) -+ -+%.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -+ -+@INTLTOOL_DESKTOP_RULE@ -+ - default_layoutdir = $(datadir)/gnome-panel - default_layout_DATA = panel-default-layout.layout - - EXTRA_DIST = \ - $(gsettings_schemas_in_in) \ -+ $(session_in_files) \ -+ $(xsession_in_files) \ - $(default_layout_DATA) - - CLEANFILES = \ - $(gsettings__enum_file) \ - $(gsettings_SCHEMAS_in) \ - $(gsettings_SCHEMAS) \ -- *.gschema.valid -+ *.gschema.valid \ -+ $(session_DATA) \ -+ $(xsession_DATA) - - -include $(top_srcdir)/git.mk -diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in -new file mode 100644 -index 0000000..4856f75 ---- /dev/null -+++ b/data/gnome-flashback.desktop.in -@@ -0,0 +1,7 @@ -+[Desktop Entry] -+_Name=GNOME Flashback -+_Comment=This session logs you into GNOME with the traditional panel -+Exec=gnome-session --session=gnome-flashback -+TryExec=gnome-session -+Icon= -+Type=Application -diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in -new file mode 100644 -index 0000000..c012c58 ---- /dev/null -+++ b/data/gnome-flashback.session.desktop.in -@@ -0,0 +1,3 @@ -+[GNOME Session] -+_Name=GNOME Flashback -+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; -diff --git a/po/POTFILES.in b/po/POTFILES.in -index bc65c4c..a6aa6c7 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c - applets/wncklet/wncklet.c - applets/wncklet/workspace-switcher.c - [type: gettext/glade]applets/wncklet/workspace-switcher.ui -+data/gnome-flashback.desktop.in -+data/gnome-flashback.session.desktop.in - data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in - data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in - data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in --- -1.7.10.4 - diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch deleted file mode 100644 index 8a72c9262..000000000 --- a/community/gnome-panel/18_fix_force_quit_applet.patch +++ /dev/null @@ -1,98 +0,0 @@ -Description: Fix Force-Quit panel applet - This patch implements handling of XInput2 extension events in the applet. - Without this patch, the applet fails to recognize such events (either mouse - click for killing application, or escape key for exiting), hence freezing the - desktop. - . - Also fix the event mask in call of gdk_device_grab() for keyboard. -Author: Sébastien Villemot <sebastien@debian.org> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740 -Forwarded: no -Last-Update: 2013-01-28 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/gnome-panel/panel-force-quit.c -+++ b/gnome-panel/panel-force-quit.c -@@ -32,6 +32,8 @@ - #include <X11/Xlib.h> - #include <X11/keysym.h> - -+#include <X11/extensions/XInput2.h> -+ - #include "panel-icon-names.h" - #include "panel-stock-icons.h" - -@@ -246,22 +248,23 @@ - - static void - handle_button_press_event (GtkWidget *popup, -- XKeyEvent *event) -+ Display *display, -+ Window subwindow) - { - Window window; - - remove_popup (popup); - -- if (event->subwindow == None) -+ if (subwindow == None) - return; - - if (wm_state_atom == None) -- wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE); -+ wm_state_atom = XInternAtom (display, "WM_STATE", FALSE); - -- window = find_managed_window (event->display, event->subwindow); -+ window = find_managed_window (display, subwindow); - - if (window != None) { -- if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window)) -+ if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window)) - kill_window_question ((gpointer) window); - } - } -@@ -272,10 +275,12 @@ - GtkWidget *popup) - { - XEvent *xevent = (XEvent *) gdk_xevent; -+ XIEvent *xiev; -+ XIDeviceEvent *xidev; - - switch (xevent->type) { - case ButtonPress: -- handle_button_press_event (popup, &xevent->xkey); -+ handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow); - return GDK_FILTER_REMOVE; - case KeyPress: - if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) { -@@ -283,6 +288,21 @@ - return GDK_FILTER_REMOVE; - } - break; -+ case GenericEvent: -+ xiev = (XIEvent *) xevent->xcookie.data; -+ xidev = (XIDeviceEvent *) xiev; -+ switch (xiev->evtype) { -+ case XI_KeyPress: -+ if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) { -+ remove_popup (popup); -+ return GDK_FILTER_REMOVE; -+ } -+ break; -+ case XI_ButtonPress: -+ handle_button_press_event (popup, xidev->display, xidev->child); -+ return GDK_FILTER_REMOVE; -+ } -+ break; - default: - break; - } -@@ -331,7 +351,7 @@ - - status = gdk_device_grab (keyboard, root, - GDK_OWNERSHIP_NONE, FALSE, -- GDK_KEY_PRESS | GDK_KEY_RELEASE, -+ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, time); - if (status != GDK_GRAB_SUCCESS) { - g_warning ("Keyboard grab failed\n"); diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index 4740091d5..3081043f6 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,53 +1,40 @@ -# $Id: PKGBUILD 96624 2013-09-02 13:22:45Z bgyorgy $ +# $Id: PKGBUILD 98191 2013-10-07 12:08:25Z jgc $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-panel pkgname=('gnome-panel' 'gnome-flashback-session') -pkgver=3.6.2 -pkgrel=7 +pkgver=3.8.0 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') pkgdesc="Legacy GNOME panel" url="https://live.gnome.org/GnomePanel" depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg' 'libwnck3' 'telepathy-glib') -makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common') +makedepends=('gobject-introspection' 'intltool' 'itstool' 'networkmanager') install=$pkgbase.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz - gnome-desktop-3.8.patch - drop-gweather-xml-include.patch - 18_fix_force_quit_applet.patch - 0001-Add-the-GNOME-Flashback-session.patch - fix-autoconf.patch) -sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079' - '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c' - 'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305' - '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775' - '79b6aab33bde167446ddea7f5c1a815dee150ba4a0678577464acbd2ba4a7504' - '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71') + libgweather-3.10.patch + session.patch) +sha256sums=('d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a' + 'd9e21449fc6c5f235673fe47e5b817ac7597490518a557908b14ca875263d90e' + 'cd4c21cf394ea5a702c660bb0d31cae31260bec1cee4e7ca8ee6c8aec2707ebb') -build() { +prepare() { cd "$pkgbase-$pkgver" - # Port to gnome-desktop 3.8 - patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch" - - # Fix build with libgweather 3.8 - patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch" + # Fix build with libgweather 3.10 + patch -Np1 -i "$srcdir/libgweather-3.10.patch" - # Fix force quit applet to avoid freeze - patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch" - - # Add GNOME Flashback session - # https://bugzilla.gnome.org/show_bug.cgi?id=694625 - patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch" + # Add more required components to the session file + patch -Np1 -i "$srcdir/session.patch" +} - # Fix build - patch -Np1 -i "$srcdir/fix-autoconf.patch" +build() { + cd "$pkgbase-$pkgver" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \ --disable-static --disable-schemas-compile \ PYTHON=/usr/bin/python2 @@ -58,11 +45,8 @@ package_gnome-panel() { cd "$pkgbase-$pkgver" make DESTDIR="$pkgdir" install - # Remove unneeded script - rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add" - # Split out the session files - rm -r "$pkgdir"/usr/share/{gnome-session,xsessions} + rm -r "$pkgdir"/usr/{lib/gnome-panel/gnome-*,share/{gnome-session,xsessions}} } package_gnome-flashback-session() { @@ -74,6 +58,7 @@ package_gnome-flashback-session() { install= cd "$pkgbase-$pkgver" + make -C gnome-panel DESTDIR="$pkgdir" install-libexecSCRIPTS make -C data DESTDIR="$pkgdir" install-sessionDATA make -C data DESTDIR="$pkgdir" install-xsessionDATA } diff --git a/community/gnome-panel/drop-gweather-xml-include.patch b/community/gnome-panel/drop-gweather-xml-include.patch deleted file mode 100644 index 3b3a559f0..000000000 --- a/community/gnome-panel/drop-gweather-xml-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600 -+++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600 -@@ -54,7 +54,6 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include <libgnome-desktop/gnome-wall-clock.h> - --#include <libgweather/gweather-xml.h> - #include <libgweather/location-entry.h> - #include <libgweather/timezone-menu.h> - #include <libgweather/gweather-enum-types.h> diff --git a/community/gnome-panel/fix-autoconf.patch b/community/gnome-panel/fix-autoconf.patch deleted file mode 100644 index 17d9e025c..000000000 --- a/community/gnome-panel/fix-autoconf.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur gnome-panel-3.6.2.orig/configure.ac gnome-panel-3.6.2/configure.ac ---- gnome-panel-3.6.2.orig/configure.ac 2012-11-12 18:51:14.000000000 +0100 -+++ gnome-panel-3.6.2/configure.ac 2013-04-10 14:50:14.132509059 +0200 -@@ -1,6 +1,6 @@ - AC_INIT([gnome-panel], [3.6.2], - [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - diff --git a/community/gnome-panel/gnome-desktop-3.8.patch b/community/gnome-panel/gnome-desktop-3.8.patch deleted file mode 100644 index 3c8823cd2..000000000 --- a/community/gnome-panel/gnome-desktop-3.8.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff -Naur gnome-panel-3.6.2.orig/applets/clock/calendar-window.c gnome-panel-3.6.2/applets/clock/calendar-window.c ---- gnome-panel-3.6.2.orig/applets/clock/calendar-window.c 2012-11-12 18:35:17.000000000 +0100 -+++ gnome-panel-3.6.2/applets/clock/calendar-window.c 2013-04-08 23:10:30.451012763 +0200 -@@ -42,9 +42,6 @@ - #include <glib/gi18n.h> - #include <gio/gio.h> - --#define GNOME_DESKTOP_USE_UNSTABLE_API --#include <libgnome-desktop/gnome-desktop-utils.h> -- - #include "calendar-window.h" - - #include "clock.h" -@@ -168,6 +165,13 @@ - return; - } - -+ /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */ -+ if (terminal) { -+ g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. " -+ "Please configure a different application.\n"); -+ return; -+ } -+ - command_line = g_find_program_in_path (program); - if (command_line == NULL) { - g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program); -@@ -189,9 +193,6 @@ - screen = gtk_widget_get_screen (calwin->priv->calendar); - error = NULL; - -- if (terminal) -- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); -- - display = gdk_screen_make_display_name (screen); - - result = g_spawn_async (NULL, /* working directory */ -diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c ---- gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c 2012-11-12 18:35:17.000000000 +0100 -+++ gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c 2013-04-08 23:10:52.408175181 +0200 -@@ -25,6 +25,7 @@ - * Havoc Pennington <hp@pobox.com> - * George Lebl <jirka@5z.com> - * Mark McLoughlin <mark@skynet.ie> -+ * Tom Tromey (Copyright (C) 1998) - */ - - #include <config.h> -@@ -42,8 +43,6 @@ - #include <gdk/gdkkeysyms.h> - #include <gmenu-tree.h> - --#include <libgnome-desktop/gnome-desktop-utils.h> -- - #include <libpanel-util/panel-error.h> - #include <libpanel-util/panel-glib.h> - #include <libpanel-util/panel-gtk.h> -@@ -335,6 +334,132 @@ - */ - } - -+ -+/** -+ * panel_run_dialog_prepend_terminal_to_vector: -+ * @argc: a pointer to the vector size -+ * @argv: a pointer to the vector -+ * -+ * Description: Prepends a terminal (either the one configured as default in -+ * the user's GNOME setup, or one of the common xterm emulators) to the passed -+ * in vector, modifying it in the process. The vector should be allocated with -+ * #g_malloc, as this will #g_free the original vector. Also all elements must -+ * have been allocated separately. That is the standard glib/GNOME way of -+ * doing vectors however. If the integer that @argc points to is negative, the -+ * size will first be computed. Also note that passing in pointers to a vector -+ * that is empty, will just create a new vector for you. -+ **/ -+/* TODO: throw out this function if there ever is a proper GAppInfo port */ -+static void -+panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv) -+{ -+ char **real_argv; -+ int real_argc; -+ int i, j; -+ char **term_argv = NULL; -+ int term_argc = 0; -+ GSettings *settings; -+ -+ gchar *terminal = NULL; -+ -+ char **the_argv; -+ -+ g_return_if_fail (argc != NULL); -+ g_return_if_fail (argv != NULL); -+ -+ /* sanity */ -+ if(*argv == NULL) -+ *argc = 0; -+ -+ the_argv = *argv; -+ -+ /* compute size if not given */ -+ if (*argc < 0) { -+ for (i = 0; the_argv[i] != NULL; i++) -+ ; -+ *argc = i; -+ } -+ -+ settings = g_settings_new ("org.gnome.desktop.default-applications.terminal"); -+ terminal = g_settings_get_string (settings, "exec"); -+ -+ if (terminal) { -+ gchar *command_line; -+ gchar *exec_flag; -+ -+ exec_flag = g_settings_get_string (settings, "exec-arg"); -+ -+ if (exec_flag == NULL) -+ command_line = g_strdup (terminal); -+ else -+ command_line = g_strdup_printf ("%s %s", terminal, -+ exec_flag); -+ -+ g_shell_parse_argv (command_line, -+ &term_argc, -+ &term_argv, -+ NULL /* error */); -+ -+ g_free (command_line); -+ g_free (exec_flag); -+ g_free (terminal); -+ } -+ -+ g_object_unref (settings); -+ -+ if (term_argv == NULL) { -+ char *check; -+ -+ term_argc = 2; -+ term_argv = g_new0 (char *, 3); -+ -+ check = g_find_program_in_path ("gnome-terminal"); -+ if (check != NULL) { -+ term_argv[0] = check; -+ /* Note that gnome-terminal takes -x and -+ * as -e in gnome-terminal is broken we use that. */ -+ term_argv[1] = g_strdup ("-x"); -+ } else { -+ if (check == NULL) -+ check = g_find_program_in_path ("nxterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("color-xterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("rxvt"); -+ if (check == NULL) -+ check = g_find_program_in_path ("xterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("dtterm"); -+ if (check == NULL) { -+ g_warning (_("Cannot find a terminal, using " -+ "xterm, even if it may not work")); -+ check = g_strdup ("xterm"); -+ } -+ term_argv[0] = check; -+ term_argv[1] = g_strdup ("-e"); -+ } -+ } -+ -+ real_argc = term_argc + *argc; -+ real_argv = g_new (char *, real_argc + 1); -+ -+ for (i = 0; i < term_argc; i++) -+ real_argv[i] = term_argv[i]; -+ -+ for (j = 0; j < *argc; j++, i++) -+ real_argv[i] = (char *)the_argv[j]; -+ -+ real_argv[i] = NULL; -+ -+ g_free (*argv); -+ *argv = real_argv; -+ *argc = real_argc; -+ -+ /* we use g_free here as we sucked all the inner strings -+ * out from it into real_argv */ -+ g_free (term_argv); -+} -+ - static gboolean - panel_run_dialog_launch_command (PanelRunDialog *dialog, - const char *command, -@@ -354,7 +479,7 @@ - screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog)); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox))) -- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); -+ panel_run_dialog_prepend_terminal_to_vector (&argc, &argv); - - display = gdk_screen_make_display_name (screen); - diff --git a/community/gnome-panel/libgweather-3.10.patch b/community/gnome-panel/libgweather-3.10.patch new file mode 100644 index 000000000..0a6e0e4e4 --- /dev/null +++ b/community/gnome-panel/libgweather-3.10.patch @@ -0,0 +1,15 @@ +diff -Naur gnome-panel-3.6.2.orig/applets/clock/clock-location.c gnome-panel-3.6.2/applets/clock/clock-location.c +--- gnome-panel-3.6.2.orig/applets/clock/clock-location.c 2013-09-27 02:39:03.315952789 +0000 ++++ gnome-panel-3.6.2/applets/clock/clock-location.c 2013-09-27 02:40:24.552036953 +0000 +@@ -542,9 +542,8 @@ + } + + priv->weather_info = +- gweather_info_new_for_world (priv->world, +- priv->loc, +- GWEATHER_FORECAST_LIST); ++ gweather_info_new (priv->loc, ++ GWEATHER_FORECAST_LIST); + g_signal_connect (priv->weather_info, "updated", + G_CALLBACK (weather_info_updated), loc); + diff --git a/community/gnome-panel/session.patch b/community/gnome-panel/session.patch new file mode 100644 index 000000000..d288b41bb --- /dev/null +++ b/community/gnome-panel/session.patch @@ -0,0 +1,8 @@ +diff -Naur gnome-panel-3.8.0.orig/data/gnome-flashback.session.desktop.in gnome-panel-3.8.0/data/gnome-flashback.session.desktop.in +--- gnome-panel-3.8.0.orig/data/gnome-flashback.session.desktop.in 2013-09-27 03:12:58.291413318 +0000 ++++ gnome-panel-3.8.0/data/gnome-flashback.session.desktop.in 2013-09-27 03:15:34.183583841 +0000 +@@ -1,3 +1,3 @@ + [GNOME Session] + _Name=GNOME Flashback +-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity; ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD index 131815c10..d254b3110 100644 --- a/community/gnome-phone-manager/PKGBUILD +++ b/community/gnome-phone-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95475 2013-08-12 20:33:04Z bgyorgy $ +# $Id: PKGBUILD 98192 2013-10-07 12:08:26Z jgc $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-phone-manager pkgver=0.69 -pkgrel=2 +pkgrel=3 pkgdesc="Control your mobile phone from your GNOME desktop" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/PhoneManager" diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 5e75a441d..b7cd44c95 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96399 2013-08-27 14:10:08Z bgyorgy $ +# $Id: PKGBUILD 98193 2013-10-07 12:08:28Z jgc $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver pkgver=3.6.1 -pkgrel=5 +pkgrel=6 pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,7 +25,7 @@ sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb' '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8') -build() { +prepare() { cd "$pkgname-$pkgver" # Upstream patch that moves gnome-screensaver desktop file out of autostart @@ -36,6 +36,10 @@ build() { # Lock screen on suspend with systemd patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch" +} + +build() { + cd "$pkgname-$pkgver" autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD deleted file mode 100644 index 8c2ae9f43..000000000 --- a/community/gnome-settings-daemon-compat/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-settings-daemon-compat -_pkgname=gnome-settings-daemon -pkgver=3.6.4 -pkgrel=3 -pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-settings-daemon') -makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom') -url="https://live.gnome.org/GnomeFlashback" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz - standalone-background-helper.patch - standalone-media-keys-helper.patch - draw-background-unconditionally.patch - sessionisactive-port.patch - revert-input-sources.patch - xinput.patch - remove-libgsd-dependency.patch - move-desktop-file.patch) -sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9' - 'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162' - '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a' - '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915' - '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a' - 'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d' - '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c' - 'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4') - -build() { - cd $_pkgname-$pkgver - - # Build background and media keys helpers as a stand alone binary - patch -Np1 -i ../standalone-background-helper.patch - patch -Np1 -i ../standalone-media-keys-helper.patch - - # Always draw background - patch -Np1 -i ../draw-background-unconditionally.patch - - # Port to gnome-session's SessionIsActive property - patch -Np1 -i ../sessionisactive-port.patch - - # Add compatibility patches for media keys plugin - patch -Np1 -i ../revert-input-sources.patch - patch -Np1 -i ../xinput.patch - - # Remove libgsd dependency - patch -Np1 -i ../remove-libgsd-dependency.patch - - # Move desktop files out of autostart, so they can be easily reusable in custom sessions - patch -Np1 -i ../move-desktop-file.patch - - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \ - --disable-static --enable-systemd - - # https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -C plugins/common - make -C plugins/automount - make -C plugins/background - make -C plugins/media-keys -} - -package() { - cd $_pkgname-$pkgver - make -C plugins/automount DESTDIR="$pkgdir" install - make -C plugins/background DESTDIR="$pkgdir" install - make -C plugins/media-keys DESTDIR="$pkgdir" install -} diff --git a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch deleted file mode 100644 index c279420de..000000000 --- a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c 2013-04-10 16:33:15.858860586 +0200 -@@ -69,110 +69,6 @@ - - static gpointer manager_object = NULL; - --static gboolean --dont_draw_background (GsdBackgroundManager *manager) --{ -- return !g_settings_get_boolean (manager->priv->settings, -- "draw-background"); --} -- --static gboolean --nautilus_is_drawing_background (GsdBackgroundManager *manager) --{ -- Atom window_id_atom; -- Window nautilus_xid; -- Atom actual_type; -- int actual_format; -- unsigned long nitems; -- unsigned long bytes_after; -- unsigned char *data; -- Atom wmclass_atom; -- gboolean running; -- gint error; -- gboolean show_desktop_icons; -- -- show_desktop_icons = g_settings_get_boolean (manager->priv->settings, -- "show-desktop-icons"); -- if (! show_desktop_icons) { -- return FALSE; -- } -- -- window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -- "NAUTILUS_DESKTOP_WINDOW_ID", True); -- -- if (window_id_atom == None) { -- return FALSE; -- } -- -- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -- GDK_ROOT_WINDOW (), -- window_id_atom, -- 0, -- 1, -- False, -- XA_WINDOW, -- &actual_type, -- &actual_format, -- &nitems, -- &bytes_after, -- &data); -- -- if (data != NULL) { -- nautilus_xid = *(Window *) data; -- XFree (data); -- } else { -- return FALSE; -- } -- -- if (actual_type != XA_WINDOW) { -- return FALSE; -- } -- if (actual_format != 32) { -- return FALSE; -- } -- -- wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False); -- -- gdk_error_trap_push (); -- -- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -- nautilus_xid, -- wmclass_atom, -- 0, -- 24, -- False, -- XA_STRING, -- &actual_type, -- &actual_format, -- &nitems, -- &bytes_after, -- &data); -- -- error = gdk_error_trap_pop (); -- -- if (error == BadWindow) { -- return FALSE; -- } -- -- if (actual_type == XA_STRING && -- nitems == 24 && -- bytes_after == 0 && -- actual_format == 8 && -- data != NULL && -- !strcmp ((char *)data, "desktop_window") && -- !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) { -- running = TRUE; -- } else { -- running = FALSE; -- } -- -- if (data != NULL) { -- XFree (data); -- } -- -- return running; --} -- - static void - on_crossfade_finished (GsdBackgroundManager *manager) - { -@@ -189,11 +85,6 @@ - int i; - - -- if (nautilus_is_drawing_background (manager) || -- dont_draw_background (manager)) { -- return; -- } -- - gnome_settings_profile_start (NULL); - - display = gdk_display_get_default (); -@@ -408,8 +299,7 @@ - const char *key, - GsdBackgroundManager *manager) - { -- if (dont_draw_background (manager) == FALSE) -- setup_bg_and_draw_background (manager); -+ setup_bg_and_draw_background (manager); - } - - gboolean -@@ -422,24 +312,8 @@ - gnome_settings_profile_start (NULL); - - manager->priv->settings = g_settings_new ("org.gnome.desktop.background"); -- g_signal_connect (manager->priv->settings, "changed::draw-background", -- G_CALLBACK (draw_background_changed), manager); - -- /* If this is set, nautilus will draw the background and is -- * almost definitely in our session. however, it may not be -- * running yet (so is_nautilus_running() will fail). so, on -- * startup, just don't do anything if this key is set so we -- * don't waste time setting the background only to have -- * nautilus overwrite it. -- */ -- show_desktop_icons = g_settings_get_boolean (manager->priv->settings, -- "show-desktop-icons"); -- -- if (!show_desktop_icons) { -- setup_bg (manager); -- } else { -- draw_background_after_session_loads (manager); -- } -+ setup_bg (manager); - - gnome_settings_profile_end (NULL); - diff --git a/community/gnome-settings-daemon-compat/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch deleted file mode 100644 index fe9272767..000000000 --- a/community/gnome-settings-daemon-compat/move-desktop-file.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 23:13:10.169941000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 23:13:41.064001562 +0200 -@@ -9,4 +9,3 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am 2013-04-24 23:13:12.830004000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am 2013-04-24 23:13:36.613896914 +0200 -@@ -21,7 +21,7 @@ - $(SYSTEMD_LIBS) \ - $(AUTOMOUNT_LIBS) - --autostartdir = $(sysconfdir)/xdg/autostart -+autostartdir = $(datadir)/applications - autostart_in_files = gnome-fallback-mount-helper.desktop.in - autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in - autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 23:13:07.229872000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 23:13:43.670729520 +0200 -@@ -9,4 +9,3 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-04-24 23:13:04.913151000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-24 23:13:47.907495798 +0200 -@@ -17,7 +17,7 @@ - $(SETTINGS_PLUGIN_LIBS) \ - $(BACKGROUND_LIBS) - --autostartdir = $(sysconfdir)/xdg/autostart -+autostartdir = $(datadir)/applications - autostart_in_files = gnome-fallback-background-helper.desktop.in - autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in - autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 23:12:58.579668000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 23:13:51.747586073 +0200 -@@ -9,4 +9,3 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am 2013-04-24 23:13:02.026416000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am 2013-04-24 23:13:54.570985777 +0200 -@@ -75,7 +75,7 @@ - $(MEDIA_KEYS_LIBS) \ - -lm - --autostartdir = $(sysconfdir)/xdg/autostart -+autostartdir = $(datadir)/applications - autostart_in_files = gnome-fallback-media-keys-helper.desktop.in - autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in - autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch deleted file mode 100644 index b843ac2ce..000000000 --- a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c ---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c 2013-04-10 17:19:51.796298000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c 2013-04-10 17:31:27.382311947 +0200 -@@ -28,13 +28,43 @@ - #include <glib/gi18n.h> - #include <gio/gio.h> - --#include "gnome-settings-profile.h" --#include "gnome-settings-session.h" - #include "gsd-automount-manager.h" - #include "gsd-autorun.h" - - #define GSD_AUTOMOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_AUTOMOUNT_MANAGER, GsdAutomountManagerPrivate)) - -+#define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" -+#define GNOME_SESSION_DBUS_OBJECT "/org/gnome/SessionManager" -+#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager" -+ -+GDBusProxy * -+get_session_proxy (void) -+{ -+ static GDBusProxy *session_proxy; -+ GError *error = NULL; -+ -+ if (session_proxy != NULL) { -+ g_object_ref (session_proxy); -+ } else { -+ session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, -+ G_DBUS_PROXY_FLAGS_NONE, -+ NULL, -+ GNOME_SESSION_DBUS_NAME, -+ GNOME_SESSION_DBUS_OBJECT, -+ GNOME_SESSION_DBUS_INTERFACE, -+ NULL, -+ &error); -+ if (error) { -+ g_warning ("Failed to connect to the session manager: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy); -+ } -+ } -+ -+ return session_proxy; -+} -+ - struct GsdAutomountManagerPrivate - { - GSettings *settings; -@@ -315,7 +345,7 @@ - static void - do_initialize_session (GsdAutomountManager *manager) - { -- manager->priv->session = gnome_settings_session_get_session_proxy (); -+ manager->priv->session = get_session_proxy (); - g_signal_connect (manager->priv->session, "g-properties-changed", - G_CALLBACK (session_props_changed), manager); - session_props_changed (manager->priv->session, NULL, NULL, manager); -@@ -490,13 +520,10 @@ - GError **error) - { - g_debug ("Starting automounting manager"); -- gnome_settings_profile_start (NULL); - - manager->priv->settings = g_settings_new ("org.gnome.desktop.media-handling"); - setup_automounter (manager); - -- gnome_settings_profile_end (NULL); -- - return TRUE; - } - -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am 2013-04-10 17:33:09.697997021 +0200 -@@ -8,7 +8,6 @@ - gsd-autorun.h - - gnome_fallback_mount_helper_CPPFLAGS = \ -- -I$(top_srcdir)/gnome-settings-daemon \ - -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ - $(AM_CPPFLAGS) - -@@ -20,8 +19,7 @@ - gnome_fallback_mount_helper_LDADD = \ - $(SETTINGS_PLUGIN_LIBS) \ - $(SYSTEMD_LIBS) \ -- $(AUTOMOUNT_LIBS) \ -- $(top_builddir)/gnome-settings-daemon/libgsd.la -+ $(AUTOMOUNT_LIBS) - - autostartdir = $(sysconfdir)/xdg/autostart - autostart_in_files = gnome-fallback-mount-helper.desktop.in -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c 2013-04-10 17:19:51.792965000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c 2013-04-10 17:22:46.930334951 +0200 -@@ -42,7 +42,6 @@ - #include <libgnome-desktop/gnome-bg.h> - #include <X11/Xatom.h> - --#include "gnome-settings-profile.h" - #include "gsd-background-manager.h" - - #define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate)) -@@ -85,8 +84,6 @@ - int i; - - -- gnome_settings_profile_start (NULL); -- - display = gdk_display_get_default (); - n_screens = gdk_display_get_n_screens (display); - -@@ -121,8 +118,6 @@ - - cairo_surface_destroy (surface); - } -- -- gnome_settings_profile_end (NULL); - } - - static void -@@ -309,14 +304,11 @@ - gboolean show_desktop_icons; - - g_debug ("Starting background manager"); -- gnome_settings_profile_start (NULL); - - manager->priv->settings = g_settings_new ("org.gnome.desktop.background"); - - setup_bg (manager); - -- gnome_settings_profile_end (NULL); -- - return TRUE; - } - -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-04-10 17:43:32.768975155 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-10 17:43:19.115328380 +0200 -@@ -6,18 +6,16 @@ - gsd-background-manager.h - - gnome_fallback_background_helper_CPPFLAGS = \ -- -I$(top_srcdir)/gnome-settings-daemon \ - -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ - $(AM_CPPFLAGS) - - gnome_fallback_background_helper_CFLAGS = \ - $(SETTINGS_PLUGIN_CFLAGS) \ - $(BACKGROUND_CFLAGS) - - gnome_fallback_background_helper_LDADD = \ - $(SETTINGS_PLUGIN_LIBS) \ -- $(BACKGROUND_LIBS) \ -- $(top_builddir)/gnome-settings-daemon/libgsd.la -+ $(BACKGROUND_LIBS) - - autostartdir = $(sysconfdir)/xdg/autostart - autostart_in_files = gnome-fallback-background-helper.desktop.in diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch deleted file mode 100644 index dc769de4e..000000000 --- a/community/gnome-settings-daemon-compat/revert-input-sources.patch +++ /dev/null @@ -1,123 +0,0 @@ -From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001 -From: Rui Matos <tiagomatos@gmail.com> -Date: Wed, 12 Dec 2012 09:31:40 +0000 -Subject: Revert "media-keys: Add key bindings to switch input sources" - -These are now provided by gnome-shell. - -This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d. - -https://bugzilla.gnome.org/show_bug.cgi?id=690106 ---- -diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in -index b56b5d1..25e5f3e 100644 ---- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in -+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in -@@ -175,16 +175,6 @@ - <_summary>Magnifier zoom out</_summary> - <_description>Binding for the magnifier to zoom out</_description> - </key> -- <key name="switch-input-source" type="s"> -- <default>''</default> -- <_summary>Switch input source</_summary> -- <_description>Binding to select the next input source</_description> -- </key> -- <key name="switch-input-source-backward" type="s"> -- <default>''</default> -- <_summary>Switch input source backward</_summary> -- <_description>Binding to select the previous input source</_description> -- </key> - </schema> - - <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"> -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index e5977d0..cd6fbc2 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -98,10 +98,6 @@ static const gchar introspection_xml[] = - #define VOLUME_STEP 6 /* percents for one volume button press */ - #define MAX_VOLUME 65536.0 - --#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" --#define KEY_CURRENT_INPUT_SOURCE "current" --#define KEY_INPUT_SOURCES "sources" -- - #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - - typedef struct { -@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager, - } - - static void --do_switch_input_source_action (GsdMediaKeysManager *manager, -- MediaKeyType type) --{ -- GSettings *settings; -- GVariant *sources; -- gint i, n; -- -- settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR); -- sources = g_settings_get_value (settings, KEY_INPUT_SOURCES); -- -- n = g_variant_n_children (sources); -- if (n < 2) -- goto out; -- -- i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE); -- -- if (type == SWITCH_INPUT_SOURCE_KEY) -- i += 1; -- else -- i -= 1; -- -- if (i < 0) -- i = n - 1; -- else if (i >= n) -- i = 0; -- -- g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i); -- -- out: -- g_variant_unref (sources); -- g_object_unref (settings); --} -- --static void - do_custom_action (GsdMediaKeysManager *manager, - MediaKey *key, - gint64 timestamp) -@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager, - case BATTERY_KEY: - do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp); - break; -- case SWITCH_INPUT_SOURCE_KEY: -- case SWITCH_INPUT_SOURCE_BACKWARD_KEY: -- do_switch_input_source_action (manager, type); -- break; - /* Note, no default so compiler catches missing keys */ - case CUSTOM_KEY: - g_assert_not_reached (); -diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h -index a16d0e7..437ed2c 100644 ---- a/plugins/media-keys/shortcuts-list.h -+++ b/plugins/media-keys/shortcuts-list.h -@@ -80,8 +80,6 @@ typedef enum { - KEYBOARD_BRIGHTNESS_DOWN_KEY, - KEYBOARD_BRIGHTNESS_TOGGLE_KEY, - BATTERY_KEY, -- SWITCH_INPUT_SOURCE_KEY, -- SWITCH_INPUT_SOURCE_BACKWARD_KEY, - CUSTOM_KEY - } MediaKeyType; - -@@ -148,8 +146,6 @@ static struct { - { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" }, - { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" }, - { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" }, -- { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL }, -- { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL }, - { BATTERY_KEY, NULL, "XF86Battery" }, - }; - --- -cgit v0.9.1 diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch deleted file mode 100644 index dc5fd260e..000000000 --- a/community/gnome-settings-daemon-compat/sessionisactive-port.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 32b0b2d85629ae765543df1d940a5ca3c37dcec1 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Tue, 06 Nov 2012 22:47:05 +0000 -Subject: [wip] Port to gnome-session's SessionIsActive property - -Rather than maintaining the systemd code here, monitor gnome-session's -SessionIsActive property. This allows us to drop the compile-time -dependency on systemd. - -The power plugin is declared dependent on systemd at runtime, but the -rest of the code should operate in more "basic functionality" mode. ---- -(limited to 'plugins/automount') - -diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c -index 7912f19..d8e9e07 100644 ---- a/plugins/automount/gsd-automount-manager.c -+++ b/plugins/automount/gsd-automount-manager.c -@@ -42,7 +42,7 @@ struct GsdAutomountManagerPrivate - GVolumeMonitor *volume_monitor; - unsigned int automount_idle_id; - -- GnomeSettingsSession *session; -+ GDBusProxy *session; - gboolean session_is_active; - gboolean screensaver_active; - guint ss_watch_id; -@@ -288,17 +288,21 @@ mount_added_callback (GVolumeMonitor *monitor, - - - static void --session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointer user_data) -+session_props_changed (GDBusProxy *session, GVariant *v, char **props, gpointer user_data) - { - GsdAutomountManager *manager = user_data; - GsdAutomountManagerPrivate *p = manager->priv; -+ GVariant *active_v = NULL; -+ gboolean is_active; - -- if (gnome_settings_session_get_state (session) == GNOME_SETTINGS_SESSION_STATE_ACTIVE) { -- p->session_is_active = TRUE; -- } -- else { -- p->session_is_active = FALSE; -- } -+ active_v = g_dbus_proxy_get_cached_property (session, "SessionIsActive"); -+ if (!active_v) -+ return; -+ -+ g_variant_get (active_v, "b", &is_active); -+ g_variant_unref (active_v); -+ g_printerr ("AUTOMOUNT: session is active: %d -> %d\n", p->session_is_active, is_active); -+ p->session_is_active = is_active; - - if (!p->session_is_active) { - if (p->volume_queue != NULL) { -@@ -311,10 +315,10 @@ session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointe - static void - do_initialize_session (GsdAutomountManager *manager) - { -- manager->priv->session = gnome_settings_session_new (); -- g_signal_connect (manager->priv->session, "notify::state", -- G_CALLBACK (session_state_changed), manager); -- session_state_changed (manager->priv->session, NULL, manager); -+ manager->priv->session = gnome_settings_session_get_session_proxy (); -+ g_signal_connect (manager->priv->session, "g-properties-changed", -+ G_CALLBACK (session_props_changed), manager); -+ session_props_changed (manager->priv->session, NULL, NULL, manager); - } - - #define SCREENSAVER_NAME "org.gnome.ScreenSaver" --- -cgit v0.9.1 diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch deleted file mode 100644 index b52de042f..000000000 --- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch +++ /dev/null @@ -1,437 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in ---- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-10 17:39:36.446882275 +0200 -@@ -2,7 +2,6 @@ - <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins" path="/org/gnome/settings-daemon/plugins/"> - <child name="a11y-keyboard" schema="org.gnome.settings-daemon.plugins.a11y-keyboard"/> - <child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/> -- <child name="background" schema="org.gnome.settings-daemon.plugins.background"/> - <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/> - <child name="color" schema="org.gnome.settings-daemon.plugins.color"/> - <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/> -@@ -45,18 +44,6 @@ - <_summary>Priority to use for this plugin</_summary> - <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description> - </key> -- </schema> -- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.background" path="/org/gnome/settings-daemon/plugins/background/"> -- <key name="active" type="b"> -- <default>true</default> -- <_summary>Activation of this plugin</_summary> -- <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description> -- </key> -- <key name="priority" type="i"> -- <default>97</default> -- <_summary>Priority to use for this plugin</_summary> -- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description> -- </key> - </schema> - <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard" path="/org/gnome/settings-daemon/plugins/clipboard/"> - <key name="active" type="b"> -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in 2012-04-07 15:21:20.000000000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100 -@@ -1,8 +0,0 @@ --[GNOME Settings Plugin] --Module=background --IAge=0 --_Name=Background --_Description=Background plugin --Authors= --Copyright=Copyright © 2007 --Website= -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c 2013-04-10 17:39:36.450215685 +0200 -@@ -0,0 +1,65 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * Author: Tomas Bzatek <tbzatek@redhat.com> -+ */ -+ -+#include "config.h" -+ -+#include <glib.h> -+#include <glib/gi18n.h> -+#include <unistd.h> -+#include <gtk/gtk.h> -+ -+#include "gsd-background-manager.h" -+ -+int -+main (int argc, -+ char **argv) -+{ -+ GMainLoop *loop; -+ GsdBackgroundManager *manager; -+ GError *error = NULL; -+ -+ g_type_init (); -+ gtk_init (&argc, &argv); -+ -+ bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR); -+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -+ textdomain (GETTEXT_PACKAGE); -+ -+ loop = g_main_loop_new (NULL, FALSE); -+ manager = gsd_background_manager_new (); -+ -+ gsd_background_manager_start (manager, &error); -+ -+ if (error != NULL) { -+ g_printerr ("Unable to start the background manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ _exit (1); -+ } -+ -+ g_main_loop_run (loop); -+ -+ gsd_background_manager_stop (manager); -+ g_main_loop_unref (loop); -+ -+ return 0; -+} -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 17:39:36.450215685 +0200 -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+_Name=Background -+_Comment=Background plugin -+Exec=@LIBEXECDIR@/gnome-fallback-background-helper -+Icon=desktop -+Terminal=false -+Type=Application -+Categories= -+NoDisplay=true -+OnlyShowIn=GNOME;Unity; -+X-GNOME-Autostart-Notify=true -+AutostartCondition=GNOME3 if-session gnome-fallback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,104 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- * -- */ -- --#include "config.h" -- --#include <glib/gi18n-lib.h> --#include <gmodule.h> -- --#include "gnome-settings-plugin.h" --#include "gsd-background-plugin.h" --#include "gsd-background-manager.h" -- --struct GsdBackgroundPluginPrivate { -- GsdBackgroundManager *manager; --}; -- --#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate)) -- --GNOME_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin) -- --static void --gsd_background_plugin_init (GsdBackgroundPlugin *plugin) --{ -- plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin); -- -- g_debug ("GsdBackgroundPlugin initializing"); -- -- plugin->priv->manager = gsd_background_manager_new (); --} -- --static void --gsd_background_plugin_finalize (GObject *object) --{ -- GsdBackgroundPlugin *plugin; -- -- g_return_if_fail (object != NULL); -- g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object)); -- -- g_debug ("GsdBackgroundPlugin finalizing"); -- -- plugin = GSD_BACKGROUND_PLUGIN (object); -- -- g_return_if_fail (plugin->priv != NULL); -- -- if (plugin->priv->manager != NULL) { -- g_object_unref (plugin->priv->manager); -- } -- -- G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object); --} -- --static void --impl_activate (GnomeSettingsPlugin *plugin) --{ -- gboolean res; -- GError *error; -- -- g_debug ("Activating background plugin"); -- -- error = NULL; -- res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error); -- if (! res) { -- g_warning ("Unable to start background manager: %s", error->message); -- g_error_free (error); -- } --} -- --static void --impl_deactivate (GnomeSettingsPlugin *plugin) --{ -- g_debug ("Deactivating background plugin"); -- gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager); --} -- --static void --gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass) --{ -- GObjectClass *object_class = G_OBJECT_CLASS (klass); -- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); -- -- object_class->finalize = gsd_background_plugin_finalize; -- -- plugin_class->activate = impl_activate; -- plugin_class->deactivate = impl_deactivate; -- -- g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate)); --} -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,59 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- * -- */ -- --#ifndef __GSD_BACKGROUND_PLUGIN_H__ --#define __GSD_BACKGROUND_PLUGIN_H__ -- --#include <glib.h> --#include <glib-object.h> --#include <gmodule.h> -- --#include "gnome-settings-plugin.h" -- --G_BEGIN_DECLS -- --#define GSD_TYPE_BACKGROUND_PLUGIN (gsd_background_plugin_get_type ()) --#define GSD_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin)) --#define GSD_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass)) --#define GSD_IS_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN)) --#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN)) --#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass)) -- --typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate; -- --typedef struct --{ -- GnomeSettingsPlugin parent; -- GsdBackgroundPluginPrivate *priv; --} GsdBackgroundPlugin; -- --typedef struct --{ -- GnomeSettingsPluginClass parent_class; --} GsdBackgroundPluginClass; -- --GType gsd_background_plugin_get_type (void) G_GNUC_CONST; -- --/* All the plugins must implement this function */ --G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); -- --G_END_DECLS -- --#endif /* __GSD_BACKGROUND_PLUGIN_H__ */ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-10 17:40:20.117885180 +0200 -@@ -1,80 +1,34 @@ --NULL = -+libexec_PROGRAMS = gnome-fallback-background-helper - --plugin_name = background -+gnome_fallback_background_helper_SOURCES = \ -+ gnome-fallback-background-helper.c \ -+ gsd-background-manager.c \ -+ gsd-background-manager.h - --libexec_PROGRAMS = gsd-test-background -- --gsd_test_background_SOURCES = \ -- test-background.c \ -- gsd-background-manager.h \ -- gsd-background-manager.c \ -- $(NULL) -- --gsd_test_background_CPPFLAGS = \ -+gnome_fallback_background_helper_CPPFLAGS = \ - -I$(top_srcdir)/gnome-settings-daemon \ -- -I$(top_srcdir)/plugins/common \ - -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ - $(AM_CPPFLAGS) - --gsd_test_background_CFLAGS = \ -- $(PLUGIN_CFLAGS) \ -+gnome_fallback_background_helper_CFLAGS = \ - $(SETTINGS_PLUGIN_CFLAGS) \ -- $(BACKGROUND_CFLAGS) \ -- $(AM_CFLAGS) -- --gsd_test_background_LDADD = \ -- $(top_builddir)/gnome-settings-daemon/libgsd.la \ -- $(SETTINGS_PLUGIN_LIBS) \ -- $(BACKGROUND_LIBS) \ -- $(NULL) -- --plugin_LTLIBRARIES = \ -- libbackground.la \ -- $(NULL) -- --libbackground_la_SOURCES = \ -- gsd-background-plugin.h \ -- gsd-background-plugin.c \ -- gsd-background-manager.h \ -- gsd-background-manager.c \ -- $(NULL) -+ $(BACKGROUND_CFLAGS) - --libbackground_la_CPPFLAGS = \ -- -I$(top_srcdir)/gnome-settings-daemon \ -- -I$(top_srcdir)/plugins/background/libbackground \ -- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ -- $(AM_CPPFLAGS) -- --libbackground_la_CFLAGS = \ -- $(SETTINGS_PLUGIN_CFLAGS) \ -- $(BACKGROUND_CFLAGS) \ -- $(AM_CFLAGS) -- --libbackground_la_LDFLAGS = \ -- $(GSD_PLUGIN_LDFLAGS) \ -- $(NULL) -- --libbackground_la_LIBADD = \ -+gnome_fallback_background_helper_LDADD = \ - $(SETTINGS_PLUGIN_LIBS) \ - $(BACKGROUND_LIBS) \ -- $(NULL) -- --plugin_in_files = \ -- background.gnome-settings-plugin.in \ -- $(NULL) -+ $(top_builddir)/gnome-settings-daemon/libgsd.la - --plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) -+autostartdir = $(sysconfdir)/xdg/autostart -+autostart_in_files = gnome-fallback-background-helper.desktop.in -+autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in -+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) - --EXTRA_DIST = \ -- $(plugin_in_files) \ -- $(NULL) -+$(autostart_in_files): $(autostart_in_in_files) -+ @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ - --CLEANFILES = \ -- $(plugin_DATA) \ -- $(NULL) -+@INTLTOOL_DESKTOP_RULE@ - --DISTCLEANFILES = \ -- $(plugin_DATA) \ -- $(NULL) -+EXTRA_DIST = $(autostart_in_in_files) - --@GSD_INTLTOOL_PLUGIN_RULE@ -+CLEANFILES = $(autostart_DATA) $(autostart_in_files) -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c gnome-settings-daemon-3.6.4/plugins/background/test-background.c ---- gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c 2012-06-01 22:02:53.000000000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/test-background.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,7 +0,0 @@ --#define NEW gsd_background_manager_new --#define START gsd_background_manager_start --#define STOP gsd_background_manager_stop --#define MANAGER GsdBackgroundManager --#include "gsd-background-manager.h" -- --#include "test-plugin.h" -diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in ---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/po/POTFILES.in 2013-04-10 17:39:36.450215685 +0200 -@@ -21,9 +21,9 @@ - [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui - [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in - plugins/automount/gnome-fallback-mount-helper.desktop.in.in -+plugins/background/gnome-fallback-background-helper.desktop.in.in - plugins/automount/gsd-automount-manager.c - plugins/automount/gsd-autorun.c --[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in - [type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in - [type: gettext/ini]plugins/color/color.gnome-settings-plugin.in - plugins/color/gsd-color-manager.c -diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip ---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip 2012-04-07 18:58:07.000000000 +0200 -+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip 2013-04-10 17:39:36.453549095 +0200 -@@ -20,6 +20,7 @@ - data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in - data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in - data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in -+plugins/background/gnome-fallback-background-helper.desktop.in - plugins/automount/gnome-fallback-mount-helper.desktop.in - plugins/power/org.gnome.settings-daemon.plugins.power.policy.in - plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch deleted file mode 100644 index 61be1737e..000000000 --- a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch +++ /dev/null @@ -1,564 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in ---- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-24 03:11:02.893859531 +0200 -+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-24 13:43:11.128884064 +0200 -@@ -9,7 +9,6 @@ - <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/> - <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/> - <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/> -- <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/> - <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/> - <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/> - <child name="power" schema="org.gnome.settings-daemon.plugins.power"/> -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c 2013-04-24 13:43:11.132217470 +0200 -@@ -0,0 +1,65 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * Author: Tomas Bzatek <tbzatek@redhat.com> -+ */ -+ -+#include "config.h" -+ -+#include <glib.h> -+#include <glib/gi18n.h> -+#include <unistd.h> -+#include <gtk/gtk.h> -+ -+#include "gsd-media-keys-manager.h" -+ -+int -+main (int argc, -+ char **argv) -+{ -+ GMainLoop *loop; -+ GsdMediaKeysManager *manager; -+ GError *error = NULL; -+ -+ g_type_init (); -+ gtk_init (&argc, &argv); -+ -+ bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR); -+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -+ textdomain (GETTEXT_PACKAGE); -+ -+ loop = g_main_loop_new (NULL, FALSE); -+ manager = gsd_media_keys_manager_new (); -+ -+ gsd_media_keys_manager_start (manager, &error); -+ -+ if (error != NULL) { -+ g_printerr ("Unable to start the media-keys manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ _exit (1); -+ } -+ -+ g_main_loop_run (loop); -+ -+ gsd_media_keys_manager_stop (manager); -+ g_main_loop_unref (loop); -+ -+ return 0; -+} -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 13:43:11.132217470 +0200 -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+_Name=Media keys -+_Comment=Media keys plugin -+Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper -+Icon=multimedia -+Terminal=false -+Type=Application -+Categories= -+NoDisplay=true -+OnlyShowIn=GNOME;Unity; -+X-GNOME-Autostart-Notify=true -+AutostartCondition=GNOME3 if-session gnome-fallback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c 2013-04-24 13:43:11.132217470 +0200 -@@ -44,7 +44,6 @@ - #include <gudev/gudev.h> - #endif - --#include "gnome-settings-profile.h" - #include "gsd-marshal.h" - #include "gsd-media-keys-manager.h" - -@@ -622,8 +621,6 @@ - char **custom_paths; - int i; - -- gnome_settings_profile_start (NULL); -- - gdk_error_trap_push (); - - manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free); -@@ -661,8 +658,6 @@ - gdk_flush (); - if (gdk_error_trap_pop ()) - g_warning ("Grab failed for some keys, another application may already have access the them."); -- -- gnome_settings_profile_end (NULL); - } - - static void -@@ -2090,7 +2085,6 @@ - char *theme_name; - - g_debug ("Starting media_keys manager"); -- gnome_settings_profile_start (NULL); - - manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR); - g_signal_connect (G_OBJECT (manager->priv->settings), "changed", -@@ -2137,19 +2131,14 @@ - - /* Start filtering the events */ - for (l = manager->priv->screens; l != NULL; l = l->next) { -- gnome_settings_profile_start ("gdk_window_add_filter"); -- - g_debug ("adding key filter for screen: %d", - gdk_screen_get_number (l->data)); - - gdk_window_add_filter (gdk_screen_get_root_window (l->data), - (GdkFilterFunc) filter_key_events, - manager); -- gnome_settings_profile_end ("gdk_window_add_filter"); - } - -- gnome_settings_profile_end (NULL); -- - manager->priv->start_idle_id = 0; - - return FALSE; -@@ -2161,8 +2150,6 @@ - { - const char * const subsystems[] = { "input", "usb", "sound", NULL }; - -- gnome_settings_profile_start (NULL); -- - if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) { - g_debug ("No Xinput2 support, disabling plugin"); - return TRUE; -@@ -2179,8 +2166,6 @@ - * The rest (grabbing and setting the keys) can happen in an - * idle. - */ -- gnome_settings_profile_start ("gvc_mixer_control_new"); -- - manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys"); - - g_signal_connect (manager->priv->volume, -@@ -2198,14 +2183,10 @@ - - gvc_mixer_control_open (manager->priv->volume); - -- gnome_settings_profile_end ("gvc_mixer_control_new"); -- - manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager); - - register_manager (manager_object); - -- gnome_settings_profile_end (NULL); -- - return TRUE; - } - -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,104 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- * -- */ -- --#include "config.h" -- --#include <glib/gi18n-lib.h> --#include <gmodule.h> -- --#include "gnome-settings-plugin.h" --#include "gsd-media-keys-plugin.h" --#include "gsd-media-keys-manager.h" -- --struct GsdMediaKeysPluginPrivate { -- GsdMediaKeysManager *manager; --}; -- --#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate)) -- --GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin) -- --static void --gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin) --{ -- plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin); -- -- g_debug ("GsdMediaKeysPlugin initializing"); -- -- plugin->priv->manager = gsd_media_keys_manager_new (); --} -- --static void --gsd_media_keys_plugin_finalize (GObject *object) --{ -- GsdMediaKeysPlugin *plugin; -- -- g_return_if_fail (object != NULL); -- g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object)); -- -- g_debug ("GsdMediaKeysPlugin finalizing"); -- -- plugin = GSD_MEDIA_KEYS_PLUGIN (object); -- -- g_return_if_fail (plugin->priv != NULL); -- -- if (plugin->priv->manager != NULL) { -- g_object_unref (plugin->priv->manager); -- } -- -- G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object); --} -- --static void --impl_activate (GnomeSettingsPlugin *plugin) --{ -- gboolean res; -- GError *error; -- -- g_debug ("Activating media_keys plugin"); -- -- error = NULL; -- res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error); -- if (! res) { -- g_warning ("Unable to start media_keys manager: %s", error->message); -- g_error_free (error); -- } --} -- --static void --impl_deactivate (GnomeSettingsPlugin *plugin) --{ -- g_debug ("Deactivating media_keys plugin"); -- gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager); --} -- --static void --gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass) --{ -- GObjectClass *object_class = G_OBJECT_CLASS (klass); -- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); -- -- object_class->finalize = gsd_media_keys_plugin_finalize; -- -- plugin_class->activate = impl_activate; -- plugin_class->deactivate = impl_deactivate; -- -- g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate)); --} -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,59 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- * -- */ -- --#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__ --#define __GSD_MEDIA_KEYS_PLUGIN_H__ -- --#include <glib.h> --#include <glib-object.h> --#include <gmodule.h> -- --#include "gnome-settings-plugin.h" -- --G_BEGIN_DECLS -- --#define GSD_TYPE_MEDIA_KEYS_PLUGIN (gsd_media_keys_plugin_get_type ()) --#define GSD_MEDIA_KEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin)) --#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass)) --#define GSD_IS_MEDIA_KEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN)) --#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN)) --#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass)) -- --typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate; -- --typedef struct --{ -- GnomeSettingsPlugin parent; -- GsdMediaKeysPluginPrivate *priv; --} GsdMediaKeysPlugin; -- --typedef struct --{ -- GnomeSettingsPluginClass parent_class; --} GsdMediaKeysPluginClass; -- --GType gsd_media_keys_plugin_get_type (void) G_GNUC_CONST; -- --/* All the plugins must implement this function */ --G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); -- --G_END_DECLS -- --#endif /* __GSD_MEDIA_KEYS_PLUGIN_H__ */ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am 2013-04-24 14:26:01.414463895 +0200 -@@ -1,17 +1,11 @@ - icondir = $(datadir)/icons/hicolor - context = actions - --plugin_name = media-keys -- --NULL = -- - SUBDIRS = cut-n-paste --plugin_LTLIBRARIES = libmedia-keys.la - - BUILT_SOURCES = \ - gsd-marshal.h \ -- gsd-marshal.c \ -- $(NULL) -+ gsd-marshal.c - - gsd-marshal.c: gsd-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@ -@@ -19,62 +13,16 @@ - gsd-marshal.h: gsd-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@ - --libmedia_keys_la_SOURCES = \ -- gsd-media-keys-plugin.h \ -- gsd-media-keys-plugin.c \ -- gsd-media-keys-manager.h \ -- gsd-media-keys-manager.c \ -- gsd-osd-window.c \ -- gsd-osd-window.h \ -- gsd-osd-window-private.h \ -- shortcuts-list.h \ -- $(BUILT_SOURCES) \ -- $(NULL) -- --libmedia_keys_la_CPPFLAGS = \ -- -I$(top_srcdir)/data/ \ -- -I$(top_srcdir)/gnome-settings-daemon \ -- -I$(top_srcdir)/plugins/common \ -- -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ -- -DBINDIR=\"$(bindir)\" \ -- -DPIXMAPDIR=\""$(pkgdatadir)"\" \ -- -DGTKBUILDERDIR=\""$(pkgdatadir)"\" \ -- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ -- $(AM_CPPFLAGS) -- --libmedia_keys_la_CFLAGS = \ -- $(PLUGIN_CFLAGS) \ -- $(SETTINGS_PLUGIN_CFLAGS) \ -- $(MEDIA_KEYS_CFLAGS) \ -- $(AM_CFLAGS) -- --libmedia_keys_la_LDFLAGS = \ -- $(GSD_PLUGIN_LDFLAGS) -- --libmedia_keys_la_LIBADD = \ -- $(top_builddir)/plugins/common/libcommon.la \ -- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ -- $(MEDIA_KEYS_LIBS) \ -- $(SETTINGS_PLUGIN_LIBS) \ -- -lm -- --plugin_in_files = \ -- media-keys.gnome-settings-plugin.in -- --plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) -- - noinst_PROGRAMS = test-media-window - - test_media_window_SOURCES = \ - gsd-osd-window.c \ - gsd-osd-window.h \ - gsd-osd-window-private.h \ -- test-media-window.c \ -- $(NULL) -+ test-media-window.c - - test_media_window_CPPFLAGS = \ - -I$(top_srcdir)/data/ \ -- -I$(top_srcdir)/gnome-settings-daemon \ - -I$(top_srcdir)/plugins/common \ - -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ - -DDATADIR=\""$(datadir)"\" \ -@@ -93,21 +41,19 @@ - $(SETTINGS_PLUGIN_LIBS) \ - -lm - --libexec_PROGRAMS = gsd-test-media-keys -+libexec_PROGRAMS = gnome-fallback-media-keys-helper - --gsd_test_media_keys_SOURCES = \ -+gnome_fallback_media_keys_helper_SOURCES = \ - gsd-media-keys-manager.c \ - gsd-media-keys-manager.h \ - gsd-osd-window.c \ - gsd-osd-window.h \ - gsd-osd-window-private.h \ -- test-media-keys.c \ -- $(BUILT_SOURCES) \ -- $(NULL) -+ gnome-fallback-media-keys-helper.c \ -+ $(BUILT_SOURCES) - --gsd_test_media_keys_CPPFLAGS = \ -+gnome_fallback_media_keys_helper_CPPFLAGS = \ - -I$(top_srcdir)/data/ \ -- -I$(top_srcdir)/gnome-settings-daemon \ - -I$(top_srcdir)/plugins/common \ - -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ - -DBINDIR=\"$(bindir)\" \ -@@ -116,14 +62,12 @@ - -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ - $(AM_CPPFLAGS) - --gsd_test_media_keys_CFLAGS = \ -+gnome_fallback_media_keys_helper_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - $(SETTINGS_PLUGIN_CFLAGS) \ -- $(MEDIA_KEYS_CFLAGS) \ -- $(AM_CFLAGS) -+ $(MEDIA_KEYS_CFLAGS) - --gsd_test_media_keys_LDADD = \ -- $(top_builddir)/gnome-settings-daemon/libgsd.la \ -+gnome_fallback_media_keys_helper_LDADD = \ - $(top_builddir)/plugins/common/libcommon.la \ - $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ - $(SETTINGS_DAEMON_LIBS) \ -@@ -131,17 +75,24 @@ - $(MEDIA_KEYS_LIBS) \ - -lm - -+autostartdir = $(sysconfdir)/xdg/autostart -+autostart_in_files = gnome-fallback-media-keys-helper.desktop.in -+autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in -+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -+ -+$(autostart_in_files): $(autostart_in_in_files) -+ @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ -+ -+@INTLTOOL_DESKTOP_RULE@ -+ - EXTRA_DIST = \ - gsd-marshal.list \ - README.media-keys-API \ - test-media-window-clutter.c \ -- $(plugin_in_files) -+ $(autostart_in_in_files) - - CLEANFILES = \ - $(BUILT_SOURCES) \ -- $(plugin_DATA) -- --DISTCLEANFILES = \ -- $(plugin_DATA) -+ $(autostart_DATA) \ -+ $(autostart_in_files) - --@GSD_INTLTOOL_PLUGIN_RULE@ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in 2012-04-07 15:21:20.000000000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100 -@@ -1,8 +0,0 @@ --[GNOME Settings Plugin] --Module=media-keys --IAge=0 --_Name=Media keys --_Description=Media keys plugin --Authors= --Copyright=Copyright © 2007 --Website= -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c 2012-06-01 22:02:53.000000000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,7 +0,0 @@ --#define NEW gsd_media_keys_manager_new --#define START gsd_media_keys_manager_start --#define STOP gsd_media_keys_manager_stop --#define MANAGER GsdMediaKeysManager --#include "gsd-media-keys-manager.h" -- --#include "test-plugin.h" -diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in ---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in 2013-04-24 03:11:02.897192946 +0200 -+++ gnome-settings-daemon-3.6.4/po/POTFILES.in 2013-04-24 13:43:11.132217470 +0200 -@@ -34,7 +34,7 @@ - [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in - plugins/media-keys/cut-n-paste/gvc-mixer-control.c - plugins/media-keys/gsd-media-keys-manager.c --[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in -+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in - plugins/mouse/gsd-mouse-manager.c - [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in - plugins/power/gpm-common.c -diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip ---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip 2013-04-24 03:11:02.897192946 +0200 -+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip 2013-04-24 13:43:11.132217470 +0200 -@@ -22,5 +22,6 @@ - data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in - plugins/background/gnome-fallback-background-helper.desktop.in - plugins/automount/gnome-fallback-mount-helper.desktop.in -+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in - plugins/power/org.gnome.settings-daemon.plugins.power.policy.in - plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch deleted file mode 100644 index 67c8082cb..000000000 --- a/community/gnome-settings-daemon-compat/xinput.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Thu, 07 Feb 2013 04:14:22 +0000 -Subject: Fix media-keys handling with GTK+ 3.7.8 - -GDK now requests XI 2.3 and if the X server supports that -version, subsequent requests for a lower version yield -a BadValue. Therefore, we need to change the code in -gsd-input-helper.c to request 2.3 as well. ---- -diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c -index 54427af..d5d2a2a 100644 ---- a/plugins/common/gsd-input-helper.c -+++ b/plugins/common/gsd-input-helper.c -@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode) - gdk_error_trap_push (); - - major = 2; -- minor = 0; -+ minor = 3; - - if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { - gdk_error_trap_pop_ignored (); -- /* try for 2.2, maybe gtk has already announced 2.2 support */ -- gdk_error_trap_push (); -- major = 2; -- minor = 2; -- if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { -- gdk_error_trap_pop_ignored (); - return FALSE; -- } - } - gdk_error_trap_pop_ignored (); - --- -cgit v0.9.1 diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD index 92b298cc3..38b16959f 100644 --- a/community/gnonlin/PKGBUILD +++ b/community/gnonlin/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 76165 2012-09-12 12:34:14Z arodseth $ +# $Id: PKGBUILD 98219 2013-10-07 15:43:14Z spupykin $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gnonlin -pkgver=0.10.17 +pkgver=1.1.90 pkgrel=1 pkgdesc='Library for creating non-linear video editors' arch=('x86_64' 'i686' 'mips64el') url='http://gnonlin.sourceforge.net/' -depends=('gstreamer0.10>=0.10.36') -makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig') +depends=('gstreamer') +makedepends=('python' 'gst-plugins-base' 'pkgconfig') options=('!libtool') license=('LGPL') -source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2") +source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz") sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935') +sha256sums=('b2214ee45583a4532d110e852e2aecf787cefa8fe50f44c8234fb55713feba61') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index 5df0d8411..fa8d3e7c7 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81579 2012-12-24 15:01:10Z spupykin $ +# $Id: PKGBUILD 98195 2013-10-07 12:08:31Z jgc $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD index f09db2909..f10250f97 100644 --- a/community/gnustep-back/PKGBUILD +++ b/community/gnustep-back/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90152 2013-05-07 13:33:45Z spupykin $ +# $Id: PKGBUILD 96988 2013-09-09 20:00:16Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back pkgver=0.23.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index be49f8bec..385a1aa33 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96475 2013-08-30 14:07:55Z spupykin $ +# $Id: PKGBUILD 96986 2013-09-09 19:51:14Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base pkgver=1.24.5 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index c13045c9f..83a323edb 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94925 2013-08-01 07:01:18Z bpiotrowski $ +# $Id: PKGBUILD 96990 2013-09-09 20:20:00Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.23.1 -pkgrel=2 +pkgrel=3 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" diff --git a/community/gnustep-make/ChangeLog b/community/gnustep-make/ChangeLog new file mode 100644 index 000000000..15622ab88 --- /dev/null +++ b/community/gnustep-make/ChangeLog @@ -0,0 +1,2 @@ +2007-06-27 tardo <tardo@nagi-fanboi.net> +* version upgrade diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD index 4afbd0cc9..c33c4a79f 100644 --- a/community/gnustep-make/PKGBUILD +++ b/community/gnustep-make/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 69454 2012-04-16 13:51:34Z spupykin $ +# $Id: PKGBUILD 96982 2013-09-09 19:40:39Z bgyorgy $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-make -pkgver=2.6.4 -pkgrel=1.1 +pkgver=2.6.5 +pkgrel=2 pkgdesc="The GNUstep make package" -arch=('mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=('GPL') depends=() conflicts=('gnustep-make-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('c5617da024add87ce9b09726bb9328a6') +md5sums=('1e143d2c920cef02535ab533af8b1846') build() { cd $srcdir/$pkgname-$pkgver @@ -25,8 +25,11 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - sed -i 's|GNUSTEP_HOST_CPU=.*|GNUSTEP_HOST_CPU=mips64el|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh - sed -i 's|GNUSTEP_HOST=.*|GNUSTEP_HOST=mips64el-unknown-linux-gnu|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh + if [ "$CARCH" = "mips64el" ]; then + sed -i 's|GNUSTEP_HOST_CPU=.*|GNUSTEP_HOST_CPU=mips64el|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh + sed -i 's|GNUSTEP_HOST=.*|GNUSTEP_HOST=mips64el-unknown-linux-gnu|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh + fi + install -D -m755 \ $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ $pkgdir/etc/profile.d/GNUstep.sh diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD index 4af762a6f..54b43ad5b 100644 --- a/community/goaccess/PKGBUILD +++ b/community/goaccess/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95903 2013-08-18 15:28:38Z fyan $ +# $Id: PKGBUILD 98175 2013-10-07 01:47:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Josh VanderLinden <arch@cloudlery.com> # Contributor: Nicolas Storme <nicolas@atelier-web.com> pkgname=goaccess -pkgver=0.6 +pkgver=0.6.1 pkgrel=1 pkgdesc="An open source real-time web log analyzer and interactive viewer" arch=('i686' 'x86_64' 'mips64el') @@ -24,4 +24,4 @@ package() { make prefix="$pkgdir/usr" install } -sha512sums=('cd3fb241a9d84f2f9023c179a96d441f7f7d52e9c7227b31a3a18761c60ae6abdbfc70799c0a2c5ceb8788afd36eeaaf55ed7944310fb5809dd403d7fe09dfbd') +sha512sums=('67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b') diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index a615d0664..75788ba61 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,30 +1,36 @@ -# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ +# $Id: PKGBUILD 96817 2013-09-05 20:34:32Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: m0rph <m0rph.mailbox@gmail.com> pkgname=goldendict pkgver=1.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64' 'mips64el') url="http://goldendict.berlios.de/" license=('GPL3') depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon') -makedepends=('patch') provides=('stardict') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 $pkgname-paths.diff - gcc47.patch) + gcc47.patch + fix-wikipedia-images.patch) sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589' - '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e') + '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e' + 'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7') -build(){ +prepare(){ cd ${srcdir} patch -Np0 -i ${srcdir}/$pkgname-paths.diff patch -p1 -i ${srcdir}/gcc47.patch + patch -Np1 -i ${srcdir}/fix-wikipedia-images.patch +} + +build(){ + cd ${srcdir} qmake-qt4 make diff --git a/community/goldendict/fix-wikipedia-images.patch b/community/goldendict/fix-wikipedia-images.patch new file mode 100644 index 000000000..ea28bcd91 --- /dev/null +++ b/community/goldendict/fix-wikipedia-images.patch @@ -0,0 +1,26 @@ +From 8c056589e989781c6ed5aac7491c802414489ae9 Mon Sep 17 00:00:00 2001 +From: Abs62 <ottomann@yandex.ru> +Date: Sat, 22 Oct 2011 15:52:52 +0400 +Subject: [PATCH] Fix Wikipedia images loading + +--- + mediawiki.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mediawiki.cc b/mediawiki.cc +index e67fdb3..9fff3dc 100644 +--- a/mediawiki.cc ++++ b/mediawiki.cc +@@ -293,6 +293,9 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r ) + // Replace the href="/foo/bar/Baz" to just href="Baz". + articleString.replace( QRegExp( "<a\\shref=\"/([\\w\\.]*/)*" ), "<a href=\"" ); + ++ // Add "http:" to image source urls ++ articleString.replace( " src=\"//", " src=\"http://" ); ++ + // In those strings, change any underscores to spaces + for( ; ; ) + { +-- +1.8.4 + diff --git a/community/gst-editing-services/PKGBUILD b/community/gst-editing-services/PKGBUILD new file mode 100644 index 000000000..c7c38a563 --- /dev/null +++ b/community/gst-editing-services/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 98225 2013-10-07 15:51:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Lubosz Sarnecki <lubosz@gmail.com> +# Contributor: Kerrick Staley <mail@kerrickstaley.com> +# Contributor: Thijs Vermeir <thijsvermeir@gmail.com> + +pkgname=gst-editing-services +pkgver=1.1.90.1.1774.fb6aabf +pkgrel=1 +pkgdesc='GStreamer editing services (Git version)' +arch=('i686' 'x86_64') +license=('LGPL') +url='http://gstreamer.freedesktop.org/modules/gst-editing-services.html' +depends=('gst-plugins-base') +makedepends=('git' 'intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +source=('git://anongit.freedesktop.org/gstreamer/gst-editing-services') +sha256sums=('SKIP') + +pkgver() { + cd $srcdir/gst-editing-services + version=$(grep AC_INIT configure.ac | sed 's/AC_INIT(GStreamer Editing Services, //' | sed 's/,//') + hash=$(git log --pretty=format:'%h' -n 1) + revision=$(git rev-list --count HEAD) + echo $version.$revision.$hash +} + +build() { + cd $srcdir/gst-editing-services + ./autogen.sh --prefix=/usr + make +} + +package() { + cd $srcdir/gst-editing-services + make DESTDIR="$pkgdir" install +} diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD new file mode 100644 index 000000000..c18cf9d9e --- /dev/null +++ b/community/gst-python/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 98229 2013-10-07 15:57:05Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gst-python +pkgver=1.1.90 +pkgrel=2 +pkgdesc="Python bindings for GStreamer" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('python2-gobject' 'gst-plugins-base') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2) +md5sums=('16d85442b98fab61bab66a53eb571d6a') + +build() { + cd "${srcdir}/gst-python-${pkgver}" + export PYTHON=python2 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/gst-python-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/gtest/PKGBUILD b/community/gtest/PKGBUILD index c77f111ed..c19a0a435 100644 --- a/community/gtest/PKGBUILD +++ b/community/gtest/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 80934 2012-12-07 06:58:41Z fyan $ +# $Id: PKGBUILD 97632 2013-09-26 06:11:28Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Alexandre Bique <bique.alexandre@gmail.com> # Contributor: Louis R. Marascio <lrm@fitnr.com> # Contributor: Cody Maloney <cmaloney@theoreticalchaos.com> pkgname=gtest -pkgver=1.6.0 -pkgrel=7 +pkgver=1.7.0 +pkgrel=1 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/googletest/" @@ -15,7 +15,6 @@ options=('!libtool') depends=('gcc-libs' 'sh') makedepends=('python2' 'cmake') source=("http://googletest.googlecode.com/files/$pkgname-$pkgver.zip") -sha1sums=('00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,14 +29,15 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - mkdir -pm 0755 $pkgdir/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake} - install -m 0644 build/libgtest{,_main}.so $pkgdir/usr/lib/ - install -m 0644 include/gtest/*.h $pkgdir/usr/include/gtest/ - install -m 0644 include/gtest/internal/*.h $pkgdir/usr/include/gtest/internal/ - install -m 0644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - install -m 0644 $srcdir/$pkgname-$pkgver/fused-src/gtest/* $pkgdir/usr/src/gtest/src - install -m 0644 $srcdir/$pkgname-$pkgver/CMakeLists.txt $pkgdir/usr/src/gtest - install -m 0644 $srcdir/$pkgname-$pkgver/cmake/* $pkgdir/usr/src/gtest/cmake + mkdir -pm 0755 "$pkgdir"/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake} + install -m 0644 build/libgtest{,_main}.so "$pkgdir"/usr/lib + install -m 0644 include/gtest/*.h "$pkgdir"/usr/include/gtest + install -m 0644 include/gtest/internal/*.h "$pkgdir"/usr/include/gtest/internal/ + install -m 0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/ + install -m 0644 "$srcdir/$pkgname-$pkgver/fused-src/gtest"/* "$pkgdir"/usr/src/gtest/src/ + install -m 0644 "$srcdir/$pkgname-$pkgver/CMakeLists.txt" "$pkgdir"/usr/src/gtest/ + install -m 0644 "$srcdir/$pkgname-$pkgver/cmake"/* "$pkgdir"/usr/src/gtest/cmake/ } # vim:set ts=2 sw=2 et: +sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07') diff --git a/community/gtk2fontsel/PKGBUILD b/community/gtk2fontsel/PKGBUILD index f92378248..2f9ae73e6 100644 --- a/community/gtk2fontsel/PKGBUILD +++ b/community/gtk2fontsel/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 67937 2012-03-16 10:28:59Z giovanni $ +# $Id: PKGBUILD 97789 2013-09-29 18:17:04Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gtk2fontsel pkgver=0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Font selection and preview tool" arch=('i686' 'x86_64' 'mips64el') url="http://gtk2fontsel.sourceforge.net/" license=('GPL') depends=('gtk2') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f344018b19b6a818795a4c702770cd9d') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gtk2fontsel.desktop) +sha256sums=('5cd6396fc3c6e7f9bc358cc5ad30592ba446cdb0138a811216497b6453905a68' + 'b827567c26b929256c5df3837019d7f9531ecf5ba5d7ba4a16f339ea0288d332') build() { cd ${srcdir}/$pkgname-$pkgver @@ -24,4 +25,6 @@ package() { cd ${srcdir}/$pkgname-$pkgver make prefix=${pkgdir}/usr install + install -D -m644 ${srcdir}/gtk2fontsel.desktop \ + ${pkgdir}/usr/share/applications/gtk2fontsel.desktop } diff --git a/community/gtk2fontsel/gtk2fontsel.desktop b/community/gtk2fontsel/gtk2fontsel.desktop new file mode 100644 index 000000000..db6da5f4f --- /dev/null +++ b/community/gtk2fontsel/gtk2fontsel.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=gtk2fontsel +GenericName=gtk2fontsel +Exec=gtk2fontsel +Terminal=false +Type=Application +Categories=System;GTK; +Comment=Font selection and preview tool diff --git a/community/gtkglarea/PKGBUILD b/community/gtkglarea/PKGBUILD new file mode 100644 index 000000000..11d03fa3e --- /dev/null +++ b/community/gtkglarea/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Andreas B. Wagner <AndreasBWagner@pointfree.net> +# Contributor: arjan <arjan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +pkgname=gtkglarea +pkgver=2.0.1 +pkgrel=3 +pkgdesc="GTK/GL Area libraries" +arch=('i686' 'x86_64') +url="http://mono-project.com/GtkGLArea" +license=('GPL') +depends=('gtk2' 'glu') +options=('!libtool') +source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.0/$pkgname-$pkgver.tar.gz") +md5sums=('2a81a86cfa80a920a5454dd00fad2e1d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # DSO link fix + LDFLAGS+=" -lm" \ + ./configure --prefix=/usr \ + --enable-static=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD index 9f9206da1..8db090a6d 100644 --- a/community/gtkspell3/PKGBUILD +++ b/community/gtkspell3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92677 2013-06-12 04:09:55Z bgyorgy $ +# $Id: PKGBUILD 97714 2013-09-27 20:04:38Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gtkspell3 -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 url="http://gtkspell.sourceforge.net/" pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" @@ -14,7 +14,7 @@ depends=('gtk3' 'enchant') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('58f68a0fe9007d9a3d6092b222689320') +md5sums=('d25b547507940738cf016936c3452113') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD deleted file mode 100644 index 1bb2f3054..000000000 --- a/community/gwibber/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=gwibber -pkgver=3.6.0 -pkgrel=4 -pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" -arch=('i686' 'x86_64' 'mips64el') -url="http://gwibber.com/" -license=('GPL') -depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') -makedepends=('intltool' 'vala') -options=('!libtool') -install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - lp_934530.patch - lp_1051801.patch - lp_1088775.patch - gtkspell3-port.patch) -md5sums=('5988e36e9f592c6eca6537ba6878307a' - '8c43ae0ed96c52602befeff640a8672a' - '0eb53f4f248a6c600b6c6dfaac12341f' - '5698a3b1699c018719b193362486c9b5' - 'e8c657543542d8141fdfe4b87a24d7fe') - -build() { - cd "$srcdir/$pkgname-$pkgver" - find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - # Apply some fixes from Ubuntu - patch -Np1 -i "$srcdir/lp_934530.patch" - patch -Np1 -i "$srcdir/lp_1051801.patch" - patch -Np1 -i "$srcdir/lp_1088775.patch" - - # Port to the new gtkspell3 - patch -Np1 -i "$srcdir/gtkspell3-port.patch" - - # Use the standalone accounts configuration panel - sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala - sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py - - # Remove unneeded dependency on libdbusmenu - sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} - - autoreconf -fi - intltoolize --force - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static --disable-schemas-compile --disable-unity - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community/gwibber/gtkspell3-port.patch b/community/gwibber/gtkspell3-port.patch deleted file mode 100644 index a7cc5da37..000000000 --- a/community/gwibber/gtkspell3-port.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac ---- gwibber-3.6.0.orig/configure.ac 2012-10-03 02:09:08.000000000 +0200 -+++ gwibber-3.6.0/configure.ac 2013-03-28 21:34:39.227995294 +0100 -@@ -159,10 +159,10 @@ - - if test "x$enable_spell" = "xyes"; then - PKG_CHECK_MODULES(GTKSPELL, -- gtkspell-3.0) -+ gtkspell3-3.0) - AC_SUBST(GTKSPELL_CFLAGS) - AC_SUBST(GTKSPELL_CFLAGS) -- GTKSPELL_PKG="--pkg gtkspell-3.0" -+ GTKSPELL_PKG="--pkg gtkspell3-3.0" - AC_SUBST(GTKSPELL_PKG) - fi - -diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala ---- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala 2012-08-21 06:14:19.000000000 +0200 -+++ gwibber-3.6.0/libgwibber-gtk/entry.vala 2013-03-28 21:36:32.830637428 +0100 -@@ -141,7 +141,8 @@ - #if HAVE_GTKSPELL - try - { -- var spell = new Gtk.Spell.attach(this, null); -+ var spell = new GtkSpell.Checker(); -+ spell.attach(this); - } - catch (Error e) - { diff --git a/community/gwibber/gwibber.install b/community/gwibber/gwibber.install deleted file mode 100644 index d973d53f7..000000000 --- a/community/gwibber/gwibber.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/gwibber/lp_1051801.patch b/community/gwibber/lp_1051801.patch deleted file mode 100644 index 706c79e54..000000000 --- a/community/gwibber/lp_1051801.patch +++ /dev/null @@ -1,12 +0,0 @@ -=== modified file 'bin/gwibber-service' ---- old/bin/gwibber-service 2012-02-13 20:39:02 +0000 -+++ new/bin/gwibber-service 2012-09-20 06:35:40 +0000 -@@ -74,6 +74,7 @@ - message_monitor = dispatcher.MessagesMonitor() - """ - -+dbus.mainloop.glib.threads_init() - logger.debug("Setting up monitors") - connection_monitor = dispatcher.ConnectionMonitor() - urlshortener = dispatcher.URLShorten() - diff --git a/community/gwibber/lp_1088775.patch b/community/gwibber/lp_1088775.patch deleted file mode 100644 index 2f3b318d0..000000000 --- a/community/gwibber/lp_1088775.patch +++ /dev/null @@ -1,16 +0,0 @@ -=== modified file 'gwibber/microblog/plugins/facebook/__init__.py' ---- old/gwibber/microblog/plugins/facebook/__init__.py 2012-09-24 20:55:20 +0000 -+++ new/gwibber/microblog/plugins/facebook/__init__.py 2013-01-14 15:41:35 +0000 -@@ -326,7 +326,10 @@ - - if data.has_key("privacy"): - m["privacy"] = {} -- m["privacy"]["description"] = data["privacy"]["description"] -+ if data["privacy"].has_key("description"): -+ m["privacy"]["description"] = data["privacy"]["description"] -+ else: -+ m["privacy"]["description"] = "" - m["privacy"]["value"] = data["privacy"]["value"] - - # Handle target for wall posts with a specific recipient - diff --git a/community/gwibber/lp_934530.patch b/community/gwibber/lp_934530.patch deleted file mode 100644 index 6f2bd4302..000000000 --- a/community/gwibber/lp_934530.patch +++ /dev/null @@ -1,21 +0,0 @@ -=== modified file 'gwibber/microblog/network.py' ---- old/gwibber/microblog/network.py 2012-03-31 15:02:54 +0000 -+++ new/gwibber/microblog/network.py 2012-06-13 16:48:52 +0000 -@@ -37,8 +37,14 @@ - logger.error("HTTP Error for %s - error code: %s", e.geturl().split("?")[0], e.getcode()) - self.res = "HTTP error: {0}".format(e.getcode()) - except urllib2.URLError, e: -- logger.error("Network failure: %s", e.reason) -- self.res = "Network error: {0}".format(e.reason) -+ logger.error("Network failure: %s", e.message) -+ self.res = "Network error: {0}".format(e.message) -+ except IOError, e: -+ logger.error("Network failure: %s", e.message) -+ self.res = "Network error: {0}".format(e.message) -+ except: -+ logger.error("Network failure: UNKNOWN") -+ self.res = "Network error: UNKNOWN" - - def get_json(self): - try: - diff --git a/community/haskell-base64-bytestring/PKGBUILD b/community/haskell-base64-bytestring/PKGBUILD deleted file mode 100644 index f74265df9..000000000 --- a/community/haskell-base64-bytestring/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=base64-bytestring -pkgname=haskell-base64-bytestring -pkgver=1.0.0.1 -pkgrel=2 -pkgdesc="Fast base64 encoding and deconding for ByteStrings" -url="https://github.com/bos/base64-bytestring" -license=(custom:BSD3) -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-bytestring') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="$pkgname.install" -sha256sums=('ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-base64-bytestring/haskell-base64-bytestring.install b/community/haskell-base64-bytestring/haskell-base64-bytestring.install deleted file mode 100644 index 434874e99..000000000 --- a/community/haskell-base64-bytestring/haskell-base64-bytestring.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-base64-bytestring - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-blaze-builder/PKGBUILD b/community/haskell-blaze-builder/PKGBUILD deleted file mode 100644 index 03ca1928d..000000000 --- a/community/haskell-blaze-builder/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -pkgname=haskell-blaze-builder -_hkgname=blaze-builder -pkgver=0.3.1.1 -pkgrel=2 -pkgdesc="Efficient buffered output." -url="http://github.com/meiersi/blaze-builder" -license=(custom:BSD3) -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-bytestring' 'haskell-text') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="$pkgname.install" -sha256sums=('a12506f8afd650e4ed90e1e2379750035f8e83032a2d260eacc3757fe52cdcde') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-blaze-builder/haskell-blaze-builder.install b/community/haskell-blaze-builder/haskell-blaze-builder.install deleted file mode 100644 index 1f2b9ed67..000000000 --- a/community/haskell-blaze-builder/haskell-blaze-builder.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-blaze-builder - -# functions -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-blaze-html/PKGBUILD b/community/haskell-blaze-html/PKGBUILD deleted file mode 100644 index 28b88312c..000000000 --- a/community/haskell-blaze-html/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Aleksandar Micovic <metaleks@gmail.com> -_hkgname=blaze-html -pkgname=haskell-blaze-html -pkgver=0.6.1.1 -pkgrel=2 -pkgdesc="A blazingly fast HTML combinator library for Haskell" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc' 'haskell-blaze-builder<0.4' 'haskell-blaze-markup<0.6' 'haskell-bytestring-show' 'haskell-text>=0.11.0.5') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=$pkgname.install -md5sums=('f9eda0a990cda190538b9e6ff73b05f3') - -build() { - cd "${srcdir}/${_hkgname}-${pkgver}" - runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd "${srcdir}/${_hkgname}-${pkgver}" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-blaze-html/haskell-blaze-html.install b/community/haskell-blaze-html/haskell-blaze-html.install deleted file mode 100644 index 9887d3a8d..000000000 --- a/community/haskell-blaze-html/haskell-blaze-html.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-blaze-html - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-blaze-markup/PKGBUILD b/community/haskell-blaze-markup/PKGBUILD deleted file mode 100644 index 6c0d5e4a9..000000000 --- a/community/haskell-blaze-markup/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=blaze-markup -pkgname=haskell-blaze-markup -pkgver=0.5.1.5 -pkgrel=2 -pkgdesc="Core modules of a blazingly fast markup combinator library for the Haskell programming language" -url="http://hackage.haskell.org/package/${_hkgname}" -license=(custom:BSD3) -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-blaze-builder' 'haskell-bytestring-show' 'haskell-text') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=$pkgname.install -md5sums=('faf0c80851b34987e74541b23cef3218') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-blaze-markup/haskell-blaze-markup.install b/community/haskell-blaze-markup/haskell-blaze-markup.install deleted file mode 100644 index fa5fb8064..000000000 --- a/community/haskell-blaze-markup/haskell-blaze-markup.install +++ /dev/null @@ -1,22 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-blaze-markup - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-citeproc-hs/PKGBUILD b/community/haskell-citeproc-hs/PKGBUILD deleted file mode 100644 index f66d18870..000000000 --- a/community/haskell-citeproc-hs/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=citeproc-hs -pkgname=haskell-citeproc-hs -pkgver=0.3.8 -pkgrel=3 -pkgdesc="A Citation Style Language implementation in Haskell" -url="http://gorgias.mine.nu/repos/citeproc-hs/" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=(haskell-http haskell-bytestring haskell-containers haskell-directory - haskell-filepath haskell-json haskell-mtl haskell-old-locale haskell-hs-bibutils - haskell-pandoc-types haskell-parsec haskell-syb haskell-time haskell-utf8-string haskell-xml) -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=('e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid -f bibutils - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-citeproc-hs/haskell-citeproc-hs.install b/community/haskell-citeproc-hs/haskell-citeproc-hs.install deleted file mode 100644 index b2c962877..000000000 --- a/community/haskell-citeproc-hs/haskell-citeproc-hs.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-citeproc-hs - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-digest/PKGBUILD b/community/haskell-digest/PKGBUILD deleted file mode 100644 index 3293c8322..000000000 --- a/community/haskell-digest/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=digest -pkgname=haskell-digest -pkgver=0.0.1.2 -pkgrel=1 -pkgdesc='Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now.' -url="http://hackage.haskell.org/package/$_hkgname" -license=(custom:BSD3) -arch=('i686' 'x86_64') -depends=('ghc' 'zlib') -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=('641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-digest/haskell-digest.install b/community/haskell-digest/haskell-digest.install deleted file mode 100644 index d0637a0cb..000000000 --- a/community/haskell-digest/haskell-digest.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-digest - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-highlighting-kate/PKGBUILD b/community/haskell-highlighting-kate/PKGBUILD deleted file mode 100644 index 1a3c0b7d1..000000000 --- a/community/haskell-highlighting-kate/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=highlighting-kate -pkgname=haskell-highlighting-kate -pkgver=0.5.3.9 -pkgrel=1 -pkgdesc="Syntax highlighting" -url="http://hackage.haskell.org/package/$_hkgname" -license=('GPL') -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-blaze-html>=0.4.2' 'haskell-containers' 'haskell-filepath' 'haskell-mtl' 'haskell-parsec' 'haskell-pcre-light') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=$pkgname.install -md5sums=('fa274eb5d1f7002b16a312693ad9eef0') - -build() { - cd $_hkgname-$pkgver - runhaskell Setup configure -O --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $_hkgname-$pkgver - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" -} diff --git a/community/haskell-highlighting-kate/haskell-highlighting-kate.install b/community/haskell-highlighting-kate/haskell-highlighting-kate.install deleted file mode 100644 index c03138b71..000000000 --- a/community/haskell-highlighting-kate/haskell-highlighting-kate.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-highlighting-kate - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-hs-bibutils/PKGBUILD b/community/haskell-hs-bibutils/PKGBUILD deleted file mode 100644 index 85a7a74c7..000000000 --- a/community/haskell-hs-bibutils/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) # us> -# Contributor: Alexander Dunlap <alexander.dunlap at gmail # dot com> - -_hkgname=hs-bibutils -pkgname=haskell-hs-bibutils -pkgver=5.0 -pkgrel=2 -pkgdesc="Haskell bindings to bibutils, the bibliography conversion utilities." -url="http://hackage.haskell.org/package/$_hkgname" -license=('GPL') -arch=('i686' 'x86_64') -depends=('ghc' 'haskell-syb>=0.3' 'bibutils') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz) -install=$pkgname.install -md5sums=('611e02005ad8bbb69218ebf15f3587c6') - -build() { - cd "$_hkgname-$pkgver" - runhaskell Setup configure -O \ - --enable-split-objs \ - --enable-shared \ - --prefix=/usr \ - --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid \ - --enable-library-profiling - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r \ - -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" \ - unregister.sh -} - -package() { - cd "$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/${pkgname}/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" -} diff --git a/community/haskell-hs-bibutils/haskell-hs-bibutils.install b/community/haskell-hs-bibutils/haskell-hs-bibutils.install deleted file mode 100644 index 7b5f4d635..000000000 --- a/community/haskell-hs-bibutils/haskell-hs-bibutils.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hs-bibutils - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-json/PKGBUILD b/community/haskell-json/PKGBUILD deleted file mode 100644 index b1ed11582..000000000 --- a/community/haskell-json/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> - -_hkgname=json -pkgname=haskell-json -pkgver=0.7 -pkgrel=5 -pkgdesc="Support for serialising Haskell to and from JSON" -url="http://hackage.haskell.org/package/${_hkgname}" -license=(custom:BSD3) -arch=('i686' 'x86_64') -depends=(ghc haskell-array 'haskell-base>=4' haskell-bytestring - haskell-containers haskell-text haskell-mtl 'haskell-syb>=0.3.3') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=("d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3") - -build() { - cd "$srcdir/$_hkgname-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}" - runhaskell Setup copy --destdir="$pkgdir" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-json/haskell-json.install b/community/haskell-json/haskell-json.install deleted file mode 100644 index 5be36b5cc..000000000 --- a/community/haskell-json/haskell-json.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-json - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-pandoc-types/PKGBUILD b/community/haskell-pandoc-types/PKGBUILD deleted file mode 100644 index a459b125a..000000000 --- a/community/haskell-pandoc-types/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=pandoc-types -pkgname=haskell-pandoc-types -pkgver=1.10 -pkgrel=3 -pkgdesc="Types for representing a structured document" -url="http://johnmacfarlane.net/pandoc" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-containers' 'haskell-syb') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=('e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - rm -f "$pkgdir/usr/share/doc/$pkgname/COPYING" -} diff --git a/community/haskell-pandoc-types/haskell-pandoc-types.install b/community/haskell-pandoc-types/haskell-pandoc-types.install deleted file mode 100644 index 72e17a9e2..000000000 --- a/community/haskell-pandoc-types/haskell-pandoc-types.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-pandoc-types - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD deleted file mode 100644 index dfbf6df4b..000000000 --- a/community/haskell-pandoc/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Aleksandar Micovic <metaleks@gmail.com> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=pandoc -pkgname=haskell-pandoc -pkgver=1.11.1 -pkgrel=8 -pkgdesc="Conversion between markup formats" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('GPL') -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup' 'haskell-bytestring' 'haskell-citeproc-hs' 'haskell-containers' 'haskell-directory' 'haskell-extensible-exceptions' 'haskell-filepath' 'haskell-highlighting-kate' 'haskell-http' 'haskell-json' 'haskell-mtl' 'haskell-network' 'haskell-old-locale' 'haskell-pandoc-types' 'haskell-parsec' 'haskell-process' 'haskell-random' 'haskell-syb' 'haskell-tagsoup' 'haskell-temporary' 'haskell-texmath' 'haskell-time' 'haskell-utf8-string' 'haskell-xml' 'haskell-zip-archive' 'haskell-zlib' haskell-data-default) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=$pkgname.install -md5sums=('e895b22745affba37c0ba5e6e6d0f17c') -provides=(pandoc) -conflicts=(pandoc) -replaces=(pandoc) - -build() { - cd $_hkgname-$pkgver - runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $_hkgname-$pkgver - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" -} diff --git a/community/haskell-pandoc/haskell-pandoc.install b/community/haskell-pandoc/haskell-pandoc.install deleted file mode 100644 index 24a22db9c..000000000 --- a/community/haskell-pandoc/haskell-pandoc.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-pandoc - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD deleted file mode 100644 index bbd9e0173..000000000 --- a/community/haskell-pcre-light/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> - -_hkgname=pcre-light -pkgname=haskell-pcre-light -pkgver=0.4 -pkgrel=22 -pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions" -url="http://code.haskell.org/~dons/code/pcre-light" -license=(custom:BSD3) -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc>=7.0.3-2" - "sh" - "haskell-bytestring-show" - "pcre") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="$pkgname.install" -sha256sums=("b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6") - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-pcre-light/haskell-pcre-light.install b/community/haskell-pcre-light/haskell-pcre-light.install deleted file mode 100644 index 0a9d80b19..000000000 --- a/community/haskell-pcre-light/haskell-pcre-light.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-pcre-light - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-tagsoup/PKGBUILD b/community/haskell-tagsoup/PKGBUILD deleted file mode 100644 index 5f7712866..000000000 --- a/community/haskell-tagsoup/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -_hkgname=tagsoup -pkgname=haskell-tagsoup -pkgver=0.12.8 -pkgrel=3 -pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents" -url="http://community.haskell.org/~ndm/tagsoup/" -license=(custom:BSD3) -arch=('i686' 'x86_64') -depends=("ghc" "haskell-text") -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=('a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515') - -build() { - cd $srcdir/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $srcdir/${_hkgname}-${pkgver} - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-tagsoup/haskell-tagsoup.install b/community/haskell-tagsoup/haskell-tagsoup.install deleted file mode 100644 index 2e0c845a5..000000000 --- a/community/haskell-tagsoup/haskell-tagsoup.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-tagsoup - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-temporary/PKGBUILD b/community/haskell-temporary/PKGBUILD deleted file mode 100644 index af3453656..000000000 --- a/community/haskell-temporary/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -_hkgname=temporary -pkgname=haskell-temporary -pkgver=1.1.2.4 -pkgrel=3 -pkgdesc="Portable temporary file and directory support for Windows and Unix, based on code from Cabal" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc' 'haskell-directory' 'haskell-filepath' 'haskell-unix') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=$pkgname.install -sha1sums=('310b6d07014064b2ecafb794393c1bba76286a33') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-temporary/haskell-temporary.install b/community/haskell-temporary/haskell-temporary.install deleted file mode 100644 index 39a0a49ff..000000000 --- a/community/haskell-temporary/haskell-temporary.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-temporary - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-texmath/PKGBUILD b/community/haskell-texmath/PKGBUILD deleted file mode 100644 index 183dab329..000000000 --- a/community/haskell-texmath/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -pkgname=haskell-texmath -_hkgname=texmath -pkgver=0.6.3 -pkgrel=1 -pkgdesc="Conversion of LaTeX math formulas to MathML." -url="https://github.com/jgm/texmath" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=(haskell-containers haskell-parsec haskell-syb haskell-xml) -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") -install=$pkgname.install -md5sums=('51a759ddfc114c5b3b7abc76644bceb1') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-texmath/haskell-texmath.install b/community/haskell-texmath/haskell-texmath.install deleted file mode 100644 index a442219ec..000000000 --- a/community/haskell-texmath/haskell-texmath.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-texmath - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-xml/PKGBUILD b/community/haskell-xml/PKGBUILD deleted file mode 100644 index 1dbd9f84a..000000000 --- a/community/haskell-xml/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Don Stewart <dons@galois.com> -# Contributor: Lex Black <autumn-wind at web dot de> - -_hkgname=xml -pkgname=haskell-xml -pkgver=1.3.13 -pkgrel=2 -pkgdesc="A simple XML library." -url="http://code.galois.com" -license=(custom:BSD3) -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc" "haskell-bytestring" "haskell-text") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=('c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-xml/haskell-xml.install b/community/haskell-xml/haskell-xml.install deleted file mode 100644 index 8ab99b5b7..000000000 --- a/community/haskell-xml/haskell-xml.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xml - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/haskell-zip-archive/PKGBUILD b/community/haskell-zip-archive/PKGBUILD deleted file mode 100644 index af589729e..000000000 --- a/community/haskell-zip-archive/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Daniel Micay <danielmicay@gmail.com> -# Contributor: Arch Haskell Team <> -# Contributor: Lex Black <autumn-wind at web dot de> - -pkgname=haskell-zip-archive -_hkgname=zip-archive -pkgver=0.1.3.4 -pkgrel=3 -pkgdesc="Library for creating and modifying zip archives." -url="http://github.com/jgm/zip-archive" -license=(custom:BSD3) -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=(haskell-array haskell-binary haskell-bytestring haskell-containers - haskell-digest haskell-directory haskell-filepath haskell-mtl - haskell-old-time haskell-pretty haskell-utf8-string haskell-zlib) -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz") -install=$pkgname.install -sha256sums=('cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} diff --git a/community/haskell-zip-archive/haskell-zip-archive.install b/community/haskell-zip-archive/haskell-zip-archive.install deleted file mode 100644 index 3fc2845ef..000000000 --- a/community/haskell-zip-archive/haskell-zip-archive.install +++ /dev/null @@ -1,23 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-zip-archive - -post_install() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - $HS_DIR/unregister.sh -} - -post_upgrade() { - $HS_DIR/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - $HS_DIR/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index a67916ef4..db7c957a7 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94887 2013-08-01 06:55:02Z bpiotrowski $ +# $Id: PKGBUILD 97071 2013-09-12 10:11:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.19 -pkgrel=2 +pkgrel=4 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -20,12 +20,10 @@ makedepends=('fpc' 'cmake' 'haskell-vector' 'haskell-random') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.desktop hedgewars.png build-fix.patch ffmpeg2.0.patch) md5sums=('51d84ad6ea00e9894e6119b118b4a523' - '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1' 'a9d7b0ba72cbeb7fc74fce459db9dd90' 'da84d64a252579236d3ff0cc6e008e72') @@ -54,5 +52,5 @@ package() { install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png - install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop + install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop } diff --git a/community/hedgewars/hedgewars.desktop b/community/hedgewars/hedgewars.desktop deleted file mode 100644 index 9d74ed3f1..000000000 --- a/community/hedgewars/hedgewars.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Hedgewars -GenericName=Platform Game -Comment=Worms style game -Exec=hedgewars -Icon=hedgewars -Categories=Game;ArcadeGame;
\ No newline at end of file diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 1b7669eb2..880fa3218 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 95716 2013-08-15 21:40:32Z bluewind $ +# $Id: PKGBUILD 98015 2013-10-03 17:42:09Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.15 +pkgver=3.16 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=(qt4 lua boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('ca89c1f01449059459d8cb173a9cf2dc' +md5sums=('88558766efc5109f07b7f5b78e62aea2' 'SKIP') build() { @@ -29,7 +29,7 @@ package_highlight() { } package_highlight-gui() { - pkgdesc="Fast and flexible source code highlighter (QT version)" + pkgdesc="Fast and flexible source code highlighter (Qt version)" depends=('qt4' 'highlight') cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD index affa75351..e17d1f4a8 100644 --- a/community/homebank/PKGBUILD +++ b/community/homebank/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96645 2013-09-02 18:43:17Z jlichtblau $ +# $Id: PKGBUILD 98074 2013-10-05 17:19:13Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=homebank -pkgver=4.5.2 +pkgver=4.5.4 pkgrel=1 pkgdesc="Free, easy, personal accounting for everyone" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool') install=$pkgname.install changelog=$pkgname.changelog source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz) -sha256sums=('f539d27758d864802d5d63a06864fcc992d2d7b7d9e872621786a83c3d672f5f') +sha256sums=('b3dd7df29d1de38b04c3bce3ade1f6266c1dc91aefa1106e37852edeab39b083') build() { cd ${srcdir}/$pkgname-$pkgver @@ -28,4 +28,3 @@ package() { make DESTDIR="${pkgdir}" install } -sha256sums=('b3318255676a09e7d6f26a8d750f77f40cfeb1b54dffaff8765f14a85f98ae74') diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog index 2866e49a6..f2e6255c2 100644 --- a/community/homebank/homebank.changelog +++ b/community/homebank/homebank.changelog @@ -1,3 +1,9 @@ +2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * homebank 4.5.4-1 + +2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * homebank 4.5.3-1 + 2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * homebank 4.5.2-1 diff --git a/community/html2text/PKGBUILD b/community/html2text/PKGBUILD index db2a328ce..c74801236 100644 --- a/community/html2text/PKGBUILD +++ b/community/html2text/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 60804 2011-12-18 13:31:52Z jlichtblau $ +# $Id: PKGBUILD 97779 2013-09-29 16:22:26Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=html2text pkgver=1.3.2a -pkgrel=9.1 +pkgrel=10 pkgdesc="A HTML to text converter" arch=('i686' 'x86_64' 'mips64el') url="http://www.mbayer.de/html2text" license=('GPL2') depends=('gcc-libs') -source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/${pkgname}-${pkgver}.tar.gz) -sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392') +makedepends=('patch') +source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/${pkgname}-${pkgver}.tar.gz \ + http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff) +sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392' + 'b05c425ce431de104dc0c506786f07590895195911e09c9cba62a64974ca05a0') build() { cd ${srcdir}/${pkgname}-${pkgver} +#FS#35920 fix + patch -Np1 < ${srcdir}/patch-amd64-html2text-1.3.2a.diff + ./configure make } diff --git a/community/ibam/03acpi-check.dpatch b/community/ibam/03acpi-check.dpatch new file mode 100644 index 000000000..7a688fe20 --- /dev/null +++ b/community/ibam/03acpi-check.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03acpi-check.dpatch by Martin Wuertele <maxx@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: change detection for sysfs and sysfs variable names for 2.6.30+ kernels + +@DPATCH@ +--- ibam-0.5.2/ibam.inl.orig 2010-01-03 12:17:10.000000000 +0100 ++++ ibam-0.5.2/ibam.inl 2010-01-03 12:17:19.000000000 +0100 +@@ -945,7 +945,7 @@ + string sysfs_path = "/sys/class/power_supply"; // ... + ifstream pmu,acpi,sysfs; + pmu.open((pmu_path+"/info").c_str()); +- acpi.open((acpi_path+"/info").c_str()); ++ acpi.open((acpi_path+"/event").c_str()); + if (pmu.is_open()) { + #ifdef IBAM_DEBUG + cout << "using pmu" << endl; +@@ -959,7 +959,7 @@ + acpi.close(); + apm = new acpi_status(); + } else { +- sysfs.open((sysfs_path+"/BAT1/charge_full").c_str()); ++ sysfs.open((sysfs_path+"/BAT0/present").c_str()); + if(sysfs.is_open()) { + #ifdef IBAM_DEBUG + cout << "using sysfs" << endl; + diff --git a/community/ibam/PKGBUILD b/community/ibam/PKGBUILD index f5a1b9c1d..b2d22e403 100644 --- a/community/ibam/PKGBUILD +++ b/community/ibam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65562 2012-02-21 08:57:40Z spupykin $ +# $Id: PKGBUILD 96802 2013-09-05 18:01:44Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: Penguin <TGates81.at.gmail.dot.com> pkgname=ibam pkgver=0.5.2 -pkgrel=5 +pkgrel=6 pkgdesc="An intelligent battery monitor" arch=('i686' 'x86_64' 'mips64el') url="http://ibam.sourceforge.net/" @@ -15,20 +15,24 @@ makedepends=('sed' 'make') optdepends=('gnuplot: graphs support') install="ibam.install" source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - ibam-0.5.2-sysfs.patch) + 03acpi-check.dpatch) md5sums=('2d5222ff504dd19e7c1ea8acc2f13cf5' - 'c3aafebd5ad9159c89f71beab4a0f414') + '2f27fc97932bd59cabacbad063a13f0e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - install -m0755 -d ${pkgdir}/usr/bin sed -i \ -e "s|/local/bin|/bin|g" \ -e "s|^CFLAGS=-O3|CFLAGS=${CFLAGS}|g" \ Makefile - patch -p1 <$srcdir/ibam-0.5.2-sysfs.patch + patch -p1 <$srcdir/03acpi-check.dpatch make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -m0755 -d ${pkgdir}/usr/bin install -m0755 -D ${srcdir}/${pkgname}-${pkgver}/ibam ${pkgdir}/usr/bin/ibam } diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index 4521e4873..ec3e113a2 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90641 2013-05-13 13:18:31Z fyan $ +# $Id: PKGBUILD 96949 2013-09-09 05:39:55Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=1 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') @@ -34,4 +34,4 @@ package() { make DESTDIR=$pkgdir/ install } -sha512sums=('490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3') +sha512sums=('8478e9ea14472d0153cc7a35feae4edea791476dc98cfc266b598f915376d267bd5db48ea0a676209d7a6fa680628116a30fec59afaf696477cfaa14082aad8d') diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD index 9580b97e5..75c2c22d1 100644 --- a/community/ibus-kkc/PKGBUILD +++ b/community/ibus-kkc/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=ibus-kkc -pkgver=1.5.16 +pkgver=1.5.18 pkgrel=1 pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus" arch=('i686' 'x86_64' 'mips64el') @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums=('e4106f4e40c5de807489f7c27b730dc7f29db6c89c30207d797e1bcced75a195fedd9ae48a5c70821d7357a2b2fad66748f75c74d959f3cdea9444bd1305e267') +sha512sums=('06212fd6d851ab68ad2ca003d52d67c87d65a2cd776d575e5110c5d39d9feb8f3648608024823bfd2caed6e536e250a1416f186b3e702f5398dd9afe60a07756') diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD index 551020f0b..1597f0ebd 100644 --- a/community/ibus-libpinyin/PKGBUILD +++ b/community/ibus-libpinyin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89875 2013-05-04 04:07:03Z fyan $ +# $Id: PKGBUILD 97726 2013-09-28 04:15:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse Su<yangtsesu@gmail.com> # Contributor: Jekyll Wu<adaptee [at] gmail [dot] com> @@ -8,12 +8,12 @@ pkgname=ibus-libpinyin pkgver=1.6.91 -pkgrel=1 +pkgrel=2 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="https://github.com/libpinyin/ibus-libpinyin" -depends=('ibus' 'libpinyin') +depends=('ibus' 'libpinyin' 'python2-xdg') makedepends=('git' 'intltool' 'gnome-common') source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz automake-1.13.patch) diff --git a/community/intel-gpu-tools/PKGBUILD b/community/intel-gpu-tools/PKGBUILD index 605221109..e0d17e5f8 100644 --- a/community/intel-gpu-tools/PKGBUILD +++ b/community/intel-gpu-tools/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 82424 2013-01-17 10:47:47Z thestinger $ +# $Id: PKGBUILD 97300 2013-09-17 05:47:11Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Mikael Eriksson <mikael_eriksson@miffe.org> # Originally by: Denis Smirnov <detanator@gmail.com> pkgname=intel-gpu-tools -pkgver=1.3 -pkgrel=2 +pkgver=1.4 +pkgrel=1 pkgdesc="Tools for development and testing of the Intel DRM driver" arch=(i686 x86_64) license=(MIT) url="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" -depends=('libdrm' 'libpciaccess' 'cairo') +depends=('libdrm' 'libpciaccess' 'cairo' python) +makedepends=(swig) +options=(!libtool) source=(http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2) -md5sums=('67facd6241e26e2c68614728e3a932e9') +md5sums=('bfa2ff70c09c95fcad46e7d332e08d28') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 9efdcecde..e5311bcef 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 92669 2013-06-11 16:29:42Z andrea $ +# $Id: PKGBUILD 97952 2013-10-01 19:32:08Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.1.4 -_pkgver=129.713 +pkgver=12.1.5 +_pkgver=129.1328 pkgrel=1 -pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" +pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.jetbrains.org/" -license=('apache') +license=('Apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('573815dd7dbb6a66c19f7f77a1bb048f') +md5sums=('1eadced44ba3dca58f909f9178833a21') package() { install -d -m755 "$pkgdir/usr/share/intellijidea-ce/bin" diff --git a/community/ipvsadm/01-fix-not-showing-all-server.patch b/community/ipvsadm/01-fix-not-showing-all-server.patch deleted file mode 100644 index dea23bf76..000000000 --- a/community/ipvsadm/01-fix-not-showing-all-server.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs.h ipvsadm-1.26/libipvs/ip_vs.h ---- ipvsadm-1.26.vanilla/libipvs/ip_vs.h 2011-02-06 18:38:57.000000000 -0800 -+++ ipvsadm-1.26/libipvs/ip_vs.h 2011-08-23 15:03:59.000000000 -0700 -@@ -413,7 +413,7 @@ - __IPVS_CMD_ATTR_MAX, - }; - --#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1) -+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1) - - /* - * Attributes used to describe a service -diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c -ipvsadm-1.26/libipvs/ip_vs_nl_policy.c ---- ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c 2008-09-18 -08:57:37.000000000 -0700 -+++ ipvsadm-1.26/libipvs/ip_vs_nl_policy.c 2011-08-23 14:45:34.000000000 -0700 -@@ -26,6 +26,8 @@ - [IPVS_SVC_ATTR_TIMEOUT] = { .type = NLA_U32 }, - [IPVS_SVC_ATTR_NETMASK] = { .type = NLA_U32 }, - [IPVS_SVC_ATTR_STATS] = { .type = NLA_NESTED }, -+ [IPVS_SVC_ATTR_PE_NAME] = { .type = NLA_STRING, -+ .maxlen = IP_VS_PENAME_MAXLEN}, - }; diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index 7a3279978..f3a016dbc 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90518 2013-05-12 23:51:34Z seblu $ +# $Id: PKGBUILD 97090 2013-09-12 12:47:32Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm -pkgver=1.26 -pkgrel=8 +pkgver=1.27 +pkgrel=1 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxvirtualserver.org/software/ipvs.html' @@ -13,18 +13,17 @@ depends=('libnl1' 'popt' 'bash') backup=("etc/$pkgname.conf") options=('!makeflags') install=$pkgname.install -source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz" +source=("https://kernel.org/pub/linux/utils/kernel/ipvsadm/$pkgname-$pkgver.tar.xz" "$pkgname.systemd" - "$pkgname.service" - '01-fix-not-showing-all-server.patch') -md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' - 'b45ef25d384a7a68b51ff80d0fe81dd2' - 'dc87684064f85b64c1e79c1eac336303' - 'e9fb77d2fbe2d3f41d60257316338543') + "$pkgname.service") +# upstream provides sha256sums of release +sha256sums=('d360fb4dcf591e0a8a918831e2c02b1dc03e3c17ee1e60d0d70de9455238b3f8' + '4960ea254128347b03665d51817f29cb643cf2ebca13f5f46649257552ad3ceb' + '25506d07f412cccab6f2f3a2a1900d5eeda27bc58602d14f44910c4e036b5341') -prepare() { - patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch -} +#prepare() { + #patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch +#} build() { cd $pkgname-$pkgver diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index e5803b06d..695218e3b 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76779 2012-09-29 19:28:30Z kkeen $ +# $Id: PKGBUILD 97810 2013-09-30 00:05:41Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc') license=('MIT') options=('!libtool') source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('3aaa1bb1195d705fac602b7504c9b945') +md5sums=('ab239be8c08871c8463b27cf7610947c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 54c750779..a3cae7c4b 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90520 2013-05-12 23:55:17Z seblu $ +# $Id: PKGBUILD 96808 2013-09-05 18:47:07Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived -pkgver=1.2.7 -pkgrel=3 +pkgver=1.2.8 +pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64' 'mips64el') url='http://www.keepalived.org/' @@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf') depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.service') -md5sums=('8551a34ee048895dbe5350a031ff29c1' +md5sums=('8a362b6cea145fd4393bf004d09b4057' '0a5171f4298528315e8a8004b55befb7') build() { diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 04945b84e..9448a2af0 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 95139 2013-08-06 07:59:09Z stativ $ +# $Id: PKGBUILD 98040 2013-10-04 13:46:45Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=klavaro -pkgver=1.9.8 +pkgver=2.00 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool') optdepends=('espeakup: voice output') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('62ad2c6bec1c2bafab4bdd29227433ac') +md5sums=('f7c804fbad7f9a053dfcfbea6d91dce6') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index f845cf74c..293e964d8 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94926 2013-08-01 07:01:20Z bpiotrowski $ +# $Id: PKGBUILD 97032 2013-09-11 02:13:11Z bgyorgy $ # Maintainer: # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64' 'mips64el') url='http://kmess.sourceforge.net/' @@ -15,9 +15,11 @@ makedepends=('automoc4' 'cmake' 'optipng') optdepends=('cabextract: provides winks support') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" - giflib-5.0.patch) + giflib-5.0.patch + fix-crash-in-contactlistmodel.patch) md5sums=('a2e57911713308bef81b9347135cc5dd' - '97734b073bf4a45ed3612d7626541cee') + '97734b073bf4a45ed3612d7626541cee' + 'fdfe837f4bd64a5123edc63019bd5cf2') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,6 +28,9 @@ prepare() { find -name '*.png' -exec optipng -quiet -force -fix {} + patch -Np1 -i ../giflib-5.0.patch + + # Fix crash in ContactListModel (FS#32402) + patch -Np1 -i ../fix-crash-in-contactlistmodel.patch } build() { diff --git a/community/kmess/fix-crash-in-contactlistmodel.patch b/community/kmess/fix-crash-in-contactlistmodel.patch new file mode 100644 index 000000000..c72659bc6 --- /dev/null +++ b/community/kmess/fix-crash-in-contactlistmodel.patch @@ -0,0 +1,29 @@ +commit e10ebb8bd33cf807e2edfa56c465b40f3237102e +Author: Ruben Vandamme <ruben@kmess.org> +Date: Sun Jul 8 10:56:37 2012 +0200 + + Fix crash in ContactListModel. + + * Individually delete every child instead of using qDeleteAll. + * Crash only happens in combination with Qt 4.8. + * See https://bugs.kde.org/show_bug.cgi?id=285951 for similar issue in Amarok. + * See https://bugreports.qt-project.org/browse/QTBUG-22037 for Qt report. + * Many thanks to Bob ("badjar" on kmess.org/board) for providing the fix. + +diff --git a/src/model/contactlistmodelitem.cpp b/src/model/contactlistmodelitem.cpp +index 462d555..ac5a6ca 100644 +--- a/src/model/contactlistmodelitem.cpp ++++ b/src/model/contactlistmodelitem.cpp +@@ -79,7 +79,11 @@ ContactListModelItem::ContactListModelItem( Group *group, ContactListModelItem * + */ + ContactListModelItem::~ContactListModelItem() + { +- qDeleteAll( childItems_ ); ++ while( !childItems_.isEmpty() ) ++ { ++ delete childItems_.takeFirst(); ++ } ++ + childItems_.clear(); + + // Delete this item from the parent's children diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD index 4d5dd3cb0..60ea59808 100644 --- a/community/kmymoney/PKGBUILD +++ b/community/kmymoney/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94028 2013-07-13 12:33:04Z svenstaro $ +# $Id: PKGBUILD 98121 2013-10-06 08:45:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vamp898 <vamp898@web.de> @@ -7,8 +7,8 @@ # Contributor: Todd Maynard <arch@toddmaynard.com> pkgname=kmymoney -pkgver=4.6.3 -pkgrel=3 +pkgver=4.6.4 +pkgrel=1 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64' 'mips64el') url="http://kmymoney2.sourceforge.net/" @@ -19,16 +19,8 @@ replaces=('kmymoney2') install=$pkgname.install changelog=$pkgname.changelog options=('!makeflags') -source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2 - git-fixes.diff) -sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e' - 'e618cc5531f00c14171c5cae837d8b5fb58bccaac363a5b09eed863355c242d3') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ../git-fixes.diff -} +source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff deleted file mode 100644 index 21b0e2330..000000000 --- a/community/kmymoney/git-fixes.diff +++ /dev/null @@ -1,43 +0,0 @@ -commit 77209f84a85360e98d2e805d412956a8f2a77db3 -Author: Alex Merry <kde@randomguy3.me.uk> -Date: Fri Feb 1 15:31:54 2013 +0000 - - Fix build with GMP 5.1.0 - - GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class - or mpf_class. So we have to have an explicit conversion. - - BUG: 312481 - -diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp -index aeed135..5de7fa9 100644 ---- a/kmymoney/mymoney/mymoneymoney.cpp -+++ b/kmymoney/mymoney/mymoneymoney.cpp -@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool - // be much better than using KGlobal::locale()->formatMoney. - bool bNegative = false; - mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den(); -- mpz_class right = (valueRef() - mpq_class(left)) * denom; -+ mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom); - - if (right < 0) { - right = -right; -commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff -Author: Christoph Feck <christoph@maxiom.de> -Date: Fri Mar 23 23:05:19 2012 +0100 - - Fix includes - -diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp -index ff217e3..d31bb02 100644 ---- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp -+++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp -@@ -16,6 +16,7 @@ - - #include "mymoneydatabasemgrtest.h" - #include <pwd.h> -+#include <unistd.h> - #include <iostream> - - #include <QtTest/QtTest> - diff --git a/community/kmymoney/kmymoney.changelog b/community/kmymoney/kmymoney.changelog index 30290a6f8..c57d5a2c0 100644 --- a/community/kmymoney/kmymoney.changelog +++ b/community/kmymoney/kmymoney.changelog @@ -1,3 +1,6 @@ +2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kmymoney 4.6.4-1 + 2012-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kmymoney 4.6.3-1 diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 035275fed..df83c72ca 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 96332 2013-08-25 18:27:42Z dicebot $ +# $Id: PKGBUILD 97980 2013-10-02 14:03:48Z 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=4 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" license=('BSD') depends=('libconfig') makedepends=('git' 'cmake' 'llvm') -backup=('etc/ldc2.conf') source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}" "ldc2.conf" "ldc2.rebuild.conf" @@ -40,6 +39,7 @@ package_ldc() { backup=("etc/ldc2.conf" "etc/ldc2.rebuild.conf" ) + provides=("d-compiler") # binaries install -D -m755 $srcdir/ldc/build/bin/ldmd2 $pkgdir/usr/bin/ldmd2 @@ -58,6 +58,7 @@ package_ldc() { package_liblphobos-devel() { depends=("ldc") + provides=("d-runtime" "d-stdlib") # libraries install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc.a $pkgdir/usr/lib/liblphobos.a @@ -67,6 +68,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/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD index 339560038..eee7fa588 100644 --- a/community/libaccounts-glib/PKGBUILD +++ b/community/libaccounts-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 92686 2013-06-12 04:53:53Z bgyorgy $ +# $Id: PKGBUILD 96927 2013-09-08 17:56:34Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libaccounts-glib -pkgver=1.11 +pkgver=1.12 pkgrel=1 pkgdesc="Glib-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3') makedepends=('python2-gobject') options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('467480fc800c6d22d8d53373f67d49f8a1e4d970') +sha1sums=('165e0b89a0bc47459711b1e7e077fb9e14848503') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index 56638ce72..957e8403a 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93073 2013-06-23 22:18:28Z bgyorgy $ +# $Id: PKGBUILD 96784 2013-09-04 22:27:13Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('f5a29ef1d1e66049bbe5d809d6dbfcf0c1a39b41') +sha1sums=('86d7bbaa7bdd18f80a28c2617653707d763d1984') build() { cd "$srcdir/$_pkgbase-$pkgver" diff --git a/community/libcgns2/PKGBUILD b/community/libcgns2/PKGBUILD deleted file mode 100644 index 6dd015a46..000000000 --- a/community/libcgns2/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 83543 2013-02-02 15:55:58Z stephane $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Klimov Max <cleemmi@gmail.com> - -pkgname=libcgns2 -_basever=2.5 -_relver=5 -pkgver=${_basever}.${_relver} -pkgrel=3 -pkgdesc='General purpose library for the storage and retrieval of computational fluid dynamics analysis data by CGNS standard' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.cgns.org' -license=('custom') -conflicts=('libcgns') -depends=('glibc') -makedepends=('chrpath') -source=("http://downloads.sourceforge.net/project/cgns/cgnslib_${_basever}/Release%205/cgnslib_${_basever}-${_relver}.tar.gz") -md5sums=('ae2a2e79b99d41c63e5ed5f661f70fd9') - -[[ "$CARCH" == "x86_64" ]] && _64bits="--enable-64bit" - -build() { - cd cgnslib_${_basever} - - ./configure \ - --prefix=/usr \ - --enable-shared \ - ${_64bits} - - make -} - -package() { - cd cgnslib_${_basever} - - install -d ${pkgdir}/usr/include - install -d ${pkgdir}/usr/lib - - make install LIBDIR=${pkgdir}/usr/lib INCLUDEDIR=${pkgdir}/usr/include - - # install license - install -d ${pkgdir}/usr/share/licenses/libcgns2 - install -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/libcgns2 - - chrpath --delete ${pkgdir}/usr/lib/libcgns.so -} diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD deleted file mode 100644 index c2b8d28ab..000000000 --- a/community/libcryptui/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 87353 2013-03-30 10:43:50Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=libcryptui -pkgver=3.8.0 -pkgrel=1 -pkgdesc="Library for OpenPGP prompts" -arch=('i686' 'x86_64' 'mips64el') -url="http://git.gnome.org/browse/libcryptui/" -license=('GPL') -depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('10eed96e33b6d7286795a7c678a5655a86ae099fb98d1f7211aa28aa636c0837') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/libcryptui/libcryptui.install b/community/libcryptui/libcryptui.install deleted file mode 100644 index 7a903e80c..000000000 --- a/community/libcryptui/libcryptui.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index fc81a7243..bb388197f 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96686 2013-09-03 02:30:19Z bgyorgy $ +# $Id: PKGBUILD 97020 2013-09-10 14:26:57Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=1.1.2 +pkgver=1.1.2.2 pkgrel=1 pkgdesc='Library for file management' url='http://pcmanfm.sourceforge.net/' @@ -17,7 +17,7 @@ install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') makedepends=('intltool') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('c09072e26b9688a7d171843c0da9b33f') +md5sums=('ea3d09b23ef4c37cb84ae57ea16b8f08') build() { cd $pkgname-$pkgver diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD index 91970093b..133589843 100644 --- a/community/libkkc/PKGBUILD +++ b/community/libkkc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94838 2013-07-31 03:58:39Z fyan $ +# $Id: PKGBUILD 97217 2013-09-15 11:42:40Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=libkkc -pkgver=0.2.7 +pkgver=0.3.1 pkgrel=1 pkgdesc="Japanese Kana Kanji conversion library" arch=('i686' 'x86_64') @@ -31,4 +31,4 @@ package() { "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" } -sha512sums=('2bb056cf00b6212a18462a5f952d4557944b29f49a92b0701abed5f5d6601fdb3b57c4e09a0b3db8ff39be01e91ab658656b89f576663046e53478ed07fe87af') +sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0') diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD deleted file mode 100644 index 308190675..000000000 --- a/community/libmatio/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 88815 2013-04-23 01:03:57Z eric $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libmatio -pkgver=1.5.1 -pkgrel=1 -pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files' -arch=('x86_64' 'i686' 'mips64el') -license=('LGPL') -url='http://sourceforge.net/projects/matio' -depends=('zlib') -options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.bz2") -sha1sums=('12b8ed59688b2f41903ddc3e7975f21f10fe42bb') - -build() { - cd matio-$pkgver - ./configure --prefix=/usr --enable-shared - make -} - -check() { - cd matio-$pkgver - make check -} - -package() { - cd matio-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD index 702a69f29..14cf05865 100644 --- a/community/librcc/PKGBUILD +++ b/community/librcc/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 83682 2013-02-04 11:06:09Z spupykin $ +# $Id: PKGBUILD 97710 2013-09-27 19:26:53Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=librcc -pkgver=0.2.6 -pkgrel=5 +pkgver=0.2.10 +pkgrel=2 pkgdesc="Charset Conversion Library" arch=(i686 x86_64 'mips64el') url="http://rusxmms.sourceforge.net/" license=('GPL') -depends=(aspell enca libxml2 db librcd) -makedepends=(patch gtk gtk2) +depends=('aspell' 'enca' 'libxml2' 'librcd') +makedepends=('patch' 'gtk' 'gtk2') install=librcc.install options=('!libtool') -source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 - librcc-strnlen.patch - librcc-0.2.6-glib.patch) -md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' - '040313d1d8f166ccf2b128cea4c05f21' - '214aef7764131252620892b56c09de9d') +source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2) +md5sums=('077260cf58ae9624c964652b79fbb5fb') build() { cd $srcdir/$pkgname-${pkgver} - patch -Np1 -i ${srcdir}/librcc-0.2.6-glib.patch - ./configure --prefix=/usr - patch -p1 <$srcdir/librcc-strnlen.patch + ./configure --prefix=/usr --disable-bdb make } diff --git a/community/librcc/librcc-strnlen.patch b/community/librcc/librcc-strnlen.patch deleted file mode 100644 index 9fc0e8b0b..000000000 --- a/community/librcc/librcc-strnlen.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h ---- librcc-0.2.6/src/rccstring.h 2006-01-08 15:42:59.000000000 +0000 -+++ librcc-0.2.6.qwe/src/rccstring.h 2009-09-28 08:45:37.000000000 +0000 -@@ -18,13 +18,6 @@ - int rccStringFixID(rcc_string string, rcc_context ctx); - int rccStringChangeID(rcc_string string, rcc_language_id language_id); - --#ifdef HAVE_STRNLEN --# ifndef strnlen --int strnlen(const char *str, size_t size); --# endif /* !strnlen */ --#else --int rccStrnlen(const char *str, size_t size); --#endif /* HAVE_STRNLEN */ - int rccIsASCII(const char *str); - size_t rccStringSizedGetChars(const char *str, size_t size); - diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD deleted file mode 100644 index 9b4e65ca6..000000000 --- a/community/libsignon-glib/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 92688 2013-06-12 04:57:26Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=libsignon-glib -pkgver=1.10 -pkgrel=1 -pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/accounts-sso/" -license=('LGPL') -depends=('signon') -makedepends=('python2-gobject') -options=('!libtool') -source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('224f66c9662843705da4b35d781a50d6aeb8ca5f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static \ - PYTHON=python2 - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # Install GI overrides for python 3 as well - install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" - ln -s ../../../../python2.7/site-packages/gi/overrides/Signon.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Signon.py" -} diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD index 5a5d3b097..3cef1c18a 100644 --- a/community/libsodium/PKGBUILD +++ b/community/libsodium/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94581 2013-07-27 14:32:50Z fyan $ +# $Id: PKGBUILD 96998 2013-09-10 02:39:45Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: namelessjon <jonathan.stott@gmail.com> # Contributor: Alessio Sergi <asergi at archlinux dot us> pkgname=libsodium -pkgver=0.4.2 -pkgrel=2 +pkgver=0.4.3 +pkgrel=1 pkgdesc="P(ortable|ackageable) NaCl-based crypto library" arch=('i686' 'x86_64') url="https://github.com/jedisct1/libsodium" @@ -13,7 +13,6 @@ license=('custom:ISC') depends=('glibc') options=('!libtool') source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz) -sha256sums=('1a7901cdd127471724e854a8eb478247dc0ca67be549345c75fc6f2d4e05ed39') build() { cd "$pkgname-$pkgver" @@ -32,7 +31,8 @@ package() { # install license install -d -m 755 "$pkgdir/usr/share/licenses/$pkgname" - install -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -m 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: +sha512sums=('479016922fa522409eac80e65046129b4ea3a34642483e6f56331c430c9cb21cf69ec4650a6717560283096d1416bf15035dbf56eba3c35259ddfc8feccda331') diff --git a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch new file mode 100644 index 000000000..70a613820 --- /dev/null +++ b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch @@ -0,0 +1,156 @@ +From 02432e3afa32e9866fbf1317069b422ef552d1d4 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Thu, 22 Aug 2013 16:00:01 +0100
+Subject: [PATCH 1/3] Also store user & group ID values in virIdentity
+
+Future improvements to the polkit code will require access to
+the numeric user ID, not merely user name.
+
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+---
+ src/rpc/virnetserverclient.c | 18 ++++++++++++++++++
+ src/util/viridentity.c | 23 +++++++++++++++++++----
+ src/util/viridentity.h | 2 ++
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
+index 83d5cf1..f30dd08 100644
+--- a/src/rpc/virnetserverclient.c
++++ b/src/rpc/virnetserverclient.c
+@@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
+ char *processid = NULL;
+ char *processtime = NULL;
+ char *username = NULL;
++ char *userid = NULL;
+ char *groupname = NULL;
++ char *groupid = NULL;
+ #if WITH_SASL
+ char *saslname = NULL;
+ #endif
+@@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
+
+ if (!(username = virGetUserName(uid)))
+ goto cleanup;
++ if (virAsprintf(&userid, "%d", uid) < 0)
++ goto cleanup;
+ if (!(groupname = virGetGroupName(gid)))
+ goto cleanup;
++ if (virAsprintf(&userid, "%d", gid) < 0)
++ goto cleanup;
+ if (virAsprintf(&processid, "%llu",
+ (unsigned long long)pid) < 0)
+ goto cleanup;
+@@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
+ VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+ username) < 0)
+ goto error;
++ if (userid &&
++ virIdentitySetAttr(ret,
++ VIR_IDENTITY_ATTR_UNIX_USER_ID,
++ userid) < 0)
++ goto error;
+ if (groupname &&
+ virIdentitySetAttr(ret,
+ VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+ groupname) < 0)
+ goto error;
++ if (groupid &&
++ virIdentitySetAttr(ret,
++ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
++ groupid) < 0)
++ goto error;
+ if (processid &&
+ virIdentitySetAttr(ret,
+ VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
+@@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
+
+ cleanup:
+ VIR_FREE(username);
++ VIR_FREE(userid);
+ VIR_FREE(groupname);
++ VIR_FREE(groupid);
+ VIR_FREE(processid);
+ VIR_FREE(processtime);
+ VIR_FREE(seccontext);
+diff --git a/src/util/viridentity.c b/src/util/viridentity.c
+index 781f660..03c375b 100644
+--- a/src/util/viridentity.c
++++ b/src/util/viridentity.c
+@@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident)
+ virIdentityPtr virIdentityGetSystem(void)
+ {
+ char *username = NULL;
++ char *userid = NULL;
+ char *groupname = NULL;
++ char *groupid = NULL;
+ char *seccontext = NULL;
+ virIdentityPtr ret = NULL;
+ #if WITH_SELINUX
+@@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void)
+
+ if (!(username = virGetUserName(getuid())))
+ goto cleanup;
++ if (virAsprintf(&userid, "%d", (int)getuid()) < 0)
++ goto cleanup;
++
+ if (!(groupname = virGetGroupName(getgid())))
+ goto cleanup;
++ if (virAsprintf(&groupid, "%d", (int)getgid()) < 0)
++ goto cleanup;
+
+ #if WITH_SELINUX
+ if (getcon(&con) < 0) {
+@@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void)
+ if (!(ret = virIdentityNew()))
+ goto cleanup;
+
+- if (username &&
+- virIdentitySetAttr(ret,
++ if (virIdentitySetAttr(ret,
+ VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+ username) < 0)
+ goto error;
+- if (groupname &&
+- virIdentitySetAttr(ret,
++ if (virIdentitySetAttr(ret,
++ VIR_IDENTITY_ATTR_UNIX_USER_ID,
++ userid) < 0)
++ goto error;
++ if (virIdentitySetAttr(ret,
+ VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+ groupname) < 0)
+ goto error;
++ if (virIdentitySetAttr(ret,
++ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
++ groupid) < 0)
++ goto error;
+ if (seccontext &&
+ virIdentitySetAttr(ret,
+ VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
+@@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void)
+
+ cleanup:
+ VIR_FREE(username);
++ VIR_FREE(userid);
+ VIR_FREE(groupname);
++ VIR_FREE(groupid);
+ VIR_FREE(seccontext);
+ VIR_FREE(processid);
+ return ret;
+diff --git a/src/util/viridentity.h b/src/util/viridentity.h
+index 4bae8d6..a240c2d 100644
+--- a/src/util/viridentity.h
++++ b/src/util/viridentity.h
+@@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr;
+
+ typedef enum {
+ VIR_IDENTITY_ATTR_UNIX_USER_NAME,
++ VIR_IDENTITY_ATTR_UNIX_USER_ID,
+ VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
++ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
+ VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
+ VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
+ VIR_IDENTITY_ATTR_SASL_USER_NAME,
+--
+1.8.3.1
+
diff --git a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch new file mode 100644 index 000000000..1fba7d56c --- /dev/null +++ b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch @@ -0,0 +1,70 @@ +From f26b6e44bf0c3efe8167a528141224ccb7623b4a Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Wed, 28 Aug 2013 15:22:05 +0100
+Subject: [PATCH 2/3] Ensure system identity includes process start time
+
+The polkit access driver will want to use the process start
+time field. This was already set for network identities, but
+not for the system identity.
+
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+---
+ src/util/viridentity.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/util/viridentity.c b/src/util/viridentity.c
+index 03c375b..f681f85 100644
+--- a/src/util/viridentity.c
++++ b/src/util/viridentity.c
+@@ -35,6 +35,7 @@
+ #include "virthread.h"
+ #include "virutil.h"
+ #include "virstring.h"
++#include "virprocess.h"
+
+ #define VIR_FROM_THIS VIR_FROM_IDENTITY
+
+@@ -142,11 +143,20 @@ virIdentityPtr virIdentityGetSystem(void)
+ security_context_t con;
+ #endif
+ char *processid = NULL;
++ unsigned long long timestamp;
++ char *processtime = NULL;
+
+ if (virAsprintf(&processid, "%llu",
+ (unsigned long long)getpid()) < 0)
+ goto cleanup;
+
++ if (virProcessGetStartTime(getpid(), ×tamp) < 0)
++ goto cleanup;
++
++ if (timestamp != 0 &&
++ virAsprintf(&processtime, "%llu", timestamp) < 0)
++ goto cleanup;
++
+ if (!(username = virGetUserName(getuid())))
+ goto cleanup;
+ if (virAsprintf(&userid, "%d", (int)getuid()) < 0)
+@@ -198,6 +208,11 @@ virIdentityPtr virIdentityGetSystem(void)
+ VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
+ processid) < 0)
+ goto error;
++ if (processtime &&
++ virIdentitySetAttr(ret,
++ VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
++ processtime) < 0)
++ goto error;
+
+ cleanup:
+ VIR_FREE(username);
+@@ -206,6 +221,7 @@ cleanup:
+ VIR_FREE(groupid);
+ VIR_FREE(seccontext);
+ VIR_FREE(processid);
++ VIR_FREE(processtime);
+ return ret;
+
+ error:
+--
+1.8.3.1
+
diff --git a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch new file mode 100644 index 000000000..8882f1227 --- /dev/null +++ b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch @@ -0,0 +1,159 @@ +From 4a061ec8fe94857dd21acf401c66195ec51b1234 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Wed, 28 Aug 2013 15:25:40 +0100
+Subject: [PATCH 3/3] Add support for using 3-arg pkcheck syntax for process
+
+With the existing pkcheck (pid, start time) tuple for identifying
+the process, there is a race condition, where a process can make
+a libvirt RPC call and in another thread exec a setuid application,
+causing it to change to effective UID 0. This in turn causes polkit
+to do its permission check based on the wrong UID.
+
+To address this, libvirt must get the UID the caller had at time
+of connect() (from SO_PEERCRED) and pass a (pid, start time, uid)
+triple to the pkcheck program.
+
+Signed-off-by: Colin Walters <walters@redhat.com>
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+---
+ configure.ac | 8 ++++++++
+ daemon/remote.c | 21 +++++++++++++++++---
+ src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++-----
+ 3 files changed, 61 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94a2e19..3dfbb4d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1184,6 +1184,14 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then
+ AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])
+ if test "x$PKCHECK_PATH" != "x" ; then
+ AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])
++ AC_MSG_CHECKING([whether pkcheck supports uid value])
++ pkcheck_supports_uid=$($PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1)
++ if test "x$pkcheck_supports_uid" = "xtrue"; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck])
++ else
++ AC_MSG_RESULT([no])
++ fi
+ AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,
+ [use PolicyKit for UNIX socket access checks])
+ AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,
+diff --git a/daemon/remote.c b/daemon/remote.c
+index 03d5557..6132091 100644
+--- a/daemon/remote.c
++++ b/daemon/remote.c
+@@ -2731,10 +2731,12 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
+ int status = -1;
+ char *ident = NULL;
+ bool authdismissed = 0;
++ bool supportsuid = 0;
+ char *pkout = NULL;
+ struct daemonClientPrivate *priv =
+ virNetServerClientGetPrivateData(client);
+ virCommandPtr cmd = NULL;
++ static bool polkitInsecureWarned = false;
+
+ virMutexLock(&priv->lock);
+ action = virNetServerClientGetReadonly(client) ?
+@@ -2756,14 +2758,27 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
+ goto authfail;
+ }
+
++ if (timestamp == 0) {
++ VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time",
++ (long long)callerPid);
++ goto authfail;
++ }
++
+ VIR_INFO("Checking PID %lld running as %d",
+ (long long) callerPid, callerUid);
+
+ virCommandAddArg(cmd, "--process");
+- if (timestamp != 0) {
+- virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);
++# ifdef PKCHECK_SUPPORTS_UID
++ supportsuid = 1;
++# endif
++ if (supportsuid) {
++ virCommandAddArgFormat(cmd, "%lld,%llu,%lu", (long long) callerPid, timestamp, (unsigned long) callerUid);
+ } else {
+- virCommandAddArgFormat(cmd, "%lld", (long long) callerPid);
++ if (!polkitInsecureWarned) {
++ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");
++ polkitInsecureWarned = true;
++ }
++ virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);
+ }
+ virCommandAddArg(cmd, "--allow-user-interaction");
+
+diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
+index 4c76e64..d980820 100644
+--- a/src/access/viraccessdriverpolkit.c
++++ b/src/access/viraccessdriverpolkit.c
+@@ -72,8 +72,12 @@ static char *
+ virAccessDriverPolkitFormatProcess(const char *actionid)
+ {
+ virIdentityPtr identity = virIdentityGetCurrent();
+- const char *process = NULL;
++ const char *callerPid = NULL;
++ const char *callerTime = NULL;
++ const char *callerUid = NULL;
+ char *ret = NULL;
++ bool supportsuid = 0;
++ static bool polkitInsecureWarned = false;
+
+ if (!identity) {
+ virAccessError(VIR_ERR_ACCESS_DENIED,
+@@ -81,17 +85,43 @@ virAccessDriverPolkitFormatProcess(const char *actionid)
+ actionid);
+ return NULL;
+ }
+- if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &process) < 0)
++ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0)
++ goto cleanup;
++ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0)
++ goto cleanup;
++ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0)
+ goto cleanup;
+
+- if (!process) {
++ if (!callerPid) {
+ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("No UNIX process ID available"));
+ goto cleanup;
+ }
+-
+- if (VIR_STRDUP(ret, process) < 0)
++ if (!callerTime) {
++ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
++ _("No UNIX process start time available"));
++ goto cleanup;
++ }
++ if (!callerUid) {
++ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
++ _("No UNIX caller UID available"));
+ goto cleanup;
++ }
++
++#ifdef PKCHECK_SUPPORTS_UID
++ supportsuid = 1;
++#endif
++ if (supportsuid) {
++ if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)
++ goto cleanup;
++ } else {
++ if (!polkitInsecureWarned) {
++ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");
++ polkitInsecureWarned = true;
++ }
++ if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0)
++ goto cleanup;
++ }
+
+ cleanup:
+ virObjectUnref(identity);
+--
+1.8.3.1
+
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index dad79163c..a1aff7e55 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96612 2013-09-02 10:46:37Z spupykin $ +# $Id: PKGBUILD 98038 2013-10-04 13:33:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') @@ -33,7 +33,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('1835bbfa492099bce12e2934870e5611' +md5sums=('b0dfe373ebe0c588b42a28c14d36a3e6' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD index 6df859ede..21be84187 100644 --- a/community/libzdb/PKGBUILD +++ b/community/libzdb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 96630 2013-09-02 14:51:26Z spupykin $ +# $Id: PKGBUILD 97586 2013-09-24 15:30:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libzdb -pkgver=2.11.3 +pkgver=2.12 pkgrel=1 pkgdesc="Zild Database Library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('postgresql-libs' 'sqlite' 'libmariadbclient') options=('!libtool') source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) -md5sums=('49c55f02e5b82110cd9007e215d58468') +md5sums=('dd95114cae471d1b5dfda1f263b222c1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 64a60c64c..9cb3a37ff 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,52 +1,56 @@ -# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $ +# $Id: PKGBUILD 98119 2013-10-06 08:35:43Z 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.2 +pkgrel=2 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64' 'mips64el') 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') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base') +options=('!libtool') source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' 'lightdm.tmpfiles' 'lightdm.pam' 'lightdm-autologin.pam' 'lightdm.rules' + 'lightdm-corrupt-x-authority.patch' 'lightdm-default-config.patch' 'lightdm-lock-screen-before-switch.patch' 'lightdm-use-login1.patch' - 'xsession') -sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' - '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f' + 'Xsession') +sha256sums=('b0de1dc81bb5ce81800feafb9fbc7806ef4dfc83733f0df058568e55b8a045f3' + '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' - '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c' + '420aac58151bc441696db0bf234123b934ca8a8798e90db8a59252258e82b5d5' + '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b' '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822' - '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac' + 'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { cd ${pkgbase}-${pkgver} + patch -Np0 -i ../lightdm-corrupt-x-authority.patch 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,26 +62,26 @@ 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 rm -rf "${pkgdir}"/etc/init + rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2 -# Persistent home install -dm 770 "${pkgdir}"/var/lib/lightdm + install -dm 711 "${pkgdir}"/var/log/lightdm chmod +t "${pkgdir}"/var/lib/lightdm 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 + chown 620:620 -R "${pkgdir}"/var/{lib,log}/lightdm # PAM install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm @@ -96,6 +100,7 @@ install=${pkgbase}.install package_liblightdm-qt4() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt4') +options+=('!emptydirs') cd ${pkgbase}-${pkgver} @@ -110,6 +115,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-corrupt-x-authority.patch b/community/lightdm/lightdm-corrupt-x-authority.patch new file mode 100755 index 000000000..f994b394c --- /dev/null +++ b/community/lightdm/lightdm-corrupt-x-authority.patch @@ -0,0 +1,21 @@ +=== modified file 'src/xauthority.c' +--- src/xauthority.c 2013-09-10 23:14:12 +0000 ++++ src/xauthority.c 2013-09-30 02:59:01 +0000 +@@ -237,7 +237,7 @@ + gboolean + x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error) + { +- gchar *input; ++ gchar *input = NULL; + gsize input_length = 0, input_offset = 0; + GList *link, *records = NULL; + XAuthority *a; +@@ -328,6 +328,7 @@ + } + + errno = 0; ++ result = TRUE; + for (link = records; link && result; link = link->next) + { + XAuthority *a = link->data; + 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..14f66f02f 100755 --- a/community/lightdm/lightdm.install +++ b/community/lightdm/lightdm.install @@ -1,18 +1,23 @@ 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 } post_upgrade() { - post_install + post_install + if [[ $(vercmp $2 1:1.6.1-1) == -1 ]]; then + cat << EOF +The file /etc/lightdm/xsession has been renamed to /etc/lightdm/Xsession. +Please update your lightdm.conf with the new path. +EOF + fi } 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/lightdm/lightdm.service b/community/lightdm/lightdm.service index a5556c7ca..9b22f034c 100755 --- a/community/lightdm/lightdm.service +++ b/community/lightdm/lightdm.service @@ -1,11 +1,11 @@ [Unit] Description=Light Display Manager Documentation=man:lightdm(1) -After=systemd-user-sessions.service +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] ExecStart=/usr/bin/lightdm -StandardOutput=syslog Restart=always IgnoreSIGPIPE=no BusName=org.freedesktop.DisplayManager diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 875474ad5..24dc14c8f 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83333 2013-01-29 17:40:17Z spupykin $ +# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> @@ -6,22 +6,27 @@ pkgname=lockdev pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") arch=('i686' 'x86_64' 'mips64el') source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" - "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") + "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz" + 'build.patch') md5sums=('64b9c1b87b125fc348e892e24625524a' - 'c4e8a5a2e46b76b48339c232b358f579') + 'c4e8a5a2e46b76b48339c232b358f579' + '2db93cadf6670ddcd01de4bfc22a35e1') -build() { +prepare() { cd "${pkgname}-${_pkgver}" - patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile + patch -p1 -i ../build.patch # FS#33280 +} +build() { + cd "${pkgname}-${_pkgver}" make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" } diff --git a/community/lockdev/build.patch b/community/lockdev/build.patch new file mode 100644 index 000000000..f1053d032 --- /dev/null +++ b/community/lockdev/build.patch @@ -0,0 +1,30 @@ +commit 0dd47123655c52d68185f06b9da8fb0e1b925400 +Author: Ludwig Nussel <ludwig.nussel@suse.de> +Date: Tue Feb 9 14:56:23 2010 +0100 + + RedHat patch 2 + + - change library file name + - install devel symlink + +diff --git a/Makefile b/Makefile +index b7b4d1f..3b351dd 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ VER = $(shell expr `pwd` : '.*-\([0-9.]*\)') + MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'} + + static = ${libname}.a +-shared = ${libname}.${VER}.so ++shared = ${libname}.so.${VER} + soname = ${libname}.so.${MVER} + + # overwritten by caller (e.g.: debian/rules) +@@ -76,6 +76,7 @@ install_doc: docs/lockdev.3 + install_run: ${shared} + install -m755 -d ${libdir} + install -m644 ${shared} ${libdir} ++ ln -s ${shared} ${libdir}/liblockdev.so + + .PHONY: clean distclean perl-clean mostyclean + perl-clean: clean diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD index f7368a40a..31645276e 100644 --- a/community/lrzip/PKGBUILD +++ b/community/lrzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96603 2013-09-02 09:08:52Z arodseth $ +# $Id: PKGBUILD 96966 2013-09-09 13:06:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> # Contributor: kastor@fobos.org.ar pkgname=lrzip -pkgver=0.615 +pkgver=0.616 pkgrel=1 pkgdesc='Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms' url='http://lrzip.kolivas.org/' @@ -18,7 +18,7 @@ then fi options=('!libtool') source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2") -sha256sums=('c419662bf840bea2e4bd5ebef2585849ee1c85cec370fda423907e4514ee427d') +sha256sums=('982d5a8db4d8bbbced6e33fbbcd589c9b3fc4275110155d7bd71cbeff4a235ae') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index b488cbe03..d75f5715a 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,82 +1,63 @@ -# $Id: PKGBUILD 95338 2013-08-09 22:46:10Z dwallace $ +# $Id: PKGBUILD 97132 2013-09-13 13:17:58Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=23 +pkgrel=27 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" license=('GPL') groups=('lxde') -depends=('gtk2' 'xorg-server') +depends=('gtk2' 'xorg-server' 'iso-codes') makedepends=('intltool') -optdepends=('librsvg: display the default background') -install=${pkgname}.install +optdepends=('gtk-engines: default GTK+ theme' + 'librsvg: display the default background') +install=$pkgname.install backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - lxdm.pam lxdm.service - lxdm-0.4.1-Xsession-source-profile.patch - lxdm-0.4.1-conf.patch - lxdm-0.4.1-event-check-bug.patch - lxdm-0.4.1-industrial-greeter-ui.patch - lxdm-0.4.1-modern-systems.patch - lxdm-0.4.1-nolang-show-sessions.patch - lxdm-0.4.1-pam-env-vars.patch - lxdm-0.4.1-kill_user_processes.patch - ) + git-fixes.patch + default-config.patch) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - '9cc734228696a3c6f06d91bba61b03c1' - 'b86317143ae44d7ed38c150fe4f25502' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - 'c50dd01b715b0a236407d48066191601' - 'a1e3c46a8bef691bc544028f5b6cfe22' - '2c4afdbe3532be4f90d8f6240d352766' - 'baed9055e8825a5511712bc095197519' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3' - '3ac63085f9df9296dfa645fa623af0e2') + '03d0779fbac1a9964776c82e69fbc53e' + 'c61ec8ffd3fe8bd2a6a9178393622f4c') prepare(){ - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch - patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch - patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch - patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch -} + cd "$srcdir/$pkgname-$pkgver" -build() { - cd $srcdir/$pkgname-$pkgver + # Apply various fixes from git + patch -Np1 -i ../git-fixes.patch + # Adjust Arch-specific settings + patch -Np1 -i ../default-config.patch - ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm \ - --bindir=/usr/bin \ - --sbindir=/usr/bin - make - - patch -Np0 -i $srcdir/lxdm-0.4.1-modern-systems.patch - patch -Np0 -i $srcdir/lxdm-0.4.1-conf.patch - patch -Np0 -i $srcdir/lxdm-0.4.1-Xsession-source-profile.patch - patch -Np0 -i $srcdir/lxdm-0.4.1-industrial-greeter-ui.patch + # Fix version number + sed -i 's/3.6.0/3.8/' gnome-shell/LXDM_User_Switch@dgod/metadata.json } +build() { + cd "$srcdir/$pkgname-$pkgver" + autoreconf -fi + ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \ + --sysconfdir=/etc --localstatedir=/var + make +} package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir sbindir=/usr/bin install - - install -m644 $srcdir/lxdm.pam $pkgdir/etc/pam.d/lxdm - install -Dm644 $srcdir/lxdm.service $pkgdir/usr/lib/systemd/system/lxdm.service - install -d $pkgdir/var/lib/lxdm - echo "GDK_CORE_DEVICE_EVENTS\t\t\tDEFAULT=1" > $pkgdir/var/lib/lxdm/.pam_environment - chmod 644 $pkgdir/var/lib/lxdm/.pam_environment - - # fix the greeter location - sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf - sed -i 's:sbin:bin:' $pkgdir/usr/bin/lxdm - + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chmod 644 "$pkgdir/etc/lxdm/lxdm.conf" + + # Home directory + install -dm 755 "$pkgdir/var/lib/lxdm" + echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment + chown -R 121:121 "$pkgdir/var/lib/lxdm" + + # GNOME Shell extension + mkdir -p "$pkgdir/usr/share/gnome-shell/extensions" + cp -r gnome-shell/LXDM_User_Switch@dgod "$pkgdir/usr/share/gnome-shell/extensions" } diff --git a/community/lxdm/default-config.patch b/community/lxdm/default-config.patch new file mode 100644 index 000000000..78c9bc00b --- /dev/null +++ b/community/lxdm/default-config.patch @@ -0,0 +1,79 @@ +diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in +--- lxdm.orig/data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200 ++++ lxdm/data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200 +@@ -23,7 +23,7 @@ + + [server] + ## arg used to start xserver, not fully function +-# arg=/usr/bin/X -background vt1 ++arg=/usr/bin/X -background vt1 + # uncomment this if you really want xserver listen to tcp + # tcp_listen=1 + # uncoment this if you want reset the xserver after logou +@@ -34,7 +34,7 @@ + gtk_theme=Clearlooks + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++# bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 +diff -Naur lxdm.orig/data/lxdm.in lxdm/data/lxdm.in +--- lxdm.orig/data/lxdm.in 2013-08-30 17:56:16.097006000 +0200 ++++ lxdm/data/lxdm.in 2013-09-04 01:57:56.950799946 +0200 +@@ -1,21 +1,13 @@ + #!/bin/sh + +-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n +- +-if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then +- . /etc/sysconfig/language +- if [ -n "$RC_LANG"]; then +- LANG=$RC_LANG +- fi ++if [ -r /etc/profile.d/locale.sh ]; then ++ . /etc/profile.d/locale.sh + fi + + if [ -n "$LANG" ]; then + export LANG + fi + +-[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop +-[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager +- + if [ -n "$DEFAULT_WM" ]; then + PREFERRED=$DEFAULT_WM + fi +diff -Naur lxdm.orig/data/Xsession lxdm/data/Xsession +--- lxdm.orig/data/Xsession 2013-08-30 17:56:16.097006000 +0200 ++++ lxdm/data/Xsession 2013-09-04 01:58:19.941348762 +0200 +@@ -9,6 +9,8 @@ + LXSESSION=/usr/bin/startlxde + fi + ++[ -f /etc/profile ] && . /etc/profile ++[ -f ~/.profile ] && . ~/.profile + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f ~/.xprofile ] && . ~/.xprofile + +diff -Naur lxdm.orig/pam/lxdm lxdm/pam/lxdm +--- lxdm.orig/pam/lxdm 2013-08-30 17:56:16.100339000 +0200 ++++ lxdm/pam/lxdm 2013-08-30 17:58:35.543771605 +0200 +@@ -1,9 +1,7 @@ + #%PAM-1.0 +-auth substack system-auth +-auth optional pam_gnome_keyring.so +-account include system-auth +-session optional pam_keyinit.so force revoke +-session include system-auth +-session optional pam_console.so +-session optional pam_gnome_keyring.so auto_start +-session optional pam_selinux.so ++auth include system-login ++-auth optional pam_gnome_keyring.so ++account include system-login ++password include system-login ++session include system-login ++-session optional pam_gnome_keyring.so auto_start diff --git a/community/lxdm/git-fixes.patch b/community/lxdm/git-fixes.patch new file mode 100644 index 000000000..6a331cf0b --- /dev/null +++ b/community/lxdm/git-fixes.patch @@ -0,0 +1,3702 @@ +diff --git a/Makefile.am b/Makefile.am +index bfac56b..6f997b8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,5 @@ + NULL = ++ + SUBDIRS= \ + src \ + po \ +@@ -6,6 +7,10 @@ SUBDIRS= \ + data \ + $(NULL) + ++if HAVE_SYSTEMD ++SUBDIRS += systemd ++endif ++ + rpm: dist @PACKAGE_NAME@.spec + rpmbuild -bb \ + --define "_sourcedir `pwd`" \ +diff --git a/configure.ac b/configure.ac +index e952473..8958c9c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,8 +2,8 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.63]) +-AC_INIT([lxdm], [0.4.1], [http://lxde.org/]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AC_INIT([lxdm], [0.5.0], [http://lxde.org/]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) + + AC_CONFIG_SRCDIR([src/lxdm.c]) + AC_CONFIG_HEADERS([config.h]) +@@ -16,10 +16,17 @@ AM_PROG_CC_C_O + # Checks for libraries. + AC_CHECK_LIB([crypt], [crypt]) + +-AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]), +-[],[AC_CHECK_LIB([pam], [pam_open_session])]) +- +-AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) ++# Check for PAM support ++AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]), ++ [USE_PAM=$withval], [USE_PAM=$use_pam_default]) ++if test "x$USE_PAM" != "xno" ; then ++ AC_SEARCH_LIBS(pam_open_session,[pam]) ++ AC_CHECK_FUNC(pam_open_session, ++ [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])], ++ [if test "x$USE_PAM" != "xtry" ; then ++ AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."]) ++ fi]) ++fi + + # Checks for header files. + AC_PATH_X +@@ -80,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules]) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ ++ ++AC_ARG_ENABLE(consolekit, ++ AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]), ++ [enable_consolekit=$enableval], ++ [enable_consolekit=yes] ++) ++ ++if test "x$enable_consolekit" = "xyes" ; then ++ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ + AC_SUBST(CONSOLEKIT_CFLAGS) + AC_SUBST(CONSOLEKIT_LIBS)],[ + echo "ConsoleKit devel package not found" + ]) ++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) ++fi ++ + + AC_ARG_ENABLE(password, + AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]), +@@ -118,7 +136,7 @@ if test "x$enable_debug" = "x$yes" ; then + fi + + AC_ARG_WITH(xconn, +- [AC_HELP_STRING([-with-xconn=@<:@xlib/xcb@:>@],[use xlib or xcb to use])], ++ [AC_HELP_STRING([--with-xconn=@<:@xlib/xcb@:>@],[use xlib or xcb to use])], + [if test "x$with_xconn" = "xxlib"; then + PKG_CHECK_MODULES(XCONN,"x11") + AC_SUBST(XCONN_CFLAGS) +@@ -138,6 +156,14 @@ AC_ARG_WITH(xconn, + ] + ) + ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + GETTEXT_PACKAGE=lxdm + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +@@ -148,6 +174,7 @@ AC_CONFIG_FILES([ + src/Makefile + po/Makefile.in + pam/Makefile ++ systemd/Makefile + data/Makefile + data/PostLogin + data/PostLogout +diff --git a/data/Makefile.am b/data/Makefile.am +index 6d3fad6..9500da9 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -1,6 +1,6 @@ + FULL_LIBEXECDIR=$(libexecdir) + +-lxdm.conf : lxdm.conf.in ++lxdm.conf: lxdm.conf.in + cat lxdm.conf.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ + + NULL= +diff --git a/data/Xsession b/data/Xsession +index 287db71..fe76de0 100755 +--- a/data/Xsession ++++ b/data/Xsession +@@ -15,12 +15,7 @@ fi + if [ -f /etc/X11/xinit/xinitrc-common ]; then + # fedora + . /etc/X11/xinit/xinitrc-common +- if ! [ -z "$XDG_SESSION_COOKIE" ]; then +- CK_XINIT_SESSION= +- elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then +- CK_XINIT_SESSION="/usr/bin/ck-launch-session" +- fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++ exec -l bash -c "$LXSESSION" + elif [ -x /etc/X11/xinit/Xsession ]; then + # fedora + exec /etc/X11/xinit/Xsession "$LXSESSION" +@@ -30,17 +25,24 @@ elif [ -x /etc/X11/Xsession ]; then + elif [ -x /etc/X11/xinit/xinitrc ]; then + #suse + export WINDOWMANAGER=$LXSESSION +- exec -l $SHELL -c /etc/X11/xinit/xinitrc ++ exec -l bash -c /etc/X11/xinit/xinitrc + else + # unknown, user should custom /etc/lxdm/xinitrc self + if [ -x /etc/lxdm/xinitrc ]; then +- . /etc/lxdm/xinitrc ++ . /etc/lxdm/xinitrc "$LXSESSION" ++ fi ++ if [ -d /etc/X11/xinit/xinitrc.d ] ; then ++ for f in /etc/X11/xinit/xinitrc.d/* ; do ++ [ -x "$f" ] && . "$f" ++ done ++ unset f + fi +- if ! [ -z "$XDG_SESSION_COOKIE" ]; then +- CK_XINIT_SESSION= +- elif [ -x /usr/bin/ck-launch-session ]; then +- CK_XINIT_SESSION="/usr/bin/ck-launch-session" ++ ++ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; ++ then ++ eval "$(dbus-launch --sh-syntax --exit-with-session)" + fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++ ++ exec -l bash -c "$LXSESSION" + fi + +diff --git a/data/config.ui b/data/config.ui +index 423fe56..b6d724d 100644 +--- a/data/config.ui ++++ b/data/config.ui +@@ -175,8 +175,99 @@ + </packing> + </child> + <child> ++ <object class="GtkHBox" id="hbox3"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <child> ++ <object class="GtkCheckButton" id="lxdm-enable-bottom-pane"> ++ <property name="label" translatable="yes">Enable bottom panel</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="use_action_appearance">False</property> ++ <property name="xalign">0</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkAlignment" id="alignment3"> ++ <property name="visible">True</property> ++ <property name="xscale">0</property> ++ <property name="yscale">0</property> ++ <child> ++ <object class="GtkHBox" id="hbox4"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <child> ++ <object class="GtkLabel" id="label3"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes">Bottom Panel Options</property> ++ <attributes> ++ <attribute name="underline" value="True"/> ++ </attributes> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ <child> ++ <object class="GtkVBox" id="vbox2"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <child> ++ <object class="GtkCheckButton" id="lxdm-transparent-pane"> ++ <property name="label" translatable="yes">Transparent panel</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="use_action_appearance">False</property> ++ <property name="xalign">0</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkCheckButton" id="lxdm-hide-sessions"> ++ <property name="label" translatable="yes">Hide sessions</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="use_action_appearance">False</property> ++ <property name="xalign">0</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> + <object class="GtkCheckButton" id="lxdm-show-lang"> +- <property name="label" translatable="yes">Show languanges menu</property> ++ <property name="label" translatable="yes">Show languages menu</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> +@@ -187,7 +278,7 @@ + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="position">3</property> ++ <property name="position">2</property> + </packing> + </child> + <child> +@@ -203,9 +294,60 @@ + <packing> + <property name="expand">False</property> + <property name="fill">True</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkCheckButton" id="lxdm-hide-exit"> ++ <property name="label" translatable="yes">Hide quit button</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="use_action_appearance">False</property> ++ <property name="xalign">0</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">5</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkAlignment" id="alignment4"> ++ <property name="visible">True</property> ++ <property name="xscale">0</property> ++ <property name="yscale">0</property> ++ <child> ++ <object class="GtkHBox" id="hbox5"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <child> ++ <object class="GtkLabel" id="label4"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes">Other Options</property> ++ <attributes> ++ <attribute name="underline" value="True"/> ++ </attributes> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> + <child> + <object class="GtkCheckButton" id="lxdm-user-list"> + <property name="label" translatable="yes">Show user list</property> +@@ -219,7 +361,23 @@ + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="position">5</property> ++ <property name="position">7</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkCheckButton" id="lxdm-hide-time"> ++ <property name="label" translatable="yes">Hide time</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="use_action_appearance">False</property> ++ <property name="xalign">0</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">8</property> + </packing> + </child> + <child> +diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in +index dd94686..d93f280 100644 +--- a/data/lxdm.conf.in ++++ b/data/lxdm.conf.in +@@ -15,12 +15,19 @@ + ## set this if you don't want to put xauth file at ~/.Xauthority + # xauth_path=/tmp + ++# not ask password for users who have empty password ++# skip_password=1 ++ + ## greeter used to welcome the user + greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk + + [server] + ## arg used to start xserver, not fully function + # arg=/usr/bin/X -background vt1 ++# uncomment this if you really want xserver listen to tcp ++# tcp_listen=1 ++# uncoment this if you want reset the xserver after logou ++# reset=1 + + [display] + ## gtk theme used by greeter +diff --git a/data/lxdm.glade b/data/lxdm.glade +index 81175e8..221c2a3 100644 +--- a/data/lxdm.glade ++++ b/data/lxdm.glade +@@ -125,7 +125,9 @@ + </packing> + </child> + <child> +- <object class="GtkComboBoxEntry" id="keyboard"/> ++ <object class="GtkComboBoxEntry" id="keyboard"> ++ <property name="text_column">0</property> ++ </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> +diff --git a/data/themes/Industrial/greeter-gtk3.ui b/data/themes/Industrial/greeter-gtk3.ui +index 483809c..2f4e631 100644 +--- a/data/themes/Industrial/greeter-gtk3.ui ++++ b/data/themes/Industrial/greeter-gtk3.ui +@@ -1,7 +1,5 @@ + <?xml version="1.0"?> + <interface> +- <!-- interface-requires gtk+ 2.12 --> +- <!-- interface-naming-policy project-wide --> + <object class="GtkWindow" id="lxdm"> + <property name="decorated">False</property> + <child> +@@ -25,7 +23,7 @@ + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xscale">0</property> +- <property name="yscale">0</property> ++ <property name="yscale">1</property> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> +@@ -34,6 +32,7 @@ + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="pixbuf">login.png</property> ++ <property name="yalign">0.8</property> + </object> + <packing> + <property name="position">0</property> +@@ -42,6 +41,7 @@ + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> ++ <property name="yalign">0.1</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> +@@ -61,19 +61,22 @@ + </packing> + </child> + <child> +- <object class="GtkIconView" id="user_list"> ++ <object class="GtkScrolledWindow" id="user_list_scrolled"> + <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="item-padding">1</property> +- <property name="margin">2</property> +- <property name="column-spacing">0</property> +- <property name="row-spacing">1</property> ++ <property name="can_focus">False</property> ++ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> ++ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> ++ <child> ++ <object class="GtkIconView" id="user_list"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="item-padding">1</property> ++ <property name="margin">2</property> ++ <property name="column-spacing">0</property> ++ <property name="row-spacing">1</property> ++ </object> ++ </child> + </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">1</property> +- </packing> + </child> + <child> + <object class="GtkEntry" id="login_entry"> +diff --git a/data/themes/Industrial/greeter.ui b/data/themes/Industrial/greeter.ui +index 77a4f8d..3413922 100644 +--- a/data/themes/Industrial/greeter.ui ++++ b/data/themes/Industrial/greeter.ui +@@ -25,7 +25,7 @@ + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xscale">0</property> +- <property name="yscale">0</property> ++ <property name="yscale">1</property> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> +@@ -34,6 +34,7 @@ + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="pixbuf">login.png</property> ++ <property name="yalign">0.8</property> + </object> + <packing> + <property name="position">0</property> +@@ -42,6 +43,7 @@ + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> ++ <property name="yalign">0.1</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> +@@ -61,19 +63,22 @@ + </packing> + </child> + <child> +- <object class="GtkIconView" id="user_list"> ++ <object class="GtkScrolledWindow" id="user_list_scrolled"> + <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="item-padding">1</property> +- <property name="margin">2</property> +- <property name="column-spacing">0</property> +- <property name="row-spacing">1</property> ++ <property name="can_focus">False</property> ++ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> ++ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> ++ <child> ++ <object class="GtkIconView" id="user_list"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="item-padding">1</property> ++ <property name="margin">2</property> ++ <property name="column-spacing">0</property> ++ <property name="row-spacing">1</property> ++ </object> ++ </child> + </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">1</property> +- </packing> + </child> + <child> + <object class="GtkEntry" id="login_entry"> +@@ -201,7 +206,9 @@ + </packing> + </child> + <child> +- <object class="GtkComboBoxEntry" id="keyboard"/> ++ <object class="GtkComboBoxEntry" id="keyboard"> ++ <property name="text_column">0</property> ++ </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> +diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css +index eefe846..7621345 100644 +--- a/data/themes/Industrial/gtk.css ++++ b/data/themes/Industrial/gtk.css +@@ -1,20 +1,21 @@ + #lxdm { +- background-image: url("wave.svg") ++ background-image: url("wave.svg"); ++ background-size: 100%; + } + + #bottom_pane { +- background-image: url("shade.png") ++ background-color: rgba(0,0,0,0.24); + } + + #time { + font: Sans 12; +- color: #ffffff ++ color: #ffffff; + } + + #user_list, #login_entry { +- background-image: none ++ background-image: none; + } + + #prompt, #bottom_pane GtkLabel { +- color: #ffffff ++ color: #ffffff; + } +diff --git a/data/themes/Industrial/gtkrc b/data/themes/Industrial/gtkrc +index 9ee55d5..8f1d810 100644 +--- a/data/themes/Industrial/gtkrc ++++ b/data/themes/Industrial/gtkrc +@@ -45,6 +45,6 @@ style "bottom" + + widget "lxdm" style "back" + widget "lxdm.*.time" style "time" +-widget "lxdm.*.prompt" style "prompt" ++widget "*.prompt" style "prompt" + widget "lxdm.*.bottom_pane" style "bottom" + widget_class "GtkWindow.*.GtkEventBox.*.<GtkLabel>" style "bottom" +diff --git a/gnome-shell/LXDM_User_Switch@dgod/extension.js b/gnome-shell/LXDM_User_Switch@dgod/extension.js +new file mode 100644 +index 0000000..5c0498f +--- /dev/null ++++ b/gnome-shell/LXDM_User_Switch@dgod/extension.js +@@ -0,0 +1,28 @@ ++const Main = imports.ui.main; ++const GLib = imports.gi.GLib; ++const PopupMenu = imports.ui.popupMenu; ++ ++let button, menu, evt; ++ ++function _buttonActivate() { ++ Main.overview.hide(); ++ GLib.spawn_command_line_async("lxdm -c USER_SWITCH"); ++} ++ ++function init() { ++} ++ ++function enable() { ++ menu = Main.panel["statusArea"].userMenu; ++ button = menu._loginScreenItem; ++ evt=button.connect('activate', function(){GLib.spawn_command_line_async("lxdm -c USER_SWITCH");}); ++ button.actor.visible=true; ++} ++ ++function disable() { ++ if(evt && button) ++ button.disconnect(evt); ++ evt=undefined; ++ button=undefined; ++ menu=undefined; ++} +diff --git a/gnome-shell/LXDM_User_Switch@dgod/metadata.json b/gnome-shell/LXDM_User_Switch@dgod/metadata.json +new file mode 100644 +index 0000000..a5a19f7 +--- /dev/null ++++ b/gnome-shell/LXDM_User_Switch@dgod/metadata.json +@@ -0,0 +1 @@ ++{"shell-version": ["3.6.0"], "uuid": "LXDM_User_Switch@dgod", "name": "LXDM User Switch", "description": "LXDM User Switch"} +\ No newline at end of file +diff --git a/gnome-shell/LXDM_User_Switch@dgod/stylesheet.css b/gnome-shell/LXDM_User_Switch@dgod/stylesheet.css +new file mode 100644 +index 0000000..e69de29 +diff --git a/lxdm.spec.in b/lxdm.spec.in +index ae5b345..3033d74 100644 +--- a/lxdm.spec.in ++++ b/lxdm.spec.in +@@ -14,7 +14,8 @@ Source0: lxdm-%{version}.tar.gz + + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} + +-BuildRequires: gtk2-devel pam-devel intltool ++BuildRequires: gtk3-devel pam-devel intltool ++Provides: service(graphical-login) = lxdm + + %description + Light weight X11 display manager +@@ -26,7 +27,7 @@ Light weight X11 display manager + export CFLAGS="$RPM_OPT_FLAGS" + export CXXFLAGS="$RPM_OPT_FLAGS" + +-%configure ++%configure --enable-gtk3 + + %__make + +@@ -64,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT + %{_sysconfdir}/lxdm/Xsession + %config %{_sysconfdir}/lxdm/lxdm.conf + %{_sysconfdir}/pam.d/lxdm ++%{_unitdir}/lxdm.service + + %changelog + +diff --git a/pam/lxdm b/pam/lxdm +index 51ffda4..41c95f4 100644 +--- a/pam/lxdm ++++ b/pam/lxdm +@@ -4,6 +4,6 @@ auth optional pam_gnome_keyring.so + account include system-auth + session optional pam_keyinit.so force revoke + session include system-auth +-session required pam_loginuid.so + session optional pam_console.so + session optional pam_gnome_keyring.so auto_start ++session optional pam_selinux.so +diff --git a/src/Makefile.am b/src/Makefile.am +index 7fdfd99..4f9a11c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,6 +8,7 @@ lxdm_binary_CFLAGS = \ + -DXSESSIONS_DIR=\"@datarootdir@/xsessions\" \ + -DLXDM_DATA_DIR=@datadir@/@PACKAGE@ \ + -DLXDM_NUMLOCK_PATH=\"@libexecdir@/lxdm-numlock\" \ ++ -DLXDM_SESSION_PATH=\"@libexecdir@/lxdm-session\" \ + $(CONSOLEKIT_CFLAGS) \ + -Werror-implicit-function-declaration \ + -Wall \ +@@ -20,10 +21,10 @@ lxdm_binary_LDADD = \ + $(NULL) + + lxdm_binary_SOURCES = \ +- lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ ++ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c lxcommon.h \ + $(NULL) + +-libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk ++libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk lxdm-session + + lxdm_greeter_gtk_CFLAGS = \ + $(GTK_CFLAGS) \ +@@ -49,6 +50,7 @@ lxdm_greeter_gtk_SOURCES = \ + gdm/locarchive.h \ + lxcom.c lxcom.h \ + greeter-utils.c greeter-utils.h \ ++ lxcommon.h \ + $(NULL) + + lxdm_greeter_gdk_CFLAGS = \ +@@ -84,6 +86,18 @@ lxdm_numlock_LDADD = \ + $(XLIB_LIBS) \ + $(NULL) + ++lxdm_session_SOURCES = \ ++ pam.c \ ++ $(NULL) ++ ++lxdm_session_CFLAGS = \ ++ $(GLIB_CFLAGS) \ ++ $(NULL) ++ ++lxdm_session_LDFLAGS = \ ++ $(GLIB_LIBS) \ ++ $(NULL) ++ + bin_PROGRAMS = lxdm-config + + lxdm_config_CFLAGS = \ +@@ -100,3 +114,4 @@ lxdm_config_SOURCES = \ + config.c \ + $(NULL) + ++ +diff --git a/src/auth.c b/src/auth.c +new file mode 100644 +index 0000000..10c047c +--- /dev/null ++++ b/src/auth.c +@@ -0,0 +1,632 @@ ++/* ++ * lxdm.c - main entry of lxdm ++ * ++ * Copyright 2009 dgod <dgod.osa@gmail.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ */ ++ ++#define _GNU_SOURCE ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++#ifndef HAVE_LIBPAM ++#ifdef USE_PAM ++#define HAVE_LIBPAM 1 ++#else ++#define HAVE_LIBPAM 0 ++#endif ++#endif ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <stdarg.h> ++ ++#include <pwd.h> ++#include <grp.h> ++#include <shadow.h> ++#include <unistd.h> ++#include <errno.h> ++ ++#include <glib.h> ++ ++#include "lxdm.h" ++#include "auth.h" ++ ++#if HAVE_LIBPAM ++ ++#define PAM_MP 1 ++ ++#endif ++ ++void switch_user(struct passwd *pw, const char *run, char **env); ++ ++static void passwd_clean(struct passwd *pw) ++{ ++ g_free(pw->pw_name); ++ g_free(pw->pw_gecos); ++ g_free(pw->pw_dir); ++ g_free(pw->pw_shell); ++ memset(pw,0,sizeof(*pw)); ++} ++ ++#if !PAM_MP ++static void passwd_copy(struct passwd *dst,struct passwd *src) ++{ ++ dst->pw_name=g_strdup(src->pw_name); ++ dst->pw_uid=src->pw_uid; ++ dst->pw_gid=src->pw_gid; ++ if(src->pw_gecos) ++ dst->pw_gecos=g_strdup(src->pw_gecos); ++ dst->pw_dir=g_strdup(src->pw_dir); ++ dst->pw_shell=g_strdup(src->pw_shell); ++} ++#endif ++ ++#if !HAVE_LIBPAM ++ ++ ++int lxdm_auth_init(LXDM_AUTH *a) ++{ ++ memset(a,0m,sizeof(*a)); ++ return 0; ++} ++ ++int lxdm_auth_cleanup(LXDM_AUTH *a) ++{ ++ passwd_clean(&a->pw); ++ return 0; ++} ++ ++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type) ++{ ++ struct passwd *pw; ++ struct spwd *sp; ++ char *real; ++ char *enc; ++ if(!user || !user[0]) ++ { ++ g_debug("user==NULL\n"); ++ return AUTH_ERROR; ++ } ++ pw = getpwnam(user); ++ endpwent(); ++ if(!pw) ++ { ++ g_debug("user %s not found\n",user); ++ return AUTH_BAD_USER; ++ } ++ if(strstr(pw->pw_shell, "nologin")) ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } ++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) ++ { ++ goto out; ++ } ++ sp = getspnam(user); ++ if( !sp ) ++ { ++ return AUTH_FAIL; ++ } ++ endspent(); ++ real = sp->sp_pwdp; ++ if( !real || !real[0] ) ++ { ++ if( !pass || !pass[0] ) ++ { ++ *ppw = pw; ++ g_debug("user %s auth with no password ok\n",user); ++ return AUTH_SUCCESS; ++ } ++ else ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++ } ++ enc = crypt(pass, real); ++ if( strcmp(real, enc) ) ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++out: ++ g_debug("user %s auth ok\n",pw->pw_name); ++ passwd_copy(&a->pw,pw); ++ return AUTH_SUCCESS; ++} ++ ++int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16]) ++{ ++ return 0; ++} ++ ++int lxdm_auth_session_end(LXDM_AUTH *a) ++{ ++ return 0; ++} ++ ++int lxdm_auth_clean_for_child(LXDM_AUTH *a) ++{ ++ return 0; ++} ++ ++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env) ++{ ++ return env; ++} ++ ++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env) ++{ ++ int pid; ++ pid = fork(); ++ if(pid==0) ++ { ++ env=lxdm_auth_append_env(a,env); ++ lxdm_auth_clean_for_child(a); ++ switch_user(&a->pw, session_exec, env); ++ lxdm_quit_self(4); ++ } ++ return pid; ++} ++ ++#elif !PAM_MP ++ ++#include <security/pam_appl.h> ++ ++static char *user_pass[2]; ++ ++static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) ++{ ++ int result = PAM_SUCCESS; ++ int i; ++ *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); ++ for(i=0;i<num;i++) ++ { ++ //printf("MSG: %d %s\n",msg[i]->msg_style,msg[i]->msg); ++ switch(msg[i]->msg_style){ ++ case PAM_PROMPT_ECHO_ON: ++ resp[i]->resp=strdup(user_pass[0]?user_pass[0]:""); ++ break; ++ case PAM_PROMPT_ECHO_OFF: ++ //resp[i]->resp=strdup(user_pass[1]?user_pass[1]:""); ++ resp[i]->resp=user_pass[1]?strdup(user_pass[1]):NULL; ++ break; ++ case PAM_ERROR_MSG: ++ case PAM_TEXT_INFO: ++ //printf("PAM: %s\n",msg[i]->msg); ++ break; ++ default: ++ break; ++ } ++ } ++ return result; ++} ++ ++static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass}; ++ ++int lxdm_auth_init(LXDM_AUTH *a) ++{ ++ memset(a,0,sizeof(*a)); ++ return 0; ++} ++ ++int lxdm_auth_cleanup(LXDM_AUTH *a) ++{ ++ passwd_clean(&a->pw); ++ return 0; ++} ++ ++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type) ++{ ++ struct passwd *pw; ++ if(!user || !user[0]) ++ { ++ g_debug("user==NULL\n"); ++ return AUTH_ERROR; ++ } ++ pw = getpwnam(user); ++ endpwent(); ++ if(!pw) ++ { ++ g_debug("user %s not found\n",user); ++ return AUTH_BAD_USER; ++ } ++ if(strstr(pw->pw_shell, "nologin")) ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } ++ if(a->handle) pam_end(a->handle,0); ++ if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, (pam_handle_t**)&a->handle)) ++ { ++ a->handle=NULL; ++ g_debug("user %s start pam fail\n",user); ++ return AUTH_FAIL; ++ } ++ else ++ { ++ int ret; ++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) ++ goto out; ++ user_pass[0]=(char*)user;user_pass[1]=(char*)pass; ++ ret=pam_authenticate(a->handle,PAM_SILENT); ++ user_pass[0]=0;user_pass[1]=0; ++ if(ret!=PAM_SUCCESS) ++ { ++ g_debug("user %s auth fail with %d\n",user,ret); ++ return AUTH_FAIL; ++ } ++ ret=pam_acct_mgmt(a->handle,PAM_SILENT); ++ if(ret!=PAM_SUCCESS) ++ { ++ g_debug("user %s acct mgmt fail with %d\n",user,ret); ++ return AUTH_FAIL; ++ } ++ } ++out: ++ passwd_copy(&a->pw,pw); ++ return AUTH_SUCCESS; ++} ++ ++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16]) ++{ ++ int err; ++ char x[256]; ++ ++ if(!a->handle) ++ { ++ g_message("begin session without auth\n"); ++ return -1; ++ } ++ sprintf(x, "tty%d", tty); ++ pam_set_item(a->handle, PAM_TTY, x); ++#ifdef PAM_XDISPLAY ++ sprintf(x,":%d",display); ++ pam_set_item(a->handle, PAM_XDISPLAY, x); ++#endif ++#if !defined(DISABLE_XAUTH) && defined(PAM_XAUTHDATA) ++ struct pam_xauth_data value; ++ value.name="MIT-MAGIC-COOKIE-1"; ++ value.namelen=18; ++ value.data=mcookie; ++ value.datalen=16; ++ pam_set_item (a->handle, PAM_XAUTHDATA, &value); ++#endif ++ if(name && name[0]) ++ { ++ char *env; ++ env = g_strdup_printf ("DESKTOP_SESSION=%s", name); ++ pam_putenv (a->handle, env); ++ g_free (env); ++ } ++ err = pam_open_session(a->handle, 0); /* FIXME pam session failed */ ++ if( err != PAM_SUCCESS ) ++ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err)); ++ return 0; ++} ++ ++int lxdm_auth_session_end(LXDM_AUTH *a) ++{ ++ int err; ++ if(!a->handle) ++ return 0; ++ err = pam_close_session(a->handle, 0); ++ pam_end(a->handle, err); ++ a->handle = NULL; ++ passwd_clean(&a->pw); ++ return 0; ++} ++ ++int lxdm_auth_clean_for_child(LXDM_AUTH *a) ++{ ++ pam_end(a->handle,0); ++ return 0; ++} ++ ++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env) ++{ ++ int i,j,n,pa; ++ char **penv; ++ if(!a->handle) return env; ++ penv=pam_getenvlist(a->handle); ++ if(!penv) return env; ++ pa=g_strv_length(penv); ++ if(pa==0) ++ { ++ free(penv); ++ return env; ++ } ++ env=g_renew(char *,env,g_strv_length(env)+1+pa+10); ++ for(i=0;penv[i]!=NULL;i++) ++ { ++ fprintf(stderr,"PAM %s\n",penv[i]); ++ n=strcspn(penv[i],"=")+1; ++ for(j=0;env[j]!=NULL;j++) ++ { ++ if(!strncmp(penv[i],env[j],n)) ++ break; ++ if(env[j+1]==NULL) ++ { ++ env[j+1]=g_strdup(penv[i]); ++ env[j+2]=NULL; ++ break; ++ } ++ } ++ free(penv[i]); ++ } ++ free(penv); ++ return env; ++} ++ ++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env) ++{ ++ int pid; ++ pid = fork(); ++ if(pid==0) ++ { ++ env=lxdm_auth_append_env(a,env); ++ lxdm_auth_clean_for_child(a); ++ switch_user(&a->pw, session_exec, env); ++ lxdm_quit_self(4); ++ } ++ return pid; ++} ++ ++#else ++ ++static void xwrite(int fd,const void *buf,size_t size) ++{ ++ int ret; ++ do{ ++ ret=write(fd,buf,size); ++ }while(ret==-1 && errno==EINTR); ++} ++ ++static int xreadline(int fd,char *buf,size_t size) ++{ ++ int i; ++ for(i=0;i<size-1;i++) ++ { ++ int ret; ++ do{ ++ ret=read(fd,buf+i,1); ++ }while(ret==-1 && errno==EINTR); ++ if(buf[i]==-1 || buf[i]=='\n') ++ break; ++ } ++ buf[i]=0; ++ return i; ++} ++ ++int lxdm_auth_init(LXDM_AUTH *a) ++{ ++ memset(a,0,sizeof(*a)); ++ a->pipe[0]=a->pipe[1]=-1; ++ return 0; ++} ++ ++int lxdm_auth_cleanup(LXDM_AUTH *a) ++{ ++ passwd_clean(&a->pw); ++ if(a->pipe[0]!=-1) ++ { ++ close(a->pipe[0]); ++ a->pipe[0]=-1; ++ } ++ if(a->pipe[1]!=-1) ++ { ++ close(a->pipe[1]); ++ a->pipe[1]=-1; ++ } ++ return 0; ++} ++ ++//#undef LXDM_SESSION_PATH ++//#define LXDM_SESSION_PATH "./lxdm-session" ++static int check_child(LXDM_AUTH *a) ++{ ++ if(a->pipe[0]!=-1) ++ return 0; ++ char *argv[3]={LXDM_SESSION_PATH,NULL,NULL}; ++ GPid pid; ++ gboolean ret; ++ ret = g_spawn_async_with_pipes(NULL, argv, NULL, ++ G_SPAWN_DO_NOT_REAP_CHILD, NULL,NULL, ++ &pid, a->pipe + 0, a->pipe + 1, NULL, NULL); ++ if(ret==FALSE) ++ { ++ g_message("spawn lxdm-auth fail\n"); ++ return -1; ++ } ++ a->child=(int)pid; ++ return 0; ++} ++ ++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type) ++{ ++ char temp[128]; ++ char res[8]; ++ int ret; ++ if(check_child(a)!=0) ++ { ++ printf("check child fail\n"); ++ return -1; ++ } ++ if(type==AUTH_TYPE_AUTO_LOGIN && pass) ++ type=AUTH_TYPE_NORMAL; ++ else if(type==AUTH_TYPE_NORMAL && !pass) ++ type=AUTH_TYPE_NULL_PASS; ++ xwrite(a->pipe[0],"auth\n",5); ++ ret=sprintf(temp,"%d\n",type); ++ xwrite(a->pipe[0],temp,ret); ++ ret=sprintf(temp,"%s\n",user); ++ xwrite(a->pipe[0],temp,ret); ++ if(pass!=NULL) ++ ret=sprintf(temp,"%s\n",pass); ++ xwrite(a->pipe[0],temp,ret); ++ ret=xreadline(a->pipe[1],res,sizeof(res)); ++ if(ret<=0) ++ { ++ g_message("read user auth result fail\n"); ++ return -1; ++ } ++ ret=atoi(res); ++ if(ret==AUTH_SUCCESS) ++ { ++ passwd_clean(&a->pw); ++ a->pw.pw_name=g_strdup(user); ++ ret=xreadline(a->pipe[1],temp,sizeof(temp)); ++ if(ret==-1) return -1; ++ a->pw.pw_uid=atoi(temp); ++ ret=xreadline(a->pipe[1],temp,sizeof(temp)); ++ if(ret==-1) return -1; ++ a->pw.pw_gid=atoi(temp); ++ ret=xreadline(a->pipe[1],temp,sizeof(temp)); ++ if(ret==-1) return -1; ++ a->pw.pw_gecos=g_strdup(temp); ++ ret=xreadline(a->pipe[1],temp,sizeof(temp)); ++ if(ret==-1) return -1; ++ a->pw.pw_dir=g_strdup(temp); ++ ret=xreadline(a->pipe[1],temp,sizeof(temp)); ++ if(ret==-1) return -1; ++ a->pw.pw_shell=g_strdup(temp); ++ } ++ return atoi(res); ++} ++#include <assert.h> ++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16]) ++{ ++ char temp[32]; ++ char res[8]; ++ gchar *b64; ++ int ret; ++ ++ if(check_child(a)!=0) ++ return -1; ++ xwrite(a->pipe[0],"begin\n",6); ++ ret=sprintf(temp,"%s\n",name?:""); ++ xwrite(a->pipe[0],temp,ret); ++ ret=sprintf(temp,"%d\n",tty); ++ xwrite(a->pipe[0],temp,ret); ++ ret=sprintf(temp,"%d\n",display); ++ xwrite(a->pipe[0],temp,ret); ++ b64=g_base64_encode((const guchar*)mcookie,16); ++ assert(b64!=NULL); ++ ret=sprintf(temp,"%s\n",b64); ++ g_free(b64); ++ xwrite(a->pipe[0],temp,ret); ++ ret=xreadline(a->pipe[1],res,sizeof(res)); ++ if(ret<=0) ++ { ++ g_message("pam session begin fail\n"); ++ return -1; ++ } ++ ret=atoi(res); ++ return ret; ++} ++ ++int lxdm_auth_session_end(LXDM_AUTH *a) ++{ ++ passwd_clean(&a->pw); ++ if(a->pipe[0]!=-1) ++ { ++ xwrite(a->pipe[0],"exit\n",5); ++ close(a->pipe[0]); ++ a->pipe[0]=-1; ++ } ++ if(a->pipe[1]!=-1) ++ { ++ close(a->pipe[1]); ++ a->pipe[1]=-1; ++ } ++ return 0; ++} ++ ++int lxdm_auth_clean_for_child(LXDM_AUTH *a) ++{ ++ return 0; ++} ++ ++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env) ++{ ++ int i,j,n,pa; ++ char temp[1024]; ++ int ret; ++ char **penv; ++ ++ if(check_child(a)!=0) ++ return env; ++ xwrite(a->pipe[0],"env\n",4); ++ ret=xreadline(a->pipe[1],temp,sizeof(temp)); ++ if(ret<=0) return env; ++ penv=g_strsplit(temp," ",-1); ++ pa=g_strv_length(penv); ++ if(pa==0) ++ { ++ g_strfreev(penv); ++ return env; ++ } ++ env=g_renew(char *,env,g_strv_length(env)+1+pa+10); ++ for(i=0;penv[i]!=NULL;i++) ++ { ++ g_debug("PAM %s\n",penv[i]); ++ n=strcspn(penv[i],"=")+1; ++ for(j=0;env[j]!=NULL;j++) ++ { ++ if(!strncmp(penv[i],env[j],n)) ++ break; ++ if(env[j+1]==NULL) ++ { ++ env[j+1]=g_strdup(penv[i]); ++ env[j+2]=NULL; ++ break; ++ } ++ } ++ } ++ g_strfreev(penv); ++ return env; ++} ++ ++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env) ++{ ++ int fd; ++ if(check_child(a)!=0) ++ return -1; ++ fd=a->pipe[0]; ++ if(env!=NULL) ++ { ++ int i; ++ xwrite(fd,"putenv\n",7); ++ for(i=0;env[i]!=NULL;i++) ++ { ++ xwrite(fd,env[i],strlen(env[i])); ++ xwrite(fd,"\n",1); ++ } ++ xwrite(a->pipe[0],"\n",1); ++ } ++ xwrite(fd,"exec\n",5); ++ xwrite(fd,session_exec,strlen(session_exec)); ++ xwrite(fd,"\n",1); ++ return a->child; ++} ++ ++#endif ++ +diff --git a/src/auth.h b/src/auth.h +new file mode 100644 +index 0000000..84d2267 +--- /dev/null ++++ b/src/auth.h +@@ -0,0 +1,44 @@ ++/* ++ * lxdm.c - main entry of lxdm ++ * ++ * Copyright 2009 dgod <dgod.osa@gmail.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ */ ++ ++#pragma once ++ ++typedef struct{ ++ void *handle; ++ struct passwd pw; ++ int pipe[2]; ++ int child; ++}LXDM_AUTH; ++ ++enum{ ++ AUTH_TYPE_NORMAL=0, ++ AUTH_TYPE_AUTO_LOGIN, ++ AUTH_TYPE_NULL_PASS ++}; ++ ++int lxdm_auth_init(LXDM_AUTH *a); ++int lxdm_auth_cleanup(LXDM_AUTH *a); ++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type); ++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16]); ++int lxdm_auth_session_end(LXDM_AUTH *a); ++int lxdm_auth_clean_for_child(LXDM_AUTH *a); ++char **lxdm_auth_append_env(LXDM_AUTH *a,char **env); ++int lxdm_auth_session_run(LXDM_AUTH *a,const char *session_exec,char **env); +diff --git a/src/config.c b/src/config.c +index 3f92f7b..bee826d 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename) + static void update_face_image(GtkWidget *w) + { + GdkPixbuf *pixbuf; +- char *path; +- path=g_build_filename(user->pw_dir,".face",NULL); +- if(access(path,R_OK)) +- { +- g_free(path); +- if(ui_nobody) +- pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); +- if(!pixbuf) +- pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), ++ char *path=g_build_filename(user->pw_dir,".face",NULL); ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); ++ g_free(path); ++ if(!pixbuf && ui_nobody) ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); ++ if(!pixbuf) ++ pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); +- } +- else ++ if(pixbuf) + { +- pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); +- g_free(path); ++ gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); ++ g_object_unref(pixbuf); + } +- gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); +- g_object_unref(pixbuf); + } + + static void set_face_file(const char *filename) +@@ -484,6 +479,82 @@ void prepare_bg(GtkBuilder *builder) + g_signal_connect(w,"toggled",on_bg_type_toggled,NULL); + } + ++static void on_enable_pane_toggled(GtkToggleButton *button) ++{ ++ int val; ++ val=gtk_toggle_button_get_active(button); ++ g_key_file_set_integer(config,"display","bottom_pane",val); ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"vbox2"); ++ gtk_widget_set_sensitive(w,val?TRUE:FALSE); ++ dirty++; ++} ++ ++static void prepare_enable_pane(GtkBuilder *builder) ++{ ++ gint val; ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-enable-bottom-pane"); ++ val=g_key_file_get_integer(config,"display","bottom_pane",NULL); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE); ++ if(!root) gtk_widget_set_sensitive(w,FALSE); ++ g_signal_connect(w,"toggled",G_CALLBACK(on_enable_pane_toggled),NULL); ++} ++ ++static void prepare_vbox2(GtkBuilder *builder) ++{ ++ gint val; ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"vbox2"); ++ val=g_key_file_get_integer(config,"display","bottom_pane",NULL); ++ if(!root) ++ { ++ gtk_widget_set_sensitive(w,FALSE); ++ } ++ else ++ { ++ gtk_widget_set_sensitive(w,val?TRUE:FALSE); ++ } ++} ++ ++static void on_transparent_pane_toggled(GtkToggleButton *button) ++{ ++ int val; ++ val=gtk_toggle_button_get_active(button); ++ g_key_file_set_integer(config,"display","transparent_pane",val); ++ dirty++; ++} ++ ++static void prepare_transparent_pane(GtkBuilder *builder) ++{ ++ gint val; ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-transparent-pane"); ++ val=g_key_file_get_integer(config,"display","transparent_pane",NULL); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE); ++ if(!root) gtk_widget_set_sensitive(w,FALSE); ++ g_signal_connect(w,"toggled",G_CALLBACK(on_transparent_pane_toggled),NULL); ++} ++ ++static void on_hide_sessions_toggled(GtkToggleButton *button) ++{ ++ int val; ++ val=gtk_toggle_button_get_active(button); ++ g_key_file_set_integer(config,"display","hide_sessions",val); ++ dirty++; ++} ++ ++static void prepare_hide_sessions(GtkBuilder *builder) ++{ ++ gint val; ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-hide-sessions"); ++ val=g_key_file_get_integer(config,"display","hide_sessions",NULL); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE); ++ if(!root) gtk_widget_set_sensitive(w,FALSE); ++ g_signal_connect(w,"toggled",G_CALLBACK(on_hide_sessions_toggled),NULL); ++} ++ + static void on_show_lang_toggled(GtkToggleButton *button) + { + int val; +@@ -522,6 +593,44 @@ static void prepare_show_keyboard(GtkBuilder *builder) + g_signal_connect(w,"toggled",G_CALLBACK(on_show_keyboard_toggled),NULL); + } + ++static void on_hide_exit_toggled(GtkToggleButton *button) ++{ ++ int val; ++ val=gtk_toggle_button_get_active(button); ++ g_key_file_set_integer(config,"display","hide_exit",val); ++ dirty++; ++} ++ ++static void prepare_hide_exit(GtkBuilder *builder) ++{ ++ gint val; ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-hide-exit"); ++ val=g_key_file_get_integer(config,"display","hide_exit",NULL); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE); ++ if(!root) gtk_widget_set_sensitive(w,FALSE); ++ g_signal_connect(w,"toggled",G_CALLBACK(on_hide_exit_toggled),NULL); ++} ++ ++static void on_hide_time_toggled(GtkToggleButton *button) ++{ ++ int val; ++ val=gtk_toggle_button_get_active(button); ++ g_key_file_set_integer(config,"display","hide_time",val); ++ dirty++; ++} ++ ++static void prepare_hide_time(GtkBuilder *builder) ++{ ++ gint val; ++ GtkWidget *w; ++ w=(GtkWidget*)gtk_builder_get_object(builder,"lxdm-hide-time"); ++ val=g_key_file_get_integer(config,"display","hide_time",NULL); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),val?TRUE:FALSE); ++ if(!root) gtk_widget_set_sensitive(w,FALSE); ++ g_signal_connect(w,"toggled",G_CALLBACK(on_hide_time_toggled),NULL); ++} ++ + static void on_show_userlist_toggled(GtkToggleButton *button) + { + int val; +@@ -553,8 +662,14 @@ GtkDialog *dialog_create(void) + prepare_user_name(builder); + prepare_user_autologin(builder); + prepare_bg(builder); ++ prepare_enable_pane(builder); ++ prepare_vbox2(builder); ++ prepare_transparent_pane(builder); ++ prepare_hide_sessions(builder); + prepare_show_lang(builder); + prepare_show_keyboard(builder); ++ prepare_hide_exit(builder); ++ prepare_hide_time(builder); + prepare_show_userlist(builder); + + return dlg; +diff --git a/src/greeter-utils.c b/src/greeter-utils.c +index 78b71dd..6d7055a 100644 +--- a/src/greeter-utils.c ++++ b/src/greeter-utils.c +@@ -42,17 +42,29 @@ int ui_get_geometry(GdkWindow *win,GdkRectangle *rc) + void ui_set_bg(GdkWindow *win,GKeyFile *config) + { + GdkPixbuf *bg_img=NULL; ++#if GTK_CHECK_VERSION(3,4,0) ++ GdkRGBA bg_color; ++#else + GdkColor bg_color; ++#endif + GdkWindow *root=gdk_get_default_root_window(); + char *p=g_key_file_get_string(config,"display","bg",NULL); ++#if GTK_CHECK_VERSION(3,4,0) ++ gdk_rgba_parse(&bg_color,"#222E45"); ++#else + gdk_color_parse("#222E45",&bg_color); ++#endif + if( p && p[0] != '#' ) + { + bg_img = gdk_pixbuf_new_from_file(p, 0); + } + if( p && p[0] == '#' ) + { +- gdk_color_parse(p, &bg_color); ++#if GTK_CHECK_VERSION(3,4,0) ++ gdk_rgba_parse(&bg_color,p); ++#else ++ gdk_color_parse(p,&bg_color); ++#endif + } + g_free(p); + +@@ -95,8 +107,13 @@ void ui_set_bg(GdkWindow *win,GKeyFile *config) + else + { + #ifdef ENABLE_GTK3 ++#if GTK_CHECK_VERSION(3,4,0) ++ if(win) gdk_window_set_background_rgba(win,&bg_color); ++ gdk_window_set_background_rgba(root,&bg_color); ++#else + if(win) gdk_window_set_background(win,&bg_color); + gdk_window_set_background(root,&bg_color); ++#endif + #else + GdkColormap *map; + if(win) +@@ -139,12 +156,20 @@ void ui_add_cursor(void) + XDefineCursor(gdk_x11_get_default_xdisplay(), + GDK_WINDOW_XID(gdk_get_default_root_window()), + GDK_CURSOR_XCURSOR(cur)); ++#if GTK_CHECK_VERSION(3,0,0) ++ g_object_unref(cur); ++#else + gdk_cursor_unref(cur); ++#endif + } + + void ui_set_cursor(GdkWindow *win,int which) + { + GdkCursor *cursor=gdk_cursor_new(which); + gdk_window_set_cursor (win,cursor); ++#if GTK_CHECK_VERSION(3,0,0) ++ g_object_unref(cursor); ++#else + gdk_cursor_unref(cursor); ++#endif + } +diff --git a/src/greeter.c b/src/greeter.c +index 095227b..2c6e5be 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -25,6 +25,10 @@ + + #include <gtk/gtk.h> + #include <gdk/gdkx.h> ++#include <gdk/gdkkeysyms.h> ++#ifdef ENABLE_GTK3 ++#include <gdk/gdkkeysyms-compat.h> ++#endif + #include <glib/gi18n.h> + #include <X11/XKBlib.h> + +@@ -36,6 +40,7 @@ + + #include "lxcom.h" + #include "greeter-utils.h" ++#include "lxcommon.h" + + enum { + COL_SESSION_NAME, +@@ -50,15 +55,16 @@ enum { + N_LANG_COLS + }; + +-#define VCONFIG_FILE "/var/lib/lxdm/lxdm.conf" + #define XKB_SYMBOL_DIR "/usr/share/X11/xkb/symbols.dir" + + static GtkBuilder* builder; + static GKeyFile *config; + static GKeyFile * var_config; + static GtkWidget* win; ++static GtkWidget* alignment2; + static GtkWidget* prompt; + static GtkWidget* login_entry; ++static GtkWidget* user_list_scrolled; + static GtkWidget* user_list; + + static GtkWidget* sessions; +@@ -110,7 +116,7 @@ static char *get_session_exec(void) + GtkTreeModel* model; + GtkTreeIter it; + gchar *res; +- if(!lang) ++ if(!sessions) + return g_strdup(""); + + if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it)) +@@ -120,12 +126,73 @@ static char *get_session_exec(void) + return res; + } + ++static void switch_to_input_user(void) ++{ ++ if(user) ++ { ++ g_free(user); ++ user=NULL; ++ } ++ if(pass) ++ { ++ g_free(pass); ++ pass=NULL; ++ } ++ gtk_label_set_text( GTK_LABEL(prompt), _("User:")); ++ gtk_widget_show(prompt); ++ if(user_list) ++ { ++ gtk_widget_hide(login_entry); ++ if(user_list_scrolled) ++ gtk_widget_show(user_list_scrolled); ++ else ++ gtk_widget_hide(user_list); ++ gtk_widget_grab_focus(user_list); ++ } ++ else ++ { ++ gtk_widget_show(login_entry); ++ gtk_widget_grab_focus(login_entry); ++ } ++} ++ ++static void switch_to_input_passwd(void) ++{ ++ if(user_list!=NULL) ++ { ++ if(user_list_scrolled) ++ gtk_widget_hide(user_list_scrolled); ++ else ++ gtk_widget_hide(user_list); ++ } ++ gtk_label_set_text( GTK_LABEL(prompt), _("Password:") ); ++ gtk_entry_set_text(GTK_ENTRY(login_entry), ""); ++ gtk_entry_set_visibility(GTK_ENTRY(login_entry), FALSE); ++ gtk_widget_show(login_entry); ++ gtk_widget_grab_focus(login_entry); ++} ++ ++static void try_login_user(const char *user) ++{ ++ char *session_exec=get_session_exec(); ++ char *session_lang=get_session_lang(); ++ ++ printf("login user=%s session=%s lang=%s\n", ++ user, session_exec, session_lang); ++ ++ g_free(session_lang); ++ g_free(session_exec); ++ ++} ++ + static void on_entry_activate(GtkEntry* entry) + { + char* tmp; + if( !user ) + { + user = g_strdup( gtk_entry_get_text( GTK_ENTRY(entry) ) ); ++ ++#if 0 + gtk_entry_set_text(GTK_ENTRY(entry), ""); + gtk_label_set_text( GTK_LABEL(prompt), _("Password:") ); + if(strchr(user, ' ')) +@@ -135,6 +202,16 @@ static void on_entry_activate(GtkEntry* entry) + return; + } + gtk_entry_set_visibility(entry, FALSE); ++#endif ++ if(g_key_file_get_integer(config,"base","skip_password",NULL)!=0) ++ { ++ gtk_label_set_text( GTK_LABEL(prompt), ""); ++ try_login_user(user); ++ } ++ else ++ { ++ switch_to_input_passwd(); ++ } + } + else + { +@@ -805,7 +882,10 @@ static void on_user_select(GtkIconView *iconview) + g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); + g_list_free (list); + gtk_tree_model_get(model,&iter,2,&name,-1); +- gtk_widget_hide(user_list); ++ if(user_list_scrolled) ++ gtk_widget_hide(user_list_scrolled); ++ else ++ gtk_widget_hide(user_list); + if(name && name[0]) + { + if(auto_login && is_autologin_user(name)) +@@ -825,6 +905,13 @@ static void on_user_select(GtkIconView *iconview) + gtk_widget_hide( GTK_WIDGET(login_entry) ); + return; + } ++ if(g_key_file_get_integer(config,"base","skip_password",NULL)!=0) ++ { ++ gtk_label_set_text( GTK_LABEL(prompt), ""); ++ user=name; ++ try_login_user(user); ++ return; ++ } + gtk_entry_set_text(GTK_ENTRY(login_entry),name); + g_free(name); + on_entry_activate(GTK_ENTRY(login_entry)); +@@ -890,6 +977,10 @@ static gboolean load_user_list(GtkWidget *widget) + #else + gtk_icon_view_set_orientation(GTK_ICON_VIEW(widget),GTK_ORIENTATION_HORIZONTAL); + #endif ++ // FIXME: this should be done at greeter-gtk3.ui ++ // but set there will cause "Floating point exception" ++ gtk_icon_view_set_columns(GTK_ICON_VIEW(widget),1); ++ + model=gtk_list_store_new(5,GDK_TYPE_PIXBUF,G_TYPE_STRING, + G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN); + gtk_icon_view_set_model(GTK_ICON_VIEW(widget),GTK_TREE_MODEL(model)); +@@ -906,18 +997,30 @@ static gboolean load_user_list(GtkWidget *widget) + } + if(count>3) + { +- // TODO: better ui needed +- count=3; ++ if(user_list_scrolled) ++ { ++ gtk_alignment_set(GTK_ALIGNMENT(alignment2), 0.5, 0.1, 0, 0.3); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(user_list_scrolled), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); ++ } ++ else ++ count=3; + } + for(i=0;i<count;i++) + { + char *gecos,*face_path,*display; ++ gchar *gecos_escape; + gboolean login; + GdkPixbuf *face=NULL; + gtk_list_store_append(model,&iter); + gecos=g_key_file_get_string(kf,users[i],"gecos",0); + face_path=g_key_file_get_string(kf,users[i],"face",0); + login=g_key_file_get_boolean(kf,users[i],"login",0); ++ if(gecos!=NULL) ++ { ++ char *comma=gecos?strchr(gecos,','):NULL; ++ if (comma) ++ *comma='\0'; ++ } + if(face_path) + face=gdk_pixbuf_new_from_file_at_scale(face_path,48,48,TRUE,NULL); + if(!face) +@@ -929,13 +1032,15 @@ static gboolean load_user_list(GtkWidget *widget) + face=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); + } ++ gecos_escape=g_markup_escape_text(gecos?gecos:users[i],-1); + display=g_strdup_printf("<span font_size=\"x-large\">%s</span>%s%s%s%s", +- gecos?gecos:users[i], +- (gecos&&strcmp(gecos,users[i]))?"(":"", ++ gecos_escape, ++ (gecos&&strcmp(gecos,users[i]))?" (":"", + (gecos&&strcmp(gecos,users[i]))?users[i]:"", + (gecos&&strcmp(gecos,users[i]))?")":"", + login?_("\n<i>logged in</i>"):""); + // don't translate it now, not freeze ++ g_free(gecos_escape); + gtk_list_store_set(model,&iter,0,face,1,display,2,users[i],3,gecos,4,login,-1); + if(face) g_object_unref(G_OBJECT(face)); + g_free(display); +@@ -944,16 +1049,17 @@ static gboolean load_user_list(GtkWidget *widget) + } + g_strfreev(users); + g_key_file_free(kf); +- ++ + // add "More ..." + gtk_list_store_append(model,&iter); + gtk_list_store_set(model,&iter,1,_("More ..."),2,"",3,"",4,FALSE,-1); +- ++ + path=gtk_tree_path_new_from_string("0"); + gtk_icon_view_select_path(GTK_ICON_VIEW(widget),path); + gtk_widget_grab_focus(widget); + gtk_icon_view_set_cursor(GTK_ICON_VIEW(widget),path,NULL,FALSE); + gtk_tree_path_free(path); ++ + return TRUE; + } + +@@ -981,6 +1087,13 @@ static void on_screen_size_changed(GdkScreen *screen,GtkWidget *win) + ui_set_bg(window,config); + } + ++static gint login_entry_on_key_press (GtkWidget *widget,GdkEventKey *event) ++{ ++ if(event->keyval == GDK_Escape) ++ switch_to_input_user(); ++ return FALSE; ++} ++ + static void create_win() + { + GSList* objs, *l; +@@ -1029,63 +1142,91 @@ static void create_win() + + } /* otherwise, let gtk theme paint it. */ + ++ alignment2=(GtkWidget*)gtk_builder_get_object(builder,"alignment2"); ++ user_list_scrolled=(GtkWidget*)gtk_builder_get_object(builder,"user_list_scrolled"); + user_list=(GtkWidget*)gtk_builder_get_object(builder,"user_list"); + + prompt = (GtkWidget*)gtk_builder_get_object(builder, "prompt"); + login_entry = (GtkWidget*)gtk_builder_get_object(builder, "login_entry"); ++ if(login_entry!=NULL) ++ { ++ g_signal_connect_after(login_entry,"key-press-event",G_CALLBACK(login_entry_on_key_press),NULL); ++ } + + g_signal_connect(login_entry, "activate", G_CALLBACK(on_entry_activate), NULL); + +- sessions = (GtkWidget*)gtk_builder_get_object(builder, "sessions"); +- gtk_widget_set_name(sessions, "sessions"); +- fix_combobox_entry(sessions); +- load_sessions(); +- +- w = (GtkWidget*)gtk_builder_get_object(builder, "bottom_pane"); +- if( g_key_file_get_integer(config, "display", "bottom_pane", 0) ) ++ if( g_key_file_get_integer(config, "display", "bottom_pane", 0)==1) + { + /* hacks to let GtkEventBox paintable with gtk pixmap engine. */ ++ w = (GtkWidget*)gtk_builder_get_object(builder, "bottom_pane"); ++ if(g_key_file_get_integer(config, "display", "transparent_pane", 0)==1) ++ { ++ } ++ else ++ { + #if GTK_CHECK_VERSION(2,18,0) +- if(gtk_widget_get_app_paintable(w)) ++ if(gtk_widget_get_app_paintable(w)) + #else +- if(GTK_WIDGET_APP_PAINTABLE(w)) ++ if(GTK_WIDGET_APP_PAINTABLE(w)) + #endif + + #if GTK_CHECK_VERSION(3,0,0) +- g_signal_connect(w,"draw",G_CALLBACK(on_evt_box_draw),NULL); ++ g_signal_connect(w,"draw",G_CALLBACK(on_evt_box_draw),NULL); + #else +- g_signal_connect(w, "expose-event", G_CALLBACK(on_evt_box_expose), NULL); ++ g_signal_connect(w, "expose-event", G_CALLBACK(on_evt_box_expose), NULL); + #endif ++ } ++ if( g_key_file_get_integer(config, "display", "hide_sessions", 0)==1) ++ { ++ w = (GtkWidget*)gtk_builder_get_object(builder, "sessions_box"); ++ if(w) gtk_widget_hide(w); ++ } ++ else ++ { ++ sessions = (GtkWidget*)gtk_builder_get_object(builder, "sessions"); ++ gtk_widget_set_name(sessions, "sessions"); ++ fix_combobox_entry(sessions); ++ load_sessions(); ++ } ++ ++ if( g_key_file_get_integer(config, "display", "lang", 0) == 0 ) ++ { ++ w = (GtkWidget*)gtk_builder_get_object(builder, "lang_box"); ++ if(w) gtk_widget_hide(w); ++ } ++ else ++ { ++ lang = (GtkWidget*)gtk_builder_get_object(builder, "lang"); ++ gtk_widget_set_name(lang, "lang"); ++ fix_combobox_entry(lang); ++ load_langs(); ++ } ++ ++ if(g_key_file_get_integer(config, "display", "keyboard", 0)==1) ++ { ++ w=(GtkWidget*)gtk_builder_get_object(builder, "keyboard"); ++ if((load_keyboards(w))!=FALSE) ++ { ++ fix_combobox_entry(w); ++ gtk_widget_show(w); ++ w=(GtkWidget*)gtk_builder_get_object(builder, "label_keyboard"); ++ if(w) gtk_widget_show(w); ++ } ++ } + } + else +- gtk_event_box_set_visible_window(GTK_EVENT_BOX(w), FALSE); +- +- if( g_key_file_get_integer(config, "display", "lang", 0) == 0 ) + { +- w = (GtkWidget*)gtk_builder_get_object(builder, "lang_box"); +- if( w ) +- gtk_widget_hide(w); ++ w = (GtkWidget*)gtk_builder_get_object(builder, "bottom_pane"); ++ gtk_widget_hide(w); + } +- else ++ ++ if(g_key_file_get_integer(config, "display", "hide_time", 0)==1) + { +- lang = (GtkWidget*)gtk_builder_get_object(builder, "lang"); +- gtk_widget_set_name(lang, "lang"); +- fix_combobox_entry(lang); +- load_langs(); ++ w = (GtkWidget*)gtk_builder_get_object(builder, "time"); ++ gtk_widget_hide(w); + } +- +- if(g_key_file_get_integer(config, "display", "keyboard", 0)==1) ++ else + { +- w=(GtkWidget*)gtk_builder_get_object(builder, "keyboard"); +- if((load_keyboards(w))!=FALSE) +- { +- fix_combobox_entry(w); +- gtk_widget_show(w); +- w=(GtkWidget*)gtk_builder_get_object(builder, "label_keyboard"); +- if(w) gtk_widget_show(w); +- } +- } +- + if( (w = (GtkWidget*)gtk_builder_get_object(builder, "time"))!=NULL ) + { + guint timeout = g_timeout_add(1000, (GSourceFunc)on_timeout, w); +@@ -1093,14 +1234,22 @@ static void create_win() + G_CALLBACK(g_source_remove), GUINT_TO_POINTER(timeout)); + on_timeout((GtkLabel*)w); + } ++ } + +- exit_btn = (GtkWidget*)gtk_builder_get_object(builder, "exit"); +- load_exit(); ++ if(g_key_file_get_integer(config, "display", "hide_exit", 0)==1) ++ { ++ w=(GtkWidget*)gtk_builder_get_object(builder, "exit"); ++ gtk_widget_hide(w); ++ } ++ else ++ { ++ exit_btn = (GtkWidget*)gtk_builder_get_object(builder, "exit"); ++ load_exit(); ++ } + + ui_get_geometry(window,&rc); + gtk_window_move(GTK_WINDOW(win),rc.x,rc.y); + gtk_window_set_default_size(GTK_WINDOW(win),rc.width,rc.height); +- ui_set_bg(window,config); + + if(user_list && !g_key_file_get_integer(config,"userlist","disable",NULL) && + load_user_list(user_list)) +@@ -1111,7 +1260,10 @@ static void create_win() + { + if(user_list) + { +- gtk_widget_hide(user_list); ++ if(user_list_scrolled) ++ gtk_widget_hide(user_list_scrolled); ++ else ++ gtk_widget_hide(user_list); + user_list=NULL; + } + } +@@ -1119,6 +1271,8 @@ static void create_win() + ui_add_cursor(); + ui_set_cursor(gtk_widget_get_window(win),GDK_LEFT_PTR); + gtk_widget_show(win); ++ ui_set_bg(window,config); ++ + ui_set_focus(window); + if(!user_list) + gtk_widget_grab_focus(login_entry); +@@ -1142,29 +1296,11 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + gtk_main_quit(); + else if( !strncmp(str, "reset", 5) ) + { +- if(user) +- { +- g_free(user); +- user=NULL; +- } +- if(pass) +- { +- g_free(pass); +- pass=NULL; +- } +- gtk_label_set_text( GTK_LABEL(prompt), _("User:")); +- gtk_widget_show(prompt); +- if(user_list) +- { +- gtk_widget_hide(login_entry); +- gtk_widget_show(user_list); +- gtk_widget_grab_focus(user_list); +- } +- else +- { +- gtk_widget_show(login_entry); +- gtk_widget_grab_focus(login_entry); +- } ++ switch_to_input_user(); ++ } ++ else if( !strncmp(str, "password", 8)) ++ { ++ switch_to_input_passwd(); + } + g_free(str); + return TRUE; +diff --git a/src/lxcom.c b/src/lxcom.c +index 02763eb..eef3d1b 100644 +--- a/src/lxcom.c ++++ b/src/lxcom.c +@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) + + static gboolean lxcom_check(GSource *source) + { +- return TRUE; ++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; + } + + static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) +@@ -272,6 +272,7 @@ void lxcom_init(const char *sock) + + s->poll.fd=self_server_fd; + s->poll.events=G_IO_IN; ++ s->poll.revents=0; + g_source_add_poll((GSource*)s,&s->poll); + self_source_id=g_source_attach((GSource*)s,NULL); + +diff --git a/src/lxcommon.h b/src/lxcommon.h +new file mode 100644 +index 0000000..24a6c38 +--- /dev/null ++++ b/src/lxcommon.h +@@ -0,0 +1,7 @@ ++#ifndef _LXCOMMON_H_ ++#define _LXCOMMON_H_ ++ ++#define VCONFIG_FILE "/var/lib/lxdm/lxdm.conf" ++ ++#endif /*_LXCOMMON_H_*/ ++ +diff --git a/src/lxdm.c b/src/lxdm.c +index 5c279af..8ac8478 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -24,9 +24,6 @@ + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif +-#ifndef HAVE_LIBPAM +-#define HAVE_LIBPAM 0 +-#endif + + #include <stdio.h> + #include <stdlib.h> +@@ -58,17 +55,27 @@ + #include <utmpx.h> + #endif + +-#if HAVE_LIBPAM +-#include <security/pam_appl.h> +-#endif +- + #if HAVE_LIBCK_CONNECTOR + #include <ck-connector.h> + #endif + ++#ifndef HAVE_LIBPAM ++#ifdef USE_PAM ++#define HAVE_LIBPAM 1 ++#else ++#define HAVE_LIBPAM 0 ++#endif ++#endif ++ ++#if HAVE_LIBPAM ++#include <security/pam_appl.h> ++#endif ++ + #include "lxdm.h" + #include "lxcom.h" + #include "xconn.h" ++#include "lxcommon.h" ++#include "auth.h" + + #define LOGFILE "/var/log/lxdm.log" + +@@ -82,9 +89,7 @@ typedef struct{ + int display; + char *option; /* hold option in config file */ + xconn_t dpy; /* hold this, or X crack */ +-#if HAVE_LIBPAM +- pam_handle_t *pamh; +-#endif ++ LXDM_AUTH auth; + #if HAVE_LIBCK_CONNECTOR + CkConnector *ckc; + #endif +@@ -96,6 +101,7 @@ typedef struct{ + + GKeyFile *config; + static int old_tty=1,def_tty = 7,nr_tty=0; ++static int def_display=0; + static GSList *session_list; + + static void lxdm_startx(LXSession *s); +@@ -128,7 +134,7 @@ static void set_active_vt(int vt) + if( fd < 0 ) + fd = 0; + ioctl(fd, VT_ACTIVATE, vt); +- if( fd != 0 ) ++ if(fd!=0) + close(fd); + } + +@@ -142,28 +148,19 @@ void stop_pid(int pid) + { + if( kill(pid, SIGTERM) ) + kill(pid, SIGKILL); +- while( 1 ) +- { +- int wpid, status; +- wpid = waitpid(pid,&status,0); +- if(wpid<0 || pid == wpid) +- break; +- } + } +- while( waitpid(-1, 0, WNOHANG) > 0 ) ; +-} ++ while( 1 ) ++ { ++ int wpid, status; ++ wpid = waitpid(pid,&status,0); ++ if(pid == wpid) ++ break; ++ if(wpid<0 && errno!=EINTR) ++ break; ++ } + +-#if HAVE_LIBPAM +-static void close_pam_session(pam_handle_t *pamh) +-{ +- int err; +- if( !pamh ) return; +- err = pam_close_session(pamh, 0); +- //err=pam_setcred(pamh, PAM_DELETE_CRED); +- pam_end(pamh, err); +- pamh = NULL; ++ while( waitpid(-1, 0, WNOHANG) > 0 ) ; + } +-#endif + + static LXSession *lxsession_find_greeter(void) + { +@@ -271,7 +268,7 @@ static int lxsession_alloc_tty(void) + static int lxsession_alloc_display(void) + { + int i; +- for(i=0;i<11;i++) ++ for(i=def_display;i<11;i++) + { + if(!display_is_used(i)) + return i; +@@ -299,6 +296,7 @@ static LXSession *lxsession_add(void) + return NULL; + } + s->env=NULL; ++ lxdm_auth_init(&s->auth); + session_list=g_slist_prepend(session_list,s); + lxdm_startx(s); + return s; +@@ -354,10 +352,7 @@ static void lxsession_stop(LXSession *s) + { + xconn_clean(s->dpy); + } +-#if HAVE_LIBPAM +- close_pam_session(s->pamh); +- s->pamh=NULL; +-#endif ++ lxdm_auth_session_end(&s->auth); + #if HAVE_LIBCK_CONNECTOR + if( s->ckc != NULL ) + { +@@ -427,6 +422,7 @@ static char *lxsession_xserver_command(LXSession *s) + int arc; + char **arg; + int i; ++ int novtswitch=0; + + if(s->option) + { +@@ -462,12 +458,16 @@ static char *lxsession_xserver_command(LXSession *s) + g_free(arg[i]); + arc--;memcpy(arg+i,arg+i+1,(arc-i)*sizeof(char*)); + } ++ else if(!strcmp(p,"-novtswitch")) ++ { ++ novtswitch=1; ++ } + else + { + i++; + } + } +-printf("arc %d\n",arc); ++ + arg = g_renew(char *, arg, arc + 10); + if(nr_tty) + { +@@ -477,8 +477,15 @@ printf("arc %d\n",arc); + arg[arc++] = g_strdup_printf(":%d",s->display); + if(s->tty>0) + arg[arc++] = g_strdup_printf("vt%02d", s->tty); +- arg[arc++] = g_strdup("-nolisten"); +- arg[arc++] = g_strdup("tcp"); ++ if(g_key_file_get_integer(config,"server","tcp_listen",0)!=1) ++ { ++ arg[arc++] = g_strdup("-nolisten"); ++ arg[arc++] = g_strdup("tcp"); ++ } ++ if(!novtswitch) ++ { ++ arg[arc++] = g_strdup("-novtswitch"); ++ } + arg[arc] = NULL; + p=g_strjoinv(" ", arg); + g_strfreev(arg); +@@ -518,15 +525,17 @@ void lxdm_get_tty(void) + { + nr_tty=1; + } ++ else if(p[0]==':' && isdigit(p[1])) ++ { ++ def_display=atoi(p+1); ++ } + } + if(!gotvtarg) + { + /* support plymouth */ +- nr_tty = g_file_test("/var/spool/gdm/force-display-on-active-vt", G_FILE_TEST_EXISTS); +- if( nr_tty || g_key_file_get_integer(config, "server", "active_vt", 0) ) ++ if(g_key_file_get_integer(config, "server", "active_vt", 0) ) + /* use the active vt */ + def_tty = old_tty; +- if( nr_tty ) unlink("/var/spool/gdm/force-display-on-active-vt"); + if(plymouth) + { + nr_tty=1; +@@ -550,13 +559,13 @@ void lxdm_quit_self(int code) + static void log_init(void) + { + int fd_log; +- + g_unlink(LOGFILE ".old"); + g_rename(LOGFILE, LOGFILE ".old"); + fd_log = open(LOGFILE, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0640); + if(fd_log == -1) return; + dup2(fd_log, 1); + dup2(fd_log, 2); ++ close(fd_log); + } + + static void log_ignore(const gchar *log_domain, GLogLevelFlags log_level, +@@ -647,6 +656,19 @@ static void replace_env(char** env, const char* name, const char* new_val) + *(penv + 1) = NULL; + } + ++static const char *get_env(char **env, const char *name) ++{ ++ register char** penv; ++ for(penv = env; *penv; ++penv) ++ { ++ if(g_str_has_prefix(*penv, name)) ++ { ++ return *penv+strlen(name); ++ } ++ } ++ return NULL; ++} ++ + #ifndef DISABLE_XAUTH + + static inline void xauth_write_uint16(int fd,uint16_t data) +@@ -665,15 +687,20 @@ static inline void xauth_write_string(int fd,const char *s) + write(fd,s,len); + } + +-static void xauth_write_file(const char *file,char data[16]) ++static void xauth_write_file(const char *file,int dpy,char data[16]) + { + int fd; ++ char addr[128]; ++ char buf[16]; ++ ++ sprintf(buf,"%d",dpy); ++ gethostname(addr,sizeof(addr)); + + fd=open(file,O_CREAT|O_TRUNC|O_WRONLY,0600); + if(!fd==-1) return; +- xauth_write_uint16(fd,252); //FamilyLocalHost +- xauth_write_string(fd,""); +- xauth_write_string(fd,""); ++ xauth_write_uint16(fd,256); //FamilyLocalHost ++ xauth_write_string(fd,addr); ++ xauth_write_string(fd,buf); + xauth_write_string(fd,"MIT-MAGIC-COOKIE-1"); + xauth_write_uint16(fd,16); + write(fd,data,16); +@@ -695,139 +722,55 @@ static void create_server_auth(LXSession *s) + + authfile = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display); + +- setenv("XAUTHORITY",authfile,1); ++ //setenv("XAUTHORITY",authfile,1); + remove(authfile); +- xauth_write_file(authfile,s->mcookie); ++ xauth_write_file(authfile,s->display,s->mcookie); + g_free(authfile); + } + +-static void create_client_auth(char *home,char **env) ++static void create_client_auth(struct passwd *pw,char **env) + { + LXSession *s; + char *authfile; +- uid_t user; +- char *path; + +- if((user=getuid())== 0 ) /* root don't need it */ ++ if(pw->pw_uid==0) /* root don't need it */ + return; + +- s=lxsession_find_user(user); ++ s=lxsession_find_user(pw->pw_uid); + if(!s) + return; +- +- path=g_key_file_get_string(config,"base","xauth_path",NULL); +- if(path) ++ ++ /* pam_mktemp may provide XAUTHORITY to DM, just use it */ ++ if((authfile=(char*)get_env(env,"XAUTHORITY="))!=NULL) + { +- authfile = g_strdup_printf("%s/.Xauth%d", path,getuid()); +- g_free(path); ++ authfile=g_strdup(authfile); + } + else + { +- authfile = g_strdup_printf("%s/.Xauthority", home); ++ char *path; ++ path=g_key_file_get_string(config,"base","xauth_path",NULL); ++ if(path) ++ { ++ authfile = g_strdup_printf("%s/.Xauth%d", path,pw->pw_uid); ++ g_free(path); ++ } ++ else ++ { ++ authfile = g_strdup_printf("%s/.Xauthority", pw->pw_dir); ++ } + } + remove(authfile); +- xauth_write_file(authfile,s->mcookie); ++ xauth_write_file(authfile,s->display,s->mcookie); + replace_env(env,"XAUTHORITY=",authfile); ++ chown(authfile,pw->pw_uid,pw->pw_gid); + g_free(authfile); + } + #endif + +-#if HAVE_LIBPAM +-static char *user_pass[2]; +- +-static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) ++int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw) + { +- int result = PAM_SUCCESS; +- int i; +- *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); +- for(i=0;i<num;i++) +- { +- //printf("MSG: %d %s\n",msg[i]->msg_style,msg[i]->msg); +- switch(msg[i]->msg_style){ +- case PAM_PROMPT_ECHO_ON: +- resp[i]->resp=strdup(user_pass[0]?user_pass[0]:""); +- break; +- case PAM_PROMPT_ECHO_OFF: +- resp[i]->resp=strdup(user_pass[1]?user_pass[1]:""); +- break; +- case PAM_ERROR_MSG: +- case PAM_TEXT_INFO: +- //printf("PAM: %s\n",msg[i]->msg); +- break; +- default: +- break; +- } +- } +- return result; +-} +- +-static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass}; +-#endif +- +-int lxdm_auth_user(char *user, char *pass, struct passwd **ppw) +-{ +- struct passwd *pw; +-#if !HAVE_LIBPAM +- struct spwd *sp; +- char *real; +- char *enc; +-#endif +- if( !user ) +- { +- g_debug("user==NULL\n"); +- return AUTH_ERROR; +- } +- if( !user[0] ) +- { +- g_debug("user[0]==0\n"); +- return AUTH_BAD_USER; +- } +- pw = getpwnam(user); +- endpwent(); +- if( !pw ) +- { +- g_debug("user %s not found\n",user); +- return AUTH_BAD_USER; +- } +- if( !pass ) +- { +- *ppw = pw; +- g_debug("user %s auth ok\n",user); +- return AUTH_SUCCESS; +- } +- if(strstr(pw->pw_shell, "nologin")) +- { +- g_debug("user %s have nologin shell\n",user); +- return AUTH_PRIV; +- } +-#if !HAVE_LIBPAM +- sp = getspnam(user); +- if( !sp ) +- return AUTH_FAIL; +- endspent(); +- real = sp->sp_pwdp; +- if( !real || !real[0] ) +- { +- if( !pass[0] ) +- { +- *ppw = pw; +- g_debug("user %s auth with no password ok\n",user); +- return AUTH_SUCCESS; +- } +- else +- { +- g_debug("user %s password not match\n",user); +- return AUTH_FAIL; +- } +- } +- enc = crypt(pass, real); +- if( strcmp(real, enc) ) +- { +- g_debug("user %s password not match\n",user); +- return AUTH_FAIL; +- } +-#else + LXSession *s; ++ int ret; + s=lxsession_find_greeter(); + if(!s) s=lxsession_find_idle(); + if(!s) s=lxsession_add(); +@@ -836,97 +779,12 @@ int lxdm_auth_user(char *user, char *pass, struct passwd **ppw) + g_critical("lxsession_add fail\n"); + exit(0); + } +- if(s->pamh) pam_end(s->pamh,0); +- if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &s->pamh)) +- { +- s->pamh=NULL; +- g_debug("user %s start pam fail\n",user); +- return AUTH_FAIL; +- } +- else +- { +- int ret; +- user_pass[0]=user;user_pass[1]=pass; +- ret=pam_authenticate(s->pamh,PAM_SILENT); +- user_pass[0]=0;user_pass[1]=0; +- if(ret!=PAM_SUCCESS) +- { +- g_debug("user %s auth fail with %d\n",user,ret); +- return AUTH_FAIL; +- } +- ret=pam_acct_mgmt(s->pamh,PAM_SILENT); +- if(ret!=PAM_SUCCESS) +- { +- g_debug("user %s acct mgmt fail with %d\n",user,ret); +- return AUTH_FAIL; +- } +- //ret=pam_setcred(s->pamh, PAM_ESTABLISH_CRED); +- } +-#endif +- *ppw = pw; +- g_debug("user %s auth ok\n",pw->pw_name); +- return AUTH_SUCCESS; ++ ret=lxdm_auth_user_authenticate(&s->auth,user,pass,type); ++ if(ret==AUTH_SUCCESS) ++ *ppw=&s->auth.pw; ++ return ret; + } + +-#if HAVE_LIBPAM +-void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) +-{ +- int err; +- char x[256]; +- +- if(!s->pamh && PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &s->pamh)) +- { +- s->pamh = NULL; +- return; +- } +- if(!s->pamh) return; +- sprintf(x, "tty%d", s->tty); +- pam_set_item(s->pamh, PAM_TTY, x); +-#ifdef PAM_XDISPLAY +- pam_set_item(s->pamh, PAM_XDISPLAY, getenv("DISPLAY") ); +-#endif +- +- if(session_name && session_name[0]) +- { +- char *env; +- env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name); +- pam_putenv (s->pamh, env); +- g_free (env); +- } +- err = pam_open_session(s->pamh, 0); /* FIXME pam session failed */ +- if( err != PAM_SUCCESS ) +- g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); +-} +- +-void append_pam_environ(pam_handle_t *pamh,char **env) +-{ +- int i,j,n; +- char **penv; +- if(!pamh) return; +- penv=pam_getenvlist(pamh); +- if(!penv) return; +- for(i=0;penv[i]!=NULL;i++) +- { +- //printf("PAM %s\n",penv[i]); +- n=strcspn(penv[i],"=")+1; +- for(j=0;env[j]!=NULL;j++) +- { +- if(!strncmp(penv[i],env[j],n)) +- break; +- if(env[j+1]==NULL) +- { +- env[j+1]=g_strdup(penv[i]); +- env[j+2]=NULL; +- break; +- } +- } +- free(penv[i]); +- } +- free(penv); +-} +- +-#endif +- + static void close_left_fds(void) + { + struct dirent **list; +@@ -945,9 +803,15 @@ static void close_left_fds(void) + close(fd); + } + free(list); ++ ++ int fd = open("/dev/null", O_WRONLY); ++ if(fd == -1) return; ++ dup2(fd, 1); ++ dup2(fd, 2); ++ close(fd); + } + +-void switch_user(struct passwd *pw, char *run, char **env) ++void switch_user(struct passwd *pw, const char *run, char **env) + { + int fd; + +@@ -968,9 +832,6 @@ void switch_user(struct passwd *pw, char *run, char **env) + dup2(fd,STDERR_FILENO); + close(fd); + } +-#ifndef DISABLE_XAUTH +- create_client_auth(pw->pw_dir,env); +-#endif + + /* reset signal */ + signal(SIGCHLD, SIG_DFL); +@@ -1114,7 +975,7 @@ void lxdm_startx(LXSession *s) + g_strfreev(args); + lxcom_add_child_watch(s->server, on_xserver_stop, s); + +- g_message("add xserver watch\n"); ++ g_message("%ld: add xserver watch\n",time(NULL)); + for( i = 0; i < 100; i++ ) + { + if(lxcom_last_sig==SIGINT || lxcom_last_sig==SIGTERM) +@@ -1124,6 +985,7 @@ void lxdm_startx(LXSession *s) + g_usleep(50 * 1000); + //g_message("retry %d\n",i); + } ++ g_message("%ld: start xserver in %d retry",time(NULL),i); + if(s->dpy==NULL) + exit(EXIT_FAILURE); + +@@ -1200,6 +1062,11 @@ static void on_session_stop(void *data,int pid, int status) + { + lxsession_free(s); + } ++ else if(g_key_file_get_integer(config,"server","reset",NULL)==1) ++ { ++ lxsession_free(s); ++ lxsession_greeter(); ++ } + gchar *argv[] = { "/etc/lxdm/PostLogout", NULL }; + g_spawn_async(NULL, argv, s->env, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); + } +@@ -1212,7 +1079,7 @@ gboolean lxdm_get_session_info(char *session,char **pname,char **pexec) + name=g_key_file_get_string(config, "base", "session", 0); + if(!name && getenv("PREFERRED")) + name = g_strdup(getenv("PREFERRED")); +- if(!session && getenv("DESKTOP")) ++ if(!name && getenv("DESKTOP")) + name = g_strdup(getenv("DESKTOP")); + if(!name) name=g_strdup("LXDE"); + } +@@ -1291,7 +1158,7 @@ static void lxdm_save_login(char *session,char *lang) + lang=""; + var=g_key_file_new(); + g_key_file_set_list_separator(var, ' '); +- g_key_file_load_from_file(var,"/var/lib/lxdm/lxdm.conf",0,NULL); ++ g_key_file_load_from_file(var,VCONFIG_FILE,0,NULL); + old=g_key_file_get_string(var,"base","last_session",0); + if(0!=g_strcmp0(old,session)) + { +@@ -1343,7 +1210,7 @@ static void lxdm_save_login(char *session,char *lang) + char* data = g_key_file_to_data(var, &len, NULL); + mkdir("/var/lib/lxdm",0755); + chmod("/var/lib/lxdm",0755); +- g_file_set_contents("/var/lib/lxdm/lxdm.conf", data, len, NULL); ++ g_file_set_contents(VCONFIG_FILE, data, len, NULL); + g_free(data); + } + g_key_file_free(var); +@@ -1357,6 +1224,8 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + LXSession *s,*prev; + + lxdm_save_login(session,lang); ++ if(!strcmp(session,"__default__")) ++ session=NULL; + + if(!session ||!session[0] || !lang || !lang[0]) + { +@@ -1423,12 +1292,10 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + s->ckc=NULL; + } + #endif +-#if HAVE_LIBPAM +- setup_pam_session(s,pw,session_name); +-#endif ++ lxdm_auth_session_begin(&s->auth,session_name,s->tty,s->display,s->mcookie); + #if HAVE_LIBCK_CONNECTOR + #if HAVE_LIBPAM +- if(!s->ckc && (!s->pamh || !pam_getenv(s->pamh,"XDG_SESSION_COOKIE"))) ++ if(!s->ckc && (!s->auth.handle || !pam_getenv(s->auth.handle,"XDG_SESSION_COOKIE"))) + #else + if(!s->ckc) + #endif +@@ -1451,9 +1318,20 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + "x11-display", &n, + "is-local",&is_local, + NULL)) +- setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); ++ { ++ setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); ++ } ++ else ++ { ++ g_message("create ConsoleKit session fail\n"); ++ } ++ } ++ else ++ { ++ g_message("create ConsoleKit connector fail\n"); + } + #endif ++ + char** env, *path; + int n_env,i; + n_env = g_strv_length(environ); +@@ -1483,17 +1361,22 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + replace_env(env, "LANGUAGE=", lang); + } + s->env = env; ++ ++#ifndef DISABLE_XAUTH ++ create_client_auth(pw,env); ++#endif + +- s->child = pid = fork(); ++ /*s->child = pid = fork(); + if(s->child==0) + { +-#if HAVE_LIBPAM +- append_pam_environ(s->pamh,env); +- pam_end(s->pamh,0); +-#endif ++ env=lxdm_auth_append_env(&s->auth,env); ++ lxdm_auth_clean_for_child(&s->auth); + switch_user(pw, session_exec, env); + lxdm_quit_self(4); +- } ++ }*/ ++ ++ s->child = pid = lxdm_auth_session_run(&s->auth,session_exec,env); ++ + g_free(session_name); + g_free(session_exec); + if(alloc_session) +@@ -1519,7 +1402,7 @@ void lxdm_do_shutdown(void) + char *cmd; + cmd = g_key_file_get_string(config, "cmd", "shutdown", 0); + if( !cmd ) cmd = g_strdup("shutdown -h now"); +- g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); ++ g_spawn_command_line_sync("/etc/lxdm/PreShutdown",0,0,0,0); + g_spawn_command_line_async(cmd,0); + g_free(cmd); + lxdm_quit_self(0); +@@ -1548,10 +1431,30 @@ int lxdm_do_auto_login(void) + if(count==1) + pass = g_key_file_get_string(config, "base", "password", 0); + #endif ++ ++ /* get defaults from last login */ ++ GKeyFile *var_config = g_key_file_new(); ++ g_key_file_set_list_separator(var_config, ' '); ++ g_key_file_load_from_file(var_config,VCONFIG_FILE,G_KEY_FILE_KEEP_COMMENTS, NULL); ++ ++ char* last_session = g_key_file_get_string(var_config, "base", "last_session", NULL); ++ if(last_session != NULL && last_session[0] == 0) ++ { ++ g_free(last_session); ++ last_session = NULL; ++ } ++ ++ char* last_lang = g_key_file_get_string(var_config, "base", "last_lang", NULL); ++ ++ g_key_file_free(var_config); ++ + for(i=0;i<count;i++) + { + char *user,*session=NULL,*lang=NULL,*option=NULL; + p=users[i]; ++ /* autologin users starting with '@' get own config section with ++ * user=, session= and lang= entry ++ */ + if(p[0]=='@') + { + option=p+1; +@@ -1559,11 +1462,16 @@ int lxdm_do_auto_login(void) + session=g_key_file_get_string(config,option,"session",0); + lang=g_key_file_get_string(config,option,"lang",0); + } ++ /* autologin users not starting with '@' get user, session, lang section ++ * from last login ++ */ + else + { + user=g_strdup(p); ++ session=g_strdup(last_session); ++ lang=g_strdup(last_lang); + } +- ret=lxdm_auth_user(user, pass, &pw); ++ ret=lxdm_auth_user(AUTH_TYPE_AUTO_LOGIN, user, pass, &pw); + if(ret==AUTH_SUCCESS) + { + lxdm_do_login(pw,session,lang,option); +@@ -1571,9 +1479,11 @@ int lxdm_do_auto_login(void) + } + g_free(user);g_free(session);g_free(lang); + } ++ g_free(last_lang); ++ g_free(last_session); + g_strfreev(users); + g_free(pass); +- return success;; ++ return success; + } + + static void log_sigsegv(void) +@@ -1677,8 +1587,23 @@ GKeyFile *lxdm_user_list(void) + g_key_file_set_comment(kf,NULL,NULL,"lxdm user list",NULL); + while((pw=getpwent())!=NULL) + { ++ char *valid_shell; ++ gboolean ret; ++ + if(strstr(pw->pw_shell, "nologin")) + continue; ++ ++ ret = FALSE; ++ setusershell(); ++ while ((valid_shell = getusershell()) != NULL) { ++ if (g_strcmp0 (pw->pw_shell, valid_shell) != 0) ++ continue; ++ ret = TRUE; ++ } ++ endusershell(); ++ if(!ret) ++ continue; ++ + if(strncmp(pw->pw_dir,"/home/",6)) + { + if(!strv_find(white,pw->pw_name)) +@@ -1780,21 +1705,21 @@ int main(int arc, char *arg[]) + return res?0:-1; + } + } +- if( getuid() != 0 ) ++ if(getuid() != 0) + { + fprintf(stderr, "only root is allowed to use this program\n"); + exit(EXIT_FAILURE); + } + +- if( daemonmode ) ++ if(daemonmode) + { + (void)daemon(1, 1); + } + log_init(); + +- if( debugmode ) ++ if(!debugmode) + { +- /* turn of debug output */ ++ /* turn off debug output */ + g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, log_ignore, NULL); + } + +@@ -1832,3 +1757,4 @@ int main(int arc, char *arg[]) + + return 0; + } ++ +diff --git a/src/lxdm.h b/src/lxdm.h +index 4c79ca3..568573f 100644 +--- a/src/lxdm.h ++++ b/src/lxdm.h +@@ -29,11 +29,12 @@ G_BEGIN_DECLS + + extern GKeyFile *config; + +-int lxdm_auth_user(char *user,char *pass,struct passwd **ppw); ++int lxdm_auth_user(int type,char *user,char *pass,struct passwd **ppw); + void lxdm_do_login(struct passwd *pw,char *session,char *lang,char *option); + void lxdm_do_reboot(void); + void lxdm_do_shutdown(void); + int lxdm_do_auto_login(void); ++void lxdm_quit_self(int code); + + enum AuthResult + { +diff --git a/src/pam.c b/src/pam.c +new file mode 100644 +index 0000000..810e44f +--- /dev/null ++++ b/src/pam.c +@@ -0,0 +1,578 @@ ++/* ++ * lxdm.c - main entry of lxdm ++ * ++ * Copyright 2009 dgod <dgod.osa@gmail.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ */ ++ ++#define _GNU_SOURCE ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++#ifndef HAVE_LIBPAM ++#ifdef USE_PAM ++#define HAVE_LIBPAM 1 ++#else ++#define HAVE_LIBPAM 0 ++#endif ++#endif ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <stdarg.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <dirent.h> ++#include <errno.h> ++#include <poll.h> ++ ++#include <pwd.h> ++#include <grp.h> ++#include <shadow.h> ++ ++#include <glib.h> ++ ++#include "lxdm.h" ++#include "auth.h" ++ ++static void passwd_copy(struct passwd *dst,struct passwd *src) ++{ ++ dst->pw_name=g_strdup(src->pw_name); ++ dst->pw_uid=src->pw_uid; ++ dst->pw_gid=src->pw_gid; ++ if(src->pw_gecos) ++ dst->pw_gecos=g_strdup(src->pw_gecos); ++ dst->pw_dir=g_strdup(src->pw_dir); ++ dst->pw_shell=g_strdup(src->pw_shell); ++} ++ ++static void passwd_clean(struct passwd *pw) ++{ ++ g_free(pw->pw_name); ++ g_free(pw->pw_gecos); ++ g_free(pw->pw_dir); ++ g_free(pw->pw_shell); ++ memset(pw,0,sizeof(*pw)); ++} ++ ++#if !HAVE_LIBPAM ++ ++int lxdm_auth_init(LXDM_AUTH *a) ++{ ++ memset(a,0m,sizeof(*a)); ++ return 0; ++} ++ ++int lxdm_auth_cleanup(LXDM_AUTH *a) ++{ ++ passwd_clean(&a->pw); ++ return 0; ++} ++ ++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type) ++{ ++ struct passwd *pw; ++ struct spwd *sp; ++ char *real; ++ char *enc; ++ if(!user || !user[0]) ++ { ++ g_debug("user==NULL\n"); ++ return AUTH_ERROR; ++ } ++ pw = getpwnam(user); ++ endpwent(); ++ if(!pw) ++ { ++ g_debug("user %s not found\n",user); ++ return AUTH_BAD_USER; ++ } ++ if(strstr(pw->pw_shell, "nologin")) ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } ++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) ++ { ++ goto out; ++ } ++ sp = getspnam(user); ++ if( !sp ) ++ { ++ return AUTH_FAIL; ++ } ++ endspent(); ++ real = sp->sp_pwdp; ++ if( !real || !real[0] ) ++ { ++ if( !pass || !pass[0] ) ++ { ++ *ppw = pw; ++ g_debug("user %s auth with no password ok\n",user); ++ return AUTH_SUCCESS; ++ } ++ else ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++ } ++ enc = crypt(pass, real); ++ if( strcmp(real, enc) ) ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++ g_debug("user %s auth ok\n",pw->pw_name); ++ passwd_copy(&a->pw,pw); ++ return AUTH_SUCCESS; ++} ++ ++int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16]) ++{ ++ return 0; ++} ++ ++int lxdm_auth_session_end(LXDM_AUTH *a) ++{ ++ return 0; ++} ++ ++int lxdm_auth_clean_for_child(LXDM_AUTH *a) ++{ ++ return 0; ++} ++ ++void lxdm_auth_print_env(LXDM_AUTH *a) ++{ ++} ++ ++#else ++ ++#include <security/pam_appl.h> ++ ++static char *user_pass[2]; ++ ++static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) ++{ ++ int result = PAM_SUCCESS; ++ int i; ++ *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); ++ for(i=0;i<num;i++) ++ { ++ //printf("MSG: %d %s\n",msg[i]->msg_style,msg[i]->msg); ++ switch(msg[i]->msg_style){ ++ case PAM_PROMPT_ECHO_ON: ++ resp[i]->resp=strdup(user_pass[0]?user_pass[0]:""); ++ break; ++ case PAM_PROMPT_ECHO_OFF: ++ //resp[i]->resp=strdup(user_pass[1]?user_pass[1]:""); ++ resp[i]->resp=user_pass[1]?strdup(user_pass[1]):NULL; ++ break; ++ case PAM_ERROR_MSG: ++ case PAM_TEXT_INFO: ++ //printf("PAM: %s\n",msg[i]->msg); ++ break; ++ default: ++ break; ++ } ++ } ++ return result; ++} ++ ++static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass}; ++ ++int lxdm_auth_init(LXDM_AUTH *a) ++{ ++ memset(a,0,sizeof(*a)); ++ return 0; ++} ++ ++int lxdm_auth_cleanup(LXDM_AUTH *a) ++{ ++ passwd_clean(&a->pw); ++ return 0; ++} ++ ++int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,int type) ++{ ++ struct passwd *pw; ++ if(!user || !user[0]) ++ { ++ g_debug("user==NULL\n"); ++ return AUTH_ERROR; ++ } ++ pw = getpwnam(user); ++ endpwent(); ++ if(!pw) ++ { ++ g_debug("user %s not found\n",user); ++ return AUTH_BAD_USER; ++ } ++ if(strstr(pw->pw_shell, "nologin")) ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } ++ if(a->handle) pam_end(a->handle,0); ++ if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, (pam_handle_t**)&a->handle)) ++ { ++ a->handle=NULL; ++ g_debug("user %s start pam fail\n",user); ++ return AUTH_FAIL; ++ } ++ else ++ { ++ int ret; ++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) ++ goto out; ++ user_pass[0]=(char*)user;user_pass[1]=(char*)pass; ++ ret=pam_authenticate(a->handle,PAM_SILENT); ++ user_pass[0]=0;user_pass[1]=0; ++ if(ret!=PAM_SUCCESS) ++ { ++ g_debug("user %s auth fail with %d\n",user,ret); ++ return AUTH_FAIL; ++ } ++ ret=pam_acct_mgmt(a->handle,PAM_SILENT); ++ if(ret!=PAM_SUCCESS) ++ { ++ g_debug("user %s acct mgmt fail with %d\n",user,ret); ++ return AUTH_FAIL; ++ } ++ } ++out: ++ passwd_copy(&a->pw,pw); ++ return AUTH_SUCCESS; ++} ++ ++int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16]) ++{ ++ int err; ++ char x[256]; ++ ++ if(!a->handle) ++ { ++ return -1; ++ } ++ sprintf(x, "tty%d", tty); ++ pam_set_item(a->handle, PAM_TTY, x); ++#ifdef PAM_XDISPLAY ++ sprintf(x,":%d",display); ++ pam_set_item(a->handle, PAM_XDISPLAY, x); ++#endif ++#if !defined(DISABLE_XAUTH) && defined(PAM_XAUTHDATA) ++ struct pam_xauth_data value; ++ value.name="MIT-MAGIC-COOKIE-1"; ++ value.namelen=18; ++ value.data=mcookie; ++ value.datalen=16; ++ pam_set_item (a->handle, PAM_XAUTHDATA, &value); ++#endif ++ if(name && name[0]) ++ { ++ char *env; ++ env = g_strdup_printf ("DESKTOP_SESSION=%s", name); ++ pam_putenv (a->handle, env); ++ g_free (env); ++ } ++ err = pam_open_session(a->handle, 0); /* FIXME pam session failed */ ++ if( err != PAM_SUCCESS ) ++ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err)); ++ return 0; ++} ++ ++int lxdm_auth_session_end(LXDM_AUTH *a) ++{ ++ int err; ++ if(!a->handle) ++ return 0; ++ err = pam_close_session(a->handle, 0); ++ pam_end(a->handle, err); ++ a->handle = NULL; ++ passwd_clean(&a->pw); ++ return 0; ++} ++ ++int lxdm_auth_clean_for_child(LXDM_AUTH *a) ++{ ++ pam_end(a->handle,0); ++ return 0; ++} ++ ++void lxdm_auth_print_env(LXDM_AUTH *a) ++{ ++ int i; ++ char **penv; ++ if(!a->handle) return; ++ penv=pam_getenvlist(a->handle); ++ if(!penv) return; ++ for(i=0;penv[i]!=NULL;i++) ++ { ++ if(i!=0) printf(" "); ++ printf("%s",penv[i]); ++ } ++ free(penv); ++} ++ ++void lxdm_auth_put_env(LXDM_AUTH *a) ++{ ++ int i; ++ char **penv; ++ ++ if(!a->handle) return; ++ penv=pam_getenvlist(a->handle); ++ if(!penv) return; ++ for(i=0;penv[i]!=NULL;i++) ++ { ++ if(i!=0) printf(" "); ++ if(0!=putenv(penv[i])) ++ perror("putenv"); ++ } ++ free(penv); ++} ++ ++#endif ++ ++static void close_left_fds(void) ++{ ++ struct dirent **list; ++ char path[256]; ++ int n; ++ ++ snprintf(path,sizeof(path),"/proc/%d/fd",getpid()); ++ n=scandir(path,&list,0,0); ++ if(n<0) return; ++ while(n--) ++ { ++ int fd=atoi(list[n]->d_name); ++ free(list[n]); ++ if(fd<=STDERR_FILENO) ++ continue; ++ close(fd); ++ } ++ free(list); ++ ++ int fd = open("/dev/null", O_WRONLY); ++ if(fd == -1) return; ++ dup2(fd, 1); ++ dup2(fd, 2); ++ close(fd); ++} ++ ++void switch_user(struct passwd *pw, const char *run, char **env) ++{ ++ int fd; ++ ++ setenv("USER",pw->pw_name,1); ++ setenv("LOGNAME",pw->pw_name,1); ++ setenv("SHELL",pw->pw_shell,1); ++ setenv("HOME",pw->pw_dir,1); ++ ++ g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL); ++ ++ if( !pw || initgroups(pw->pw_name, pw->pw_gid) || ++ setgid(pw->pw_gid) || setuid(pw->pw_uid)/* || setsid() == -1 */) ++ exit(EXIT_FAILURE); ++ chdir(pw->pw_dir); ++ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); ++ if(fd!=-1) ++ { ++ dup2(fd,STDERR_FILENO); ++ close(fd); ++ } ++ ++ /* reset signal */ ++ signal(SIGCHLD, SIG_DFL); ++ signal(SIGTERM, SIG_DFL); ++ signal(SIGPIPE, SIG_DFL); ++ signal(SIGALRM, SIG_DFL); ++ signal(SIGHUP, SIG_DFL); ++ close_left_fds(); ++ ++ g_spawn_command_line_async ("/etc/lxdm/PostLogin",NULL); ++ execle("/etc/lxdm/Xsession", "/etc/lxdm/Xsession", run, NULL, environ); ++ perror("execle"); ++ exit(EXIT_FAILURE); ++} ++ ++void run_session(LXDM_AUTH *a,const char *run) ++{ ++ setsid(); ++ a->child=fork(); ++ if(a->child==0) ++ { ++ lxdm_auth_put_env(a); ++ lxdm_auth_clean_for_child(a); ++ switch_user(&a->pw,run,NULL); ++ _exit(EXIT_FAILURE); ++ } ++} ++ ++LXDM_AUTH a; ++static int session_exit=0; ++ ++static int xreadline(int fd,char *buf,size_t size) ++{ ++ int i; ++ for(i=0;i<size-1;i++) ++ { ++ int ret; ++ do{ ++ ret=read(fd,buf+i,1); ++ }while(ret==-1 && errno==EINTR); ++ if(buf[i]==-1 || buf[i]=='\n') ++ break; ++ } ++ buf[i]=0; ++ return i; ++} ++ ++int file_get_line(char *line, size_t n, FILE *fp) ++{ ++ int len; ++ ++ if(session_exit) ++ return -1; ++/* ++ if(!fgets(line,n,fp)) ++ return -1; ++ len=strcspn(line,"\r\n"); ++ line[len]=0; ++*/ ++ ++ struct pollfd fds; ++ fds.fd=fileno(fp); ++ fds.events=POLLIN; ++ poll(&fds,1,-1); ++ if(session_exit) ++ return -1; ++ ++ len=xreadline(fileno(fp),line,n); ++ return len; ++} ++ ++void sig_handler(int sig) ++{ ++ if(sig==SIGCHLD) ++ { ++ int wpid, status; ++ while(1) ++ { ++ wpid = waitpid(-1,&status,0); ++ if(wpid==a.child) ++ { ++ session_exit=1; ++ } ++ if(wpid<0) break; ++ } ++ } ++} ++ ++int main(int arc,char *arg[]) ++{ ++ char cmd[128]; ++ int ret; ++ ++ setvbuf(stdout, NULL, _IOLBF, 0 ); ++ signal(SIGCHLD,sig_handler); ++ ++ lxdm_auth_init(&a); ++ while(file_get_line(cmd,sizeof(cmd),stdin)>=0) ++ { ++ //fprintf(stderr,"begin %s\n",cmd); ++ if(!strcmp(cmd,"auth")) ++ { ++ char temp[8],user[64],pass[64]; ++ int type; ++ ret=file_get_line(temp,sizeof(temp),stdin); ++ if(ret<0) break; ++ type=atoi(temp); ++ ret=file_get_line(user,sizeof(user),stdin); ++ if(ret<0) break; ++ if(type==AUTH_TYPE_NORMAL) ++ { ++ ret=file_get_line(pass,sizeof(pass),stdin); ++ if(ret<0) break; ++ ret=lxdm_auth_user_authenticate(&a,user,pass,type); ++ } ++ else ++ { ++ ret=lxdm_auth_user_authenticate(&a,user,NULL,type); ++ } ++ printf("%d\n",ret); ++ if(ret==AUTH_SUCCESS) ++ { ++ printf("%d\n",a.pw.pw_uid); ++ printf("%d\n",a.pw.pw_gid); ++ printf("%s\n",a.pw.pw_gecos?:""); ++ printf("%s\n",a.pw.pw_dir); ++ printf("%s\n",a.pw.pw_shell); ++ } ++ } ++ else if(!strcmp(cmd,"begin")) ++ { ++ char name[128],tty[8],display[8],mcookie[32]; ++ gsize out_len; ++ ret=file_get_line(name,sizeof(name),stdin); ++ if(ret<0) break; ++ ret=file_get_line(tty,sizeof(tty),stdin); ++ if(ret<0) break; ++ ret=file_get_line(display,sizeof(display),stdin); ++ if(ret<0) break; ++ ret=file_get_line(mcookie,sizeof(mcookie),stdin); ++ if(ret<0) break; ++ g_base64_decode_inplace(mcookie,&out_len); ++ ret=lxdm_auth_session_begin(&a,name,atoi(tty),atoi(display),mcookie); ++ printf("%d\n",ret); ++ } ++ else if(!strcmp(cmd,"end")) ++ { ++ ret=lxdm_auth_session_end(&a); ++ printf("%d\n",ret); ++ } ++ else if(!strcmp(cmd,"env")) ++ { ++ lxdm_auth_print_env(&a); ++ printf("\n"); ++ } ++ else if(!strcmp(cmd,"putenv")) ++ { ++ char env[1024]; ++ while(file_get_line(env,sizeof(env),stdin)>0) ++ { ++ putenv(env); ++ } ++ } ++ else if(!strcmp(cmd,"exec")) ++ { ++ char run[256]; ++ if(file_get_line(run,sizeof(run),stdin)>0) ++ run_session(&a,run); ++ } ++ else if(!strcmp(cmd,"exit")) ++ { ++ break; ++ } ++ //fprintf(stderr,"end\n"); ++ } ++ lxdm_auth_cleanup(&a); ++ return 0; ++} ++ +diff --git a/src/ui.c b/src/ui.c +index 2691a03..f233589 100644 +--- a/src/ui.c ++++ b/src/ui.c +@@ -20,8 +20,6 @@ + */ + + +-#include <X11/Xlib.h> +- + #include <string.h> + #include <poll.h> + #include <grp.h> +@@ -34,6 +32,7 @@ + + #include "lxdm.h" + #include "lxcom.h" ++#include "auth.h" + + static pid_t greeter = -1; + static int greeter_pipe[2]; +@@ -153,17 +152,22 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo + char *pass = greeter_param(str, "pass"); + char *session = greeter_param(str, "session"); + char *lang = greeter_param(str, "lang"); +- if( user && pass ) ++ if( user/* && pass */) + { + struct passwd *pw; +- int ret = lxdm_auth_user(user, pass, &pw); ++ int ret = lxdm_auth_user(AUTH_TYPE_NORMAL, user, pass, &pw); + if( AUTH_SUCCESS == ret && pw != NULL ) + { + ui_drop(); + lxdm_do_login(pw, session, lang,NULL); + } + else +- xwrite(greeter_pipe[0], "reset\n", 6); ++ { ++ if(pass!=NULL) ++ xwrite(greeter_pipe[0], "reset\n", 6); ++ else ++ xwrite(greeter_pipe[0], "password\n", 9); ++ } + } + g_free(user); + g_free(pass); +@@ -180,7 +184,7 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo + if(user) + { + struct passwd *pw; +- int ret = lxdm_auth_user(user, pass, &pw); ++ int ret = lxdm_auth_user(AUTH_TYPE_AUTO_LOGIN, user, pass, &pw); + if( AUTH_SUCCESS == ret && pw != NULL ) + { + ui_drop(); +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +new file mode 100644 +index 0000000..b568c5a +--- /dev/null ++++ b/systemd/Makefile.am +@@ -0,0 +1,10 @@ ++NULL= ++ ++lxdm_systemddir = @systemdsystemunitdir@ ++lxdm_systemd_DATA = \ ++ lxdm.service \ ++ $(NULL) ++ ++EXTRA_DIST = \ ++ $(lxdm_systemd_DATA) \ ++ $(NULL) +diff --git a/systemd/lxdm.service b/systemd/lxdm.service +new file mode 100644 +index 0000000..bf4a0a8 +--- /dev/null ++++ b/systemd/lxdm.service +@@ -0,0 +1,12 @@ ++[Unit] ++Description=LXDE Display Manager ++Conflicts=getty@tty1.service plymouth-quit.service ++After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service ++ ++[Service] ++ExecStart=/usr/sbin/lxdm ++Restart=always ++IgnoreSIGPIPE=no ++ ++[Install] ++Alias=display-manager.service diff --git a/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch deleted file mode 100644 index 035ff0383..000000000 --- a/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200 -+++ data/Xsession 2011-12-03 09:09:14.592876087 +0100 -@@ -9,6 +9,8 @@ - LXSESSION=/usr/bin/startlxde - fi - -+[ -f /etc/profile ] && . /etc/profile -+[ -f ~/.profile ] && . ~/.profile - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f ~/.xprofile ] && . ~/.xprofile - diff --git a/community/lxdm/lxdm-0.4.1-conf.patch b/community/lxdm/lxdm-0.4.1-conf.patch deleted file mode 100644 index 1744e557e..000000000 --- a/community/lxdm/lxdm-0.4.1-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 -+++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 -@@ -27,7 +27,7 @@ - gtk_theme=Clearlooks - - ## background of the greeter --bg=/usr/share/backgrounds/default.png -+# bg=/usr/share/backgrounds/default.png - - ## if show bottom pane - bottom_pane=1 diff --git a/community/lxdm/lxdm-0.4.1-event-check-bug.patch b/community/lxdm/lxdm-0.4.1-event-check-bug.patch deleted file mode 100644 index cebfc6133..000000000 --- a/community/lxdm/lxdm-0.4.1-event-check-bug.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: dgod <dgod.osa@gmail.com> -Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800) -Subject: fix event check bug caused cpu 100% -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1 - -fix event check bug caused cpu 100% ---- - -diff --git a/src/lxcom.c b/src/lxcom.c -index 02763eb..18ee12e 100644 ---- a/src/lxcom.c -+++ b/src/lxcom.c -@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) - - static gboolean lxcom_check(GSource *source) - { -- return TRUE; -+ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; - } - - static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) diff --git a/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch deleted file mode 100644 index a2a366809..000000000 --- a/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300 -+++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300 -@@ -201,7 +201,9 @@ - </packing> - </child> - <child> -- <object class="GtkComboBoxEntry" id="keyboard"/> -+ <object class="GtkComboBoxEntry" id="keyboard"> -+ <property name="text_column">0</property> -+ </object> - <packing> - <property name="expand">False</property> - <property name="position">3</property> diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch deleted file mode 100644 index f267b105a..000000000 --- a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c ---- lxdm/src/xconn.c 2012-12-23 19:27:04.512531088 -0800 -+++ lxdm/src/xconn.c 2012-12-23 19:28:31.659227448 -0800 -@@ -172,7 +172,7 @@ - free(c); - } - --#if 0 -+//#if 0 - static xcb_window_t xconn_get_root(xconn_t c) - { - const xcb_setup_t *setup; -@@ -181,11 +181,11 @@ - xcb_screen_t *screen = iter.data; - return screen->root; - } --#endif -+//#endif - - void xconn_clean(xconn_t c) - { --#if 0 -+//#if 0 - xcb_query_tree_cookie_t wintree; - xcb_query_tree_reply_t *rep; - xcb_window_t *children; -@@ -202,7 +202,7 @@ - xcb_kill_client(c->c,children[i]); - free(rep); - xcb_flush(c->c); --#endif -+//#endif - } - - #endif diff --git a/community/lxdm/lxdm-0.4.1-modern-systems.patch b/community/lxdm/lxdm-0.4.1-modern-systems.patch deleted file mode 100644 index a703a386d..000000000 --- a/community/lxdm/lxdm-0.4.1-modern-systems.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200 -+++ data/lxdm 2010-01-19 11:56:34.308668692 -0200 -@@ -1,21 +1,13 @@ - #!/bin/sh - --[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then -- . /etc/sysconfig/language -- if [ -n "$RC_LANG"]; then -- LANG=$RC_LANG -- fi -+if [ -r /etc/profile.d/locale.sh ]; then -+ . /etc/profile.d/locale.sh - fi - - if [ -n "$LANG" ]; then - export LANG - fi - --[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop --[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager -- - if [ -n "$DEFAULT_WM" ]; then - PREFERRED=$DEFAULT_WM - fi diff --git a/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch deleted file mode 100644 index f3b94a57a..000000000 --- a/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/greeter.c b/src/greeter.c -index c0c150d..1f6b88e 100644 ---- a/src/greeter.c -+++ b/src/greeter.c -@@ -114,7 +114,7 @@ static char *get_session_exec(void) - GtkTreeModel* model; - GtkTreeIter it; - gchar *res; -- if(!lang) -+ if(!sessions) - return g_strdup(""); - - if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it)) diff --git a/community/lxdm/lxdm-0.4.1-pam-env-vars.patch b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch deleted file mode 100644 index ab8605ff1..000000000 --- a/community/lxdm/lxdm-0.4.1-pam-env-vars.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/lxdm.c b/src/lxdm.c -index 369aedf..cd1d486 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) - g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); - } - --void append_pam_environ(pam_handle_t *pamh,char **env) -+static char **append_pam_environ(pam_handle_t *pamh,char **env) - { -- int i,j,n; -+ int i,j,n,a; - char **penv; -- if(!pamh) return; -+ if(!pamh) return env; - penv=pam_getenvlist(pamh); -- if(!penv) return; -+ if(!penv) return env; -+ a=g_strv_length(penv); -+ if(a==0) -+ { -+ free(penv); -+ return env; -+ } -+ env=g_renew(char *,env,g_strv_length(env)+1+a+10); - for(i=0;penv[i]!=NULL;i++) - { -- //printf("PAM %s\n",penv[i]); -+ fprintf(stderr,"PAM %s\n",penv[i]); - n=strcspn(penv[i],"=")+1; - for(j=0;env[j]!=NULL;j++) - { -@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env) - free(penv[i]); - } - free(penv); -+ return env; - } - - #endif -@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) - if(s->child==0) - { - #if HAVE_LIBPAM -- append_pam_environ(s->pamh,env); -+ env=append_pam_environ(s->pamh,env); - pam_end(s->pamh,0); - #endif - switch_user(pw, session_exec, env); diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index 3bbb59a2e..a8bc882dc 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,22 +1,17 @@ post_install() { - getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm - getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm - chown -R 121:121 /var/lib/lxdm - chgrp 121 /etc/lxdm/lxdm.conf - chmod +r /etc/lxdm/lxdm.conf - systemd-tmpfiles --create lxdm.conf + getent group lxdm > /dev/null 2>&1 && \ + groupmod -g 121 lxdm > /dev/null 2>&1 || \ + groupadd -g 121 lxdm + getent passwd lxdm > /dev/null 2>&1 && \ + usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \ + useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm + passwd -l lxdm > /dev/null } post_upgrade() { - post_install $1 - if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then - groupmod -g 121 lxdm - usermod -g 121 -u 121 lxdm - fi + post_install } post_remove() { - userdel -f lxdm - groupdel lxdm - true + getent passwd lxdm > /dev/null 2>&1 && userdel lxdm } diff --git a/community/lxdm/lxdm.pam b/community/lxdm/lxdm.pam deleted file mode 100644 index 57f33b221..000000000 --- a/community/lxdm/lxdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so --session optional pam_loginuid.so --session optional pam_systemd.so diff --git a/community/lxdm/lxdm.service b/community/lxdm/lxdm.service deleted file mode 100644 index 026d62b50..000000000 --- a/community/lxdm/lxdm.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=LXDE Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/lxdm - -[Install] -Alias=display-manager.service diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 2206d41ec..36bdde8c8 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96687 2013-09-03 02:37:13Z bgyorgy $ +# $Id: PKGBUILD 98054 2013-10-04 17:26:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel -pkgver=0.5.12 -pkgrel=2 +pkgver=0.6.1 +pkgrel=1 pkgdesc='Lightweight X11 desktop panel for LXDE' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -14,16 +14,8 @@ groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') makedepends=('intltool' 'docbook-xml' 'docbook-xsl' 'wireless_tools') optdepends=('wireless_tools: netstat plugin') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz - lxpanel-0.5.12-automake-1.14-support.patch) -sha256sums=('c29997c522f138e4beb02fc549c84136fc840a836c1f69b400d90d2d4e91de1b' - 'ce5bf608374188da00ce3f0a1c74d1ddebd160555db4119eebd85f64731fe1d1') - -prepare() { - cd $pkgname-$pkgver - patch -Np0 -i ../lxpanel-0.5.12-automake-1.14-support.patch - ./autogen.sh -} +source=(http://downloads.sourceforge.net/sourceforge/lxde/lxpanel-$pkgver.tar.gz) +sha256sums=('a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb') build() { cd $pkgname-$pkgver diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index e305c8c70..127a04730 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 96146 2013-08-20 10:35:29Z seblu $ +# $Id: PKGBUILD 98004 2013-10-03 00:48:10Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=102 -pkgrel=2 +pkgver=106 +pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') url='https://code.google.com/p/lz4/' @@ -18,11 +18,12 @@ md5sums=('SKIP') build() { cd $pkgname - make + make lz4 lz4c } package() { cd $pkgname + install -Dm755 lz4 "$pkgdir/usr/bin/lz4" install -Dm755 lz4c "$pkgdir/usr/bin/lz4c" install -Dm644 cmake/pack/release_COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 04b1abb13..b00f681b3 100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 83342 2013-01-29 21:58:18Z jsteel $ -# Maintainer: Jonathan Steel <mail at jsteel dot org> +# $Id: PKGBUILD 97157 2013-09-14 14:43:41Z jsteel $ +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: megadriver <megadriver at gmx dot com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> @@ -7,8 +7,8 @@ # Contributor: Hans-Kristian Arntzen <maister@archlinux.us> pkgname=mednafen -pkgver=0.9.28 -_pkgver=0.9.28-wip +pkgver=0.9.32 +_pkgver=$pkgver-wip pkgrel=1 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net" @@ -19,7 +19,7 @@ makedepends=('mesa' 'glu') replaces=('mednafen-wip') install="$pkgname.install" source=(http://downloads.sourceforge.net/mednafen/$pkgname-$_pkgver.tar.bz2) -md5sums=('2b9f0be9f77a6e1b5d26093e30b24e77') +md5sums=('ffdf4f4bb4498df38e6aaaf316be40f5') build() { cd "$srcdir"/$pkgname diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD index 8473f04d3..2037b0efe 100644 --- a/community/ming/PKGBUILD +++ b/community/ming/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: mar77i <mysatyre at gmail dot com> pkgname=ming -pkgver=0.4.4 -pkgrel=2 +pkgver=0.4.5 +pkgrel=1 pkgdesc="SWF output library" arch=('i686' 'x86_64' 'mips64el') url="http://www.libming.net/" @@ -12,11 +12,10 @@ depends=('freetype2' 'libpng' 'flex') makedepends=('bison' 'pkg-config' 'python2') options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('9e780f93670eaf68b1eefa6cdfc1d1e2') +md5sums=('73bcbcb837f3872ef1a936c539a2513c') build() { cd "$srcdir"/$pkgname-$pkgver/ - sed -i -e 's/ifndef HAVE_VASPRINTF/ifdef HAVE_VASPRINTF/' util/decompile.c util/makeswf.c LDFLAGS="${LDFLAGS/ -Wl,--as-needed/}" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-python make @@ -26,3 +25,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver/ make DESTDIR="$pkgdir" install } + diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index ed80bc65e..ce08d5b60 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 83577 2013-02-03 13:21:39Z speps $ +# $Id: PKGBUILD 97545 2013-09-23 20:44:05Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=minitube -pkgver=2.0 +pkgver=2.1.3 pkgrel=1 -pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player" +pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64' 'mips64el') url='http://flavio.tordini.org/minitube' -license=('GPL') +license=('GPL3') depends=('phonon') install="$pkgname.install" source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('0da4cb8940034aad832e41acc52df365') +md5sums=('b43df4358de2e170d7e22370b39bd1ec') build() { - cd "$srcdir/$pkgname" - qmake + cd $pkgname + qmake-qt4 } package() { - cd "$srcdir/$pkgname" + cd $pkgname make install INSTALL_ROOT="$pkgdir/" } diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index b3770a264..83f8b024c 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96457 2013-08-29 15:10:58Z spupykin $ +# $Id: PKGBUILD 97836 2013-09-30 10:02:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.9.0 -pkgrel=4 +pkgrel=5 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -25,7 +25,7 @@ build() { cd "$srcdir/mlt-$pkgver" msg "SSE2=$SSE2" - ./configure --prefix=/usr --disable-gtk2 \ + ./configure --prefix=/usr \ --avformat-swscale \ --enable-gpl --enable-gpl3 make diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index 318e5e1b9..0b7bbe9a7 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92063 2013-05-31 02:32:07Z seblu $ +# $Id: PKGBUILD 97739 2013-09-28 07:54:08Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.5 -pkgrel=3 +pkgver=5.6 +pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64' 'mips64el') url="http://mmonit.com/monit/" @@ -15,14 +15,13 @@ backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ monit.service) -sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53' +sha256sums=('38e09bd8b39abc59e6b9a9bb7a78f7eac2b02a92f4de1f3a6dc24e84dfedae0d' 'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4') build() { cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr - make } @@ -30,8 +29,6 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - install -D -m700 monitrc ${pkgdir}/etc/monitrc - install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service } diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index 07cea8e3d..ddc3eac05 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,4 +1,7 @@ -2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.6-1 + +2012-10-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.5-2 systemd .service file added 2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD deleted file mode 100644 index 854edd47b..000000000 --- a/community/mpdscribble/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 82753 2013-01-23 20:52:45Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowwski.pl> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: evr <evanroman at gmail> -# Contributor: Luiz Ribeiro <luizribeiro@gmail.com> - -pkgname=mpdscribble -pkgver=0.22 -pkgrel=6 -pkgdesc='MPD client which submits track info to Last.fm' -url='http://mpd.wikia.com/wiki/Client:Mpdscribble' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('libsoup' 'glib2' 'libmpdclient') -install=$pkgname.install -source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2 - service) -sha256sums=('1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41' - '8a6568235e8b2ac7535a6f99f4401450a4162bac0cacb938af2ec39a808e1132') - -build() { - cd mpdscribble-$pkgver - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-http-client=soup - - make -} - -package() { - cd mpdscribble-$pkgver - - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/service \ - "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service - - # default config is really an example - install -D -m644 "${pkgdir}"/etc/mpdscribble.conf \ - "${pkgdir}"/usr/share/mpdscribble/mpdscribble.conf.example - rm -f "${pkgdir}"/etc/mpdscribble.conf - - install -d "${pkgdir}"/var/cache/mpdscribble - touch "${pkgdir}"/var/cache/mpdscribble/mpdscribble.cache -} diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install deleted file mode 100644 index e7038d5d8..000000000 --- a/community/mpdscribble/mpdscribble.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example' - echo - echo 'For system-wide config copy this file to /etc/mpdscribble.conf' - echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf' -} - -## arg 1: the new package version -## arg 2: the old package version -pre_upgrade() { - # removed /etc/mpdscribble.conf on FEB 19 2011 - # only display warning for people with mpdscribble older then 0.21 - if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]] - then - echo "$1 is new $2 is old" - cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup - echo 'The package does not provide /etc/mpdscribble.conf anymore.' - echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup' - echo - echo 'The example file is now located at /etc/mpdscribble.conf.example' - fi -} diff --git a/community/mpdscribble/service b/community/mpdscribble/service deleted file mode 100644 index 25f64d7d5..000000000 --- a/community/mpdscribble/service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=last.fm updater for MPD -After=mpd.service - -[Service] -ExecStart=/usr/bin/mpdscribble --no-daemon - -[Install] -WantedBy=multi-user.target diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD deleted file mode 100644 index 4711ca200..000000000 --- a/community/mplayer2/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 94896 2013-08-01 06:55:15Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Martin Panter <vadmium+aur@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=mplayer2 -pkgver=20130428 -pkgrel=4 -pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url='http://www.mplayer2.org/' -install=$pkgname.install -depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' - 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' - 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' - 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' - 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' - 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu' 'giflib') -makedepends=('unzip' 'python' 'python-docutils' 'git') -if [ "$CARCH" != "mips64el" ]; then - depends+=('libgl' 'libvdpau' 'lirc-utils') - makedepends+=('mesa' 'mesa-libgl' 'yasm') -fi -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -provides=('mplayer') -conflicts=('mplayer') -options=(!emptydirs) -source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa - giflib-5.0.patch) -sha256sums=('SKIP' - '20706ebb35e7c1935ae263c48d623a878db3b634ca575927913f56d9ce059c7a') - -pkgver() { - cd $pkgname - git log -1 --format="%cd" --date=short | sed 's|-||g' -} - -prepare() { - cd $pkgname - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop - find -type f -exec sed -e 's/python3/python/' -i {} \; - patch -Np1 -i ../giflib-5.0.patch -} - -build() { - cd $pkgname - - [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection" - - ./configure --prefix=/usr --confdir=/etc/mplayer \ - --enable-translation --language=all \ - --enable-joystick \ - --enable-gif \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - $extra - make -} - -package() { - cd $pkgname - make DESTDIR=$pkgdir install - - install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/ - install -dm755 $pkgdir/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf - - install -dm755 $pkgdir/usr/share/applications/ - install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/ -} diff --git a/community/mplayer2/giflib-5.0.patch b/community/mplayer2/giflib-5.0.patch deleted file mode 100644 index 9eaa6e98e..000000000 --- a/community/mplayer2/giflib-5.0.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c -index b808f81..c61d86c 100644 ---- a/libvo/vo_gif89a.c -+++ b/libvo/vo_gif89a.c -@@ -196,7 +196,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, - mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n"); - #endif - -+#if GIFLIB_MAJOR > 4 -+ new_gif = EGifOpenFileName(gif_filename, 0, NULL); -+#else - new_gif = EGifOpenFileName(gif_filename, 0); -+#endif - if (new_gif == NULL) { - mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); - return 1; -@@ -215,7 +219,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, - return 1; - } - -+#if GIFLIB_MAJOR > 4 -+ reduce_cmap = GifMakeMapObject(256, NULL); -+#else - reduce_cmap = MakeMapObject(256, NULL); -+#endif - if (reduce_cmap == NULL) { - free(slice_data); slice_data = NULL; - free(reduce_data); reduce_data = NULL; -@@ -267,7 +275,11 @@ static int gif_reduce(int width, int height, uint8_t *src, uint8_t *dst, GifColo - } - - R = Ra; G = Ga; B = Ba; -+#if GIFLIB_MAJOR > 4 -+ return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors); -+#else - return QuantizeBuffer(width, height, &size, R, G, B, dst, colors); -+#endif - } - - static void flip_page(void) -@@ -365,8 +377,11 @@ static void uninit(void) - free(gif_filename); - free(slice_data); - free(reduce_data); -+#if GIFLIB_MAJOR > 4 -+ if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap); -+#else - if (reduce_cmap != NULL) FreeMapObject(reduce_cmap); -- -+#endif - // set the pointers back to null. - new_gif = NULL; - gif_filename = NULL; - -diff --git a/configure b/configure -index 95a5ae8..d9c826f 100755 ---- a/configure -+++ b/configure -@@ -3659,6 +3659,7 @@ if test "$_gif" = auto ; then - _gif=no - for _ld_gif in "-lungif" "-lgif" ; do - statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break -+ statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break - done - fi - -diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c -index eee7a85..a764474 100644 ---- a/libmpdemux/demux_gif.c -+++ b/libmpdemux/demux_gif.c -@@ -44,6 +44,16 @@ typedef struct { - - #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') - -+static void PrintGifError(errcode) -+{ -+ char *Err = GifErrorString(errcode); -+ -+ if (Err != NULL) -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); -+ else -+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", errcode); -+} -+ - #ifndef CONFIG_GIF_TVT_HACK - // not supported by certain versions of the library - static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) -@@ -240,6 +250,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) - gif_priv_t *priv = calloc(1, sizeof(gif_priv_t)); - sh_video_t *sh_video = NULL; - GifFileType *gif = NULL; -+ int GifError; - - priv->current_pts = 0; - demuxer->seekable = 0; // FIXME -@@ -254,12 +265,12 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) - // not read from the beginning of the file and the command will fail. - // with this hack enabled, you will lose the ability to stream a GIF. - lseek(demuxer->stream->fd, 0, SEEK_SET); -- gif = DGifOpenFileHandle(demuxer->stream->fd); -+ gif = DGifOpenFileHandle(demuxer->stream->fd, &GifError); - #else -- gif = DGifOpen(demuxer->stream, my_read_gif); -+ gif = DGifOpen(demuxer->stream, my_read_gif, &GifError); - #endif - if (!gif) { -- PrintGifError(); -+ PrintGifError(GifError); - free(priv); - return NULL; - } diff --git a/community/mplayer2/mplayer2.install b/community/mplayer2/mplayer2.install deleted file mode 100644 index 660593cf5..000000000 --- a/community/mplayer2/mplayer2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 87eb5686c..1b211fb4f 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 98183 2013-10-07 12:06:59Z jgc $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv -pkgver=0.1.4 -pkgrel=4 +pkgver=0.1.7 +pkgrel=2 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=('69185e255fe6e8b6b13dcf6ea9b2fefb') 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/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index 12fa8741e..3e4f4886b 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 96739 2013-09-03 19:46:20Z arodseth $ +# $Id: PKGBUILD 96840 2013-09-06 11:15:47Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=12 +pkgrel=13 pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('i686' 'x86_64' 'mips64el') url='http://mtpaint.sourceforge.net/' license=('GPL3') depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2' - 'jasper' 'libtiff' 'libpng' 'freetype2') -makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper' 'libtiff' - 'libpng' 'freetype2') + 'libtiff' 'libpng' 'freetype2') +makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng' + 'freetype2') install='mtpaint.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890') @@ -21,6 +21,10 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890') prepare() { cd "$pkgname-$pkgver" + # Recommended by Mark Tyler himself + sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure + + # Needed for giflib 5. Not needed for mtpaint>3.40. sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 8d71d1522..06619942b 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,32 +1,26 @@ -# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $ +# $Id: PKGBUILD 98231 2013-10-07 17:24:18Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.8.2 +pkgver=2.0.0 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/linuxmint/muffin" license=('GPL') depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ - 'libcanberra' 'startup-notification' 'zenity' 'dconf') + 'libcanberra' 'startup-notification' 'zenity' 'dconf' 'cinnamon-desktop') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch") -sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz") +sha256sums=('e16efc49d7629141d0d784ca855b9276c83deee0669b7053d457e9f7676dc028') build() { cd ${pkgname}-${pkgver} - # Fix windows switcher keybinding with default settings in GNOME 3.8 - patch -Np1 -i ../switch-applications.patch - - PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch deleted file mode 100644 index 61b727b57..000000000 --- a/community/muffin/switch-applications.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c ---- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c 2013-04-15 15:53:35.000000000 +0200 -+++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c 2013-04-24 18:37:54.028549911 +0200 -@@ -3774,14 +3774,14 @@ - handle_switch, META_TAB_LIST_GROUP); - - add_builtin_keybinding (display, -- "switch-windows", -+ "switch-applications", - SCHEMA_COMMON_KEYBINDINGS, - META_KEY_BINDING_REVERSES, - META_KEYBINDING_ACTION_SWITCH_WINDOWS, - handle_switch, META_TAB_LIST_NORMAL); - - add_builtin_keybinding (display, -- "switch-windows-backward", -+ "switch-applications-backward", - SCHEMA_COMMON_KEYBINDINGS, - REVERSES_AND_REVERSED, - META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD, diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 4e2669b9f..ef5bb739a 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96533 2013-08-31 09:24:59Z bpiotrowski $ +# $Id: PKGBUILD 96830 2013-09-06 06:55:21Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,7 +7,7 @@ pkgname=mupdf pkgver=1.3 -pkgrel=4 +pkgrel=5 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64' 'mips64el') url='http://mupdf.com' @@ -44,6 +44,7 @@ package() { sed -i -e 's/mupdf.xpm/mupdf/' \ -e 's/application\/x-pdf/application\/x-pdf/' \ -e 's/mupdf-select-file/mupdf/' \ + -e 's/^$/NoDisplay=true/' \ mupdf.desktop install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD deleted file mode 100644 index 36883b709..000000000 --- a/community/musepack-tools/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 67972 2012-03-16 13:24:52Z giovanni $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> - -pkgname=musepack-tools -pkgver=475 -pkgrel=2 -pkgdesc="Musepack decoder/encoder" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.musepack.net/" -license=('LGPL') -depends=('libcuefile' 'libreplaygain') -makedepends=('cmake') -source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz" - 'math.patch') -md5sums=('754d67be67f713e54baf70fcfdb2817e' - '9de31f07a3492c7b1db1248b055fbdc8') - -build() { - cd "$srcdir/musepack_src_r$pkgver" - - #export LDFLAGS+="-lm" - - patch -Np1 -i "$srcdir/math.patch" - - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON -} - -package() { - cd "$srcdir/musepack_src_r$pkgver" - - make DESTDIR="$pkgdir" install - - for bin in chap cut dec enc gain 2sv8; do - install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin" - done - - find ${pkgdir} -depth -type d -name .svn -exec rm -rf {} \; -} - -# vim:set ts=2 sw=2 et: diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch deleted file mode 100644 index 61b3d07ec..000000000 --- a/community/musepack-tools/math.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt ---- musepack_src_r475.old/CMakeLists.txt 2011-10-14 16:31:05.536450109 +0800 -+++ musepack_src_r475/CMakeLists.txt 2011-10-14 16:31:34.022962450 +0800 -@@ -16,7 +16,7 @@ - add_definitions(-DFAST_MATH -DCVD_FASTLOG) - - if(NOT MSVC) -- set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe") -+ set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm") - endif(NOT MSVC) - - add_subdirectory(libmpcdec) diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD new file mode 100755 index 000000000..f2e8fe475 --- /dev/null +++ b/community/musescore/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 97939 2013-10-01 16:51:03Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Cristian Maureira <saint@archlinux.cl> +# Contributor: Dr.Egg <rwhite@archlinux.us> + +pkgbase=musescore +pkgname=('musescore' 'musescore-docs') +pkgver=1.3 +pkgrel=5 +pkgdesc="Create, play and print beautiful sheet music" +arch=('i686' 'x86_64') +url="http://musescore.org/" +license=('GPL') +makedepends=('cmake' 'doxygen' 'portaudio' 'qtscriptgenerator' 'texlive-core') +source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2" + 'mscore-docs.patch') +sha256sums=('a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683' + 'ea4c25e8998c1666103d48fb3bcb5a8d7c9601e971195ef23c2f535c1191585d') + +prepare() { + cd mscore-${pkgver}/mscore + + patch -Np1 -i ../../mscore-docs.patch + sed 's/COMMAND lupdate/COMMAND lupdate-qt4/g + s/COMMAND lrelease/COMMAND lrelease-qt4/g + s/set(BUILD_SCRIPTGEN TRUE)/set(BUILD_SCRIPTGEN FALSE)/' -i CMakeLists.txt +} + +build() { + cd mscore-${pkgver}/mscore + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' + make lupdate + make lrelease + make +} + +package_musescore() { + depends=('portaudio' 'qtscriptgenerator') + optdepends=('musescore-docs: Documentation') + install="${pkgname}.install" + + cd mscore-${pkgver}/mscore/build + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/share/mscore-${pkgver}/man +} + +package_musescore-docs() { + pkgdesc="Documentation for MuseScore" + + cd mscore-${pkgver}/mscore + + install -dm 755 "${pkgdir}"/usr/share/doc/${pkgbase} + install -m 644 manual/*.pdf "${pkgdir}"/usr/share/doc/${pkgbase}/ +} + +# vim: ts=2 sw=2 et: diff --git a/community/musescore/mscore-docs.patch b/community/musescore/mscore-docs.patch new file mode 100755 index 000000000..544dffd86 --- /dev/null +++ b/community/musescore/mscore-docs.patch @@ -0,0 +1,21 @@ +--- a/mscore/mscore.cpp ++++ b/mscore/mscore.cpp +@@ -919,15 +919,15 @@ + if (debugMode) + printf("open handbook for language <%s>\n", qPrintable(lang)); + +- QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf")); ++ QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf")); + if (!mscoreHelp.isReadable()) { + if (debugMode) { + printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath())); + } + lang = lang.left(2); +- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf")); ++ mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf")); + if(!mscoreHelp.isReadable()){ +- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf")); ++ mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf")); + if (!mscoreHelp.isReadable()) { + QString info(tr("MuseScore handbook not found at: \n")); + info += mscoreHelp.filePath(); diff --git a/community/seahorse-nautilus/seahorse-nautilus.install b/community/musescore/musescore.install index 21f12fbda..c4f528da9 100644..100755 --- a/community/seahorse-nautilus/seahorse-nautilus.install +++ b/community/musescore/musescore.install @@ -1,12 +1,13 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } + +# vim: ts=2 sw=2 et: diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index b52ba6c15..0ef3c338a 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96153 2013-08-20 11:49:57Z jconder $ +# $Id: PKGBUILD 97427 2013-09-19 14:38:19Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -13,7 +13,7 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.26.1 +pkgver=0.27 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -21,28 +21,30 @@ url="http://www.mythtv.org" license=('GPL') makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' 'libvorbis' 'mesa' 'mesa-libgl' 'mplayer' 'mythtv' - 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' - 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' - 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' - 'python2-pycurl' 'taglib' 'zlib') -source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" - 'cdparanoia.patch' - 'php55.patch' - 'mtd.rc') -md5sums=('d896d9f9313ba5dd95e2e977bf9c0f8f' - '5de8dd79d0b8a2b006f3c3258938b6b7' - 'a6df720ef22fe6bef8c650b1bd5948cb' - '476c12ba074794ad7f4ae092bdf949d6') + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' + 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' + 'python2-pycurl' 'zlib') +source=("mythtv-$pkgver.tar.gz::http://www.mythtv.org/download/mythtv/$pkgver" + "mythweb-$pkgver.tar.gz::http://www.mythtv.org/download/mythweb/$pkgver" + 'cdparanoia.patch') +sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8' + 'fe135281c4828a96762ea22a8a4cf622988b12e7f2189dce9273f1ce7bb367d3' + '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c') + +prepare() { + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase" -build() { - cd "$srcdir/$pkgbase-$pkgver" find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/cdparanoia.patch" - sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php' - sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp' + cd "$srcdir/mythweb-fixes-$pkgver" - patch -Np1 -i "$srcdir/cdparanoia.patch" - patch -Np1 -i "$srcdir/php55.patch" + sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php' +} + +build() { + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase" ./configure --prefix=/usr \ --enable-all \ @@ -56,7 +58,7 @@ package_mythplugins-mytharchive() { depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' 'python-imaging') - cd "$srcdir/$pkgbase-$pkgver/mytharchive" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive" make INSTALL_ROOT="$pkgdir" install } @@ -64,7 +66,7 @@ package_mythplugins-mythbrowser() { pkgdesc="Mini web browser for MythTV" depends=('mythtv') - cd "$srcdir/$pkgbase-$pkgver/mythbrowser" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser" make INSTALL_ROOT="$pkgdir" install } @@ -72,7 +74,7 @@ package_mythplugins-mythgallery() { pkgdesc="Image gallery plugin for MythTV" depends=('libexif' 'mythtv') - cd "$srcdir/$pkgbase-$pkgver/mythgallery" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery" make INSTALL_ROOT="$pkgdir" install } @@ -80,15 +82,15 @@ package_mythplugins-mythgame() { pkgdesc="Game emulator plugin for MythTV" depends=('mythtv') - cd "$srcdir/$pkgbase-$pkgver/mythgame" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgame" make INSTALL_ROOT="$pkgdir" install } package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=('mythtv' 'libcdio-paranoia' 'taglib') + depends=('mythtv' 'libcdio-paranoia') - cd "$srcdir/$pkgbase-$pkgver/mythmusic" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic" make INSTALL_ROOT="$pkgdir" install } @@ -96,7 +98,7 @@ package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" depends=('mythtv' 'python2-oauth') - cd "$srcdir/$pkgbase-$pkgver/mythnetvision" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision" make INSTALL_ROOT="$pkgdir" install } @@ -104,7 +106,7 @@ package_mythplugins-mythnews() { pkgdesc="News checking plugin for MythTV" depends=('mythtv') - cd "$srcdir/$pkgbase-$pkgver/mythnews" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews" make INSTALL_ROOT="$pkgdir" install } @@ -114,7 +116,7 @@ package_mythplugins-mythweather() { 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') - cd "$srcdir/$pkgbase-$pkgver/mythweather" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather" make INSTALL_ROOT="$pkgdir" install } @@ -126,7 +128,7 @@ package_mythplugins-mythweb() { install='mythplugins-mythweb.install' mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions} - cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb" + cp -R "$srcdir/mythweb-fixes-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb" chown -R http:http "$pkgdir/var/lib/mythtv/mythweb" chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions} } @@ -136,6 +138,6 @@ package_mythplugins-mythzoneminder() { depends=('mythtv') install='mythplugins-mythzoneminder.install' - cd "$srcdir/$pkgbase-$pkgver/mythzoneminder" + cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder" make INSTALL_ROOT="$pkgdir" install } diff --git a/community/mythplugins/mtd.rc b/community/mythplugins/mtd.rc deleted file mode 100644 index 1f46dfed1..000000000 --- a/community/mythplugins/mtd.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/mtd` -case "$1" in - start) - stat_busy "Starting Myth Transcoding Daemon" - [ -z "$PID" ] && /usr/bin/mtd -d - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/mtd.pid - add_daemon mythtranscode - stat_done - fi - ;; - stop) - stat_busy "Stopping Myth Transcoding Daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mtd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/mythplugins/php55.patch b/community/mythplugins/php55.patch deleted file mode 100644 index eba7fd696..000000000 --- a/community/mythplugins/php55.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/mythweb/includes/errors.php -+++ b/mythweb/includes/errors.php -@@ -103,6 +103,9 @@ - /**/ - function error_handler($errno, $errstr, $errfile, $errline, $vars) { - global $db; -+ // Leave early if we haven't requested reports from this kind of error -+ if (!($errno & error_reporting())) -+ return; - if (class_exists('Translate')) - $errstr = Translate::find()->string($errstr); - // Try to auto-repair damaged SQL tables -@@ -113,9 +116,6 @@ - add_error('Regular Expression Error: '.$match[1]); - return; - } -- // Leave early if we haven't requested reports from this kind of error -- if (!($errno & error_reporting())) -- return; - // Fatal errors should report considerably more detail - if (in_array($errno, array(E_USER_ERROR, E_ERROR))) { - // What type of error? diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index f3c23c0cc..a61dbdd84 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96148 2013-08-20 11:25:49Z jconder $ +# $Id: PKGBUILD 97419 2013-09-19 04:04:04Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.26.1 +pkgver=0.27 pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" @@ -14,56 +14,54 @@ arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' - 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' - 'mariadb-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' - 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' - 'x264') + 'libpulse' 'libva' 'libvpx' 'libxinerama' 'lirc-utils' 'mariadb-clients' + 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' + 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'taglib' 'urlgrabber' 'x264') makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm') optdepends=('glew: for GPU commercial flagging' 'libcec: for consumer electronics control capabilities' - 'libxml2: to read blu-ray metadata' - 'openssl: for AirTunes (RAOP) support' + 'libxml2: to read blu-ray metadata' + 'openssl: for AirTunes (RAOP) support' 'xmltv: to download tv listings') conflicts=('myththemes' 'mythplugins-mythvideo') replaces=('myththemes' 'mythplugins-mythvideo') backup=() install='mythtv.install' -source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'alsa.patch' - 'mythbackend.service' - 'libva-compat.patch::https://github.com/garybuhrmaster/mythtv/commit/2add868d2f18b8b47d9747e043f052e88869bfc3.patch' - 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch') -md5sums=('ef25a9b86f4a23d6f07d83791a1e5c9e' - 'f64b8219e3d27a2edf96733b851e576b' - 'e4d572dcc307d6d8ae26bee5aebf9f3a' - 'ae88a16e9f42a913f395bf71af18e931' - '6e156c9fc0b369346d93ccafad46cba3') +source=("http://www.$pkgname.org/download/$pkgname/$pkgver" + 'mythbackend.service' + 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') +sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8' + 'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f' + '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') + +prepare() { + cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" -build() { - cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np2 -i "$srcdir/libcec-2-support.2.patch" +} - patch -Np1 -i "$srcdir/alsa.patch" - patch -Np2 -i "$srcdir/libva-compat.patch" - patch -Np2 -i "$srcdir/libcec-2-support.patch" +build() { + cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ - --disable-altivec \ - --disable-audio-jack \ - --disable-ccache \ - --disable-distcc \ - --enable-libfftw3 \ - --enable-libmp3lame \ - --enable-libx264 \ - --enable-vaapi \ - --python=python2 + --disable-altivec \ + --disable-audio-jack \ + --disable-ccache \ + --disable-distcc \ + --enable-libfftw3 \ + --enable-libmp3lame \ + --enable-libvpx \ + --enable-libx264 \ + --enable-vaapi \ + --python=python2 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" make INSTALL_ROOT="$pkgdir" install install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service" diff --git a/community/mythtv/alsa.patch b/community/mythtv/alsa.patch deleted file mode 100644 index 07cf1c3a9..000000000 --- a/community/mythtv/alsa.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-common.c b/external/FFmpeg/libavdevice/alsa-audio-common.c ---- a/external/FFmpeg/libavdevice/alsa-audio-common.c 2012-10-02 23:30:24.000000000 +1300 -+++ b/external/FFmpeg/libavdevice/alsa-audio-common.c 2013-01-09 13:23:49.704360811 +1300 -@@ -28,6 +28,7 @@ - * @author Nicolas George ( nicolas george normalesup org ) - */ - -+#include <sys/types.h> - #include <alsa/asoundlib.h> - #include "avdevice.h" - #include "libavutil/avassert.h" -diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-dec.c b/external/FFmpeg/libavdevice/alsa-audio-dec.c ---- a/external/FFmpeg/libavdevice/alsa-audio-dec.c 2012-10-02 23:30:24.000000000 +1300 -+++ b/external/FFmpeg/libavdevice/alsa-audio-dec.c 2013-01-09 13:23:47.911005108 +1300 -@@ -45,6 +45,7 @@ - * plugin. - */ - -+#include <sys/types.h> - #include <alsa/asoundlib.h> - #include "libavformat/internal.h" - #include "libavutil/opt.h" -diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-enc.c b/external/FFmpeg/libavdevice/alsa-audio-enc.c ---- a/external/FFmpeg/libavdevice/alsa-audio-enc.c 2012-10-02 23:30:24.000000000 +1300 -+++ b/external/FFmpeg/libavdevice/alsa-audio-enc.c 2013-01-09 13:23:46.880992286 +1300 -@@ -37,6 +37,7 @@ - * which gives a low latency suitable for real-time playback. - */ - -+#include <sys/types.h> - #include <alsa/asoundlib.h> - - #include "libavformat/internal.h" -diff -Nru a/external/FFmpeg/libavdevice/alsa-audio.h b/external/FFmpeg/libavdevice/alsa-audio.h ---- a/external/FFmpeg/libavdevice/alsa-audio.h 2012-10-02 23:30:24.000000000 +1300 -+++ b/external/FFmpeg/libavdevice/alsa-audio.h 2013-01-09 13:23:51.121045145 +1300 -@@ -30,6 +30,7 @@ - #ifndef AVDEVICE_ALSA_AUDIO_H - #define AVDEVICE_ALSA_AUDIO_H - -+#include <sys/types.h> - #include <alsa/asoundlib.h> - #include "config.h" - #include "libavutil/log.h" -diff -Nru a/libs/libmyth/audio/audiooutputalsa.h b/libs/libmyth/audio/audiooutputalsa.h ---- a/libs/libmyth/audio/audiooutputalsa.h 2012-10-02 23:30:24.000000000 +1300 -+++ b/libs/libmyth/audio/audiooutputalsa.h 2013-01-09 13:22:13.313180438 +1300 -@@ -1,6 +1,7 @@ - #ifndef AUDIOOUTPUTALSA - #define AUDIOOUTPUTALSA - -+#include <sys/types.h> - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API - #include <alsa/asoundlib.h> -diff -Nru a/libs/libmythtv/audioinputalsa.h b/libs/libmythtv/audioinputalsa.h ---- a/libs/libmythtv/audioinputalsa.h 2012-10-02 23:30:24.000000000 +1300 -+++ b/libs/libmythtv/audioinputalsa.h 2013-01-09 13:22:44.470223553 +1300 -@@ -24,6 +24,7 @@ - #include "audioinput.h" - - #ifdef USING_ALSA -+#include <sys/types.h> - #include <alsa/asoundlib.h> - #else - typedef int snd_pcm_t; diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 4f4700e96..99fd5d13d 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,38 +1,39 @@ -# $Id: PKGBUILD 96434 2013-08-28 19:54:26Z faidoc $ +# $Id: PKGBUILD 98197 2013-10-07 12:08:32Z jgc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo -pkgver=1.8.5 -pkgrel=1 +pkgver=2.0.0 +pkgrel=2 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/linuxmint/nemo" license=('GPL') depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2' - 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql') + 'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2' + 'cinnamon-translations') makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common') optdepends=('gksu: Open as Root') options=('!emptydirs' '!libtool') install=nemo.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "tracker-0.16.patch" - "remove-desktop-background.patch") -sha256sums=('ba43794293c66ebc31a9c4145d6e7a8326321a4f0e58b28fe4f3d56a8fe39874' - '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' - '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver") +sha256sums=('3848d55a20134826aa6512898c78b05a953f5d2f353817e7003c1a4f6286e31c') -build() { +prepare() { cd linuxmint-nemo-* # Python2 fix sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py - # https://github.com/linuxmint/nemo/pull/258 - patch -Np1 -i ../tracker-0.16.patch + # Fix build + sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in + + # Rename 'Files' app name to avoid having the same as nautilus + sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in +} - # https://github.com/linuxmint/nemo/pull/263 - patch -Np1 -i ../remove-desktop-background.patch +build() { + cd linuxmint-nemo-* ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ @@ -49,9 +50,6 @@ package() { make DESTDIR="$pkgdir/" install - # Rename 'Files' app name to avoid having the same as nautilus - sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' "$pkgdir/usr/share/applications/nemo.desktop" - # Autostart only in Cinnamon to avoid conflict with GNOME Classic session cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \ "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop" diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch deleted file mode 100644 index 0301cc820..000000000 --- a/community/nemo/remove-desktop-background.patch +++ /dev/null @@ -1,1050 +0,0 @@ -From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Mon, 15 Apr 2013 18:44:35 -0400 -Subject: [PATCH 1/6] Don't render the background. Need to fix selected icon - style - ---- - src/nemo-desktop-icon-view.c | 18 +++--------------- - src/nemo-desktop-window.c | 15 ++++++++++++++- - 2 files changed, 17 insertions(+), 16 deletions(-) - -diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c -index b903c5b..37cd8cb 100644 ---- a/src/nemo-desktop-icon-view.c -+++ b/src/nemo-desktop-icon-view.c -@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails - static void - real_begin_loading (NemoView *object) - { -- NemoIconContainer *icon_container; -- NemoDesktopIconView *view; -- -- view = NEMO_DESKTOP_ICON_VIEW (object); -- -- icon_container = get_icon_container (view); -- if (view->details->background == NULL) { -- view->details->background = nemo_desktop_background_new (icon_container); -- } -- - NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object); - } - -@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails - nemo_view_update_menus, - icon_view); - -- if (icon_view->details->background != NULL) { -- g_object_unref (icon_view->details->background); -- icon_view->details->background = NULL; -- } -- - G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)->dispose (object); - } - -@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails - G_CALLBACK (nemo_view_update_menus), - desktop_icon_view); - -+ GdkRGBA transparent = { 0, 0, 0, 0 }; -+ gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent); -+ - have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL; - } - -diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c -index 9c80c62..2d5c4e8 100644 ---- a/src/nemo-desktop-window.c -+++ b/src/nemo-desktop-window.c -@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails { - g_signal_connect_swapped (nemo_preferences, "changed::" NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR, - G_CALLBACK (nemo_desktop_window_update_directory), - window); -+ - } - - static void -@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails { - /* Chain up to realize our children */ - GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->map (widget); - gdk_window_lower (gtk_widget_get_window (widget)); -+ -+ GdkWindow *window; -+ GdkRGBA transparent = { 0, 0, 0, 0 }; -+ -+ window = gtk_widget_get_window (widget); -+ gdk_window_set_background_rgba (window, &transparent); - } - - static void -@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails { - { - NemoDesktopWindow *window; - NemoDesktopWindowDetails *details; -+ GdkVisual *visual; - - window = NEMO_DESKTOP_WINDOW (widget); - details = window->details; -@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails { - /* Make sure we get keyboard events */ - gtk_widget_set_events (widget, gtk_widget_get_events (widget) - | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); -- -+ -+ visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget)); -+ if (visual) { -+ gtk_widget_set_visual (widget, visual); -+ } -+ - /* Do the work of realizing. */ - GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget); - --- -1.8.1.6 - - -From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Mon, 15 Apr 2013 20:03:03 -0400 -Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes - a transparent background and just uses the existing rendered background from - muffin/g-s-d - ---- - libnemo-private/Makefile.am | 2 - - libnemo-private/nemo-desktop-background.c | 578 ------------------------------ - libnemo-private/nemo-desktop-background.h | 65 ---- - src/nemo-desktop-icon-view.c | 26 +- - 4 files changed, 13 insertions(+), 658 deletions(-) - delete mode 100644 libnemo-private/nemo-desktop-background.c - delete mode 100644 libnemo-private/nemo-desktop-background.h - -diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am -index 3b46318..5fd797c 100644 ---- a/libnemo-private/Makefile.am -+++ b/libnemo-private/Makefile.am -@@ -81,8 +81,6 @@ libnemo_private_la_SOURCES = \ - nemo-debug.h \ - nemo-default-file-icon.c \ - nemo-default-file-icon.h \ -- nemo-desktop-background.c \ -- nemo-desktop-background.h \ - nemo-desktop-directory-file.c \ - nemo-desktop-directory-file.h \ - nemo-desktop-directory.c \ -diff --git a/libnemo-private/nemo-desktop-background.c b/libnemo-private/nemo-desktop-background.c -deleted file mode 100644 -index f8dc979..0000000 ---- a/libnemo-private/nemo-desktop-background.c -+++ /dev/null -@@ -1,578 +0,0 @@ --/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -- --/* -- * nemo-desktop-background.c: Helper object to handle desktop background -- * changes. -- * -- * Copyright (C) 2000 Eazel, Inc. -- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org> -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of the -- * License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -- * -- * You should have received a copy of the GNU General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500, -- * Boston, MA 02110-1335, USA. -- * -- * Authors: Darin Adler <darin@bentspoon.com> -- * Cosimo Cecchi <cosimoc@gnome.org> -- */ -- --#include <config.h> -- --#include "nemo-desktop-background.h" -- --#include <eel/eel-gdk-extensions.h> --#include <eel/eel-gtk-extensions.h> -- --#include "nemo-global-preferences.h" -- --#define GNOME_DESKTOP_USE_UNSTABLE_API --#include <libgnome-desktop/gnome-bg.h> --#include <gdesktop-enums.h> -- --#include <gtk/gtk.h> --#include <string.h> -- --static void init_fade (NemoDesktopBackground *self); --static void free_fade (NemoDesktopBackground *self); --static void queue_background_change (NemoDesktopBackground *self); -- --static NemoDesktopBackground *singleton = NULL; -- --G_DEFINE_TYPE (NemoDesktopBackground, nemo_desktop_background, G_TYPE_OBJECT); -- --enum { -- PROP_WIDGET = 1, -- NUM_PROPERTIES, --}; -- --struct NemoDesktopBackgroundDetails { -- -- GtkWidget *widget; -- GnomeBG *bg; -- -- /* Realized data: */ -- cairo_surface_t *background_surface; -- GnomeBGCrossfade *fade; -- int background_entire_width; -- int background_entire_height; -- GdkColor default_color; -- -- /* Desktop screen size watcher */ -- gulong screen_size_handler; -- /* Desktop monitors configuration watcher */ -- gulong screen_monitors_handler; -- guint change_idle_id; --}; -- -- --static gboolean --background_settings_change_event_cb (GSettings *settings, -- gpointer keys, -- gint n_keys, -- gpointer user_data); -- -- --static void --free_fade (NemoDesktopBackground *self) --{ -- if (self->details->fade != NULL) { -- g_object_unref (self->details->fade); -- self->details->fade = NULL; -- } --} -- --static void --free_background_surface (NemoDesktopBackground *self) --{ -- cairo_surface_t *surface; -- -- surface = self->details->background_surface; -- if (surface != NULL) { -- cairo_surface_destroy (surface); -- self->details->background_surface = NULL; -- } --} -- --static void --nemo_desktop_background_finalize (GObject *object) --{ -- NemoDesktopBackground *self; -- -- self = NEMO_DESKTOP_BACKGROUND (object); -- -- g_signal_handlers_disconnect_by_func (gnome_background_preferences, -- background_settings_change_event_cb, -- self); -- -- free_background_surface (self); -- free_fade (self); -- -- g_clear_object (&self->details->bg); -- -- G_OBJECT_CLASS (nemo_desktop_background_parent_class)->finalize (object); --} -- --static void --nemo_desktop_background_unrealize (NemoDesktopBackground *self) --{ -- free_background_surface (self); -- -- self->details->background_entire_width = 0; -- self->details->background_entire_height = 0; -- self->details->default_color.red = 0xffff; -- self->details->default_color.green = 0xffff; -- self->details->default_color.blue = 0xffff; --} -- --static void --nemo_desktop_background_set_image_uri (NemoDesktopBackground *self, -- const char *image_uri) --{ -- char *filename; -- -- if (image_uri != NULL) { -- filename = g_filename_from_uri (image_uri, NULL, NULL); -- } -- else { -- filename = NULL; -- } -- -- gnome_bg_set_filename (self->details->bg, filename); -- -- g_free (filename); --} -- --static void --init_fade (NemoDesktopBackground *self) --{ -- GtkWidget *widget; -- gboolean do_fade; -- -- widget = self->details->widget; -- -- if (widget == NULL || !gtk_widget_get_realized (widget)) -- return; -- -- do_fade = g_settings_get_boolean (nemo_desktop_preferences, -- NEMO_PREFERENCES_DESKTOP_BACKGROUND_FADE); -- -- if (!do_fade) { -- return; -- } -- -- if (self->details->fade == NULL) { -- GdkWindow *window; -- GdkScreen *screen; -- int old_width, old_height, width, height; -- -- /* If this was the result of a screen size change, -- * we don't want to crossfade -- */ -- window = gtk_widget_get_window (widget); -- old_width = gdk_window_get_width (window); -- old_height = gdk_window_get_height (window); -- -- screen = gtk_widget_get_screen (widget); -- width = gdk_screen_get_width (screen); -- height = gdk_screen_get_height (screen); -- -- if (old_width == width && old_height == height) { -- self->details->fade = gnome_bg_crossfade_new (width, height); -- g_signal_connect_swapped (self->details->fade, -- "finished", -- G_CALLBACK (free_fade), -- self); -- } -- } -- -- if (self->details->fade != NULL && !gnome_bg_crossfade_is_started (self->details->fade)) { -- cairo_surface_t *start_surface; -- -- if (self->details->background_surface == NULL) { -- start_surface = gnome_bg_get_surface_from_root (gtk_widget_get_screen (widget)); -- } else { -- start_surface = cairo_surface_reference (self->details->background_surface); -- } -- gnome_bg_crossfade_set_start_surface (self->details->fade, -- start_surface); -- cairo_surface_destroy (start_surface); -- } --} -- --static void --screen_size_changed (GdkScreen *screen, -- NemoDesktopBackground *self) --{ -- queue_background_change (self); --} -- --static gboolean --nemo_desktop_background_ensure_realized (NemoDesktopBackground *self) --{ -- int entire_width; -- int entire_height; -- GdkScreen *screen; -- GdkWindow *window; -- -- screen = gtk_widget_get_screen (self->details->widget); -- entire_height = gdk_screen_get_height (screen); -- entire_width = gdk_screen_get_width (screen); -- -- /* If the window size is the same as last time, don't update */ -- if (entire_width == self->details->background_entire_width && -- entire_height == self->details->background_entire_height) { -- return FALSE; -- } -- -- free_background_surface (self); -- -- window = gtk_widget_get_window (self->details->widget); -- self->details->background_surface = gnome_bg_create_surface (self->details->bg, -- window, -- entire_width, entire_height, -- TRUE); -- -- /* We got the surface and everything, so we don't care about a change -- that is pending (unless things actually change after this time) */ -- g_object_set_data (G_OBJECT (self), -- "ignore-pending-change", GINT_TO_POINTER (TRUE)); -- -- self->details->background_entire_width = entire_width; -- self->details->background_entire_height = entire_height; -- -- return TRUE; --} -- --static void --on_fade_finished (GnomeBGCrossfade *fade, -- GdkWindow *window, -- gpointer user_data) --{ -- NemoDesktopBackground *self = user_data; -- -- nemo_desktop_background_ensure_realized (self); -- gnome_bg_set_surface_as_root (gdk_window_get_screen (window), -- self->details->background_surface); --} -- --static gboolean --fade_to_surface (NemoDesktopBackground *self, -- GdkWindow *window, -- cairo_surface_t *surface) --{ -- if (self->details->fade == NULL) { -- return FALSE; -- } -- -- if (!gnome_bg_crossfade_set_end_surface (self->details->fade, -- surface)) { -- return FALSE; -- } -- -- if (!gnome_bg_crossfade_is_started (self->details->fade)) { -- gnome_bg_crossfade_start (self->details->fade, window); -- g_signal_connect (self->details->fade, -- "finished", -- G_CALLBACK (on_fade_finished), self); -- } -- -- return gnome_bg_crossfade_is_started (self->details->fade); --} -- --static void --nemo_desktop_background_set_up_widget (NemoDesktopBackground *self) --{ -- GdkWindow *window; -- gboolean in_fade = FALSE; -- GtkWidget *widget; -- -- widget = self->details->widget; -- -- if (!gtk_widget_get_realized (widget)) { -- return; -- } -- -- nemo_desktop_background_ensure_realized (self); -- window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); -- -- in_fade = fade_to_surface (self, window, -- self->details->background_surface); -- -- if (!in_fade) { -- cairo_pattern_t *pattern; -- -- pattern = cairo_pattern_create_for_surface (self->details->background_surface); -- gdk_window_set_background_pattern (window, pattern); -- cairo_pattern_destroy (pattern); -- -- gnome_bg_set_surface_as_root (gtk_widget_get_screen (widget), -- self->details->background_surface); -- } --} -- --static gboolean --background_changed_cb (NemoDesktopBackground *self) --{ -- self->details->change_idle_id = 0; -- -- nemo_desktop_background_unrealize (self); -- nemo_desktop_background_set_up_widget (self); -- -- gtk_widget_queue_draw (self->details->widget); -- -- return FALSE; --} -- --static void --queue_background_change (NemoDesktopBackground *self) --{ -- if (self->details->change_idle_id != 0) { -- g_source_remove (self->details->change_idle_id); -- } -- -- self->details->change_idle_id = -- g_idle_add ((GSourceFunc) background_changed_cb, self); --} -- --static void --nemo_desktop_background_changed (GnomeBG *bg, -- gpointer user_data) --{ -- NemoDesktopBackground *self; -- -- self = user_data; -- init_fade (self); -- queue_background_change (self); --} -- --static void --nemo_desktop_background_transitioned (GnomeBG *bg, -- gpointer user_data) --{ -- NemoDesktopBackground *self; -- -- self = user_data; -- free_fade (self); -- queue_background_change (self); --} -- --static void --widget_realize_cb (GtkWidget *widget, -- gpointer user_data) --{ -- GdkScreen *screen; -- NemoDesktopBackground *self = user_data; -- -- screen = gtk_widget_get_screen (widget); -- -- if (self->details->screen_size_handler > 0) { -- g_signal_handler_disconnect (screen, -- self->details->screen_size_handler); -- } -- self->details->screen_size_handler = -- g_signal_connect (screen, "size_changed", -- G_CALLBACK (screen_size_changed), self); -- -- if (self->details->screen_monitors_handler > 0) { -- g_signal_handler_disconnect (screen, -- self->details->screen_monitors_handler); -- } -- self->details->screen_monitors_handler = -- g_signal_connect (screen, "monitors-changed", -- G_CALLBACK (screen_size_changed), self); -- nemo_desktop_background_set_up_widget (self); --} -- --static void --widget_unrealize_cb (GtkWidget *widget, -- gpointer user_data) --{ -- NemoDesktopBackground *self = user_data; -- -- if (self->details->screen_size_handler > 0) { -- g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)), -- self->details->screen_size_handler); -- self->details->screen_size_handler = 0; -- } -- if (self->details->screen_monitors_handler > 0) { -- g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)), -- self->details->screen_monitors_handler); -- self->details->screen_monitors_handler = 0; -- } --} -- --static void --on_widget_destroyed (GtkWidget *widget, -- gpointer user_data) --{ -- NemoDesktopBackground *self = user_data; -- -- if (self->details->change_idle_id != 0) { -- g_source_remove (self->details->change_idle_id); -- self->details->change_idle_id = 0; -- } -- -- free_fade (self); -- self->details->widget = NULL; --} -- --static gboolean --background_change_event_idle_cb (NemoDesktopBackground *self) --{ -- gnome_bg_load_from_preferences (self->details->bg, -- gnome_background_preferences); -- -- g_object_unref (self); -- -- return FALSE; --} -- --static gboolean --background_settings_change_event_cb (GSettings *settings, -- gpointer keys, -- gint n_keys, -- gpointer user_data) --{ -- NemoDesktopBackground *self = user_data; -- -- /* Need to defer signal processing otherwise -- * we would make the dconf backend deadlock. -- */ -- g_idle_add ((GSourceFunc) background_change_event_idle_cb, -- g_object_ref (self)); -- -- return FALSE; --} -- --static void --nemo_desktop_background_constructed (GObject *obj) --{ -- NemoDesktopBackground *self; -- GtkWidget *widget; -- -- self = NEMO_DESKTOP_BACKGROUND (obj); -- -- if (G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed != NULL) { -- G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed (obj); -- } -- -- widget = self->details->widget; -- -- g_assert (widget != NULL); -- -- g_signal_connect_object (widget, "destroy", -- G_CALLBACK (on_widget_destroyed), self, 0); -- g_signal_connect_object (widget, "realize", -- G_CALLBACK (widget_realize_cb), self, 0); -- g_signal_connect_object (widget, "unrealize", -- G_CALLBACK (widget_unrealize_cb), self, 0); -- -- gnome_bg_load_from_preferences (self->details->bg, -- gnome_background_preferences); -- -- /* Let's receive batch change events instead of every single one */ -- g_signal_connect (gnome_background_preferences, -- "change-event", -- G_CALLBACK (background_settings_change_event_cb), -- self); -- -- queue_background_change (self); --} -- --static void --nemo_desktop_background_set_property (GObject *object, -- guint property_id, -- const GValue *value, -- GParamSpec *pspec) --{ -- NemoDesktopBackground *self; -- -- self = NEMO_DESKTOP_BACKGROUND (object); -- -- switch (property_id) { -- case PROP_WIDGET: -- self->details->widget = g_value_get_object (value); -- break; -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -- break; -- } --} -- --static GObject * --nemo_desktop_background_constructor (GType type, -- guint n_construct_params, -- GObjectConstructParam *construct_params) --{ -- GObject *retval; -- -- if (singleton != NULL) { -- return g_object_ref (singleton); -- } -- -- retval = G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructor -- (type, n_construct_params, construct_params); -- -- singleton = NEMO_DESKTOP_BACKGROUND (retval); -- g_object_add_weak_pointer (retval, (gpointer) &singleton); -- -- return retval; --} -- --static void --nemo_desktop_background_class_init (NemoDesktopBackgroundClass *klass) --{ -- GObjectClass *object_class; -- GParamSpec *pspec; -- -- object_class = G_OBJECT_CLASS (klass); -- object_class->finalize = nemo_desktop_background_finalize; -- object_class->set_property = nemo_desktop_background_set_property; -- object_class->constructor = nemo_desktop_background_constructor; -- object_class->constructed = nemo_desktop_background_constructed; -- -- pspec = g_param_spec_object ("widget", "The widget for this background", -- "The widget that gets its background set", -- NEMO_TYPE_ICON_CONTAINER, -- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); -- g_object_class_install_property (object_class, PROP_WIDGET, pspec); -- -- g_type_class_add_private (klass, sizeof (NemoDesktopBackgroundDetails)); --} -- --static void --nemo_desktop_background_init (NemoDesktopBackground *self) --{ -- self->details = -- G_TYPE_INSTANCE_GET_PRIVATE (self, -- NEMO_TYPE_DESKTOP_BACKGROUND, -- NemoDesktopBackgroundDetails); -- -- self->details->bg = gnome_bg_new (); -- self->details->default_color.red = 0xffff; -- self->details->default_color.green = 0xffff; -- self->details->default_color.blue = 0xffff; -- -- g_signal_connect (self->details->bg, "changed", -- G_CALLBACK (nemo_desktop_background_changed), self); -- g_signal_connect (self->details->bg, "transitioned", -- G_CALLBACK (nemo_desktop_background_transitioned), self); --} -- --NemoDesktopBackground * --nemo_desktop_background_new (NemoIconContainer *container) --{ -- return g_object_new (NEMO_TYPE_DESKTOP_BACKGROUND, -- "widget", container, -- NULL); --} -diff --git a/libnemo-private/nemo-desktop-background.h b/libnemo-private/nemo-desktop-background.h -deleted file mode 100644 -index 8755cb1..0000000 ---- a/libnemo-private/nemo-desktop-background.h -+++ /dev/null -@@ -1,65 +0,0 @@ --/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -- --/* -- * nemo-desktop-background.c: Helper object to handle desktop background -- * changes. -- * -- * Copyright (C) 2000 Eazel, Inc. -- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org> -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of the -- * License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -- * -- * You should have received a copy of the GNU General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500, -- * Boston, MA 02110-1335, USA. -- * -- * Authors: Darin Adler <darin@bentspoon.com> -- * Cosimo Cecchi <cosimoc@gnome.org> -- */ -- --#ifndef __NAUTILIUS_DESKTOP_BACKGROUND_H__ --#define __NAUTILIUS_DESKTOP_BACKGROUND_H__ -- --#include <gtk/gtk.h> -- --#include "nemo-icon-container.h" -- --typedef struct NemoDesktopBackground NemoDesktopBackground; --typedef struct NemoDesktopBackgroundClass NemoDesktopBackgroundClass; -- --#define NEMO_TYPE_DESKTOP_BACKGROUND nemo_desktop_background_get_type() --#define NEMO_DESKTOP_BACKGROUND(obj) \ -- (G_TYPE_CHECK_INSTANCE_CAST ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackground)) --#define NEMO_DESKTOP_BACKGROUND_CLASS(klass) \ -- (G_TYPE_CHECK_CLASS_CAST ((klass), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass)) --#define NEMO_IS_DESKTOP_BACKGROUND(obj) \ -- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NEMO_TYPE_DESKTOP_BACKGROUND)) --#define NEMO_IS_DESKTOP_BACKGROUND_CLASS(klass) \ -- (G_TYPE_CHECK_CLASS_TYPE ((klass), NEMO_TYPE_DESKTOP_BACKGROUND)) --#define NEMO_DESKTOP_BACKGROUND_GET_CLASS(obj) \ -- (G_TYPE_INSTANCE_GET_CLASS ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass)) -- --GType nemo_desktop_background_get_type (void); --NemoDesktopBackground * nemo_desktop_background_new (NemoIconContainer *container); -- --typedef struct NemoDesktopBackgroundDetails NemoDesktopBackgroundDetails; -- --struct NemoDesktopBackground { -- GObject parent; -- NemoDesktopBackgroundDetails *details; --}; -- --struct NemoDesktopBackgroundClass { -- GObjectClass parent_class; --}; -- --#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */ -diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c -index 37cd8cb..5dec8b5 100644 ---- a/src/nemo-desktop-icon-view.c -+++ b/src/nemo-desktop-icon-view.c -@@ -41,7 +41,6 @@ - #include <fcntl.h> - #include <gdk/gdkx.h> - #include <glib/gi18n.h> --#include <libnemo-private/nemo-desktop-background.h> - #include <libnemo-private/nemo-desktop-icon-file.h> - #include <libnemo-private/nemo-directory-notify.h> - #include <libnemo-private/nemo-file-changes-queue.h> -@@ -76,8 +75,6 @@ struct NemoDesktopIconViewDetails - gulong delayed_init_signal; - guint reload_desktop_timeout; - gboolean pending_rescan; -- -- NemoDesktopBackground *background; - }; - - static void default_zoom_level_changed (gpointer user_data); -@@ -240,12 +237,6 @@ struct NemoDesktopIconViewDetails - return GDK_FILTER_CONTINUE; - } - --static void --real_begin_loading (NemoView *object) --{ -- NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object); --} -- - static const char * - real_get_id (NemoView *view) - { -@@ -300,7 +291,6 @@ struct NemoDesktopIconViewDetails - - G_OBJECT_CLASS (class)->dispose = nemo_desktop_icon_view_dispose; - -- vclass->begin_loading = real_begin_loading; - vclass->merge_menus = real_merge_menus; - vclass->update_menus = real_update_menus; - vclass->get_view_id = real_get_id; -@@ -428,6 +418,17 @@ struct NemoDesktopIconViewDetails - desktop_icon_view); - } - -+static void -+desktop_icon_container_realize (GtkWidget *widget, -+ NemoDesktopIconView *desktop_icon_view) -+{ -+ GdkWindow *bin_window; -+ GdkRGBA transparent = { 0, 0, 0, 0 }; -+ -+ bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); -+ gdk_window_set_background_rgba (bin_window, &transparent); -+} -+ - static NemoZoomLevel - get_default_zoom_level (void) - { -@@ -614,6 +615,8 @@ struct NemoDesktopIconViewDetails - - g_signal_connect_object (icon_container, "middle_click", - G_CALLBACK (nemo_desktop_icon_view_handle_middle_click), desktop_icon_view, 0); -+ g_signal_connect_object (icon_container, "realize", -+ G_CALLBACK (desktop_icon_container_realize), desktop_icon_view, 0); - g_signal_connect_object (desktop_icon_view, "realize", - G_CALLBACK (realized_callback), desktop_icon_view, 0); - g_signal_connect_object (desktop_icon_view, "unrealize", -@@ -637,9 +640,6 @@ struct NemoDesktopIconViewDetails - G_CALLBACK (nemo_view_update_menus), - desktop_icon_view); - -- GdkRGBA transparent = { 0, 0, 0, 0 }; -- gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent); -- - have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL; - } - --- -1.8.1.6 - - -From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Mon, 15 Apr 2013 20:14:40 -0400 -Subject: [PATCH 3/6] Forgot an include - ---- - libnemo-private/nemo-icon-dnd.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libnemo-private/nemo-icon-dnd.c b/libnemo-private/nemo-icon-dnd.c -index 017c6a7..2ed073c 100644 ---- a/libnemo-private/nemo-icon-dnd.c -+++ b/libnemo-private/nemo-icon-dnd.c -@@ -52,7 +52,6 @@ - #include <gtk/gtk.h> - #include <glib/gi18n.h> - --#include <libnemo-private/nemo-desktop-background.h> - #include <libnemo-private/nemo-file-utilities.h> - #include <libnemo-private/nemo-file-changes-queue.h> - #include <stdio.h> --- -1.8.1.6 - - -From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Tue, 16 Apr 2013 18:00:01 -0400 -Subject: [PATCH 4/6] Change to use cinnamon background keys - ---- - libnemo-private/nemo-global-preferences.c | 2 +- - libnemo-private/nemo-global-preferences.h | 2 +- - src/nemo-places-sidebar.c | 2 +- - src/nemo-view.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c -index d3ad20a..336afc3 100644 ---- a/libnemo-private/nemo-global-preferences.c -+++ b/libnemo-private/nemo-global-preferences.c -@@ -76,7 +76,7 @@ - nemo_desktop_preferences = g_settings_new("org.nemo.desktop"); - nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); - gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); -- gnome_background_preferences = g_settings_new("org.gnome.desktop.background"); -+ cinnamon_background_preferences = g_settings_new("org.cinnamon.background"); - gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); - gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); - } -diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h -index 2b9c56a..c1ec61a 100644 ---- a/libnemo-private/nemo-global-preferences.h -+++ b/libnemo-private/nemo-global-preferences.h -@@ -226,7 +226,7 @@ enum - GSettings *nemo_tree_sidebar_preferences; - GSettings *nemo_window_state; - GSettings *gnome_lockdown_preferences; --GSettings *gnome_background_preferences; -+GSettings *cinnamon_background_preferences; - GSettings *gnome_media_handling_preferences; - GSettings *gnome_terminal_preferences; - -diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c -index a0bc4d4..ca32193 100644 ---- a/src/nemo-places-sidebar.c -+++ b/src/nemo-places-sidebar.c -@@ -3825,7 +3825,7 @@ static void expand_or_collapse_category (NemoPlacesSidebar *sidebar, - bookmarks_popup_menu_detach_cb, - sidebar); - -- g_signal_handlers_disconnect_by_func (gnome_background_preferences, -+ g_signal_handlers_disconnect_by_func (cinnamon_background_preferences, - desktop_setting_changed_callback, - sidebar); - -diff --git a/src/nemo-view.c b/src/nemo-view.c -index ab03b44..3ece32a 100644 ---- a/src/nemo-view.c -+++ b/src/nemo-view.c -@@ -6945,7 +6945,7 @@ static void slot_changed_pane (NemoWindowSlot *slot, - - uri = nemo_file_info_get_uri (file); - -- g_settings_set_string (gnome_background_preferences, -+ g_settings_set_string (cinnamon_background_preferences, - "picture-uri", uri); - g_free (uri); - } --- -1.8.1.6 - - -From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Mon, 22 Apr 2013 08:33:41 -0400 -Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when - cinnamon is not installed - ---- - libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c -index 336afc3..7eb04ef 100644 ---- a/libnemo-private/nemo-global-preferences.c -+++ b/libnemo-private/nemo-global-preferences.c -@@ -76,7 +76,25 @@ - nemo_desktop_preferences = g_settings_new("org.nemo.desktop"); - nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); - gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); -- cinnamon_background_preferences = g_settings_new("org.cinnamon.background"); - gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); - gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); -+ -+ const gchar * const *schema_list = g_settings_list_schemas (); -+ int i = 0; -+ gboolean has_cinnamon = FALSE; -+ if (schema_list != NULL) { -+ while (schema_list[i] != NULL) { -+ if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) { -+ has_cinnamon = TRUE; -+ break; -+ } -+ i++; -+ } -+ } -+ -+ if (has_cinnamon) { -+ cinnamon_background_preferences = g_settings_new ("org.cinnamon.background"); -+ } else { -+ cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background"); -+ } - } --- -1.8.1.6 - - -From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Mon, 22 Apr 2013 09:31:49 -0400 -Subject: [PATCH 6/6] simplify schema check - ---- - libnemo-private/nemo-global-preferences.c | 17 +++-------------- - 1 file changed, 3 insertions(+), 14 deletions(-) - -diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c -index 7eb04ef..0470595 100644 ---- a/libnemo-private/nemo-global-preferences.c -+++ b/libnemo-private/nemo-global-preferences.c -@@ -79,20 +79,9 @@ - gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); - gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); - -- const gchar * const *schema_list = g_settings_list_schemas (); -- int i = 0; -- gboolean has_cinnamon = FALSE; -- if (schema_list != NULL) { -- while (schema_list[i] != NULL) { -- if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) { -- has_cinnamon = TRUE; -- break; -- } -- i++; -- } -- } -- -- if (has_cinnamon) { -+ GSettingsSchemaSource *schema_source; -+ schema_source = g_settings_schema_source_get_default(); -+ if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) { - cinnamon_background_preferences = g_settings_new ("org.cinnamon.background"); - } else { - cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background"); --- -1.8.1.6 - diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch deleted file mode 100644 index 49964678d..000000000 --- a/community/nemo/tracker-0.16.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 88459a57ac2fcf06400ade5c6d0189bf1aa2334d Mon Sep 17 00:00:00 2001 -From: Nick Black <nick.black@sprezzatech.com> -Date: Fri, 12 Apr 2013 17:10:46 -0400 -Subject: [PATCH] build with tracker 0.16 - ---- - configure.in | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/configure.in b/configure.in -index ec72f73..21afbe4 100644 ---- a/configure.in -+++ b/configure.in -@@ -249,11 +249,13 @@ AC_ARG_ENABLE(tracker, - - build_tracker=no - if test "x$enable_tracker" != "xno"; then -- PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14, -+ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16, - [build_tracker=yes], -- [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, -+ [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14, -+ [build_tracker=yes], -+ [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, - [build_tracker=yes], -- [build_tracker=no])]) -+ [build_tracker=no])])]) - if test "x$build_tracker" = "xyes"; then - AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support]) - fi --- -1.8.1.5 - diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index cc8f0ca4b..c28463a87 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,102 +1,96 @@ -# $Id: PKGBUILD 94240 2013-07-17 19:28:57Z bpiotrowski $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 96815 2013-09-05 20:15:59Z seblu $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Maintainer: Sébastien Luttringer +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> -_cfgdir=/etc/nginx -_tmpdir=/var/lib/nginx - pkgname=nginx pkgver=1.4.2 -pkgrel=1 +pkgrel=4 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') -depends=('pcre' 'zlib' 'openssl' 'geoip') -makedepends=('passenger') -url="http://nginx.org" +url='http://nginx.org' license=('custom') -install=nginx.install -backup=(${_cfgdir:1}/fastcgi.conf - ${_cfgdir:1}/fastcgi_params - ${_cfgdir:1}/koi-win - ${_cfgdir:1}/koi-utf - ${_cfgdir:1}/mime.types - ${_cfgdir:1}/nginx.conf - ${_cfgdir:1}/scgi_params - ${_cfgdir:1}/uwsgi_params - ${_cfgdir:1}/win-utf - etc/logrotate.d/nginx) -source=(http://nginx.org/download/nginx-$pkgver.tar.gz - service - logrotate) +depends=('pcre' 'zlib' 'openssl') +backup=('etc/nginx/fastcgi.conf' + 'etc/nginx/fastcgi_params' + 'etc/nginx/koi-win' + 'etc/nginx/koi-utf' + 'etc/nginx/mime.types' + 'etc/nginx/nginx.conf' + 'etc/nginx/scgi_params' + 'etc/nginx/uwsgi_params' + 'etc/nginx/win-utf' + 'etc/logrotate.d/nginx') +install=install +source=("http://nginx.org/download/nginx-$pkgver.tar.gz" + 'service' + 'logrotate') sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611' '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' - '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') + '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98') build() { - cd "$srcdir"/$pkgname-$pkgver - - ./configure \ - --prefix=$_cfgdir \ - --conf-path=$_cfgdir/nginx.conf \ + cd $pkgname-$pkgver + ./configure \ + --prefix=/etc/nginx \ + --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/bin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/lock/nginx.lock \ - --user=http --group=http \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ + --user=http \ + --group=http \ --http-log-path=/var/log/nginx/access.log \ --error-log-path=/var/log/nginx/error.log \ - --http-client-body-temp-path=$_tmpdir/client-body \ - --http-proxy-temp-path=$_tmpdir/proxy \ - --http-fastcgi-temp-path=$_tmpdir/fastcgi \ - --http-scgi-temp-path=$_tmpdir/scgi \ - --http-uwsgi-temp-path=$_tmpdir/uwsgi \ - --with-imap --with-imap_ssl_module \ - --with-ipv6 --with-pcre-jit \ + --http-client-body-temp-path=/var/lib/nginx/client-body \ + --http-proxy-temp-path=/var/lib/nginx/proxy \ + --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ + --http-scgi-temp-path=/var/lib/nginx/scgi \ + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ + --with-imap \ + --with-imap_ssl_module \ + --with-ipv6 \ + --with-pcre-jit \ --with-file-aio \ --with-http_dav_module \ - --with-http_geoip_module \ --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_realip_module \ --with-http_spdy_module \ --with-http_ssl_module \ --with-http_stub_status_module \ - --add-module=/usr/lib/passenger/ext/nginx \ - #--with-http_mp4_module \ - #--with-http_addition_module \ - #--with-http_xslt_module \ - #--with-http_image_filter_module \ - #--with-http_sub_module \ - #--with-http_flv_module \ - #--with-http_random_index_module \ - #--with-http_secure_link_module \ - #--with-http_degradation_module \ - #--with-http_perl_module \ - - make + --with-http_addition_module \ + --with-http_degradation_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_secure_link_module \ + --with-http_sub_module + make } package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - sed -e 's|\<user\s\+\w\+;|user html;|g' \ - -e '44s|html|/usr/share/nginx/html|' \ - -e '54s|html|/usr/share/nginx/html|' \ - -i "$pkgdir"/etc/nginx/nginx.conf - rm "$pkgdir"/etc/nginx/*.default + sed -e 's|\<user\s\+\w\+;|user html;|g' \ + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + rm "$pkgdir"/etc/nginx/*.default - install -d "$pkgdir"/$_tmpdir - install -dm700 "$pkgdir"/$_tmpdir/proxy + install -d "$pkgdir"/var/lib/nginx + install -dm700 "$pkgdir"/var/lib/nginx/proxy - chmod 750 "$pkgdir"/var/log/nginx - chown http:log "$pkgdir"/var/log/nginx + chmod 750 "$pkgdir"/var/log/nginx + chown http:log "$pkgdir"/var/log/nginx - install -d "$pkgdir"/usr/share/nginx - mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx + install -d "$pkgdir"/usr/share/nginx + mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx - install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE - rm -rf "$pkgdir"/var/run + install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx + install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + rmdir "$pkgdir/run" } + +# vim:set ts=4 sw=4 et: diff --git a/community/nginx/install b/community/nginx/install new file mode 100644 index 000000000..7c4adf14b --- /dev/null +++ b/community/nginx/install @@ -0,0 +1,21 @@ +post_upgrade() { + if (( $(vercmp $2 1.2.7-4) <= 0 )); then + chmod 750 var/log/nginx + chown http:log var/log/nginx + fi + if (( $(vercmp $2 1.2.1-2) <= 0 )); then + echo ' >>> Since 1.2.1-2 several changes has been made in package:' + echo ' - *.conf files have been moved to /etc/nginx' + echo ' - /etc/conf.d/nginx has been removed' + echo ' Main configuration file is set to /etc/nginx/nginx.conf' + echo ' - access.log and error.log can be found in /var/log/nginx by default' + echo ' - bundled *.html files have been moved to /usr/share/nginx/html' + echo ' - /etc/nginx/{html,logs} symbolic links and *.default files have been removed' + fi + if (( $(vercmp $2 1.4.2-4) < 0 )); then + echo 'Nginx now includes only upstream bundled modules.' + echo 'Thus, passenger module support was dropped.' + fi +} + +# vim:set ts=4 sw=4 et: diff --git a/community/nginx/logrotate b/community/nginx/logrotate index 3d082bcf8..e0fa9ec4c 100644 --- a/community/nginx/logrotate +++ b/community/nginx/logrotate @@ -4,6 +4,6 @@ sharedscripts compress postrotate - test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` + test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid` endscript } diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install deleted file mode 100644 index 0daccc639..000000000 --- a/community/nginx/nginx.install +++ /dev/null @@ -1,15 +0,0 @@ -post_upgrade() { - if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then - chmod 750 var/log/nginx - chown http:log var/log/nginx - fi - if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then - echo " >>> Since 1.2.1-2 several changes has been made in package:" - echo " - *.conf files have been moved to /etc/nginx" - echo " - /etc/conf.d/nginx has been removed" - echo " Main configuration file is set to /etc/nginx/nginx.conf" - echo " - access.log and error.log can be found in /var/log/nginx by default" - echo " - bundled *.html files have been moved to /usr/share/nginx/html" - echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" - fi -} diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 953550047..3f4a845f0 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96776 2013-09-04 21:38:52Z bpiotrowski $ +# $Id: PKGBUILD 97916 2013-10-01 05:49:26Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.18 +pkgver=0.10.20 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('3ee4436473869d4d84bb5cad4352b09ace00656467eca7d6db7cd7da5b8c5495') +sha256sums=('b5af00d4d43644f37caa2dad5fa81e6f898ebb7b238f02a1cddfcff11c81e649') prepare() { cd node-v$pkgver diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index c30bc8a73..94e93fe5f 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 92109 2013-05-31 15:39:41Z foutrelis $ +# $Id: PKGBUILD 96996 2013-09-10 01:53:10Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop pkgver=5.0.1 -pkgrel=3 +pkgrel=4 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64' 'mips64el') url='http://www.ntop.org/' license=('GPL') -depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') +depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua' 'python2') makedepends=('subversion' 'wget' 'ca-certificates') options=('!libtool' '!makeflags') install='ntop.install' @@ -18,6 +18,14 @@ source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pk md5sums=('01710b6925a8a5ffe1a41b8b512ebd69' '0e149d20f881600e8387d850ac268483') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Python2 fix + find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + sed -i 's/python-config/python2-config/' configure.in +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index ee1726eb2..6d3ca4b2f 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90332 2013-05-11 15:38:55Z alucryd $ +# $Id: PKGBUILD 96992 2013-09-09 20:32:19Z bgyorgy $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite pkgver=1.77 -pkgrel=2 +pkgrel=3 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD deleted file mode 100644 index 1157c0a30..000000000 --- a/community/openclonk/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 94898 2013-08-01 06:55:20Z bpiotrowski $ -# Maintainer: Jonathan Steel <mail at jsteel dot org> -# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Wesley <rudirennsau at hotmail dot com> - -pkgname=openclonk -pkgver=5.3.3 -pkgrel=2 -pkgdesc="A multiplayer-action-tactic-skill game" -arch=('i686' 'x86_64') -url="http://openclonk.org" -license=('custom') -depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm' 'hicolor-icon-theme' 'libupnp') -makedepends=('cmake' 'boost' 'imagemagick' 'mesa') -install=$pkgname.install -source=(http://hg.openclonk.org/$pkgname/archive/$pkgname-release-$pkgver-src.tar.gz) -md5sums=('a61d8a7d7c41bcc8d85a647c25095658') - -build() { - [[ -d build ]] && rm -rf build - mkdir build && cd build - - cmake ../ -DCMAKE_INSTALL_PREFIX=/usr - - make -} - -package() { - cd build - - make DESTDIR="$pkgdir"/ install - - install -Dm644 clonk.png "$pkgdir"/usr/share/pixmaps/clonk.png - install -dm755 "$pkgdir"/usr/share/licenses/$pkgname - install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname -} - -# vim: ts=2 sw=2 et: diff --git a/community/openclonk/openclonk.install b/community/openclonk/openclonk.install deleted file mode 100644 index b9bbaf706..000000000 --- a/community/openclonk/openclonk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index d88c3a5f1..16596caec 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $ +# $Id: PKGBUILD 97519 2013-09-23 16:14:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.8.3 -pkgrel=3 +pkgver=2.8.4 +pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -17,7 +17,7 @@ install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.service) -md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc' +md5sums=('17f667d022c167c7874a993e928d4a6d' '3e2bb1058ac0662f01e675aa6ac7ee8f' '85010750a21954e2d3cf5d57fe210d3f') diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD index f32d5af1f..404f7c376 100644 --- a/community/opus-tools/PKGBUILD +++ b/community/opus-tools/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 81947 2013-01-04 06:03:54Z bpiotrowski $ +# $Id: PKGBUILD 96976 2013-09-09 15:45:45Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Michael Düll <mail@akurei.me> # Contributor: pumbur pkgname=opus-tools -pkgver=0.1.6 +pkgver=0.1.7 pkgrel=1 pkgdesc='Collection of tools for Opus audio codec' arch=('i686' 'x86_64' 'mips64el') url='http://wiki.xiph.org/Opus-tools' license=('BSD') -depends=('opus' 'libogg') +depends=('flac' 'libogg' 'opus') source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz) +md5sums=('62af32d1669bcabf1aabaf7187a377f6') build(){ - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } - -sha512sums=('547828082c4838643eeda513f65316b60b0e44c4a0826ef39cbfa3fe81df71b30651c03ceee7729aeb74258c259014bf95ca5f01aba097a4de8334e58c8e7ce6') diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD deleted file mode 100644 index deee1070c..000000000 --- a/community/pam_pwcheck/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 90578 2013-05-13 09:54:52Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=pam_pwcheck -pkgver=3.12.1 -pkgrel=1 -pkgdesc="A password strength checking module for PAM-aware password changing programs" -arch=(i686 x86_64 'mips64el') -url="http://www.thkukuk.de/pam/pam_pwcheck/" -depends=('pam') -license=('GPL') -source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2) -md5sums=('85cd0d48500c160abcb0b9902e5594ce') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index c61e08f6a..2433d00bd 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90928 2013-05-15 13:56:58Z bisson $ +# $Id: PKGBUILD 97765 2013-09-29 05:06:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari -pkgver=2.5.4 +pkgver=2.5.5 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -12,7 +12,7 @@ depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc}) -sha1sums=('471226fd86fea0ad1f236249a49bdaee16aa34bf' 'SKIP') +sha1sums=('77637f935ee4a3b78e7015cef00146bd2f7e96bc' 'SKIP') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index eba0b90dc..fb8cdeaf3 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94711 2013-07-29 10:19:02Z spupykin $ +# $Id: PKGBUILD 97838 2013-09-30 10:03:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=5.6.0 +pkgver=5.7.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('7bf098790c5772bb45480abe3e425f3c') +md5sums=('3fcb1b21a3d71be8c4a4111fcac56278') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 0000be2ca..0823d454b 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95467 2013-08-12 19:57:14Z bpiotrowski $ +# $Id: PKGBUILD 97022 2013-09-10 14:32:02Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,14 +6,15 @@ pkgname=pcmanfm pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64' 'mips64el') url="http://pcmanfm.sourceforge.net/" license=('GPL') groups=('lxde') depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool') +optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) md5sums=('41104699e653ff2b0a9a9e80a257d6a2') diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD index 71bb22650..984dfac74 100644 --- a/community/pcsxr/PKGBUILD +++ b/community/pcsxr/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 96557 2013-08-31 16:57:39Z schuay $ +# $Id: PKGBUILD 97005 2013-09-10 08:52:26Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: quantax -- contact via Arch Linux forum or AUR # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=pcsxr pkgver=1.9.93 -pkgrel=1 +pkgrel=2 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project' arch=('i686' 'x86_64') url='http://pcsxr.codeplex.com/' license=('GPL') -depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'gtk3') +options=('!libtool') +depends=('libcdio' 'libxv' 'sdl' 'gtk3') makedepends=('mesa' 'intltool') +[[ $CARCH == 'i686' ]] && makedepends+=('nasm') # Accessible through /srv/ftp/other/community on nymeria. source=("ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2") diff --git a/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch b/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch new file mode 100644 index 000000000..fda79cff3 --- /dev/null +++ b/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch @@ -0,0 +1,3539 @@ +From 6325837d6abf272b8c3dfac664f18435f8a2abf8 Mon Sep 17 00:00:00 2001 +From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +Date: Thu, 5 Sep 2013 09:52:54 +0200 +Subject: [PATCH] MDEV-4902 - sql_yacc.yy incompatible with bison 3 + +- YYPARSE_PARAM and YYLEX_PARAM are removed in Bison 3.0. Deprecated + since Bison 1.875 in favor of %lex-param, %parse-param. +- %pure_parser is deprecated in favor of %define api.pure. +- %parse-param adds an argument to yyerror() as well, updated + MYSQLerror() accordingly. +- %parse-param allows to declare proper type for argument. That's + what 99% of this patch is about. +--- + sql/sql_lex.cc | 12 +- + sql/sql_lex.h | 2 +- + sql/sql_parse.cc | 2 +- + sql/sql_yacc.yy | 799 ++++++++++++++++++++++++------------------------------- + 4 files changed, 361 insertions(+), 454 deletions(-) + +diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc +index 18323f8..b01d451 100644 +--- a/sql/sql_lex.cc ++++ b/sql/sql_lex.cc +@@ -29,7 +29,7 @@ + #include "sp.h" + #include "sp_head.h" + +-static int lex_one_token(void *arg, void *yythd); ++static int lex_one_token(void *arg, THD *thd); + + /* + We are using pointer to this variable for distinguishing between assignment +@@ -869,9 +869,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted) + (which can't be followed by a signed number) + */ + +-int MYSQLlex(void *arg, void *yythd) ++int MYSQLlex(void *arg, THD *thd) + { +- THD *thd= (THD *)yythd; + Lex_input_stream *lip= & thd->m_parser_state->m_lip; + YYSTYPE *yylval=(YYSTYPE*) arg; + int token; +@@ -889,7 +888,7 @@ int MYSQLlex(void *arg, void *yythd) + return token; + } + +- token= lex_one_token(arg, yythd); ++ token= lex_one_token(arg, thd); + + switch(token) { + case WITH: +@@ -900,7 +899,7 @@ int MYSQLlex(void *arg, void *yythd) + to transform the grammar into a LALR(1) grammar, + which sql_yacc.yy can process. + */ +- token= lex_one_token(arg, yythd); ++ token= lex_one_token(arg, thd); + switch(token) { + case CUBE_SYM: + return WITH_CUBE_SYM; +@@ -923,14 +922,13 @@ int MYSQLlex(void *arg, void *yythd) + return token; + } + +-int lex_one_token(void *arg, void *yythd) ++int lex_one_token(void *arg, THD *thd) + { + reg1 uchar c= 0; + bool comment_closed; + int tokval, result_state; + uint length; + enum my_lex_states state; +- THD *thd= (THD *)yythd; + Lex_input_stream *lip= & thd->m_parser_state->m_lip; + LEX *lex= thd->lex; + YYSTYPE *yylval=(YYSTYPE*) arg; +diff --git a/sql/sql_lex.h b/sql/sql_lex.h +index 8648b32..ba37127 100644 +--- a/sql/sql_lex.h ++++ b/sql/sql_lex.h +@@ -2820,7 +2820,7 @@ extern void lex_init(void); + extern void lex_free(void); + extern void lex_start(THD *thd); + extern void lex_end(LEX *lex); +-extern int MYSQLlex(void *arg, void *yythd); ++extern int MYSQLlex(void *arg, THD *thd); + + extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str); + +diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc +index a1a79fd..d826b77 100644 +--- a/sql/sql_parse.cc ++++ b/sql/sql_parse.cc +@@ -7636,7 +7636,7 @@ bool check_host_name(LEX_STRING *str) + } + + +-extern int MYSQLparse(void *thd); // from sql_yacc.cc ++extern int MYSQLparse(THD *thd); // from sql_yacc.cc + + + /** +diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy +index 34ae03b..2a6d9aa 100644 +--- a/sql/sql_yacc.yy ++++ b/sql/sql_yacc.yy +@@ -22,20 +22,13 @@ + */ + + %{ +-/* thd is passed as an argument to yyparse(), and subsequently to yylex(). +-** The type will be void*, so it must be cast to (THD*) when used. +-** Use the YYTHD macro for this. +-*/ +-#define YYPARSE_PARAM yythd +-#define YYLEX_PARAM yythd +-#define YYTHD ((THD *)yythd) +-#define YYLIP (& YYTHD->m_parser_state->m_lip) +-#define YYPS (& YYTHD->m_parser_state->m_yacc) ++#define YYLIP (& thd->m_parser_state->m_lip) ++#define YYPS (& thd->m_parser_state->m_yacc) + + #define MYSQL_YACC + #define YYINITDEPTH 100 + #define YYMAXDEPTH 3200 /* Because of 64K stack */ +-#define Lex (YYTHD->lex) ++#define Lex (thd->lex) + #define Select Lex->current_select + #include "sql_priv.h" + #include "unireg.h" // REQUIRED: for other includes +@@ -69,14 +62,14 @@ + #pragma warning (disable : 4065) + #endif + +-int yylex(void *yylval, void *yythd); ++int yylex(void *yylval, THD *thd); + + #define yyoverflow(A,B,C,D,E,F) \ + { \ + ulong val= *(F); \ + if (my_yyoverflow((B), (D), &val)) \ + { \ +- yyerror((char*) (A)); \ ++ yyerror(current_thd, (char*) (A)); \ + return 2; \ + } \ + else \ +@@ -88,7 +81,7 @@ int yylex(void *yylval, void *yythd); + #define MYSQL_YYABORT \ + do \ + { \ +- LEX::cleanup_lex_after_parse_error(YYTHD);\ ++ LEX::cleanup_lex_after_parse_error(thd);\ + YYABORT; \ + } while (0) + +@@ -174,10 +167,8 @@ void my_parse_error(const char *s) + to abort from the parser. + */ + +-void MYSQLerror(const char *s) ++void MYSQLerror(THD *thd, const char *s) + { +- THD *thd= current_thd; +- + /* + Restore the original LEX if it was replaced when parsing + a stored procedure. We must ensure that a parsing error +@@ -780,7 +771,10 @@ static bool add_create_index (LEX *lex, Key::Keytype type, + bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); + %} + +-%pure_parser /* We have threads */ ++/* We have threads */ ++%define api.pure ++%parse-param { THD *thd } ++%lex-param { THD *thd } + /* + Currently there are 168 shift/reduce conflicts. + We should not introduce new conflicts any more. +@@ -1668,7 +1662,6 @@ rule: <-- starts at col 1 + query: + END_OF_INPUT + { +- THD *thd= YYTHD; + if (!thd->bootstrap && + (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT))) + { +@@ -1682,7 +1675,7 @@ query: + { + Lex_input_stream *lip = YYLIP; + +- if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) && ++ if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) && + lip->multi_statements && + ! lip->eof()) + { +@@ -1778,7 +1771,6 @@ statement: + deallocate: + deallocate_or_drop PREPARE_SYM ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->sql_command= SQLCOM_DEALLOCATE_PREPARE; + lex->prepared_stmt_name= $3; +@@ -1793,7 +1785,6 @@ deallocate_or_drop: + prepare: + PREPARE_SYM ident FROM prepare_src + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->sql_command= SQLCOM_PREPARE; + lex->prepared_stmt_name= $2; +@@ -1803,14 +1794,12 @@ prepare: + prepare_src: + TEXT_STRING_sys + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->prepared_stmt_code= $1; + lex->prepared_stmt_code_is_varref= FALSE; + } + | '@' ident_or_text + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->prepared_stmt_code= $2; + lex->prepared_stmt_code_is_varref= TRUE; +@@ -1820,7 +1809,6 @@ prepare_src: + execute: + EXECUTE_SYM ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->sql_command= SQLCOM_EXECUTE; + lex->prepared_stmt_name= $2; +@@ -1955,7 +1943,7 @@ master_def: + } + if (Lex->mi.heartbeat_period > slave_net_timeout) + { +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX, + ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX)); + } +@@ -1963,7 +1951,7 @@ master_def: + { + if (Lex->mi.heartbeat_period != 0.0) + { +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN, + ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN)); + Lex->mi.heartbeat_period= 0.0; +@@ -2038,7 +2026,6 @@ master_file_def: + create: + CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->sql_command= SQLCOM_CREATE_TABLE; + if (!lex->select_lex.add_table_to_list(thd, $5, NULL, +@@ -2063,13 +2050,13 @@ create: + } + create2 + { +- LEX *lex= YYTHD->lex; ++ LEX *lex= thd->lex; + lex->current_select= &lex->select_lex; + if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && + !lex->create_info.db_type) + { +- lex->create_info.db_type= ha_default_handlerton(YYTHD); +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, ++ lex->create_info.db_type= ha_default_handlerton(thd); ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARN_USING_OTHER_HANDLER, + ER(ER_WARN_USING_OTHER_HANDLER), + ha_resolve_storage_engine_name(lex->create_info.db_type), +@@ -2199,7 +2186,6 @@ server_option: + event_tail: + remember_name EVENT_SYM opt_if_not_exists sp_name + { +- THD *thd= YYTHD; + LEX *lex=Lex; + + lex->stmt_definition_begin= $1; +@@ -2266,7 +2252,7 @@ opt_ev_status: + ev_starts: + /* empty */ + { +- Item *item= new (YYTHD->mem_root) Item_func_now_local(); ++ Item *item= new (thd->mem_root) Item_func_now_local(); + if (item == NULL) + MYSQL_YYABORT; + Lex->event_parse_data->item_starts= item; +@@ -2316,7 +2302,6 @@ opt_ev_comment: + + ev_sql_stmt: + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + +@@ -2359,7 +2344,6 @@ ev_sql_stmt: + } + ev_sql_stmt_inner + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + + /* return back to the original memory root ASAP */ +@@ -2418,11 +2402,10 @@ sp_name: + $$= new sp_name($1, $3, true); + if ($$ == NULL) + MYSQL_YYABORT; +- $$->init_qname(YYTHD); ++ $$->init_qname(thd); + } + | ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + LEX_STRING db; + if (check_routine_name(&$1)) +@@ -2492,7 +2475,7 @@ call: + lex->sql_command= SQLCOM_CALL; + lex->spname= $2; + lex->value_list.empty(); +- sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE); ++ sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE); + } + opt_sp_cparam_list {} + ; +@@ -2565,7 +2548,7 @@ sp_fdparam: + (enum enum_field_types)$3, + sp_param_in); + +- if (lex->sphead->fill_field_definition(YYTHD, lex, ++ if (lex->sphead->fill_field_definition(thd, lex, + (enum enum_field_types) $3, + &spvar->field_def)) + { +@@ -2602,7 +2585,7 @@ sp_pdparam: + (enum enum_field_types)$4, + (sp_param_mode_t)$1); + +- if (lex->sphead->fill_field_definition(YYTHD, lex, ++ if (lex->sphead->fill_field_definition(thd, lex, + (enum enum_field_types) $4, + &spvar->field_def)) + { +@@ -2665,13 +2648,12 @@ sp_decl: + { + LEX *lex= Lex; + +- lex->sphead->reset_lex(YYTHD); ++ lex->sphead->reset_lex(thd); + lex->spcont->declare_var_boundary($2); + } + type_with_opt_collate + sp_opt_default + { +- THD *thd= YYTHD; + LEX *lex= Lex; + sp_pcontext *pctx= lex->spcont; + uint num_vars= pctx->context_var_count(); +@@ -2697,7 +2679,7 @@ sp_decl: + spvar->type= var_type; + spvar->dflt= dflt_value_item; + +- if (lex->sphead->fill_field_definition(YYTHD, lex, var_type, ++ if (lex->sphead->fill_field_definition(thd, lex, var_type, + &spvar->field_def)) + { + MYSQL_YYABORT; +@@ -2721,7 +2703,7 @@ sp_decl: + } + + pctx->declare_var_boundary(0); +- if (lex->sphead->restore_lex(YYTHD)) ++ if (lex->sphead->restore_lex(thd)) + MYSQL_YYABORT; + $$.vars= $2; + $$.conds= $$.hndlrs= $$.curs= 0; +@@ -2736,7 +2718,7 @@ sp_decl: + my_error(ER_SP_DUP_COND, MYF(0), $2.str); + MYSQL_YYABORT; + } +- if(YYTHD->lex->spcont->push_cond(&$2, $5)) ++ if(thd->lex->spcont->push_cond(&$2, $5)) + MYSQL_YYABORT; + $$.vars= $$.hndlrs= $$.curs= 0; + $$.conds= 1; +@@ -2822,7 +2804,7 @@ sp_decl: + + sp_cursor_stmt: + { +- Lex->sphead->reset_lex(YYTHD); ++ Lex->sphead->reset_lex(thd); + } + select + { +@@ -2838,7 +2820,7 @@ sp_cursor_stmt: + } + lex->sp_lex_in_use= TRUE; + $$= lex; +- if (lex->sphead->restore_lex(YYTHD)) ++ if (lex->sphead->restore_lex(thd)) + MYSQL_YYABORT; + } + ; +@@ -2887,7 +2869,7 @@ sp_cond: + my_error(ER_WRONG_VALUE, MYF(0), "CONDITION", "0"); + MYSQL_YYABORT; + } +- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); ++ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + MYSQL_YYABORT; + $$->type= sp_cond_type_t::number; +@@ -2904,7 +2886,7 @@ sqlstate: + my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str); + MYSQL_YYABORT; + } +- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); ++ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + MYSQL_YYABORT; + $$->type= sp_cond_type_t::state; +@@ -2934,21 +2916,21 @@ sp_hcond: + } + | SQLWARNING_SYM /* SQLSTATEs 01??? */ + { +- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); ++ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + MYSQL_YYABORT; + $$->type= sp_cond_type_t::warning; + } + | not FOUND_SYM /* SQLSTATEs 02??? */ + { +- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); ++ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + MYSQL_YYABORT; + $$->type= sp_cond_type_t::notfound; + } + | SQLEXCEPTION_SYM /* All other SQLSTATEs */ + { +- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); ++ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + MYSQL_YYABORT; + $$->type= sp_cond_type_t::exception; +@@ -2958,7 +2940,6 @@ sp_hcond: + signal_stmt: + SIGNAL_SYM signal_value opt_set_signal_information + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Yacc_state *state= & thd->m_parser_state->m_yacc; + +@@ -3008,7 +2989,7 @@ opt_signal_value: + opt_set_signal_information: + /* empty */ + { +- YYTHD->m_parser_state->m_yacc.m_set_signal_info.clear(); ++ thd->m_parser_state->m_yacc.m_set_signal_info.clear(); + } + | SET signal_information_item_list + ; +@@ -3017,7 +2998,7 @@ signal_information_item_list: + signal_condition_information_item_name EQ signal_allowed_expr + { + Set_signal_information *info; +- info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info; ++ info= & thd->m_parser_state->m_yacc.m_set_signal_info; + int index= (int) $1; + info->clear(); + info->m_item[index]= $3; +@@ -3026,7 +3007,7 @@ signal_information_item_list: + signal_condition_information_item_name EQ signal_allowed_expr + { + Set_signal_information *info; +- info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info; ++ info= & thd->m_parser_state->m_yacc.m_set_signal_info; + int index= (int) $3; + if (info->m_item[index] != NULL) + { +@@ -3097,7 +3078,6 @@ signal_condition_information_item_name: + resignal_stmt: + RESIGNAL_SYM opt_signal_value opt_set_signal_information + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Yacc_state *state= & thd->m_parser_state->m_yacc; + +@@ -3172,7 +3152,6 @@ sp_proc_stmt_if: + + sp_proc_stmt_statement: + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + +@@ -3181,7 +3160,6 @@ sp_proc_stmt_statement: + } + statement + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + sp_head *sp= lex->sphead; +@@ -3228,7 +3206,7 @@ sp_proc_stmt_statement: + + sp_proc_stmt_return: + RETURN_SYM +- { Lex->sphead->reset_lex(YYTHD); } ++ { Lex->sphead->reset_lex(thd); } + expr + { + LEX *lex= Lex; +@@ -3250,7 +3228,7 @@ sp_proc_stmt_return: + MYSQL_YYABORT; + sp->m_flags|= sp_head::HAS_RETURN; + } +- if (sp->restore_lex(YYTHD)) ++ if (sp->restore_lex(thd)) + MYSQL_YYABORT; + } + ; +@@ -3477,7 +3455,7 @@ sp_fetch_list: + ; + + sp_if: +- { Lex->sphead->reset_lex(YYTHD); } ++ { Lex->sphead->reset_lex(thd); } + expr THEN_SYM + { + LEX *lex= Lex; +@@ -3491,7 +3469,7 @@ sp_if: + sp->add_cont_backpatch(i) || + sp->add_instr(i)) + MYSQL_YYABORT; +- if (sp->restore_lex(YYTHD)) ++ if (sp->restore_lex(thd)) + MYSQL_YYABORT; + } + sp_proc_stmts1 +@@ -3530,7 +3508,7 @@ simple_case_stmt: + { + LEX *lex= Lex; + case_stmt_action_case(lex); +- lex->sphead->reset_lex(YYTHD); /* For expr $3 */ ++ lex->sphead->reset_lex(thd); /* For expr $3 */ + } + expr + { +@@ -3539,7 +3517,7 @@ simple_case_stmt: + MYSQL_YYABORT; + + /* For expr $3 */ +- if (lex->sphead->restore_lex(YYTHD)) ++ if (lex->sphead->restore_lex(thd)) + MYSQL_YYABORT; + } + simple_when_clause_list +@@ -3581,7 +3559,7 @@ searched_when_clause_list: + simple_when_clause: + WHEN_SYM + { +- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ ++ Lex->sphead->reset_lex(thd); /* For expr $3 */ + } + expr + { +@@ -3591,7 +3569,7 @@ simple_when_clause: + if (case_stmt_action_when(lex, $3, true)) + MYSQL_YYABORT; + /* For expr $3 */ +- if (lex->sphead->restore_lex(YYTHD)) ++ if (lex->sphead->restore_lex(thd)) + MYSQL_YYABORT; + } + THEN_SYM +@@ -3606,7 +3584,7 @@ simple_when_clause: + searched_when_clause: + WHEN_SYM + { +- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ ++ Lex->sphead->reset_lex(thd); /* For expr $3 */ + } + expr + { +@@ -3614,7 +3592,7 @@ searched_when_clause: + if (case_stmt_action_when(lex, $3, false)) + MYSQL_YYABORT; + /* For expr $3 */ +- if (lex->sphead->restore_lex(YYTHD)) ++ if (lex->sphead->restore_lex(thd)) + MYSQL_YYABORT; + } + THEN_SYM +@@ -3778,7 +3756,7 @@ sp_unlabeled_control: + MYSQL_YYABORT; + } + | WHILE_SYM +- { Lex->sphead->reset_lex(YYTHD); } ++ { Lex->sphead->reset_lex(thd); } + expr DO_SYM + { + LEX *lex= Lex; +@@ -3792,7 +3770,7 @@ sp_unlabeled_control: + sp->new_cont_backpatch(i) || + sp->add_instr(i)) + MYSQL_YYABORT; +- if (sp->restore_lex(YYTHD)) ++ if (sp->restore_lex(thd)) + MYSQL_YYABORT; + } + sp_proc_stmts1 END WHILE_SYM +@@ -3807,7 +3785,7 @@ sp_unlabeled_control: + lex->sphead->do_cont_backpatch(); + } + | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM +- { Lex->sphead->reset_lex(YYTHD); } ++ { Lex->sphead->reset_lex(thd); } + expr END REPEAT_SYM + { + LEX *lex= Lex; +@@ -3819,7 +3797,7 @@ sp_unlabeled_control: + if (i == NULL || + lex->sphead->add_instr(i)) + MYSQL_YYABORT; +- if (lex->sphead->restore_lex(YYTHD)) ++ if (lex->sphead->restore_lex(thd)) + MYSQL_YYABORT; + /* We can shortcut the cont_backpatch here */ + i->m_cont_dest= ip+1; +@@ -4242,7 +4220,6 @@ create2: + create3 {} + | LIKE table_ident + { +- THD *thd= YYTHD; + TABLE_LIST *src_table; + LEX *lex= thd->lex; + +@@ -4257,7 +4234,6 @@ create2: + } + | '(' LIKE table_ident ')' + { +- THD *thd= YYTHD; + TABLE_LIST *src_table; + LEX *lex= thd->lex; + +@@ -4858,7 +4834,7 @@ part_value_expr_item: + my_parse_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR)); + MYSQL_YYABORT; + } +- if (part_info->add_column_list_value(YYTHD, part_expr)) ++ if (part_info->add_column_list_value(thd, part_expr)) + { + MYSQL_YYABORT; + } +@@ -5252,19 +5228,19 @@ default_collation: + storage_engines: + ident_or_text + { +- plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1); ++ plugin_ref plugin= ha_resolve_by_name(thd, &$1); + + if (plugin) + $$= plugin_data(plugin, handlerton*); + else + { +- if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) ++ if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) + { + my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str); + MYSQL_YYABORT; + } + $$= 0; +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_UNKNOWN_STORAGE_ENGINE, + ER(ER_UNKNOWN_STORAGE_ENGINE), + $1.str); +@@ -5276,7 +5252,7 @@ known_storage_engines: + ident_or_text + { + plugin_ref plugin; +- if ((plugin= ha_resolve_by_name(YYTHD, &$1))) ++ if ((plugin= ha_resolve_by_name(thd, &$1))) + $$= plugin_data(plugin, handlerton*); + else + { +@@ -5506,7 +5482,7 @@ type: + { + char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; + my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length); +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE, ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, + ER_WARN_DEPRECATED_SYNTAX, + ER(ER_WARN_DEPRECATED_SYNTAX), + buff, "YEAR(4)"); +@@ -5520,7 +5496,7 @@ type: + { $$=MYSQL_TYPE_TIME; } + | TIMESTAMP + { +- if (YYTHD->variables.sql_mode & MODE_MAXDB) ++ if (thd->variables.sql_mode & MODE_MAXDB) + $$=MYSQL_TYPE_DATETIME; + else + { +@@ -5652,7 +5628,7 @@ int_type: + real_type: + REAL + { +- $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ? ++ $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ? + MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; + } + | DOUBLE_SYM +@@ -5727,7 +5703,7 @@ attribute: + | DEFAULT now_or_signed_literal { Lex->default_value=$2; } + | ON UPDATE_SYM NOW_SYM optional_braces + { +- Item *item= new (YYTHD->mem_root) Item_func_now_local(); ++ Item *item= new (thd->mem_root) Item_func_now_local(); + if (item == NULL) + MYSQL_YYABORT; + Lex->on_update_value= item; +@@ -5798,7 +5774,7 @@ type_with_opt_collate: + now_or_signed_literal: + NOW_SYM optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_now_local(); ++ $$= new (thd->mem_root) Item_func_now_local(); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -6217,7 +6193,6 @@ string_list: + alter: + ALTER opt_ignore TABLE_SYM table_ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->name.str= 0; + lex->name.length= 0; +@@ -6243,7 +6218,6 @@ alter: + } + alter_commands + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + if (!lex->m_stmt) + { +@@ -6356,7 +6330,7 @@ alter: + Event_parse_data. + */ + +- if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD))) ++ if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd))) + MYSQL_YYABORT; + Lex->event_parse_data->identifier= $4; + +@@ -6471,7 +6445,6 @@ alter_commands: + | OPTIMIZE PARTITION_SYM opt_no_write_to_binlog + all_or_alt_part_name_list + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->no_write_to_binlog= $3; + lex->check_opt.init(); +@@ -6485,7 +6458,6 @@ alter_commands: + | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog + all_or_alt_part_name_list + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->no_write_to_binlog= $3; + lex->check_opt.init(); +@@ -6497,7 +6469,6 @@ alter_commands: + } + | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->check_opt.init(); + DBUG_ASSERT(!lex->m_stmt); +@@ -6510,7 +6481,6 @@ alter_commands: + | REPAIR PARTITION_SYM opt_no_write_to_binlog + all_or_alt_part_name_list + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->no_write_to_binlog= $3; + lex->check_opt.init(); +@@ -6530,7 +6500,6 @@ alter_commands: + } + | TRUNCATE_SYM PARTITION_SYM all_or_alt_part_name_list + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->check_opt.init(); + DBUG_ASSERT(!lex->m_stmt); +@@ -6785,7 +6754,6 @@ alter_list_item: + { + if (!$4) + { +- THD *thd= YYTHD; + $4= thd->variables.collation_database; + } + $5= $5 ? $5 : $4; +@@ -6980,7 +6948,6 @@ repair: + } + table_list opt_mi_repair_type + { +- THD *thd= YYTHD; + LEX* lex= thd->lex; + DBUG_ASSERT(!lex->m_stmt); + lex->m_stmt= new (thd->mem_root) Repair_table_statement(lex); +@@ -7018,7 +6985,6 @@ analyze: + } + table_list + { +- THD *thd= YYTHD; + LEX* lex= thd->lex; + DBUG_ASSERT(!lex->m_stmt); + lex->m_stmt= new (thd->mem_root) Analyze_table_statement(lex); +@@ -7053,7 +7019,6 @@ check: + } + table_list opt_mi_check_type + { +- THD *thd= YYTHD; + LEX* lex= thd->lex; + DBUG_ASSERT(!lex->m_stmt); + lex->m_stmt= new (thd->mem_root) Check_table_statement(lex); +@@ -7094,7 +7059,6 @@ optimize: + } + table_list + { +- THD *thd= YYTHD; + LEX* lex= thd->lex; + DBUG_ASSERT(!lex->m_stmt); + lex->m_stmt= new (thd->mem_root) Optimize_table_statement(lex); +@@ -7179,7 +7143,7 @@ keycache_list: + assign_to_keycache: + table_ident cache_keys_spec + { +- if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, ++ if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, + MDL_SHARED_READ, + Select->pop_index_hints())) + MYSQL_YYABORT; +@@ -7189,7 +7153,7 @@ assign_to_keycache: + assign_to_keycache_parts: + table_ident adm_partition cache_keys_spec + { +- if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, ++ if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, + MDL_SHARED_READ, + Select->pop_index_hints())) + MYSQL_YYABORT; +@@ -7225,7 +7189,7 @@ preload_list: + preload_keys: + table_ident cache_keys_spec opt_ignore_leaves + { +- if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ, ++ if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ, + MDL_SHARED_READ, + Select->pop_index_hints())) + MYSQL_YYABORT; +@@ -7235,7 +7199,7 @@ preload_keys: + preload_keys_parts: + table_ident adm_partition cache_keys_spec opt_ignore_leaves + { +- if (!Select->add_table_to_list(YYTHD, $1, NULL, $4, TL_READ, ++ if (!Select->add_table_to_list(thd, $1, NULL, $4, TL_READ, + MDL_SHARED_READ, + Select->pop_index_hints())) + MYSQL_YYABORT; +@@ -7252,7 +7216,7 @@ adm_partition: + + cache_keys_spec: + { +- Lex->select_lex.alloc_index_hints(YYTHD); ++ Lex->select_lex.alloc_index_hints(thd); + Select->set_index_hint_type(INDEX_HINT_USE, + old_mode ? + INDEX_HINT_MASK_JOIN : +@@ -7471,7 +7435,6 @@ select_item_list: + | select_item + | '*' + { +- THD *thd= YYTHD; + Item *item= new (thd->mem_root) + Item_field(&thd->lex->current_select->context, + NULL, NULL, "*"); +@@ -7486,14 +7449,12 @@ select_item_list: + select_item: + remember_name table_wild remember_end + { +- THD *thd= YYTHD; + + if (add_item_to_list(thd, $2)) + MYSQL_YYABORT; + } + | remember_name expr remember_end select_alias + { +- THD *thd= YYTHD; + DBUG_ASSERT($1 < $3); + + if (add_item_to_list(thd, $2)) +@@ -7589,7 +7550,7 @@ expr: + else + { + /* X OR Y */ +- $$ = new (YYTHD->mem_root) Item_cond_or($1, $3); ++ $$ = new (thd->mem_root) Item_cond_or($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7597,7 +7558,7 @@ expr: + | expr XOR expr %prec XOR + { + /* XOR is a proprietary extension */ +- $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3); ++ $$ = new (thd->mem_root) Item_cond_xor($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7639,50 +7600,50 @@ expr: + else + { + /* X AND Y */ +- $$ = new (YYTHD->mem_root) Item_cond_and($1, $3); ++ $$ = new (thd->mem_root) Item_cond_and($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + } + | NOT_SYM expr %prec NOT_SYM + { +- $$= negate_expression(YYTHD, $2); ++ $$= negate_expression(thd, $2); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS TRUE_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_istrue($1); ++ $$= new (thd->mem_root) Item_func_istrue($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS not TRUE_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isnottrue($1); ++ $$= new (thd->mem_root) Item_func_isnottrue($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS FALSE_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isfalse($1); ++ $$= new (thd->mem_root) Item_func_isfalse($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS not FALSE_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isnotfalse($1); ++ $$= new (thd->mem_root) Item_func_isnotfalse($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS UNKNOWN_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isnull($1); ++ $$= new (thd->mem_root) Item_func_isnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS not UNKNOWN_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); ++ $$= new (thd->mem_root) Item_func_isnotnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7692,19 +7653,19 @@ expr: + bool_pri: + bool_pri IS NULL_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isnull($1); ++ $$= new (thd->mem_root) Item_func_isnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri IS not NULL_SYM %prec IS + { +- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); ++ $$= new (thd->mem_root) Item_func_isnotnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM + { +- $$= new (YYTHD->mem_root) Item_func_equal($1,$3); ++ $$= new (thd->mem_root) Item_func_equal($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7726,13 +7687,12 @@ bool_pri: + predicate: + bit_expr IN_SYM '(' subselect ')' + { +- $$= new (YYTHD->mem_root) Item_in_subselect($1, $4); ++ $$= new (thd->mem_root) Item_in_subselect($1, $4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr not IN_SYM '(' subselect ')' + { +- THD *thd= YYTHD; + Item *item= new (thd->mem_root) Item_in_subselect($1, $5); + if (item == NULL) + MYSQL_YYABORT; +@@ -7742,7 +7702,7 @@ predicate: + } + | bit_expr IN_SYM '(' expr ')' + { +- $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4); ++ $$= handle_sql2003_note184_exception(thd, $1, true, $4); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7750,13 +7710,13 @@ predicate: + { + $6->push_front($4); + $6->push_front($1); +- $$= new (YYTHD->mem_root) Item_func_in(*$6); ++ $$= new (thd->mem_root) Item_func_in(*$6); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr not IN_SYM '(' expr ')' + { +- $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5); ++ $$= handle_sql2003_note184_exception(thd, $1, false, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7764,7 +7724,7 @@ predicate: + { + $7->push_front($5); + $7->push_front($1); +- Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7); ++ Item_func_in *item = new (thd->mem_root) Item_func_in(*$7); + if (item == NULL) + MYSQL_YYABORT; + item->negate(); +@@ -7772,14 +7732,14 @@ predicate: + } + | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate + { +- $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5); ++ $$= new (thd->mem_root) Item_func_between($1,$3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate + { + Item_func_between *item; +- item= new (YYTHD->mem_root) Item_func_between($1,$4,$6); ++ item= new (thd->mem_root) Item_func_between($1,$4,$6); + if (item == NULL) + MYSQL_YYABORT; + item->negate(); +@@ -7787,42 +7747,42 @@ predicate: + } + | bit_expr SOUNDS_SYM LIKE bit_expr + { +- Item *item1= new (YYTHD->mem_root) Item_func_soundex($1); +- Item *item4= new (YYTHD->mem_root) Item_func_soundex($4); ++ Item *item1= new (thd->mem_root) Item_func_soundex($1); ++ Item *item4= new (thd->mem_root) Item_func_soundex($4); + if ((item1 == NULL) || (item4 == NULL)) + MYSQL_YYABORT; +- $$= new (YYTHD->mem_root) Item_func_eq(item1, item4); ++ $$= new (thd->mem_root) Item_func_eq(item1, item4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr LIKE simple_expr opt_escape + { +- $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); ++ $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr not LIKE simple_expr opt_escape + { +- Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5, ++ Item *item= new (thd->mem_root) Item_func_like($1,$4,$5, + Lex->escape_used); + if (item == NULL) + MYSQL_YYABORT; +- $$= new (YYTHD->mem_root) Item_func_not(item); ++ $$= new (thd->mem_root) Item_func_not(item); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr REGEXP bit_expr + { +- $$= new (YYTHD->mem_root) Item_func_regex($1,$3); ++ $$= new (thd->mem_root) Item_func_regex($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr not REGEXP bit_expr + { +- Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4); ++ Item *item= new (thd->mem_root) Item_func_regex($1,$4); + if (item == NULL) + MYSQL_YYABORT; +- $$= negate_expression(YYTHD, item); ++ $$= negate_expression(thd, item); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7832,85 +7792,85 @@ predicate: + bit_expr: + bit_expr '|' bit_expr %prec '|' + { +- $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3); ++ $$= new (thd->mem_root) Item_func_bit_or($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '&' bit_expr %prec '&' + { +- $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3); ++ $$= new (thd->mem_root) Item_func_bit_and($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT + { +- $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3); ++ $$= new (thd->mem_root) Item_func_shift_left($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT + { +- $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3); ++ $$= new (thd->mem_root) Item_func_shift_right($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '+' bit_expr %prec '+' + { +- $$= new (YYTHD->mem_root) Item_func_plus($1,$3); ++ $$= new (thd->mem_root) Item_func_plus($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '-' bit_expr %prec '-' + { +- $$= new (YYTHD->mem_root) Item_func_minus($1,$3); ++ $$= new (thd->mem_root) Item_func_minus($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '+' INTERVAL_SYM expr interval %prec '+' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0); ++ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '-' INTERVAL_SYM expr interval %prec '-' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1); ++ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '*' bit_expr %prec '*' + { +- $$= new (YYTHD->mem_root) Item_func_mul($1,$3); ++ $$= new (thd->mem_root) Item_func_mul($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '/' bit_expr %prec '/' + { +- $$= new (YYTHD->mem_root) Item_func_div($1,$3); ++ $$= new (thd->mem_root) Item_func_div($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '%' bit_expr %prec '%' + { +- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); ++ $$= new (thd->mem_root) Item_func_mod($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr DIV_SYM bit_expr %prec DIV_SYM + { +- $$= new (YYTHD->mem_root) Item_func_int_div($1,$3); ++ $$= new (thd->mem_root) Item_func_int_div($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr MOD_SYM bit_expr %prec MOD_SYM + { +- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); ++ $$= new (thd->mem_root) Item_func_mod($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr '^' bit_expr + { +- $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3); ++ $$= new (thd->mem_root) Item_func_bit_xor($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7959,7 +7919,6 @@ simple_expr: + | function_call_conflict + | simple_expr COLLATE_SYM ident_or_text %prec NEG + { +- THD *thd= YYTHD; + Item *i1= new (thd->mem_root) Item_string($3.str, + $3.length, + thd->charset()); +@@ -7975,7 +7934,7 @@ simple_expr: + | sum_expr + | simple_expr OR_OR_SYM simple_expr + { +- $$= new (YYTHD->mem_root) Item_func_concat($1, $3); ++ $$= new (thd->mem_root) Item_func_concat($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -7985,25 +7944,25 @@ simple_expr: + } + | '-' simple_expr %prec NEG + { +- $$= new (YYTHD->mem_root) Item_func_neg($2); ++ $$= new (thd->mem_root) Item_func_neg($2); + if ($$ == NULL) + MYSQL_YYABORT; + } + | '~' simple_expr %prec NEG + { +- $$= new (YYTHD->mem_root) Item_func_bit_neg($2); ++ $$= new (thd->mem_root) Item_func_bit_neg($2); + if ($$ == NULL) + MYSQL_YYABORT; + } + | not2 simple_expr %prec NEG + { +- $$= negate_expression(YYTHD, $2); ++ $$= negate_expression(thd, $2); + if ($$ == NULL) + MYSQL_YYABORT; + } + | '(' subselect ')' + { +- $$= new (YYTHD->mem_root) Item_singlerow_subselect($2); ++ $$= new (thd->mem_root) Item_singlerow_subselect($2); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8012,20 +7971,20 @@ simple_expr: + | '(' expr ',' expr_list ')' + { + $4->push_front($2); +- $$= new (YYTHD->mem_root) Item_row(*$4); ++ $$= new (thd->mem_root) Item_row(*$4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | ROW_SYM '(' expr ',' expr_list ')' + { + $5->push_front($3); +- $$= new (YYTHD->mem_root) Item_row(*$5); ++ $$= new (thd->mem_root) Item_row(*$5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | EXISTS '(' subselect ')' + { +- $$= new (YYTHD->mem_root) Item_exists_subselect($3); ++ $$= new (thd->mem_root) Item_exists_subselect($3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8034,7 +7993,7 @@ simple_expr: + | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' + { + $2->push_front($5); +- Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6); ++ Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6); + if (i1 == NULL) + MYSQL_YYABORT; + Select->add_ftfunc_to_list(i1); +@@ -8042,7 +8001,7 @@ simple_expr: + } + | BINARY simple_expr %prec NEG + { +- $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL, ++ $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL, + &my_charset_bin); + if ($$ == NULL) + MYSQL_YYABORT; +@@ -8050,27 +8009,27 @@ simple_expr: + | CAST_SYM '(' expr AS cast_type ')' + { + LEX *lex= Lex; +- $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec, ++ $$= create_func_cast(thd, $3, $5, lex->length, lex->dec, + lex->charset); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CASE_SYM opt_expr when_list opt_else END + { +- $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 ); ++ $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 ); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CONVERT_SYM '(' expr ',' cast_type ')' + { +- $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec, ++ $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec, + Lex->charset); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CONVERT_SYM '(' expr USING charset_name ')' + { +- $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5); ++ $$= new (thd->mem_root) Item_func_conv_charset($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8083,14 +8042,14 @@ simple_expr: + my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str); + MYSQL_YYABORT; + } +- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(), ++ $$= new (thd->mem_root) Item_default_value(Lex->current_context(), + $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | VALUES '(' simple_ident_nospvar ')' + { +- $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(), ++ $$= new (thd->mem_root) Item_insert_value(Lex->current_context(), + $3); + if ($$ == NULL) + MYSQL_YYABORT; +@@ -8098,7 +8057,7 @@ simple_expr: + | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM + /* we cannot put interval before - */ + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0); ++ $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8113,19 +8072,19 @@ simple_expr: + function_call_keyword: + CHAR_SYM '(' expr_list ')' + { +- $$= new (YYTHD->mem_root) Item_func_char(*$3); ++ $$= new (thd->mem_root) Item_func_char(*$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CHAR_SYM '(' expr_list USING charset_name ')' + { +- $$= new (YYTHD->mem_root) Item_func_char(*$3, $5); ++ $$= new (thd->mem_root) Item_func_char(*$3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CURRENT_USER optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context()); ++ $$= new (thd->mem_root) Item_func_current_user(Lex->current_context()); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); +@@ -8133,31 +8092,30 @@ function_call_keyword: + } + | DATE_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_date_typecast($3); ++ $$= new (thd->mem_root) Item_date_typecast($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | DAY_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_dayofmonth($3); ++ $$= new (thd->mem_root) Item_func_dayofmonth($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | HOUR_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_hour($3); ++ $$= new (thd->mem_root) Item_func_hour($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | INSERT '(' expr ',' expr ',' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9); ++ $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9); + if ($$ == NULL) + MYSQL_YYABORT; + } + | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM + { +- THD *thd= YYTHD; + List<Item> *list= new (thd->mem_root) List<Item>; + if (list == NULL) + MYSQL_YYABORT; +@@ -8172,7 +8130,6 @@ function_call_keyword: + } + | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM + { +- THD *thd= YYTHD; + $7->push_front($5); + $7->push_front($3); + Item_row *item= new (thd->mem_root) Item_row(*$7); +@@ -8184,103 +8141,103 @@ function_call_keyword: + } + | LEFT '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_left($3,$5); ++ $$= new (thd->mem_root) Item_func_left($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MINUTE_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_minute($3); ++ $$= new (thd->mem_root) Item_func_minute($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MONTH_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_month($3); ++ $$= new (thd->mem_root) Item_func_month($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | RIGHT '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_right($3,$5); ++ $$= new (thd->mem_root) Item_func_right($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SECOND_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_second($3); ++ $$= new (thd->mem_root) Item_func_second($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TIME_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_time_typecast($3); ++ $$= new (thd->mem_root) Item_time_typecast($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TIMESTAMP '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_datetime_typecast($3); ++ $$= new (thd->mem_root) Item_datetime_typecast($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TIMESTAMP '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0); ++ $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_trim($3); ++ $$= new (thd->mem_root) Item_func_trim($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' LEADING expr FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4); ++ $$= new (thd->mem_root) Item_func_ltrim($6,$4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' TRAILING expr FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4); ++ $$= new (thd->mem_root) Item_func_rtrim($6,$4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' BOTH expr FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_trim($6,$4); ++ $$= new (thd->mem_root) Item_func_trim($6,$4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' LEADING FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_ltrim($5); ++ $$= new (thd->mem_root) Item_func_ltrim($5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' TRAILING FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_rtrim($5); ++ $$= new (thd->mem_root) Item_func_rtrim($5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' BOTH FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_trim($5); ++ $$= new (thd->mem_root) Item_func_trim($5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRIM '(' expr FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_trim($5,$3); ++ $$= new (thd->mem_root) Item_func_trim($5,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | USER '(' ')' + { +- $$= new (YYTHD->mem_root) Item_func_user(); ++ $$= new (thd->mem_root) Item_func_user(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); +@@ -8288,7 +8245,7 @@ function_call_keyword: + } + | YEAR_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_year($3); ++ $$= new (thd->mem_root) Item_func_year($3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8309,34 +8266,34 @@ function_call_keyword: + function_call_nonkeyword: + ADDDATE_SYM '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, ++ $$= new (thd->mem_root) Item_date_add_interval($3, $5, + INTERVAL_DAY, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0); ++ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CURDATE optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_curdate_local(); ++ $$= new (thd->mem_root) Item_func_curdate_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | CURTIME optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_curtime_local(); ++ $$= new (thd->mem_root) Item_func_curtime_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | CURTIME '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_curtime_local($3); ++ $$= new (thd->mem_root) Item_func_curtime_local($3); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; +@@ -8344,83 +8301,83 @@ function_call_nonkeyword: + | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' + %prec INTERVAL_SYM + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0); ++ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | DATE_SUB_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' + %prec INTERVAL_SYM + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,1); ++ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | EXTRACT_SYM '(' interval FROM expr ')' + { +- $$=new (YYTHD->mem_root) Item_extract( $3, $5); ++ $$=new (thd->mem_root) Item_extract( $3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | GET_FORMAT '(' date_time_type ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_get_format($3, $5); ++ $$= new (thd->mem_root) Item_func_get_format($3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | NOW_SYM optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_now_local(); ++ $$= new (thd->mem_root) Item_func_now_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | NOW_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_now_local($3); ++ $$= new (thd->mem_root) Item_func_now_local($3); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | POSITION_SYM '(' bit_expr IN_SYM expr ')' + { +- $$ = new (YYTHD->mem_root) Item_func_locate($5,$3); ++ $$ = new (thd->mem_root) Item_func_locate($5,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUBDATE_SYM '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, ++ $$= new (thd->mem_root) Item_date_add_interval($3, $5, + INTERVAL_DAY, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 1); ++ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUBSTRING '(' expr ',' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); ++ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUBSTRING '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); ++ $$= new (thd->mem_root) Item_func_substr($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUBSTRING '(' expr FROM expr FOR_SYM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); ++ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUBSTRING '(' expr FROM expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); ++ $$= new (thd->mem_root) Item_func_substr($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8435,9 +8392,9 @@ function_call_nonkeyword: + */ + Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION); + if (global_system_variables.sysdate_is_now == 0) +- $$= new (YYTHD->mem_root) Item_func_sysdate_local(); ++ $$= new (thd->mem_root) Item_func_sysdate_local(); + else +- $$= new (YYTHD->mem_root) Item_func_now_local(); ++ $$= new (thd->mem_root) Item_func_now_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; +@@ -8445,42 +8402,42 @@ function_call_nonkeyword: + | SYSDATE '(' expr ')' + { + if (global_system_variables.sysdate_is_now == 0) +- $$= new (YYTHD->mem_root) Item_func_sysdate_local($3); ++ $$= new (thd->mem_root) Item_func_sysdate_local($3); + else +- $$= new (YYTHD->mem_root) Item_func_now_local($3); ++ $$= new (thd->mem_root) Item_func_now_local($3); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0); ++ $$= new (thd->mem_root) Item_date_add_interval($7,$5,$3,0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3); ++ $$= new (thd->mem_root) Item_func_timestamp_diff($5,$7,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | UTC_DATE_SYM optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_curdate_utc(); ++ $$= new (thd->mem_root) Item_func_curdate_utc(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | UTC_TIME_SYM optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_curtime_utc(); ++ $$= new (thd->mem_root) Item_func_curtime_utc(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | UTC_TIMESTAMP_SYM optional_braces + { +- $$= new (YYTHD->mem_root) Item_func_now_utc(); ++ $$= new (thd->mem_root) Item_func_now_utc(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; +@@ -8495,62 +8452,61 @@ function_call_nonkeyword: + function_call_conflict: + ASCII_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_ascii($3); ++ $$= new (thd->mem_root) Item_func_ascii($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | CHARSET '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_charset($3); ++ $$= new (thd->mem_root) Item_func_charset($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | COALESCE '(' expr_list ')' + { +- $$= new (YYTHD->mem_root) Item_func_coalesce(* $3); ++ $$= new (thd->mem_root) Item_func_coalesce(* $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | COLLATION_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_collation($3); ++ $$= new (thd->mem_root) Item_func_collation($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | DATABASE '(' ')' + { +- $$= new (YYTHD->mem_root) Item_func_database(); ++ $$= new (thd->mem_root) Item_func_database(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } + | IF '(' expr ',' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_if($3,$5,$7); ++ $$= new (thd->mem_root) Item_func_if($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MICROSECOND_SYM '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_microsecond($3); ++ $$= new (thd->mem_root) Item_func_microsecond($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MOD_SYM '(' expr ',' expr ')' + { +- $$ = new (YYTHD->mem_root) Item_func_mod($3, $5); ++ $$ = new (thd->mem_root) Item_func_mod($3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | OLD_PASSWORD '(' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_old_password($3); ++ $$= new (thd->mem_root) Item_func_old_password($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | PASSWORD '(' expr ')' + { +- THD *thd= YYTHD; + Item* i1; + if (thd->variables.old_passwords) + i1= new (thd->mem_root) Item_func_old_password($3); +@@ -8562,31 +8518,30 @@ function_call_conflict: + } + | QUARTER_SYM '(' expr ')' + { +- $$ = new (YYTHD->mem_root) Item_func_quarter($3); ++ $$ = new (thd->mem_root) Item_func_quarter($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | REPEAT_SYM '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_repeat($3,$5); ++ $$= new (thd->mem_root) Item_func_repeat($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | REPLACE '(' expr ',' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7); ++ $$= new (thd->mem_root) Item_func_replace($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRUNCATE_SYM '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_round($3,$5,1); ++ $$= new (thd->mem_root) Item_func_round($3,$5,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | WEEK_SYM '(' expr ')' + { +- THD *thd= YYTHD; + Item *i1= new (thd->mem_root) Item_int((char*) "0", + thd->variables.default_week_format, + 1); +@@ -8598,7 +8553,7 @@ function_call_conflict: + } + | WEEK_SYM '(' expr ',' expr ')' + { +- $$= new (YYTHD->mem_root) Item_func_week($3,$5); ++ $$= new (thd->mem_root) Item_func_week($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8620,52 +8575,52 @@ function_call_conflict: + geometry_function: + CONTAINS_SYM '(' expr ',' expr ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_rel($3, $5, + Item_func::SP_CONTAINS_FUNC)); + } + | GEOMETRYCOLLECTION '(' expr_list ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_collection(* $3, + Geometry::wkb_geometrycollection, + Geometry::wkb_point)); + } + | LINESTRING '(' expr_list ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_collection(* $3, + Geometry::wkb_linestring, + Geometry::wkb_point)); + } + | MULTILINESTRING '(' expr_list ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_collection(* $3, + Geometry::wkb_multilinestring, + Geometry::wkb_linestring)); + } + | MULTIPOINT '(' expr_list ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_collection(* $3, + Geometry::wkb_multipoint, + Geometry::wkb_point)); + } + | MULTIPOLYGON '(' expr_list ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_collection(* $3, + Geometry::wkb_multipolygon, + Geometry::wkb_polygon)); + } + | POINT_SYM '(' expr ',' expr ')' + { +- $$= GEOM_NEW(YYTHD, Item_func_point($3,$5)); ++ $$= GEOM_NEW(thd, Item_func_point($3,$5)); + } + | POLYGON '(' expr_list ')' + { +- $$= GEOM_NEW(YYTHD, ++ $$= GEOM_NEW(thd, + Item_func_spatial_collection(* $3, + Geometry::wkb_polygon, + Geometry::wkb_linestring)); +@@ -8703,7 +8658,6 @@ function_call_generic: + } + opt_udf_expr_list ')' + { +- THD *thd= YYTHD; + Create_func *builder; + Item *item= NULL; + +@@ -8757,7 +8711,6 @@ function_call_generic: + } + | ident '.' ident '(' opt_expr_list ')' + { +- THD *thd= YYTHD; + Create_qfunc *builder; + Item *item= NULL; + +@@ -8821,7 +8774,7 @@ opt_udf_expr_list: + udf_expr_list: + udf_expr + { +- $$= new (YYTHD->mem_root) List<Item>; ++ $$= new (thd->mem_root) List<Item>; + if ($$ == NULL) + MYSQL_YYABORT; + $$->push_back($1); +@@ -8854,7 +8807,7 @@ udf_expr: + remember_name we may get quoted or escaped names. + */ + else if ($2->type() != Item::FIELD_ITEM) +- $2->set_name($1, (uint) ($3 - $1), YYTHD->charset()); ++ $2->set_name($1, (uint) ($3 - $1), thd->charset()); + $$= $2; + } + ; +@@ -8862,46 +8815,46 @@ udf_expr: + sum_expr: + AVG_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_avg($3, FALSE); ++ $$= new (thd->mem_root) Item_sum_avg($3, FALSE); + if ($$ == NULL) + MYSQL_YYABORT; + } + | AVG_SYM '(' DISTINCT in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_avg($4, TRUE); ++ $$= new (thd->mem_root) Item_sum_avg($4, TRUE); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BIT_AND '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_and($3); ++ $$= new (thd->mem_root) Item_sum_and($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BIT_OR '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_or($3); ++ $$= new (thd->mem_root) Item_sum_or($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BIT_XOR '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_xor($3); ++ $$= new (thd->mem_root) Item_sum_xor($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | COUNT_SYM '(' opt_all '*' ')' + { +- Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1); ++ Item *item= new (thd->mem_root) Item_int((int32) 0L,1); + if (item == NULL) + MYSQL_YYABORT; +- $$= new (YYTHD->mem_root) Item_sum_count(item); ++ $$= new (thd->mem_root) Item_sum_count(item); + if ($$ == NULL) + MYSQL_YYABORT; + } + | COUNT_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_count($3); ++ $$= new (thd->mem_root) Item_sum_count($3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8911,13 +8864,13 @@ sum_expr: + { Select->in_sum_expr--; } + ')' + { +- $$= new (YYTHD->mem_root) Item_sum_count(* $5); ++ $$= new (thd->mem_root) Item_sum_count(* $5); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MIN_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_min($3); ++ $$= new (thd->mem_root) Item_sum_min($3); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8928,55 +8881,55 @@ sum_expr: + */ + | MIN_SYM '(' DISTINCT in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_min($4); ++ $$= new (thd->mem_root) Item_sum_min($4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MAX_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_max($3); ++ $$= new (thd->mem_root) Item_sum_max($3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | MAX_SYM '(' DISTINCT in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_max($4); ++ $$= new (thd->mem_root) Item_sum_max($4); + if ($$ == NULL) + MYSQL_YYABORT; + } + | STD_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_std($3, 0); ++ $$= new (thd->mem_root) Item_sum_std($3, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | VARIANCE_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_variance($3, 0); ++ $$= new (thd->mem_root) Item_sum_variance($3, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | STDDEV_SAMP_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_std($3, 1); ++ $$= new (thd->mem_root) Item_sum_std($3, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | VAR_SAMP_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_variance($3, 1); ++ $$= new (thd->mem_root) Item_sum_variance($3, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUM_SYM '(' in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_sum($3, FALSE); ++ $$= new (thd->mem_root) Item_sum_sum($3, FALSE); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SUM_SYM '(' DISTINCT in_sum_expr ')' + { +- $$= new (YYTHD->mem_root) Item_sum_sum($4, TRUE); ++ $$= new (thd->mem_root) Item_sum_sum($4, TRUE); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -8988,7 +8941,7 @@ sum_expr: + { + SELECT_LEX *sel= Select; + sel->in_sum_expr--; +- $$= new (YYTHD->mem_root) ++ $$= new (thd->mem_root) + Item_func_group_concat(Lex->current_context(), $3, $5, + sel->gorder_list, $7); + if ($$ == NULL) +@@ -9017,7 +8970,7 @@ variable_aux: + ident_or_text SET_VAR expr + { + Item_func_set_user_var *item; +- $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3, false); ++ $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3, false); + if ($$ == NULL) + MYSQL_YYABORT; + LEX *lex= Lex; +@@ -9026,7 +8979,7 @@ variable_aux: + } + | ident_or_text + { +- $$= new (YYTHD->mem_root) Item_func_get_user_var($1); ++ $$= new (thd->mem_root) Item_func_get_user_var($1); + if ($$ == NULL) + MYSQL_YYABORT; + LEX *lex= Lex; +@@ -9040,7 +8993,7 @@ variable_aux: + my_parse_error(ER(ER_SYNTAX_ERROR)); + MYSQL_YYABORT; + } +- if (!($$= get_system_var(YYTHD, $2, $3, $4))) ++ if (!($$= get_system_var(thd, $2, $3, $4))) + MYSQL_YYABORT; + if (!((Item_func_get_system_var*) $$)->is_written_to_binlog()) + Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE); +@@ -9055,7 +9008,7 @@ opt_distinct: + opt_gconcat_separator: + /* empty */ + { +- $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); ++ $$= new (thd->mem_root) String(",", 1, &my_charset_latin1); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -9082,9 +9035,9 @@ opt_gorder_clause: + + gorder_list: + gorder_list ',' order_ident order_dir +- { if (add_gorder_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } ++ { if (add_gorder_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } + | order_ident order_dir +- { if (add_gorder_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } ++ { if (add_gorder_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } + ; + + in_sum_expr: +@@ -9137,7 +9090,7 @@ opt_expr_list: + expr_list: + expr + { +- $$= new (YYTHD->mem_root) List<Item>; ++ $$= new (thd->mem_root) List<Item>; + if ($$ == NULL) + MYSQL_YYABORT; + $$->push_back($1); +@@ -9157,7 +9110,7 @@ ident_list_arg: + ident_list: + simple_ident + { +- $$= new (YYTHD->mem_root) List<Item>; ++ $$= new (thd->mem_root) List<Item>; + if ($$ == NULL) + MYSQL_YYABORT; + $$->push_back($1); +@@ -9257,7 +9210,7 @@ join_table: + { + MYSQL_YYABORT_UNLESS($1 && $3); + /* Change the current name resolution context to a local context. */ +- if (push_new_name_resolution_context(YYTHD, $1, $3)) ++ if (push_new_name_resolution_context(thd, $1, $3)) + MYSQL_YYABORT; + Select->parsing_place= IN_ON; + } +@@ -9272,7 +9225,7 @@ join_table: + { + MYSQL_YYABORT_UNLESS($1 && $3); + /* Change the current name resolution context to a local context. */ +- if (push_new_name_resolution_context(YYTHD, $1, $3)) ++ if (push_new_name_resolution_context(thd, $1, $3)) + MYSQL_YYABORT; + Select->parsing_place= IN_ON; + } +@@ -9302,7 +9255,7 @@ join_table: + { + MYSQL_YYABORT_UNLESS($1 && $5); + /* Change the current name resolution context to a local context. */ +- if (push_new_name_resolution_context(YYTHD, $1, $5)) ++ if (push_new_name_resolution_context(thd, $1, $5)) + MYSQL_YYABORT; + Select->parsing_place= IN_ON; + } +@@ -9338,7 +9291,7 @@ join_table: + { + MYSQL_YYABORT_UNLESS($1 && $5); + /* Change the current name resolution context to a local context. */ +- if (push_new_name_resolution_context(YYTHD, $1, $5)) ++ if (push_new_name_resolution_context(thd, $1, $5)) + MYSQL_YYABORT; + Select->parsing_place= IN_ON; + } +@@ -9393,7 +9346,7 @@ table_factor: + } + table_ident opt_table_alias opt_key_definition + { +- if (!($$= Select->add_table_to_list(YYTHD, $2, $3, ++ if (!($$= Select->add_table_to_list(thd, $2, $3, + Select->get_table_join_options(), + YYPS->m_lock_type, + YYPS->m_mdl_type, +@@ -9700,7 +9653,7 @@ index_hints_list: + + opt_index_hints_list: + /* empty */ +- | { Select->alloc_index_hints(YYTHD); } index_hints_list ++ | { Select->alloc_index_hints(thd); } index_hints_list + ; + + opt_key_definition: +@@ -9709,15 +9662,15 @@ opt_key_definition: + ; + + opt_key_usage_list: +- /* empty */ { Select->add_index_hint(YYTHD, NULL, 0); } ++ /* empty */ { Select->add_index_hint(thd, NULL, 0); } + | key_usage_list {} + ; + + key_usage_element: + ident +- { Select->add_index_hint(YYTHD, $1.str, $1.length); } ++ { Select->add_index_hint(thd, $1.str, $1.length); } + | PRIMARY_SYM +- { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); } ++ { Select->add_index_hint(thd, (char *)"PRIMARY", 7); } + ; + + key_usage_list: +@@ -9730,7 +9683,7 @@ using_list: + { + if (!($$= new List<String>)) + MYSQL_YYABORT; +- String *s= new (YYTHD->mem_root) String((const char *) $1.str, ++ String *s= new (thd->mem_root) String((const char *) $1.str, + $1.length, + system_charset_info); + if (s == NULL) +@@ -9739,7 +9692,7 @@ using_list: + } + | using_list ',' ident + { +- String *s= new (YYTHD->mem_root) String((const char *) $3.str, ++ String *s= new (thd->mem_root) String((const char *) $3.str, + $3.length, + system_charset_info); + if (s == NULL) +@@ -9844,7 +9797,6 @@ opt_escape: + } + | /* empty */ + { +- THD *thd= YYTHD; + Lex->escape_used= FALSE; + $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? + new (thd->mem_root) Item_string("", 0, &my_charset_latin1) : +@@ -9865,9 +9817,9 @@ group_clause: + + group_list: + group_list ',' order_ident order_dir +- { if (add_group_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } ++ { if (add_group_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } + | order_ident order_dir +- { if (add_group_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } ++ { if (add_group_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } + ; + + olap_opt: +@@ -9928,7 +9880,6 @@ alter_order_list: + alter_order_item: + simple_ident_nospvar order_dir + { +- THD *thd= YYTHD; + bool ascending= ($2 == 1) ? true : false; + if (add_order_to_list(thd, $1, ascending)) + MYSQL_YYABORT; +@@ -9981,9 +9932,9 @@ order_clause: + + order_list: + order_list ',' order_ident order_dir +- { if (add_order_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } ++ { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } + | order_ident order_dir +- { if (add_order_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } ++ { if (add_order_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } + ; + + order_dir: +@@ -10047,7 +9998,6 @@ limit_option: + ident + { + Item_splocal *splocal; +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= & thd->m_parser_state->m_lip; + sp_variable_t *spv; +@@ -10084,19 +10034,19 @@ limit_option: + } + | ULONGLONG_NUM + { +- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); ++ $$= new (thd->mem_root) Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | LONG_NUM + { +- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); ++ $$= new (thd->mem_root) Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | NUM + { +- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); ++ $$= new (thd->mem_root) Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -10183,7 +10133,7 @@ procedure_clause: + lex->proc_list.elements=0; + lex->proc_list.first=0; + lex->proc_list.next= &lex->proc_list.first; +- Item_field *item= new (YYTHD->mem_root) ++ Item_field *item= new (thd->mem_root) + Item_field(&lex->current_select->context, + NULL, NULL, $2.str); + if (item == NULL) +@@ -10208,7 +10158,6 @@ procedure_list2: + procedure_item: + remember_name expr remember_end + { +- THD *thd= YYTHD; + + if (add_proc_to_list(thd, $2)) + MYSQL_YYABORT; +@@ -10383,7 +10332,6 @@ drop: + } + | DROP FUNCTION_SYM if_exists ident '.' ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + sp_name *spname; + if ($4.str && check_db_name(&$4)) +@@ -10406,7 +10354,6 @@ drop: + } + | DROP FUNCTION_SYM if_exists ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + LEX_STRING db= {0, 0}; + sp_name *spname; +@@ -10491,7 +10438,7 @@ table_list: + table_name: + table_ident + { +- if (!Select->add_table_to_list(YYTHD, $1, NULL, ++ if (!Select->add_table_to_list(thd, $1, NULL, + TL_OPTION_UPDATING, + YYPS->m_lock_type, + YYPS->m_mdl_type)) +@@ -10507,7 +10454,7 @@ table_alias_ref_list: + table_alias_ref: + table_ident_opt_wild + { +- if (!Select->add_table_to_list(YYTHD, $1, NULL, ++ if (!Select->add_table_to_list(thd, $1, NULL, + TL_OPTION_UPDATING | TL_OPTION_ALIAS, + YYPS->m_lock_type, + YYPS->m_mdl_type)) +@@ -10581,7 +10528,7 @@ insert_lock_option: + | DELAYED_SYM + { + Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - +- YYTHD->query()); ++ thd->query()); + Lex->keyword_delayed_end_offset= Lex->keyword_delayed_begin_offset + + YYLIP->yyLength() + 1; + $$= TL_WRITE_DELAYED; +@@ -10594,7 +10541,7 @@ replace_lock_option: + | DELAYED_SYM + { + Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - +- YYTHD->query()); ++ thd->query()); + Lex->keyword_delayed_end_offset= Lex->keyword_delayed_begin_offset + + YYLIP->yyLength() + 1; + $$= TL_WRITE_DELAYED; +@@ -10711,7 +10658,7 @@ expr_or_default: + expr { $$= $1;} + | DEFAULT + { +- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context()); ++ $$= new (thd->mem_root) Item_default_value(Lex->current_context()); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -10764,7 +10711,7 @@ update_list: + update_elem: + simple_ident_nospvar equal expr_or_default + { +- if (add_item_to_list(YYTHD, $1) || add_value_to_list(YYTHD, $3)) ++ if (add_item_to_list(thd, $1) || add_value_to_list(thd, $3)) + MYSQL_YYABORT; + } + ; +@@ -10809,7 +10756,7 @@ delete: + single_multi: + FROM table_ident + { +- if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING, ++ if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING, + YYPS->m_lock_type, + YYPS->m_mdl_type)) + MYSQL_YYABORT; +@@ -10853,7 +10800,7 @@ table_wild_one: + Table_ident *ti= new Table_ident($1); + if (ti == NULL) + MYSQL_YYABORT; +- if (!Select->add_table_to_list(YYTHD, ++ if (!Select->add_table_to_list(thd, + ti, + NULL, + TL_OPTION_UPDATING | TL_OPTION_ALIAS, +@@ -10863,10 +10810,10 @@ table_wild_one: + } + | ident '.' ident opt_wild + { +- Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0); ++ Table_ident *ti= new Table_ident(thd, $1, $3, 0); + if (ti == NULL) + MYSQL_YYABORT; +- if (!Select->add_table_to_list(YYTHD, ++ if (!Select->add_table_to_list(thd, + ti, + NULL, + TL_OPTION_UPDATING | TL_OPTION_ALIAS, +@@ -10906,7 +10853,6 @@ truncate: + } + table_name + { +- THD *thd= YYTHD; + LEX* lex= thd->lex; + DBUG_ASSERT(!lex->m_stmt); + lex->m_stmt= new (thd->mem_root) Truncate_statement(lex); +@@ -11000,7 +10946,7 @@ show_param: + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_DATABASES; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_SCHEMATA)) ++ if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA)) + MYSQL_YYABORT; + } + | opt_full TABLES opt_db wild_and_where +@@ -11008,7 +10954,7 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_TABLES; + lex->select_lex.db= $3; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_NAMES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES)) + MYSQL_YYABORT; + } + | opt_var_type TEMPORARY TABLES opt_db +@@ -11017,7 +10963,7 @@ show_param: + lex->sql_command= SQLCOM_SHOW_TEMPORARY_TABLES; + lex->option_type= $1; + lex->select_lex.db= $4; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_TEMPORARY_TABLES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_TEMPORARY_TABLES)) + MYSQL_YYABORT; + } + | opt_full TRIGGERS_SYM opt_db wild_and_where +@@ -11025,7 +10971,7 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_TRIGGERS; + lex->select_lex.db= $3; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_TRIGGERS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS)) + MYSQL_YYABORT; + } + | EVENTS_SYM opt_db wild_and_where +@@ -11033,7 +10979,7 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_EVENTS; + lex->select_lex.db= $2; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_EVENTS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_EVENTS)) + MYSQL_YYABORT; + } + | TABLE_SYM STATUS_SYM opt_db wild_and_where +@@ -11041,7 +10987,7 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; + lex->select_lex.db= $3; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_TABLES)) + MYSQL_YYABORT; + } + | OPEN_SYM TABLES opt_db wild_and_where +@@ -11049,14 +10995,14 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; + lex->select_lex.db= $3; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES)) + MYSQL_YYABORT; + } + | PLUGINS_SYM + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_PLUGINS; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) + MYSQL_YYABORT; + } + | ENGINE_SYM known_storage_engines show_engine_param +@@ -11069,7 +11015,7 @@ show_param: + lex->sql_command= SQLCOM_SHOW_FIELDS; + if ($5) + $4->change_db($5); +- if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS)) ++ if (prepare_schema_table(thd, lex, $4, SCH_COLUMNS)) + MYSQL_YYABORT; + } + | master_or_binary LOGS_SYM +@@ -11096,21 +11042,21 @@ show_param: + lex->sql_command= SQLCOM_SHOW_KEYS; + if ($4) + $3->change_db($4); +- if (prepare_schema_table(YYTHD, lex, $3, SCH_STATISTICS)) ++ if (prepare_schema_table(thd, lex, $3, SCH_STATISTICS)) + MYSQL_YYABORT; + } + | opt_storage ENGINES_SYM + { + LEX *lex=Lex; + lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) + MYSQL_YYABORT; + } + | AUTHORS_SYM + { + LEX *lex=Lex; + lex->sql_command= SQLCOM_SHOW_AUTHORS; +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, + ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), + "SHOW AUTHORS"); +@@ -11119,7 +11065,7 @@ show_param: + { + LEX *lex=Lex; + lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS; +- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, ++ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, + ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), + "SHOW CONTRIBUTORS"); +@@ -11143,7 +11089,7 @@ show_param: + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_PROFILE; +- if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0) ++ if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0) + YYABORT; + } + | opt_var_type STATUS_SYM wild_and_where +@@ -11151,7 +11097,7 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_STATUS; + lex->option_type= $1; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_STATUS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_STATUS)) + MYSQL_YYABORT; + } + | opt_full PROCESSLIST_SYM +@@ -11161,21 +11107,21 @@ show_param: + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_VARIABLES; + lex->option_type= $1; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES)) + MYSQL_YYABORT; + } + | charset wild_and_where + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_CHARSETS; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS)) + MYSQL_YYABORT; + } + | COLLATION_SYM wild_and_where + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_COLLATIONS; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS)) + MYSQL_YYABORT; + } + | GRANTS +@@ -11205,7 +11151,7 @@ show_param: + { + LEX *lex= Lex; + lex->sql_command = SQLCOM_SHOW_CREATE; +- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0)) ++ if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0)) + MYSQL_YYABORT; + lex->only_view= 0; + lex->create_info.storage_media= HA_SM_DEFAULT; +@@ -11214,7 +11160,7 @@ show_param: + { + LEX *lex= Lex; + lex->sql_command = SQLCOM_SHOW_CREATE; +- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL, 0)) ++ if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0)) + MYSQL_YYABORT; + lex->only_view= 1; + } +@@ -11236,7 +11182,7 @@ show_param: + #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION + LEX *lex= Lex; + lex->sql_command= SQLCOM_SELECT; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_QUERY_RESPONSE_TIME)) ++ if (prepare_schema_table(thd, lex, 0, SCH_QUERY_RESPONSE_TIME)) + MYSQL_YYABORT; + #endif // HAVE_RESPONSE_TIME_DISTRIBUTION + } +@@ -11244,35 +11190,35 @@ show_param: + { + LEX *lex= Lex; + Lex->sql_command= SQLCOM_SELECT; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_CLIENT_STATS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_CLIENT_STATS)) + MYSQL_YYABORT; + } + | USER_STATS_SYM wild_and_where + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SELECT; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_USER_STATS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_USER_STATS)) + MYSQL_YYABORT; + } + | THREAD_STATS_SYM wild_and_where + { + LEX *lex= Lex; + Lex->sql_command= SQLCOM_SELECT; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_THREAD_STATS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_THREAD_STATS)) + MYSQL_YYABORT; + } + | TABLE_STATS_SYM wild_and_where + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SELECT; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_STATS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_TABLE_STATS)) + MYSQL_YYABORT; + } + | INDEX_STATS_SYM wild_and_where + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SELECT; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_INDEX_STATS)) ++ if (prepare_schema_table(thd, lex, 0, SCH_INDEX_STATS)) + MYSQL_YYABORT; + } + | CREATE PROCEDURE_SYM sp_name +@@ -11299,14 +11245,14 @@ show_param: + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_STATUS_PROC; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) + MYSQL_YYABORT; + } + | FUNCTION_SYM STATUS_SYM wild_and_where + { + LEX *lex= Lex; + lex->sql_command= SQLCOM_SHOW_STATUS_FUNC; +- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) ++ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) + MYSQL_YYABORT; + } + | PROCEDURE_SYM CODE_SYM sp_name +@@ -11374,7 +11320,7 @@ wild_and_where: + /* empty */ + | LIKE TEXT_STRING_sys + { +- Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length, ++ Lex->wild= new (thd->mem_root) String($2.str, $2.length, + system_charset_info); + if (Lex->wild == NULL) + MYSQL_YYABORT; +@@ -11397,7 +11343,7 @@ describe: + lex->sql_command= SQLCOM_SHOW_FIELDS; + lex->select_lex.db= 0; + lex->verbose= 0; +- if (prepare_schema_table(YYTHD, lex, $2, SCH_COLUMNS)) ++ if (prepare_schema_table(thd, lex, $2, SCH_COLUMNS)) + MYSQL_YYABORT; + } + opt_describe_column +@@ -11429,7 +11375,7 @@ opt_describe_column: + | text_string { Lex->wild= $1; } + | ident + { +- Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str, ++ Lex->wild= new (thd->mem_root) String((const char*) $1.str, + $1.length, + system_charset_info); + if (Lex->wild == NULL) +@@ -11647,7 +11593,6 @@ use: + load: + LOAD data_or_xml + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + + if (lex->sphead) +@@ -11670,7 +11615,7 @@ load: + opt_duplicate INTO TABLE_SYM table_ident + { + LEX *lex=Lex; +- if (!Select->add_table_to_list(YYTHD, $12, NULL, TL_OPTION_UPDATING, ++ if (!Select->add_table_to_list(thd, $12, NULL, TL_OPTION_UPDATING, + $4, MDL_SHARED_WRITE)) + MYSQL_YYABORT; + lex->field_list.empty(); +@@ -11813,7 +11758,7 @@ field_or_var: + simple_ident_nospvar {$$= $1;} + | '@' ident_or_text + { +- $$= new (YYTHD->mem_root) Item_user_var_as_out_param($2); ++ $$= new (thd->mem_root) Item_user_var_as_out_param($2); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -11834,16 +11779,16 @@ load_data_set_elem: + { + LEX *lex= Lex; + uint length= (uint) ($5 - $3); +- String *val= new (YYTHD->mem_root) String($3, ++ String *val= new (thd->mem_root) String($3, + length, +- YYTHD->charset()); ++ thd->charset()); + if (val == NULL) + MYSQL_YYABORT; + if (lex->update_list.push_back($1) || + lex->value_list.push_back($4) || + lex->load_set_str_list.push_back(val)) + MYSQL_YYABORT; +- $4->set_name_no_truncate($3, length, YYTHD->charset()); ++ $4->set_name_no_truncate($3, length, thd->charset()); + } + ; + +@@ -11853,7 +11798,6 @@ text_literal: + TEXT_STRING + { + LEX_STRING tmp; +- THD *thd= YYTHD; + CHARSET_INFO *cs_con= thd->variables.collation_connection; + CHARSET_INFO *cs_cli= thd->variables.character_set_client; + uint repertoire= thd->lex->text_string_is_7bit && +@@ -11879,7 +11823,7 @@ text_literal: + uint repertoire= Lex->text_string_is_7bit ? + MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; + DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); +- $$= new (YYTHD->mem_root) Item_string($1.str, $1.length, ++ $$= new (thd->mem_root) Item_string($1.str, $1.length, + national_charset_info, + DERIVATION_COERCIBLE, + repertoire); +@@ -11888,7 +11832,7 @@ text_literal: + } + | UNDERSCORE_CHARSET TEXT_STRING + { +- Item_string *str= new (YYTHD->mem_root) Item_string($2.str, ++ Item_string *str= new (thd->mem_root) Item_string($2.str, + $2.length, $1); + if (str == NULL) + MYSQL_YYABORT; +@@ -11907,7 +11851,7 @@ text_literal: + If the string has been pure ASCII so far, + check the new part. + */ +- CHARSET_INFO *cs= YYTHD->variables.collation_connection; ++ CHARSET_INFO *cs= thd->variables.collation_connection; + item->collation.repertoire|= my_string_repertoire(cs, + $2.str, + $2.length); +@@ -11918,15 +11862,15 @@ text_literal: + text_string: + TEXT_STRING_literal + { +- $$= new (YYTHD->mem_root) String($1.str, ++ $$= new (thd->mem_root) String($1.str, + $1.length, +- YYTHD->variables.collation_connection); ++ thd->variables.collation_connection); + if ($$ == NULL) + MYSQL_YYABORT; + } + | HEX_NUM + { +- Item *tmp= new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); ++ Item *tmp= new (thd->mem_root) Item_hex_string($1.str, $1.length); + if (tmp == NULL) + MYSQL_YYABORT; + /* +@@ -11938,7 +11882,7 @@ text_string: + } + | BIN_NUM + { +- Item *tmp= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); ++ Item *tmp= new (thd->mem_root) Item_bin_string($1.str, $1.length); + if (tmp == NULL) + MYSQL_YYABORT; + /* +@@ -11953,7 +11897,6 @@ text_string: + param_marker: + PARAM_MARKER + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + Item_param *item; +@@ -11986,38 +11929,38 @@ literal: + | NUM_literal { $$ = $1; } + | NULL_SYM + { +- $$ = new (YYTHD->mem_root) Item_null(); ++ $$ = new (thd->mem_root) Item_null(); + if ($$ == NULL) + MYSQL_YYABORT; + YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT; + } + | FALSE_SYM + { +- $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1); ++ $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRUE_SYM + { +- $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1); ++ $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | HEX_NUM + { +- $$ = new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); ++ $$ = new (thd->mem_root) Item_hex_string($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BIN_NUM + { +- $$= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); ++ $$= new (thd->mem_root) Item_bin_string($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | UNDERSCORE_CHARSET HEX_NUM + { +- Item *tmp= new (YYTHD->mem_root) Item_hex_string($2.str, $2.length); ++ Item *tmp= new (thd->mem_root) Item_hex_string($2.str, $2.length); + if (tmp == NULL) + MYSQL_YYABORT; + /* +@@ -12028,7 +11971,7 @@ literal: + String *str= tmp->val_str((String*) 0); + + Item_string *item_str; +- item_str= new (YYTHD->mem_root) ++ item_str= new (thd->mem_root) + Item_string(NULL, /* name will be set in select_item */ + str ? str->ptr() : "", + str ? str->length() : 0, +@@ -12046,7 +11989,7 @@ literal: + } + | UNDERSCORE_CHARSET BIN_NUM + { +- Item *tmp= new (YYTHD->mem_root) Item_bin_string($2.str, $2.length); ++ Item *tmp= new (thd->mem_root) Item_bin_string($2.str, $2.length); + if (tmp == NULL) + MYSQL_YYABORT; + /* +@@ -12057,7 +12000,7 @@ literal: + String *str= tmp->val_str((String*) 0); + + Item_string *item_str; +- item_str= new (YYTHD->mem_root) ++ item_str= new (thd->mem_root) + Item_string(NULL, /* name will be set in select_item */ + str ? str->ptr() : "", + str ? str->length() : 0, +@@ -12081,7 +12024,7 @@ NUM_literal: + NUM + { + int error; +- $$= new (YYTHD->mem_root) ++ $$= new (thd->mem_root) + Item_int($1.str, + (longlong) my_strtoll10($1.str, NULL, &error), + $1.length); +@@ -12091,7 +12034,7 @@ NUM_literal: + | LONG_NUM + { + int error; +- $$= new (YYTHD->mem_root) ++ $$= new (thd->mem_root) + Item_int($1.str, + (longlong) my_strtoll10($1.str, NULL, &error), + $1.length); +@@ -12100,23 +12043,23 @@ NUM_literal: + } + | ULONGLONG_NUM + { +- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); ++ $$= new (thd->mem_root) Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | DECIMAL_NUM + { +- $$= new (YYTHD->mem_root) Item_decimal($1.str, $1.length, +- YYTHD->charset()); +- if (($$ == NULL) || (YYTHD->is_error())) ++ $$= new (thd->mem_root) Item_decimal($1.str, $1.length, ++ thd->charset()); ++ if (($$ == NULL) || (thd->is_error())) + { + MYSQL_YYABORT; + } + } + | FLOAT_NUM + { +- $$= new (YYTHD->mem_root) Item_float($1.str, $1.length); +- if (($$ == NULL) || (YYTHD->is_error())) ++ $$= new (thd->mem_root) Item_float($1.str, $1.length); ++ if (($$ == NULL) || (thd->is_error())) + { + MYSQL_YYABORT; + } +@@ -12136,7 +12079,7 @@ table_wild: + ident '.' '*' + { + SELECT_LEX *sel= Select; +- $$= new (YYTHD->mem_root) Item_field(Lex->current_context(), ++ $$= new (thd->mem_root) Item_field(Lex->current_context(), + NullS, $1.str, "*"); + if ($$ == NULL) + MYSQL_YYABORT; +@@ -12144,7 +12087,6 @@ table_wild: + } + | ident '.' ident '.' '*' + { +- THD *thd= YYTHD; + SELECT_LEX *sel= Select; + const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ? + NullS : $1.str; +@@ -12164,7 +12106,6 @@ order_ident: + simple_ident: + ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + sp_variable_t *spv; +@@ -12215,7 +12156,6 @@ simple_ident: + simple_ident_nospvar: + ident + { +- THD *thd= YYTHD; + SELECT_LEX *sel=Select; + if ((sel->parsing_place != IN_HAVING) || + (sel->get_in_sum_expr() > 0)) +@@ -12237,7 +12177,6 @@ simple_ident_nospvar: + simple_ident_q: + ident '.' ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + + /* +@@ -12316,7 +12255,6 @@ simple_ident_q: + } + | '.' ident '.' ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + SELECT_LEX *sel= lex->current_select; + if (sel->no_table_names_allowed) +@@ -12341,7 +12279,6 @@ simple_ident_q: + } + | ident '.' ident '.' ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + SELECT_LEX *sel= lex->current_select; + const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ? +@@ -12409,7 +12346,7 @@ table_ident: + } + | ident '.' ident + { +- $$= new Table_ident(YYTHD, $1,$3,0); ++ $$= new Table_ident(thd, $1,$3,0); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -12431,7 +12368,7 @@ table_ident_opt_wild: + } + | ident '.' ident opt_wild + { +- $$= new Table_ident(YYTHD, $1,$3,0); ++ $$= new Table_ident(thd, $1,$3,0); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -12441,7 +12378,7 @@ table_ident_nodb: + ident + { + LEX_STRING db={(char*) any_db,3}; +- $$= new Table_ident(YYTHD, db,$1,0); ++ $$= new Table_ident(thd, db,$1,0); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -12451,7 +12388,6 @@ IDENT_sys: + IDENT { $$= $1; } + | IDENT_QUOTED + { +- THD *thd= YYTHD; + + if (thd->charset_is_system_charset) + { +@@ -12481,7 +12417,6 @@ IDENT_sys: + TEXT_STRING_sys: + TEXT_STRING + { +- THD *thd= YYTHD; + + if (thd->charset_is_system_charset) + $$= $1; +@@ -12497,7 +12432,6 @@ TEXT_STRING_sys: + TEXT_STRING_literal: + TEXT_STRING + { +- THD *thd= YYTHD; + + if (thd->charset_is_collation_connection) + $$= $1; +@@ -12513,7 +12447,6 @@ TEXT_STRING_literal: + TEXT_STRING_filesystem: + TEXT_STRING + { +- THD *thd= YYTHD; + + if (thd->charset_is_character_set_filesystem) + $$= $1; +@@ -12531,7 +12464,6 @@ ident: + IDENT_sys { $$=$1; } + | keyword + { +- THD *thd= YYTHD; + $$.str= thd->strmake($1.str, $1.length); + if ($$.str == NULL) + MYSQL_YYABORT; +@@ -12543,7 +12475,6 @@ label_ident: + IDENT_sys { $$=$1; } + | keyword_sp + { +- THD *thd= YYTHD; + $$.str= thd->strmake($1.str, $1.length); + if ($$.str == NULL) + MYSQL_YYABORT; +@@ -12560,7 +12491,6 @@ ident_or_text: + user: + ident_or_text + { +- THD *thd= YYTHD; + if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) + MYSQL_YYABORT; + $$->user = $1; +@@ -12577,7 +12507,6 @@ user: + } + | ident_or_text '@' ident_or_text + { +- THD *thd= YYTHD; + if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) + MYSQL_YYABORT; + $$->user = $1; $$->host=$3; +@@ -12599,7 +12528,7 @@ user: + } + | CURRENT_USER optional_braces + { +- if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user)))) ++ if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) + MYSQL_YYABORT; + /* + empty LEX_USER means current_user and +@@ -12987,7 +12916,6 @@ option_value_list: + + option_type_value: + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + +@@ -13018,7 +12946,6 @@ option_type_value: + } + ext_option_value + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + +@@ -13101,7 +13028,6 @@ ext_option_value: + sys_option_value: + option_type internal_variable_name equal set_expr_or_default + { +- THD *thd= YYTHD; + LEX *lex= Lex; + LEX_STRING *name= &$2.base_name; + +@@ -13113,7 +13039,7 @@ sys_option_value: + my_parse_error(ER(ER_SYNTAX_ERROR)); + MYSQL_YYABORT; + } +- if (set_trigger_new_row(YYTHD, name, $4)) ++ if (set_trigger_new_row(thd, name, $4)) + MYSQL_YYABORT; + } + else if ($2.var) +@@ -13143,7 +13069,6 @@ sys_option_value: + } + | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types + { +- THD *thd= YYTHD; + LEX *lex=Lex; + lex->option_type= $1; + Item *item= new (thd->mem_root) Item_int((int32) $5); +@@ -13163,7 +13088,7 @@ option_value: + '@' ident_or_text equal expr + { + Item_func_set_user_var *item; +- item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4, false); ++ item= new (thd->mem_root) Item_func_set_user_var($2, $4, false); + if (item == NULL) + MYSQL_YYABORT; + set_var_user *var= new set_var_user(item); +@@ -13173,7 +13098,6 @@ option_value: + } + | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default + { +- THD *thd= YYTHD; + struct sys_var_with_base tmp= $4; + /* Lookup if necessary: must be a system variable. */ + if (tmp.var == NULL) +@@ -13186,7 +13110,6 @@ option_value: + } + | charset old_or_new_charset_name_or_default + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + CHARSET_INFO *cs2; + cs2= $2 ? $2: global_system_variables.character_set_client; +@@ -13234,7 +13157,6 @@ option_value: + } + | PASSWORD equal text_or_password + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + LEX_USER *user; + sp_pcontext *spc= lex->spcont; +@@ -13274,7 +13196,6 @@ option_value: + internal_variable_name: + ident + { +- THD *thd= YYTHD; + sp_pcontext *spc= thd->lex->spcont; + sp_variable_t *spv; + +@@ -13333,7 +13254,7 @@ internal_variable_name: + } + else + { +- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); ++ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); + if (!tmp) + MYSQL_YYABORT; + if (!tmp->is_struct()) +@@ -13344,7 +13265,7 @@ internal_variable_name: + } + | DEFAULT '.' ident + { +- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); ++ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); + if (!tmp) + MYSQL_YYABORT; + if (!tmp->is_struct()) +@@ -13366,16 +13287,16 @@ text_or_password: + TEXT_STRING { $$=$1.str;} + | PASSWORD '(' TEXT_STRING ')' + { +- $$= $3.length ? YYTHD->variables.old_passwords ? +- Item_func_old_password::alloc(YYTHD, $3.str, $3.length) : +- Item_func_password::alloc(YYTHD, $3.str, $3.length) : ++ $$= $3.length ? thd->variables.old_passwords ? ++ Item_func_old_password::alloc(thd, $3.str, $3.length) : ++ Item_func_password::alloc(thd, $3.str, $3.length) : + $3.str; + if ($$ == NULL) + MYSQL_YYABORT; + } + | OLD_PASSWORD '(' TEXT_STRING ')' + { +- $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str, ++ $$= $3.length ? Item_func_old_password::alloc(thd, $3.str, + $3.length) : + $3.str; + if ($$ == NULL) +@@ -13389,19 +13310,19 @@ set_expr_or_default: + | DEFAULT { $$=0; } + | ON + { +- $$=new (YYTHD->mem_root) Item_string("ON", 2, system_charset_info); ++ $$=new (thd->mem_root) Item_string("ON", 2, system_charset_info); + if ($$ == NULL) + MYSQL_YYABORT; + } + | ALL + { +- $$=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info); ++ $$=new (thd->mem_root) Item_string("ALL", 3, system_charset_info); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BINARY + { +- $$=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info); ++ $$=new (thd->mem_root) Item_string("binary", 6, system_charset_info); + if ($$ == NULL) + MYSQL_YYABORT; + } +@@ -13440,7 +13361,7 @@ table_lock: + { + thr_lock_type lock_type= (thr_lock_type) $3; + bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE); +- if (!Select->add_table_to_list(YYTHD, $1, $2, 0, lock_type, ++ if (!Select->add_table_to_list(thd, $1, $2, 0, lock_type, + (lock_for_write ? + MDL_SHARED_NO_READ_WRITE : + MDL_SHARED_READ))) +@@ -13511,7 +13432,7 @@ handler: + lex->expr_allows_subselect= FALSE; + lex->sql_command = SQLCOM_HA_READ; + lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ +- Item *one= new (YYTHD->mem_root) Item_int((int32) 1); ++ Item *one= new (thd->mem_root) Item_int((int32) 1); + if (one == NULL) + MYSQL_YYABORT; + lex->current_select->select_limit= one; +@@ -13857,10 +13778,10 @@ grant_user: + MYSQL_YYABORT; + if ($4.length) + { +- if (YYTHD->variables.old_passwords) ++ if (thd->variables.old_passwords) + { + char *buff= +- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); ++ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); + if (buff == NULL) + MYSQL_YYABORT; + my_make_scrambled_password_323(buff, $4.str, $4.length); +@@ -13870,7 +13791,7 @@ grant_user: + else + { + char *buff= +- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); ++ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); + if (buff == NULL) + MYSQL_YYABORT; + my_make_scrambled_password(buff, $4.str, $4.length); +@@ -13923,7 +13844,7 @@ column_list: + column_list_id: + ident + { +- String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info); ++ String *new_str = new (thd->mem_root) String((const char*) $1.str,$1.length,system_charset_info); + if (new_str == NULL) + MYSQL_YYABORT; + List_iterator <LEX_COLUMN> iter(Lex->columns); +@@ -14133,7 +14054,6 @@ opt_union_order_or_limit: + + union_order_or_limit: + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); + SELECT_LEX *sel= lex->current_select; +@@ -14149,7 +14069,6 @@ union_order_or_limit: + } + order_or_limit + { +- THD *thd= YYTHD; + thd->lex->current_select->no_table_names_allowed= 0; + thd->where= ""; + } +@@ -14331,14 +14250,14 @@ no_definer: + from older master servers (i.e. to create non-suid trigger in this + case). + */ +- YYTHD->lex->definer= 0; ++ thd->lex->definer= 0; + } + ; + + definer: + DEFINER_SYM EQ user + { +- YYTHD->lex->definer= get_current_user(YYTHD, $3); ++ thd->lex->definer= get_current_user(thd, $3); + } + ; + +@@ -14383,7 +14302,6 @@ view_suid: + view_tail: + view_suid VIEW_SYM table_ident + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + lex->sql_command= SQLCOM_CREATE_VIEW; + /* first table in list is target VIEW name */ +@@ -14427,7 +14345,6 @@ view_select: + } + view_select_aux view_check_option + { +- THD *thd= YYTHD; + LEX *lex= Lex; + uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str; + void *create_view_select= thd->memdup(lex->create_view_select.str, len); +@@ -14483,7 +14400,6 @@ trigger_tail: + EACH_SYM + ROW_SYM + { /* $15 */ +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + sp_head *sp; +@@ -14517,8 +14433,8 @@ trigger_tail: + sp_head *sp= lex->sphead; + + lex->sql_command= SQLCOM_CREATE_TRIGGER; +- sp->set_stmt_end(YYTHD); +- sp->restore_thd_mem_root(YYTHD); ++ sp->set_stmt_end(thd); ++ sp->restore_thd_mem_root(thd); + + if (sp->is_not_allowed_in_function("trigger")) + MYSQL_YYABORT; +@@ -14528,7 +14444,7 @@ trigger_tail: + sp_proc_stmt alternatives are not saving/restoring LEX, so + lex->query_tables can be wiped out. + */ +- if (!lex->select_lex.add_table_to_list(YYTHD, $9, ++ if (!lex->select_lex.add_table_to_list(thd, $9, + (LEX_STRING*) 0, + TL_OPTION_UPDATING, + TL_READ_NO_INSERT, +@@ -14547,7 +14463,6 @@ udf_tail: + AGGREGATE_SYM remember_name FUNCTION_SYM ident + RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + if (is_native_function(thd, & $4)) + { +@@ -14565,7 +14480,6 @@ udf_tail: + | remember_name FUNCTION_SYM ident + RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + if (is_native_function(thd, & $3)) + { +@@ -14588,7 +14502,6 @@ sf_tail: + sp_name /* $3 */ + '(' /* $4 */ + { /* $5 */ +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + sp_head *sp; +@@ -14646,7 +14559,7 @@ sf_tail: + MYSQL_YYABORT; + } + +- if (sp->fill_field_definition(YYTHD, lex, ++ if (sp->fill_field_definition(thd, lex, + (enum enum_field_types) $11, + &sp->m_return_field_def)) + MYSQL_YYABORT; +@@ -14655,7 +14568,6 @@ sf_tail: + } + sp_c_chistics /* $13 */ + { /* $14 */ +- THD *thd= YYTHD; + LEX *lex= thd->lex; + Lex_input_stream *lip= YYLIP; + +@@ -14664,7 +14576,6 @@ sf_tail: + } + sp_proc_stmt /* $15 */ + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + sp_head *sp= lex->sphead; + +@@ -14735,10 +14646,10 @@ sp_tail: + sp= new sp_head(); + if (sp == NULL) + MYSQL_YYABORT; +- sp->reset_thd_mem_root(YYTHD); ++ sp->reset_thd_mem_root(thd); + sp->init(lex); + sp->m_type= TYPE_ENUM_PROCEDURE; +- sp->init_sp_name(YYTHD, $3); ++ sp->init_sp_name(thd, $3); + + lex->sphead= sp; + } +@@ -14753,7 +14664,6 @@ sp_tail: + sp_pdparam_list + ')' + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + + lex->sphead->m_param_end= YYLIP->get_cpp_tok_start(); +@@ -14761,7 +14671,6 @@ sp_tail: + } + sp_c_chistics + { +- THD *thd= YYTHD; + LEX *lex= thd->lex; + + lex->sphead->m_chistics= &lex->sp_chistics; +@@ -14772,9 +14681,9 @@ sp_tail: + LEX *lex= Lex; + sp_head *sp= lex->sphead; + +- sp->set_stmt_end(YYTHD); ++ sp->set_stmt_end(thd); + lex->sql_command= SQLCOM_CREATE_PROCEDURE; +- sp->restore_thd_mem_root(YYTHD); ++ sp->restore_thd_mem_root(thd); + } + ; + +@@ -14811,21 +14720,21 @@ xid: + text_string + { + MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE); +- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) ++ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) + MYSQL_YYABORT; + Lex->xid->set(1L, $1->ptr(), $1->length(), 0, 0); + } + | text_string ',' text_string + { + MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); +- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) ++ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) + MYSQL_YYABORT; + Lex->xid->set(1L, $1->ptr(), $1->length(), $3->ptr(), $3->length()); + } + | text_string ',' text_string ',' ulong_num + { + MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); +- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) ++ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) + MYSQL_YYABORT; + Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length()); + } +-- +1.8.4 + diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 0aee6e562..6a4f9f549 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 93544 2013-07-05 09:53:28Z mtorromeo $ +# $Id: PKGBUILD 96790 2013-09-05 08:50:02Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.32_rel31.0 +pkgver=5.5.33_rel31.1 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') @@ -19,14 +19,18 @@ options=('!libtool' 'emptydirs') backup=('etc/mysql/my.cnf') install=percona.install source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" + '0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch' 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf') -build() { +prepare() { cd "${srcdir}/Percona-Server-${pkgver/_/-}" sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt + patch -p1 -i "$srcdir/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch" +} +build() { cd "${srcdir}" rm -rf build mkdir build @@ -97,7 +101,8 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('e34676cea5ceb398258408e31e8527724845f83bbbf1f22308f5069304118e8f' +sha256sums=('2039ae974d0973b765a4cdc7ffa1dc75ebd93540769fb134b3a8dc521dfc0b3a' + '35f5e7819d6c24863f3319462676ea989fd58f8a334925432444b6bf5c42fdaf' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index 4830160de..31ddf15e9 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alex Dioso <adioso->gmail*com> pkgname=perl-clone -pkgver=0.34 -pkgrel=2 +pkgver=0.35 +pkgrel=1 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64' 'mips64el') url='http://search.cpan.org/~RDF/Clone' @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz") -md5sums=('6475432d91b1820eff1ae877ea5c8e3b') +md5sums=('22175ef74a6e5f5604cb74d1e4af456e') build() { cd Clone-${pkgver} diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index 927542dcf..c7e3231a6 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96253 2013-08-22 17:25:25Z jsteel $ +# $Id: PKGBUILD 97592 2013-09-24 21:06:57Z jsteel $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=2.0103 +pkgver=2.0106 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') install=$pkgname.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('77184192598ea59389b76dfea2a23b7c') +md5sums=('5da8ecfdedccca81fe0821e9935fe11c') build() { cd XML-LibXML-$pkgver diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index a86cc84ef..e363630e3 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 92722 2013-06-13 12:58:46Z spupykin $ +# $Id: PKGBUILD 97840 2013-09-30 10:03:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: bekks <eduard.warkentin@gmx.de> pkgname=pgadmin3 -pkgver=1.16.1 +pkgver=1.18.0 pkgrel=2 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://www.pgadmin.org" license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') -makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick') +makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick') _categories="Development;Application" source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) -md5sums=('f3bc59630f0dc9600d4ad125097ce2fa') +md5sums=('ed1968a9abda0064be68bf57d7ccad43') build() { cd "$srcdir" convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cp pgadmin3-3.png pgadmin3.png - gendesk $startdir/PKGBUILD cd "pgadmin3-${pkgver}" [ -f Makefile ] || ./configure --prefix=/usr @@ -36,5 +35,5 @@ package() { install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico install -Dm644 "$srcdir/pgadmin3.png" "$pkgdir/usr/share/pixmaps/pgadmin3.png" - install -Dm644 "$srcdir/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop" + install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop" } diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD index 46ba64245..9bbf6f5cc 100644 --- a/community/phantomjs/PKGBUILD +++ b/community/phantomjs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92506 2013-06-07 11:18:15Z fyan $ +# $Id: PKGBUILD 97046 2013-09-11 13:42:10Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: grimsock <lord.grimsock at gmail dot com> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> @@ -6,8 +6,8 @@ # Contributor: Henry Tang <henryykt@gmail.com> pkgname=phantomjs -pkgver=1.9.1 -pkgrel=2 +pkgver=1.9.2 +pkgrel=1 pkgdesc="Headless WebKit with JavaScript API" url="http://www.phantomjs.org/" license=('BSD' 'LGPL' 'MIT') @@ -16,7 +16,6 @@ depends=('gstreamer0.10-base' 'fontconfig' 'freetype2') makedepends=('unzip') source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip") noextract=("${pkgname}-${pkgver}-source.zip") -md5sums=('93a0043d4ff8cd83e23e9d261c93830d') build() { # workaround for https://code.google.com/p/libarchive/issues/detail?id=271 @@ -40,3 +39,4 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" } +sha512sums=('ada4010a1ba43950f25bcf42bc41f158c8dc91320edff18efece68c69cd16d1246512fbd66e2dcbe9d0ecd71d8587252570072e2499ec9dfce0ac871c0ce2720') diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD index 43facc006..ca792101e 100644 --- a/community/pianobar/PKGBUILD +++ b/community/pianobar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93512 2013-07-04 21:18:29Z dwallace $ +# $Id: PKGBUILD 98105 2013-10-06 00:35:49Z dwallace $ # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com> # Contributor: Mitch Bigelow <ipha00@gmail.com> # Contributor: Patrick Palka <patrick@parcs.ath.cx> pkgname=pianobar -pkgver=2013.05.19 +pkgver=2013.09.15 pkgrel=1 pkgdesc="console-based frontend for Pandora" url="http://6xq.net/0017" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt') source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2) -sha256sums=('cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046') +sha256sums=('3f8cf25ef054acf46e519d02453a6e214cfa09661b3adc03da99ace1c6f10066') build() { make -C "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index f2e876d91..cc2c65dff 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96467 2013-08-30 08:55:39Z fyan $ +# $Id: PKGBUILD 98142 2013-10-06 16:28:12Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2a.20130824 -_commit=b2208aaa0c622e7daf1e9e78af7b1e04277f99a5 +pkgver=0.2c +_commit=41f9151c2273e8d3321458a1bbabf918b4e050c6 pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,9 @@ optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install -source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" -#source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" +options=(debug) +#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" +source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" "git://github.com/xiehuc/lwqq.git") prepare() { diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index eddc8f90e..fc2519b76 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88636 2013-04-20 19:00:12Z arodseth $ +# $Id: PKGBUILD 98017 2013-10-03 19:11:32Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=plan9port -pkgver=20130320 -pkgrel=1 +pkgver=20130927 +pkgrel=2 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686' 'mips64el') url='http://swtch.com/plan9port/' @@ -18,19 +18,21 @@ install='plan9.install' options=('!zipman') source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz" 'plan9.sh') -sha256sums=('49a5e6c97c76f0846c45791bda10d6b3ba5c4453855e401980e8e04f92e830fa' - '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d') +sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542' + 'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1') package() { - cd "$srcdir/plan9" + cd plan9 + + d=/usr/local # /opt - # Package ./INSTALL -b install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh" - mkdir -p "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname" - cp -r "$srcdir/plan9" "$pkgdir/opt/" - cd "$pkgdir/opt/plan9" - ./INSTALL -c -r "$pkgdir/opt/plan9" + install -d "$pkgdir$d" + install -d "$pkgdir/usr/share/doc/$pkgname" + cp -r "$srcdir/plan9" "$pkgdir/$d/" + cd "$pkgdir$d/plan9" + ./INSTALL -c -r "$pkgdir$d/plan9" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Clean up @@ -41,9 +43,9 @@ package() { LICENSE # Fix hardcoded paths - for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do + for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do echo -n "\t$f" - [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true + [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true done # Fix python scripts @@ -58,7 +60,7 @@ package() { done # Decompress the plan9 man pages - for i in `find /opt/plan9/man -type f`; do + for i in `find $pkgdir$d/plan9/man -type f`; do if [ ${i##*.} = "gz" ]; then gunzip "$i" fi diff --git a/community/plan9port/plan9.sh b/community/plan9port/plan9.sh index 84c3d7ef4..86109fc57 100644 --- a/community/plan9port/plan9.sh +++ b/community/plan9port/plan9.sh @@ -1,2 +1,2 @@ -export PLAN9=/opt/plan9 +export PLAN9=/usr/local/plan9 export PATH=$PATH:$PLAN9/bin diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD index dcda13503..fac6fb857 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.1 +pkgrel=2 pkgdesc='A free, cross-platform, open source, audio I/O library.' arch=('i686' 'x86_64' 'mips64el') 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 b3f9f7eaa..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' 'mips64el') -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/prelink/PKGBUILD b/community/prelink/PKGBUILD index a302459ee..33b84d17c 100644 --- a/community/prelink/PKGBUILD +++ b/community/prelink/PKGBUILD @@ -1,28 +1,21 @@ -# $Id: PKGBUILD 90944 2013-05-16 03:44:23Z eric $ +# $Id: PKGBUILD 96818 2013-09-05 20:51:50Z eric $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> pkgname=prelink -pkgver=20111012 -pkgrel=2 -pkgdesc='ELF prelinking utility to speed up dynamic linking.' +pkgver=20130503 +pkgrel=1 +pkgdesc='ELF prelinking utility to speed up dynamic linking' arch=('i686' 'x86_64' 'mips64el') url='http://people.redhat.com/jakub/prelink/' license=('GPL') depends=('elfutils') backup=('etc/prelink.conf') source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2" - 'prelink.conf' - 'arch-x86_64-dynamic_linker.patch') -md5sums=('f5aaf347432d677c293e5e3399ba4fdf' - '0793ed49e9b31c125cba4d936c333cf6' - 'b347580536e078b34c547742d36a3e9d') - -prepare() { - cd ${pkgname} - patch -Np0 -i ../arch-x86_64-dynamic_linker.patch -} + 'prelink.conf') +sha1sums=('eff86cb26f0cc174486769527286cc388d5216b0' + 'b83bd2d3505076151aa13d40de3d5c08a04440c7') build() { cd ${pkgname} @@ -30,6 +23,11 @@ build() { make } +check() { + cd ${pkgname} + make check +} + package() { cd ${pkgname} make DESTDIR="${pkgdir}" install diff --git a/community/prelink/arch-x86_64-dynamic_linker.patch b/community/prelink/arch-x86_64-dynamic_linker.patch deleted file mode 100644 index bceb9b2dc..000000000 --- a/community/prelink/arch-x86_64-dynamic_linker.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup ../prelink.orig/src/arch-x86_64.c ./src/arch-x86_64.c ---- ../prelink.orig/src/arch-x86_64.c 2010-12-22 12:03:06.725004002 +0100 -+++ ./src/arch-x86_64.c 2010-12-22 12:04:08.193712039 +0100 -@@ -532,7 +532,7 @@ PL_ARCH = { - .R_COPY = R_X86_64_COPY, - .R_RELATIVE = R_X86_64_RELATIVE, - .rtype_class_valid = RTYPE_CLASS_VALID, -- .dynamic_linker = "/lib64/ld-linux-x86-64.so.2", -+ .dynamic_linker = "/lib/ld-linux-x86-64.so.2", - .adjust_dyn = x86_64_adjust_dyn, - .adjust_rel = x86_64_adjust_rel, - .adjust_rela = x86_64_adjust_rela, diff --git a/community/prelink/prelink.conf b/community/prelink/prelink.conf index a242269ad..f48d7f9f8 100644 --- a/community/prelink/prelink.conf +++ b/community/prelink/prelink.conf @@ -1,24 +1,8 @@ # System /usr/lib /usr/bin -/lib -/bin -/usr/sbin -# Gnome -/opt/gnome/lib -/opt/gnome/bin -/opt/gnome/share - -# KDE/Qt -/opt/qt/lib -/opt/qt/bin -/opt/qt/share +# KDE3 /opt/kde/lib /opt/kde/bin /opt/kde/share - -# XFCE -/opt/xfce4/lib -/opt/xfce4/bin -/opt/xfce4/share 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/projectm/PKGBUILD b/community/projectm/PKGBUILD index fa7f74367..9440ce0f6 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,37 +1,40 @@ -# $Id: PKGBUILD 94903 2013-08-01 06:55:29Z bpiotrowski $ +# $Id: PKGBUILD 97763 2013-09-28 21:30:38Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Denis A. Altoe Falqueto <denisfalqueto@gmail.com> pkgbase=projectm -pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test') +pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-jack' 'projectm-qt' 'projectm-test') pkgver=2.1.0 -pkgrel=6 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') url='http://projectm.sourceforge.net/' license=('LGPL') -makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio') +makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack') source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz" 'projectm-test-opengl.patch' 'projectm-install-vera-ttf.patch') sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee' 'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1' '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110') -_projectmdir="projectM-complete-$pkgver-Source" -build() { - cd "$srcdir/projectM-complete-$pkgver-Source" +prepare() { + cd "projectM-complete-$pkgver-Source" + patch -p1 -i "$srcdir/projectm-test-opengl.patch" patch -p1 -i "$srcdir/projectm-install-vera-ttf.patch" - mkdir -p "$srcdir/build" - cd "$srcdir/build" +} + +build() { + cd build cmake \ -Wno-dev \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DINCLUDE-PROJECTM-JACK=ON \ "../projectM-complete-$pkgver-Source" make } @@ -41,7 +44,6 @@ package_projectm() { depends=('ftgl' 'glew' 'libgl') cd "$srcdir/build" - for dirs in src/{NativePresets,libprojectM}; do make -C "$dirs" DESTDIR="$pkgdir" install done @@ -65,6 +67,14 @@ package_projectm-pulseaudio() { make DESTDIR="$pkgdir" install } +package_projectm-jack() { + pkgdesc='ProjectM support for Jack' + depends=('projectm-qt' 'jack') + + cd "$srcdir/build/src/projectM-jack" + make DESTDIR="$pkgdir" install +} + package_projectm-qt() { pkgdesc='Qt bindings for ProjectM' depends=('projectm' 'qt4' 'libgl') diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 78a7aae01..2ab0743cc 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,59 +1,72 @@ -# $Id: PKGBUILD 96186 2013-08-21 12:28:21Z spupykin $ +# $Id: PKGBUILD 97026 2013-09-10 15:54:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Dwayne Bent <dbb.0@liqd.org> +# Maintainer: Dwayne Bent <dbb@dbb.io> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> +# Contributor: Timothée Ravier <tim@siosm.fr> pkgname=prosody -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 -pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." +pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua" arch=('i686' 'x86_64' 'mips64el') url="http://prosody.im/" license=('MIT') -depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' 'openssl') +depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' + 'openssl') optdepends=('lua51-sec: TLS encryption support') install=prosody.install backup=('etc/logrotate.d/prosody' - 'etc/prosody/prosody.cfg.lua') -source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" - 'prosody.logrotated' - 'fix-config.patch' - 'prosody.tmpfile.d' - 'prosody.service') -md5sums=('cf0dd4f3389ab666d2d2b3a43464afc4' - '5b44aee99f1fa9e7f055e067688cafbd' - 'a21d6a6efef8a08ae21109c2aa9c2fc7' - 'e2f5a1df410b05696a30dcb058841084' - 'e74045f27cb60908d535969906781f75') + 'etc/prosody/prosody.cfg.lua') +source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'prosody.logrotated' + 'fix-config.patch' + 'prosody.tmpfile.d' + 'prosody.service') +sha256sums=('f0e5e5fa27aa3ffec326b6c212adf2d86fb438133739d45e1232082ff0fbe06f' + 'SKIP' + '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' + '1b461d860b584c09ba4c16300a245f2580f1d0b74d774ae7567b7aac0f249587' + '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4' + '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b') +sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5' + 'SKIP' + '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' + 'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da' + '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4' + '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 < ../fix-config.patch + find . -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \; +} build() { - cd "$srcdir/prosody-$pkgver" - patch -p1 <$srcdir/fix-config.patch - find . -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \; - ./configure --prefix=/usr --sysconfdir=/etc/prosody \ - --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 - make + cd ${pkgname}-${pkgver} + ./configure --ostype=linux --prefix=/usr --sysconfdir=/etc/prosody \ + --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \ + --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \ + --ldflags="${LDFLAGS} -shared" + make } package() { - cd "$srcdir/prosody-$pkgver" - - make DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" install -C tools/migration + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install -C tools/migration - rm $pkgdir/etc/prosody/certs/* + install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody + install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf + install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service - install -d "$pkgdir/etc/logrotate.d" - install -d "$pkgdir/var/log/prosody" - for i in tools/*.lua; do - install -Dm0644 $i $pkgdir/usr/share/prosody/$i - done + for i in tools/*.lua; do + install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i} + done - install -o root -g root -m 644 "$srcdir/prosody.logrotated" \ - "$pkgdir/etc/logrotate.d/prosody" - - install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir/usr/lib/tmpfiles.d/prosody.conf - install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service + install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING + install -dm 755 "${pkgdir}"/var/log/prosody + rm "${pkgdir}"/etc/prosody/certs/* } + +# vim: ft=sh syn=sh ts=2 sw=2 diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD index 525dc8f3e..00761c7a0 100644 --- a/community/pv/PKGBUILD +++ b/community/pv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84287 2013-02-15 14:40:03Z lfleischer $ +# $Id: PKGBUILD 98158 2013-10-06 19:15:22Z jlichtblau $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=pv -pkgver=1.4.6 +pkgver=1.4.12 pkgrel=1 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml' license=('custom:Artistic 2.0') depends=('glibc') source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2") -md5sums=('d55ff76f5caa83efc23aa527dbb0b191') +md5sums=('605adc0f369496bca92b0656cf86b25e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/python-basemap/PKGBUILD b/community/python-basemap/PKGBUILD index f9345de0e..33e38db5e 100644 --- a/community/python-basemap/PKGBUILD +++ b/community/python-basemap/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 87032 2013-03-26 01:43:08Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 97800 2013-09-29 19:59:55Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Matthias Ellmer <ellmer.matthias@gmail.com> # Contributor: Julien Morin <jmorin@cp.dias.ie> pkgbase=python-basemap pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common') pkgver=1.0.6 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://matplotlib.org/basemap/" license=('custom') diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD index 379a16e6d..d381c2e8a 100644 --- a/community/python-numexpr/PKGBUILD +++ b/community/python-numexpr/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96119 2013-08-20 06:32:53Z lcarlier $ +# $Id: PKGBUILD 96812 2013-09-05 18:53:58Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@lblbox> pkgbase=python-numexpr pkgname=('python2-numexpr' 'python-numexpr') -pkgver=2.1 -pkgrel=2 +pkgver=2.2 +pkgrel=1 pkgdesc="A JIT compiler for Python expressions" url="http://code.google.com/p/numexpr/" arch=('i686' 'x86_64' 'mips64el') license=('MIT') makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy') source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) -md5sums=('8c138e81fb4214d05453da0fc88bf0d5') +md5sums=('1d83b13e69fff897a5bc588b7119506c') build() { cd "$srcdir" diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD new file mode 100644 index 000000000..6ef3cd700 --- /dev/null +++ b/community/python-pillow/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 98021 2013-10-04 01:35:36Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: minder + +pkgbase=python-pillow +pkgname=(python-pillow python2-pillow) +_appname=Pillow +pkgver=2.2.1 +pkgrel=1 +pkgdesc="Python Imaging Library (PIL) fork. Python3 version." +arch=('i686' 'x86_64') +url="http://python-imaging.github.io/" +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip") +md5sums=('d1d20d3db5d1ab312da0951ff061e6bf') + +build() { + cd "$srcdir" + cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" +} + +package_python-pillow() { + depends=('python' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python-pyqt4: for the ImageQt module') + cd "$srcdir/$_appname-$pkgver" + python3 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane + python3 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do + mv "$f" "${f%.py}" + done +} + +package_python2-pillow() { + pkgdesc="Python Imaging Library (PIL) fork. Python2 version." + depends=('python2' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python2-pyqt4: for the ImageQt module') + provides=('python-imaging' 'python2-imaging') + conflicts=('python-imaging' 'python2-imaging') + replaces=('python2-imaging') + cd "$srcdir/${_appname}2-$pkgver" + python2 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane + python2 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do + mv "$f" "${f%.py}2" + done +} + diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index d6fb7d73b..f3481c83d 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 96198 2013-08-21 15:11:15Z 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 +pkgver=2.6.2 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686' 'mips64el') @@ -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=('0397584348e5b9efa678878ef686ea3bb77f9b83e634480033ce67467d43675a') +sha256sums=('091d584f7b5d8de60bf6152d9269ec9a29ae7fa34415862b2f092af393233c4e') build() { cd "$srcdir" diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD index 83bdaefff..ed0fba2c4 100644 --- a/community/python-pyproj/PKGBUILD +++ b/community/python-pyproj/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 87227 2013-03-28 19:33:14Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 97803 2013-09-29 20:15:06Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyproj pkgname=('python-pyproj' 'python2-pyproj') pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python interfaces to PROJ.4 library" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/pyproj" diff --git a/community/python-reportlab/PKGBUILD b/community/python-reportlab/PKGBUILD index 6e44f03d6..7b4873f45 100644 --- a/community/python-reportlab/PKGBUILD +++ b/community/python-reportlab/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78251 2012-10-17 10:27:06Z allan $ +# $Id: PKGBUILD 97429 2013-09-19 20:25:51Z jelle $ # Maintainer: # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgbase=python-reportlab pkgname=python2-reportlab _origname=reportlab -pkgver=2.6 +pkgver=2.7 pkgrel=1 pkgdesc="A proven industry-strength PDF generating solution" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ depends=('python2' 'freetype2') conflicts=('python-reportlab<=2.5-2') replaces=('python-reportlab<=2.5-2') license=('CUSTOM') -source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz) -md5sums=('e5d27a24a2c8456b168913242aa1940f') +source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz) +md5sums=('78300e6fe8a0d020fc16734a3de80cc4') build() { cd $srcdir/${_origname}-$pkgver @@ -33,3 +33,8 @@ package_python2-reportlab() { python2 setup.py install --root=$pkgdir --optimize=1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt } + +check() { + cd ${srcdir}/${_origname}-${pkgver} +# python2 setup.py tests +} diff --git a/community/python-scikit-learn/LICENSE b/community/python-scikit-learn/LICENSE new file mode 100644 index 000000000..9827e0f0c --- /dev/null +++ b/community/python-scikit-learn/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2010–2011, scikit-learn developers +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the <organization> nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/python-scikit-learn/PKGBUILD b/community/python-scikit-learn/PKGBUILD new file mode 100644 index 000000000..ae64bf4d2 --- /dev/null +++ b/community/python-scikit-learn/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 96814 2013-09-05 19:19:46Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> + +pkgbase=python-scikit-learn +pkgname=('python2-scikit-learn' 'python-scikit-learn') +pkgver=0.14.1 +pkgrel=1 +pkgdesc="A set of python modules for machine learning and data mining" +arch=('i686' 'x86_64') +url="http://scikit-learn.sourceforge.net/" +license=('BSD') +makedepends=('python2-scipy' 'python-scipy' 'python2-setuptools' 'python-setuptools') +options=(!emptydirs) + +source=("http://downloads.sourceforge.net/project/scikit-learn/scikit-learn-${pkgver}.tar.gz" + "LICENSE") +md5sums=('790ad23547bb7f428060636628e13491' + '327083d2576cc0aad1b8f10b2bcd2974') + +build() { + cd "$srcdir" + cp -a scikit-learn-$pkgver scikit-learn-py2-$pkgver + + msg "Building Python2" + cd "$srcdir"/scikit-learn-py2-$pkgver + python2 setup.py build + + msg "Building Python3" + cd "$srcdir"/scikit-learn-$pkgver + python setup.py build +} + +package_python2-scikit-learn() { + depends=('python2-scipy') + cd "$srcdir"/scikit-learn-py2-$pkgver + + python2 setup.py install --root="$pkgdir"/ --optimize=1 + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find "${pkgdir}" -name '*.py') + + install -D "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_python-scikit-learn() { + depends=('python-scipy') + cd "$srcdir"/scikit-learn-$pkgver + + python setup.py install --root="$pkgdir"/ --optimize=1 + + install -D "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community/python2-gevent-beta/PKGBUILD b/community/python2-gevent-beta/PKGBUILD index 6d727edbc..820a03cb6 100644 --- a/community/python2-gevent-beta/PKGBUILD +++ b/community/python2-gevent-beta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95610 2013-08-15 01:52:53Z fyan $ +# $Id: PKGBUILD 97219 2013-09-15 11:50:12Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> _pkgbase=gevent pkgname=python2-${_pkgbase}-beta -pkgver=1.0rc2 -pkgrel=4 +pkgver=1.0rc3 +pkgrel=1 pkgdesc="Python networking library based on greenlet and libev - Beta version" arch=('i686' 'x86_64') url="http://www.gevent.org/" @@ -19,9 +19,6 @@ package() { cd "$srcdir/${_pkgbase}-${pkgver}" msg "Starting make..." - # Workaround - unset MAKEFLAGS - LIBEV_EMBED=1 \ CARES_EMBED=1 \ CYTHON=cython2 \ @@ -33,4 +30,4 @@ package() { install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -md5sums=('e1bce8e15c7ebb08788978c0f4860f9d') +sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index c22bd0225..916069472 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 96151 2013-08-20 11:37:41Z spupykin $ +# $Id: PKGBUILD 97523 2013-09-23 16:15:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=3.2.0.0 -pkgrel=2 +pkgver=3.3.1.0 +pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" @@ -16,7 +16,7 @@ makedepends=('glu') options=(libtool) source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('6dd9c47742a0193a739d390e81ca67d0' +md5sums=('e6e469482b40515980c416e61482abc2' '35100eaedbdf6625f6e6a09b177854cd') prepare() { @@ -64,6 +64,7 @@ package() { install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop install -dm0755 $pkgdir/usr/bin - echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH exec ./qcad-bin' >$pkgdir/usr/bin/qcad + echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad + chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch b/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch deleted file mode 100644 index a0c7e6c4d..000000000 --- a/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 50b7344bc2cc941a43b3adfaebdc96dd1935e747 Mon Sep 17 00:00:00 2001 -From: Jonathan Ross Rogers <jrogers@socialserve.com> -Date: Mon, 9 May 2011 18:16:29 -0400 -Subject: [PATCH] Cause qgit to use "git config" everywhere. - -Whenever starting up qgit, it pops up a dialog showing that git -complained about the obsolete command "repo-config". This patch -replaces remaining calls to "git repo-config" with "git config". - -Signed-off-by: Jonathan Ross Rogers <jrogers@socialserve.com> ---- - src/git.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/git.cpp b/src/git.cpp -index 50e6dd3..8e9365c 100644 ---- a/src/git.cpp -+++ b/src/git.cpp -@@ -427,7 +427,7 @@ void Git::setTextCodec(QTextCodec* tc) { - if (name == "Big5-HKSCS") - name = "Big5"; - -- run("git repo-config i18n.commitencoding " + name); -+ run("git config i18n.commitencoding " + name); - } - - QTextCodec* Git::getTextCodec(bool* isGitArchive) { -@@ -437,7 +437,7 @@ QTextCodec* Git::getTextCodec(bool* isGitArchive) { - return NULL; - - QString runOutput; -- if (!run("git repo-config --get i18n.commitencoding", &runOutput)) -+ if (!run("git config --get i18n.commitencoding", &runOutput)) - return NULL; - - if (runOutput.isEmpty()) // git docs says default is utf-8 --- -1.7.5 - diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD index 84f9a7da4..b7d170b3d 100644 --- a/community/qgit/PKGBUILD +++ b/community/qgit/PKGBUILD @@ -1,36 +1,33 @@ -# $Id: PKGBUILD 85388 2013-03-01 10:37:43Z andrea $ +# $Id: PKGBUILD 97768 2013-09-29 11:31:51Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=qgit -pkgver=2.3 -pkgrel=4 +pkgver=2.5 +pkgrel=1 pkgdesc="A GIT GUI viewer built on Qt/C++" -url="http://digilander.libero.it/mcostalba/" +url='http://libre.tibirna.org/projects/qgit/wiki/QGit' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('qt4' 'git') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'qgit.desktop' 'qgit.png' - '0001-Cause-qgit-to-use-git-config-everywhere.patch') -md5sums=('1f6cd60cc1b92973718b108d542e3270' - 'ecb8b35e17163a7ec6893ffa71445c40' - '85138f44d577b03dfc738d3f27e04992' - '8b8eda62d6f4d04ed57f87d4dbda9fa9') +source=("http://libre.tibirna.org/attachments/download/9/${pkgname}-${pkgver}.tar.gz" + 'qgit.desktop' 'qgit.png') build() { - cd ${srcdir}/${pkgname} - # patch taken from http://sourceforge.net/tracker/?func=detail&aid=3299672&group_id=139897&atid=744829 - patch -Np1 < ${srcdir}/0001-Cause-qgit-to-use-git-config-everywhere.patch - qmake qgit.pro + cd ${srcdir}/redivivus + qmake-qt4 qgit.pro make } package() { - cd ${srcdir}/${pkgname} + cd ${srcdir}/redivivus install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop install -Dm644 ${srcdir}/qgit.png ${pkgdir}/usr/share/pixmaps/qgit.png } + +md5sums=('0e70fc4468b060ab042933497f6a6f3c' + 'ecb8b35e17163a7ec6893ffa71445c40' + '85138f44d577b03dfc738d3f27e04992') diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index d5b316af4..39b925f01 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96652 2013-09-02 19:19:45Z jlichtblau $ +# $Id: PKGBUILD 97737 2013-09-28 07:46:07Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('156ae80bda0e7004f63867f0880b8737fb4e175388fc9edf6d541f2901686737' +sha256sums=('d6412ae6b34c2ec8a5f929f7aa8b4d1a660f913f16ea52096f93b42d4f271daf' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { @@ -40,5 +40,3 @@ package(){ install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } -sha256sums=('dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 01b841a7d..4630d2591 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.7.4-1 + 2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.7.3-1 diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 7a6b39148..2872d3f50 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 94904 2013-08-01 06:55:31Z bpiotrowski $ +#$Id: PKGBUILD 98072 2013-10-05 17:15:55Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.7.1 -pkgrel=2 +pkgver=0.7.3 +pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') url="http://qmmp.ylsoftware.com/" @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('5e86c3c783bffa384d4c5c8731ebaff7a1589f56b6e0ad69ec6f82a8da160671') +sha256sums=('57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index cec0d2b97..d279bfb82 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,9 @@ +2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.3-1 + +2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.2-1 + 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.7.1-1 diff --git a/community/qtcurve-kde3/PKGBUILD b/community/qtcurve-kde3/PKGBUILD deleted file mode 100644 index f5e057cfb..000000000 --- a/community/qtcurve-kde3/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 65718 2012-02-22 11:48:53Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=qtcurve-kde3 -pkgver=1.8.5 -pkgrel=3 -arch=('i686' 'x86_64') -groups=('qtcurve') -license=('GPL') -pkgdesc='A configurable set of widget styles for KDE and Gtk' -url='http://www.kde-look.org/content/show.php?content=40492' -depends=('kdelibs3') -makedepends=('cmake' 'kdelibs') -source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2" - 'kdeglobals' - 'bypass-kde-config.patch') -md5sums=('d9cca99526079782f9fc7bd7ba432582' - '05a6294c7f0e239e698e7e5224fc8e7f' - 'e1ab2c0995e412b2cbfe804fba75517e') - -build() { - . /etc/profile.d/qt3.sh - . /etc/profile.d/kde3.sh - - cd ${srcdir}/QtCurve-KDE3-${pkgver} - # Bypass KDE prefix detection by kde4-config, see: - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667 - patch -Np1 -i ${srcdir}/bypass-kde-config.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../QtCurve-KDE3-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kde - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - - # remove kcontrol plugins - rm -f $pkgdir/opt/kde/lib/kde3/kstyle_qtcurve_config.* - - # set default theme - install -D -m644 $srcdir/kdeglobals $pkgdir/opt/kde/share/config/kdeglobals -} diff --git a/community/qtcurve-kde3/bypass-kde-config.patch b/community/qtcurve-kde3/bypass-kde-config.patch deleted file mode 100644 index 113fb93b8..000000000 --- a/community/qtcurve-kde3/bypass-kde-config.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- QtCurve-KDE3-1.6.0/CMakeLists.txt~ 2010-09-14 16:19:36.543333337 +0200 -+++ QtCurve-KDE3-1.6.0/CMakeLists.txt 2010-09-14 16:22:18.160000003 +0200 -@@ -44,6 +44,12 @@ - endif (QT_PLUGINS_DIR MATCHES NOTFOUND) - endif (NOT QTC_QT_ONLY) - -+# Comment the kde3/kde4 prefix detection as a whole as it wants to run -+# kde-config and kde4-config, which in turn can create stuff in ~/.kde. -+# This cannot work on read-only homes. -+# So, the "fallback" prefixes ("/usr" for both) will be used. -+if (BRAINDEAD_DETECTION) -+ - if (NOT QTC_QT_ONLY) - exec_program(kde-config - ARGS --prefix --expandvars -@@ -71,6 +77,8 @@ - OUTPUT_VARIABLE KDE4PREFIX) - endif(KDE4_KDECONFIG_EXECUTABLE) - -+endif (BRAINDEAD_DETECTION) -+ - if(NOT KDE4PREFIX) - set(KDE4PREFIX ${KDE3PREFIX}) - endif(NOT KDE4PREFIX) diff --git a/community/qtcurve-kde3/kdeglobals b/community/qtcurve-kde3/kdeglobals deleted file mode 100644 index ffbe26579..000000000 --- a/community/qtcurve-kde3/kdeglobals +++ /dev/null @@ -1,2 +0,0 @@ -[General] -widgetStyle=qtcurve diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD new file mode 100644 index 000000000..815c9d945 --- /dev/null +++ b/community/qtcurve/PKGBUILD @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qtcurve +pkgname=('qtcurve-qt4' 'qtcurve-kde4') +pkgver=1.8.15 +pkgrel=2 +arch=('i686' 'x86_64') +groups=('qtcurve') +license=('GPL') +pkgdesc='A configurable set of widget styles for KDE and Gtk' +url='https://github.com/QtCurve/qtcurve-qt4' +makedepends=('cmake' 'automoc4' 'kdebase-workspace') +source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") +md5sums=('ee0b35fe428807b0dc2b0c57e5eb4f38') + +build() { + cd "qtcurve-qt4-$pkgver" + + sed -i "s/QApplication/QCoreApplication/g" tools/gen_image_header_qt4.cpp + + mkdir build-{qt,kde}4 + + cd build-qt4 + cmake .. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DQTC_QT4_ENABLE_KDE=false + make + + cd ../build-kde4 + cmake .. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_qtcurve-qt4() { + depends=('qt4') + cd "qtcurve-qt4-$pkgver/build-qt4/qt4/style" + make DESTDIR="$pkgdir" install +} + +package_qtcurve-kde4() { + depends=('kdebase-workspace') + cd "qtcurve-qt4-$pkgver/build-kde4" + make DESTDIR="$pkgdir" install +} diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 6aa010178..e45e1a451 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 70446 2012-05-07 08:29:18Z lfleischer $ +# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.4.2 -pkgrel=1 +pkgver=0.9.3.1 +pkgrel=2 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') url='http://quvi.sourceforge.net/' -license=('LGPL') +license=('AGPL3') depends=('libquvi') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('05f1e2c711d1ca9d4bc68b8de553941d' - '523b17d5a9024c8b0a1636917d79e792') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +md5sums=('24b3173f8662a6bb33d9a8a58662764f' + 'SKIP') build() { cd "${pkgname}-${pkgver}" diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 6dd3df121..52d45b620 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90532 2013-05-13 00:28:44Z seblu $ +# $Id: PKGBUILD 98000 2013-10-02 23:02:19Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.9.3 -pkgrel=2 +pkgver=1.9.5 +pkgrel=1 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el') backup=('etc/radvd.conf') source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.service") -sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d' +sha1sums=('0e65206803ab2bcb4e6012a0d11ecdad4f64ce9c' '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc') build() { cd ${pkgname}-${pkgver} diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD deleted file mode 100644 index b6a8bed1d..000000000 --- a/community/raptor1/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 72968 2012-06-25 18:19:15Z andrea $ -# Maintainer: -# Contributor: Andreas Radke <andyrtr at archlinux.org> -# Contributor: eric <eric@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=raptor1 -pkgver=1.4.21 -pkgrel=4.1 -pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility" -arch=('i686' 'x86_64' 'mips64el') -url="http://librdf.org/raptor" -depends=('curl' 'libxslt') -license=('LGPL') -options=('!libtool' '!docs') -source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz" - 'curl.patch') -md5sums=('992061488af7a9e2d933df6b694bb876' - '8fe28761645d6a6607b25c94f9ada964') - -build() { - cd "${srcdir}"/raptor-${pkgver} - patch -p1 -i "${srcdir}"/curl.patch - - ./configure --prefix=/usr \ - --disable-static - make -} - -package() { - cd "${srcdir}/raptor-${pkgver}" - make prefix="${pkgdir}"/usr install - - mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1 - rm -f "${pkgdir}"/usr/share/man/man1/rapper.1 -} diff --git a/community/raptor1/curl.patch b/community/raptor1/curl.patch deleted file mode 100644 index 590140536..000000000 --- a/community/raptor1/curl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h ---- raptor-1.4.21/src/raptor_internal.h.curl 2010-01-29 17:54:42.000000000 -0600 -+++ raptor-1.4.21/src/raptor_internal.h 2011-07-31 11:02:44.182465296 -0500 -@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch - - #ifdef RAPTOR_WWW_LIBCURL - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - #endif - diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index 5695a8399..6a5e9b989 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81067 2012-12-11 14:37:23Z allan $ +# $Id: PKGBUILD 98046 2013-10-04 15:27:57Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,13 +6,13 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=8 +pkgrel=9 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://rawstudio.org/" -depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' - 'raptor1' 'lcms' 'gtk2') +depends=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite' + 'libgphoto2' 'gtk-engines' 'desktop-file-utils') install=${pkgname}.install options=('!libtool') source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz @@ -20,11 +20,15 @@ source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' '2f8b7acbe10d8096ce613cbea7986fd3') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 <$srcdir/libpng15.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 73c967da2..0d25aaaae 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93674 2013-07-08 11:20:28Z spupykin $ +# $Id: PKGBUILD 96952 2013-09-09 09:19:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -16,7 +16,7 @@ depends=('xapian-core>=1.0.15-1' 'qt4' 'openssl' 'hicolor-icon-theme' 'qtwebkit' makedepends=('python2') optdepends=('libxslt: for XML based formats (fb2,etc)' 'unzip: for the OpenOffice.org documents' - 'xpdf: for pdf' + 'poppler: for pdf' 'pstotext: for postscipt' 'antiword: for msword' 'catdoc: for ms excel and powerpoint' diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD index c7a493fb1..f9bc87caf 100644 --- a/community/recorditnow/PKGBUILD +++ b/community/recorditnow/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93279 2013-07-01 05:44:50Z fyan $ +# $Id: PKGBUILD 97147 2013-09-14 07:29:00Z bpiotrowski $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yichao Yu <yyc1992@gmail.com> # Contributor: Weng Xuetian <wengxt@gmail.com> @@ -7,26 +7,32 @@ pkgname=recorditnow pkgver=0.8.1 -pkgrel=5 +pkgrel=7 pkgdesc="A plugin based desktop recorder for KDE SC 4" arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/RecordItNow?content=114610" license=('GPL') depends=('kdebase-runtime' 'ffmpeg' 'xdg-utils') -makedepends=('cmake' 'automoc4' 'recordmydesktop') +makedepends=('cmake' 'automoc4' 'recordmydesktop' 'mencoder') optdepends=('mencoder: for mencoder encoder plugin' 'recordmydesktop') provides=('joschy') -conflicts=('joschy-git') install=recorditnow.install source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2" - "cmake.patch") + "cmake.patch" + "ffmpeg.patch") md5sums=('6619b4048545adbab1d13a790189e80f' - '74ea0ababc2291e2a62e5d045c62616a') + '74ea0ababc2291e2a62e5d045c62616a' + '867f30a0cba692c7dad56195fd64b092') + +prepare() { + cd "${srcdir}/$pkgname-$pkgver" + patch -p0 -i "${srcdir}/cmake.patch" + patch -p0 -i "${srcdir}/ffmpeg.patch" +} build() { cd "${srcdir}/$pkgname-$pkgver" - patch -i "${srcdir}/cmake.patch" -p0 mkdir -p build cd build diff --git a/community/recorditnow/ffmpeg.patch b/community/recorditnow/ffmpeg.patch new file mode 100644 index 000000000..6247cbafe --- /dev/null +++ b/community/recorditnow/ffmpeg.patch @@ -0,0 +1,16 @@ +--- src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp.orig 2010-03-04 17:39:20.000000000 +0100 ++++ src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp 2013-09-10 18:17:26.193834681 +0200 +@@ -120,11 +120,10 @@ + videoQuality = 2; + } + +- args << "-f" << "x11grab" << "-qscale" << QString::number(videoQuality) << "-r" << QString::number(d.fps); ++ args << "-f" << "x11grab" << "-r" << QString::number(d.fps); + args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height()); + args << "-i" << DisplayString(QX11Info::display())+QString("+%1,%2").arg(geometry.x()).arg(geometry.y()); +- args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height()); +- args << m_tmpFile; ++ args << "-qscale" << QString::number(videoQuality) << m_tmpFile; + //ffmpeg -f x11grab -qscale 2 -r 20 -s 1440x900 -i :0.0 -s 1440x900 x11grab.avi + } else { + diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index d4de2b60b..2d16fcbbd 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96458 2013-08-29 15:11:24Z spupykin $ +# $Id: PKGBUILD 97559 2013-09-24 10:30:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis pkgver=2.6.16 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -27,12 +27,15 @@ md5sums=('ca1b81bd56fe0c5e2c8ec443a95c908d' prepare() { cd "$srcdir/${pkgname}-${pkgver}" sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf + sed -i 's|daemonize no|daemonize yes|' redis.conf + sed -i 's|dir \./|dir /var/lib/redis/|' redis.conf sed -i 's|pidfile .*|pidfile /run/redis/redis.pid|' redis.conf + sed -i 's|logfile stdout|logfile /var/log/redis.log|' redis.conf } build() { cd "$srcdir/${pkgname}-${pkgver}" - make MALLOC=libc + make } package() { @@ -40,10 +43,9 @@ package() { mkdir -p $pkgdir/usr/bin make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install - install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" + install -Dm755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" - sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf - install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf" + install -Dm644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf" install -Dm644 "$srcdir/redis.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/redis.conf" } diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index e3083daf9..5348ccc9f 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 93676 2013-07-08 11:20:55Z spupykin $ +# $Id: PKGBUILD 97525 2013-09-23 16:15:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.4.2 +pkgver=7.4.4 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -22,7 +22,7 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('52ba87ddce153625ec4e4a2e60c4ec0e' +md5sums=('ebcc010a6205c28eb505c0fe862f32c6' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD index a1a2f6071..0f43dd6ab 100755 --- a/community/ruby-iconv/PKGBUILD +++ b/community/ruby-iconv/PKGBUILD @@ -1,24 +1,40 @@ -# $Id: PKGBUILD 89242 2013-04-28 10:01:07Z alucryd $ -# Maintainer: Alucryd <alucryd at gmail dot com> +# $Id: PKGBUILD 97686 2013-09-27 08:51:25Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ruby-iconv pkgver=1.0.3 -pkgrel=2 +pkgrel=4 pkgdesc="Wrapper library for iconv" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/nurse/iconv" -license=('GPL3') +license=('BSD') depends=('ruby') -makedepends=('rubygems') -options=('!emptydirs') -source=("https://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") +source=("http://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") +noextract=("${pkgname#*-}-${pkgver}.gem") sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da') +prepare() { + gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem +} + package() { - cd "${srcdir}" + cd gems/${pkgname#*-}-${pkgver} + + local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')" + + install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby} + mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver} + +# Native extension + install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/$CARCH-linux + mv "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/{iconv,$CARCH-linux}/iconv.so + +# Gem compatibility + mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/ - local _gemdir="$(ruby -rubygems -e 'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "${pkgdir}"${_gemdir} ${pkgname#*-}-${pkgver}.gem +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}BSDL } # vim: ts=2 sw=2 et: diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD index c9530fd58..b6831ab5d 100644 --- a/community/rust/PKGBUILD +++ b/community/rust/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 93472 2013-07-04 02:25:38Z thestinger $ +# $Id: PKGBUILD 97658 2013-09-27 01:45:47Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> pkgname=rust -pkgver=0.7 +pkgver=0.8 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A safe, concurrent, practical language' url='http://www.rust-lang.org/' license=('MIT' 'Apache') depends=(gcc shared-mime-info) -makedepends=(libffi perl python2 curl chrpath emacs-nox) -optdepends=('haskell-pandoc: documentation generator (rustdoc)') -source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz") -sha256sums=('0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0') +makedepends=(libffi perl python2 curl chrpath) +source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz" + "http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz.asc") +sha256sums=('42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182' + 'SKIP') install=rust.install build() { @@ -51,12 +52,13 @@ package() { install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname" cd src/etc/emacs - make - mkdir -p "$pkgdir/usr/share/emacs/site-lisp/" - install -Dm644 cm-mode.el{,c} rust-mode.el{,c} "$pkgdir/usr/share/emacs/site-lisp/" + install -Dm644 rust-mode.el "$pkgdir/usr/share/emacs/site-lisp/rust-mode.el" cd "$pkgdir/usr" # https://github.com/mozilla/rust/issues/5219 chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so + + cd lib + ln -sf rustc/$CARCH-unknown-linux-gnu/lib/* . } diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index c4ddb2d10..3046bc23a 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93777 2013-07-10 07:27:17Z bpiotrowski $ +# $Id: PKGBUILD 96935 2013-09-09 01:33:22Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.10 +pkgver=5.11 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -103,6 +103,9 @@ package() { } # vim :set ts=2 sw=2 et: -md5sums=('bfca3afc9030e63c7e7200287ee0135e' +md5sums=('ceeccaa83f45a4fb674acf10f76543d8' + 'b82f94383829eee26648feb977e2d89b' + '985da1c1d1dcdc3ea9aa73035cb7996b') +md5sums=('ceeccaa83f45a4fb674acf10f76543d8' 'b82f94383829eee26648feb977e2d89b' '985da1c1d1dcdc3ea9aa73035cb7996b') diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD deleted file mode 100644 index 6f6fc16c1..000000000 --- a/community/seahorse-nautilus/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 89362 2013-04-28 20:39:50Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=seahorse-nautilus -pkgver=3.8.0 -pkgrel=2 -pkgdesc="PGP encryption and signing for nautilus" -arch=('i686' 'x86_64' 'mips64el') -url="http://git.gnome.org/browse/seahorse-nautilus/" -license=('GPL') -depends=('libcryptui' 'gcr' 'nautilus') -makedepends=('intltool') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - glib236.patch) -sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863' - '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Fix compatibility with glib 2.36 - patch -Np1 -i "$srcdir/glib236.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/seahorse-nautilus/glib236.patch b/community/seahorse-nautilus/glib236.patch deleted file mode 100644 index d0ab03046..000000000 --- a/community/seahorse-nautilus/glib236.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c ---- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c 2011-10-24 09:25:37.000000000 +0200 -+++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c 2013-04-28 22:26:54.483276592 +0200 -@@ -226,8 +226,6 @@ - progress_fd = -1; - return; - } -- -- g_child_watch_add (progress_pid, progress_cancel, NULL); - } - - void diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD deleted file mode 100644 index dd99e1c0d..000000000 --- a/community/sensors-applet/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 89360 2013-04-28 20:21:26Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=sensors-applet -pkgver=3.0.0 -pkgrel=3 -pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings" -arch=('i686' 'x86_64' 'mips64el') -url="http://sensors-applet.sourceforge.net/" -license=('GPL') -depends=('gnome-panel' 'libatasmart' 'lm_sensors' 'xdg-utils') -makedepends=('intltool' 'gnome-doc-utils') -optdepends=('hddtemp: get HDD temperatures' - 'udisks: get HDD temperatures') -options=('!libtool') -install=$pkgname.install -source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz - gtk38.patch) -md5sums=('425078fc1ff5a98af1547e039002a73f' - '7289cb0acd5c05daf824df6a90967240') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Enable reprecations - sed -i '/CFLAGS+=/d' configure{,.ac} - - # Fix compatibility with GTK+ 3.8 - patch -Np1 -i "$srcdir/gtk38.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static --disable-scrollkeeper --with-nvidia=no - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/sensors-applet/gtk38.patch b/community/sensors-applet/gtk38.patch deleted file mode 100644 index 530d756a3..000000000 --- a/community/sensors-applet/gtk38.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c ---- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c 2011-11-03 12:33:36.000000000 +0100 -+++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c 2013-04-28 20:08:31.002620583 +0200 -@@ -641,122 +641,8 @@ - /* get the first active sensor */ - first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data; - -- switch (display_mode) { -- case DISPLAY_VALUE: -- gtk_widget_size_request(GTK_WIDGET(first_sensor->value), -- &req); -- value_width = req.width + COLUMN_SPACING; -- value_height = req.height + ROW_SPACING; -+ num_sensors_per_group = 1; - -- /* make sure all widths and heights are non zero, -- * otherwise will get a divide by zero exception below -- * - is a non critical error since can happen when -- * elements first added to list, so simply return - is -- * not a programming error */ -- if (value_width == 0 && value_height == 0) { -- return; -- } -- -- num_sensors_per_group = (sensors_applet->size / -- (horizontal ? value_height : -- value_width)); -- break; -- -- case DISPLAY_LABEL_WITH_VALUE: -- /* even though we end up packing the event boxes into the -- * panel, these dont give back request sizes, so need to ask -- * widgets directly */ -- gtk_widget_size_request(GTK_WIDGET(first_sensor->value), -- &req); -- value_width = req.width + COLUMN_SPACING; -- value_height = req.height + ROW_SPACING; -- -- gtk_widget_size_request(GTK_WIDGET(first_sensor->label), -- &req); -- label_width = req.width + COLUMN_SPACING; -- label_height = req.height + ROW_SPACING; -- -- /* make sure all widths and heights are non zero, otherwise -- * will get a divide by zero exception below -- * - is a non critical error since can happen when -- * elements first added to list, so simply return - is -- * not a programming error */ -- if (!(label_width && label_height && -- value_width && value_height)) { -- return; -- } -- -- switch (layout_mode) { -- case VALUE_BESIDE_LABEL: -- num_sensors_per_group = (sensors_applet->size / -- (horizontal ? MAX(label_height, value_height) : -- (label_width + value_width))); -- break; -- case VALUE_BELOW_LABEL: -- num_sensors_per_group = (sensors_applet->size / -- (horizontal ? (label_height + value_height) : -- MAX(label_width, value_width))); -- -- -- break; -- } -- break; -- -- case DISPLAY_ICON_WITH_VALUE: -- gtk_widget_size_request(GTK_WIDGET(first_sensor->value), -- &req); -- value_width = req.width + COLUMN_SPACING; -- value_height = req.height + ROW_SPACING; -- -- gtk_widget_size_request(GTK_WIDGET(first_sensor->icon), -- &req); -- icon_width = req.width + COLUMN_SPACING; -- icon_height = req.height + ROW_SPACING; -- -- //watch out if num_sensors_per_group is correctly computed -- //while icon_height is 0 -- if (!(icon_width && -- value_width && value_height)) { -- return; -- } -- -- -- switch (layout_mode) { -- case VALUE_BESIDE_LABEL: -- num_sensors_per_group = (sensors_applet->size / -- (horizontal ? MAX(icon_height, value_height) : -- (icon_width + value_width))); -- break; -- case VALUE_BELOW_LABEL: -- num_sensors_per_group = (sensors_applet->size / -- (horizontal ? (icon_height + value_height) : -- MAX(icon_width, value_width))); -- -- -- break; -- } -- break; -- -- case DISPLAY_ICON: -- gtk_widget_size_request(GTK_WIDGET(first_sensor->icon), -- &req); -- icon_width = req.width + COLUMN_SPACING; -- icon_height = req.height + ROW_SPACING; -- if (!(icon_width && icon_height)) { -- return; -- } -- -- num_sensors_per_group = (sensors_applet->size / -- (horizontal ? icon_height : -- icon_width)); -- break; -- -- case DISPLAY_GRAPH: -- /* only show graphs in a line like System Monitor -- * applet */ -- num_sensors_per_group = 1; -- break; -- } - /* ensure always atleast 1 sensor per group */ - if (num_sensors_per_group < 1) { - /* force a better layout */ diff --git a/community/sensors-applet/sensors-applet.install b/community/sensors-applet/sensors-applet.install deleted file mode 100644 index a23a623cc..000000000 --- a/community/sensors-applet/sensors-applet.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD index da73f52d4..ad4ccf6ec 100644 --- a/community/shapelib/PKGBUILD +++ b/community/shapelib/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 93041 2013-06-23 03:50:51Z foutrelis $ -# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# $Id: PKGBUILD 97796 2013-09-29 19:27:30Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Bob Finch <w9ya@arrl.net> pkgname=shapelib pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='simple C API for reading and writing ESRI Shapefiles' arch=('i686' 'x86_64' 'mips64el') url='http://shapelib.maptools.org/' license=('LGPL' 'MIT') options=('!libtool') -source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz" - "LICENSE") +source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz + LICENSE) sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f' '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789') diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 7d8805616..a9ce6c61e 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,39 +1,26 @@ -# $Id: PKGBUILD 96421 2013-08-28 11:35:15Z spupykin $ +# $Id: PKGBUILD 98032 2013-10-04 09:55:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.14.1 -pkgrel=5 +pkgver=0.15.0 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('libgee06' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' +depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2') makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install -source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz" - "no-libexec.patch" - "libraw-0.15.2.patch" - "FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff") -md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' - 'b4124e022c98b4382530e6fbcef965e2' - '3ad21364f82229122f48452f5c74dfde' - '9f9690f4b860f52ffd44f8ab6d4fd3b5') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/no-libexec.patch - patch -Rp1 <$srcdir/libraw-0.15.2.patch - patch -p1 <$srcdir/FS35899.patch -} +source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz") +md5sums=('8b33dd5df51f49e7f4f451b431d7c133') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --libexec=/usr/lib/shotwell \ --disable-schemas-compile \ --disable-desktop-update \ --disable-icon-update diff --git a/community/shotwell/libraw-0.15.2.patch b/community/shotwell/libraw-0.15.2.patch deleted file mode 100644 index 248c5f236..000000000 --- a/community/shotwell/libraw-0.15.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -wbBur shotwell-0.14.1/src/photos/GRaw.vala shotwell-0.14.1/src/photos/GRaw.vala ---- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/src/photos/GRaw.vala 2013-06-17 16:26:12.247179310 +0400 -+++ shotwell-0.14.1/src/photos/GRaw.vala 2013-04-03 04:54:23.000000000 +0400 -@@ -168,7 +168,7 @@ - } - - public void document_mode_processing() throws Exception { -- throw_exception("document_mode_processing", 0); -+ throw_exception("document_mode_processing", proc.document_mode_processing()); - } - - public unowned LibRaw.ImageOther get_image_other() { -@@ -244,7 +244,7 @@ - // threshold - output_params->half_size = half_size; - // four_color_rgb --// output_params->document_mode = GRaw.DocMode.STANDARD; -+ output_params->document_mode = GRaw.DocMode.STANDARD; - output_params->highlight = GRaw.HighlightMode.CLIP; - output_params->use_auto_wb = true; - output_params->use_camera_wb = true; -diff -wbBur shotwell-0.14.1/vapi/libraw.vapi shotwell-0.14.1/vapi/libraw.vapi ---- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/vapi/libraw.vapi 2013-06-17 16:25:23.623846536 +0400 -+++ shotwell-0.14.1/vapi/libraw.vapi 2013-04-03 04:54:23.000000000 +0400 -@@ -184,6 +184,8 @@ - public Processor(Options flags = Options.NONE); - - public Result adjust_sizes_info_only(); -+ [CCode (cname="libraw_dcraw_document_mode_processing")] -+ public Result document_mode_processing(); - public unowned ImageOther get_image_other() { return other; } - public unowned ImageParams get_image_params() { return idata; } - public Progress get_progress_flags() { return progress_flags; } diff --git a/community/shotwell/no-libexec.patch b/community/shotwell/no-libexec.patch deleted file mode 100644 index fe8960719..000000000 --- a/community/shotwell/no-libexec.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur shotwell-0.13.1.orig/Makefile shotwell-0.13.1/Makefile ---- shotwell-0.13.1.orig/Makefile 2012-10-05 20:07:37.000000000 +0200 -+++ shotwell-0.13.1/Makefile 2012-10-31 22:27:30.382869896 +0100 -@@ -558,8 +558,8 @@ - mkdir -p $(DESTDIR)$(PREFIX)/bin - $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin - $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin -- mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell -- $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell -+ mkdir -p $(DESTDIR)$(PREFIX)/lib/shotwell -+ $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/lib/shotwell - mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons - $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons - mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps -diff -Naur shotwell-0.13.1.orig/src/AppDirs.vala shotwell-0.13.1/src/AppDirs.vala ---- shotwell-0.13.1.orig/src/AppDirs.vala 2012-10-05 19:56:07.000000000 +0200 -+++ shotwell-0.13.1/src/AppDirs.vala 2012-10-31 22:28:17.634388872 +0100 -@@ -109,7 +109,7 @@ - // not installed yet - use wherever we were run from - libexec_dir = get_exec_dir(); - } else { -- libexec_dir = File.new_for_path(Resources.PREFIX + "/libexec/shotwell"); -+ libexec_dir = File.new_for_path(Resources.PREFIX + "/lib/shotwell"); - } - } - diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index edc6ace43..5f42d1094 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 95093 2013-08-05 14:00:41Z bluewind $ +# $Id: PKGBUILD 97337 2013-09-18 09:31:58Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=siege -pkgver=3.0.2 +pkgver=3.0.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -29,4 +29,4 @@ package() { sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('116bcedf8a6663c1d42ce958e2cdd3ca') +md5sums=('ea4180f0b02b99d0f43cf676a697c999') diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 972735efd..ecdfdff9e 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94050 2013-07-13 12:37:15Z svenstaro $ +# $Id: PKGBUILD 97088 2013-09-12 10:47:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.7.2 -pkgrel=2 +pkgver=0.7.3 +pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" @@ -13,7 +13,7 @@ depends=('qt5-webkit' 'boost-libs') makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('540745983db57a2150cc2f4057455b19') +md5sums=('13630c59bd85e91b96e312b4d39e5087') build() { cd "${srcdir}" diff --git a/community/signon-keyring-extension/PKGBUILD b/community/signon-keyring-extension/PKGBUILD deleted file mode 100644 index 7a7c1c182..000000000 --- a/community/signon-keyring-extension/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 79491 2012-11-06 04:11:27Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=signon-keyring-extension -_pkgname=keyring -pkgver=0.4 -pkgrel=1 -pkgdesc="GNOME keyring extension for signond" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/online-accounts-keyring-extension" -license=('LGPL') -depends=('signon' 'libgnome-keyring') -source=(https://launchpad.net/online-accounts-keyring-extension/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2) -md5sums=('4bbe5840cf0d5cfd142ba5ef262a38ed') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - # Do not install tests - echo 'INSTALLS =' >>tests/tests.pro - - qmake PREFIX=/usr LIBDIR=/usr/lib - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - make INSTALL_ROOT="$pkgdir" install -} diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD deleted file mode 100644 index 9165da106..000000000 --- a/community/signon-plugin-oauth2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 93075 2013-06-23 22:20:48Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=signon-plugin-oauth2 -_pkgname=signon-oauth2 -pkgver=0.18 -pkgrel=1 -pkgdesc="OAuth 2 plugin for signon" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/accounts-sso/" -license=('LGPL') -depends=('signon-ui' 'qjson') -makedepends=('signon') -source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('4b7aabd69a67814b19447215b6466a93523d5dce') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - sed -i '/-Werror/d' common-project-config.pri - - # Do not install tests and example - echo 'INSTALLS =' >>tests/tests.pro - echo 'INSTALLS =' >>example/example.pro - - qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - make INSTALL_ROOT="$pkgdir" install -} diff --git a/community/signon-ui/Makefile b/community/signon-ui/Makefile deleted file mode 100644 index 3ede78507..000000000 --- a/community/signon-ui/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Add here the language codes for the translated .po files: -LINGUAS = - -I18N_DOMAIN = signon-ui - -PO_FILES = $(addsuffix .po, $(LINGUAS)) -MO_FILES = $(addsuffix .mo, $(LINGUAS)) - -DEL_FILE = rm -f -INSTALL = /usr/bin/install -c -m 644 -MKDIR = mkdir -p - -all: $(MO_FILES) - -install: all - for lang in $(LINGUAS); do \ - dir=$(INSTALL_ROOT)/usr/share/locale/$$lang/LC_MESSAGES; \ - $(MKDIR) $$dir; \ - $(INSTALL) $$lang.mo $$dir/$(I18N_DOMAIN).mo; \ - done - -%.mo: %.po - msgfmt -o "$@" "$<" - -clean: - -$(DEL_FILE) $(MO_FILES) - -distclean: clean - -check: all - diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD deleted file mode 100644 index 7be5dfc66..000000000 --- a/community/signon-ui/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 92692 2013-06-12 05:09:15Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=signon-ui -pkgver=0.15 -pkgrel=1 -pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/online-accounts-signon-ui" -license=('GPL') -depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify') -source=(https://launchpad.net/online-accounts-signon-ui/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2) -md5sums=('67ac8ce4cc85b69ec6ff67ae892fda90') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Do not install tests - echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro - echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro - - qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make INSTALL_ROOT="$pkgdir" install -} diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index af1ac68ad..c4d0840d1 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96589 2013-09-02 00:00:14Z bgyorgy $ +# $Id: PKGBUILD 96925 2013-09-08 17:54:00Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.53 +pkgver=8.54 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('7148cf6cac0d5e56c5b697836f18aeb8cfce3734' +sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index af8420930..00b0628cf 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $ +# $Id: PKGBUILD 97539 2013-09-23 17:39:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=simgear -pkgver=2.10.0 -pkgrel=2 +pkgver=2.12.0 +pkgrel=1 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') @@ -17,12 +17,12 @@ options=('!makeflags') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2" "osg-3.2.patch") -md5sums=('0ec974d3778f777d5c99c89db671fcc7' +md5sums=('dfc752f4759a2f795b7cdc9dad28411e' 'd7f35f02d88c6ef9c58e07b8431811e6') prepare() { cd $srcdir/simgear-$pkgver - patch -p1 <$srcdir/osg-3.2.patch +# patch -p1 <$srcdir/osg-3.2.patch } build() { diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index 64b1b7032..6da48a5d6 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $ +# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=9 +pkgrel=11 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop + fix_pillow_import.patch build-fix.patch) -md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' - 'bbf6f10b8155838eede93b5abed724f5' - 'b22c3c7b6a979c0a4e59ecaa2bd2182b') -build() { +package() { local _tclver=`pacman -Q tcl` local _tclnum=${tclver:4:3} local _tcldir='tcl'${tclnum} cd $srcdir/sK1-${pkgver}pre + # pillow import fix + patch -Np1 -i $srcdir/fix_pillow_import.patch + # python2 fix sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py @@ -44,3 +45,7 @@ build() { sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1 } +md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' + 'bbf6f10b8155838eede93b5abed724f5' + '4a44dd89707b19fe58f4c124ed321236' + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch new file mode 100644 index 000000000..7306dd3b6 --- /dev/null +++ b/community/sk1/fix_pillow_import.patch @@ -0,0 +1,35 @@ +diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py +--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py 2009-07-16 23:26:15.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py 2013-09-22 09:52:26.543457833 +0000 +@@ -24,7 +24,7 @@ + + import tooltips + +-import Image, ImageTk, ImageDraw ++from PIL import Image, ImageTk, ImageDraw + + DEFAULT_WIDTH=0.283286 + DEFAULT_CORNER=const.JoinMiter +diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py +--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py 2009-05-15 22:11:39.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py 2013-09-22 09:52:13.216885815 +0000 +@@ -24,7 +24,7 @@ + + import tooltips + +-import Image, ImageTk, ImageDraw ++from PIL import Image, ImageTk, ImageDraw + + DEFAULT_WIDTH=0.283286 + DEFAULT_CORNER=const.JoinMiter +diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py +--- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py 2009-04-30 02:58:41.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py 2013-09-22 09:52:38.150044124 +0000 +@@ -8,7 +8,7 @@ + # The color sample size is 31x20 px + + from Ttk import TButton +-import Image, ImageTk ++from PIL import Image, ImageTk + + class TColorButton(TButton): diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index f89d77c77..82dc1baf5 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91047 2013-05-18 14:03:22Z jlichtblau $ +# $Id: PKGBUILD 98131 2013-10-06 15:36:48Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> pkgname=skrooge -pkgver=1.7.1 +pkgver=1.8.0 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ makedepends=('cmake' 'automoc4' 'docbook-xsl' 'boost' 'kdepim-libkdepim') optdepends=('kdepim-libkdepim: for KDE PIM integration') install=$pkgname.install changelog=$pkgname.changelog -source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('7427c9c4a93a9c6794e6419ef225c8f512548217ab2eac7abf217f5802cd6a88') +source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('98c0ed6cfefd4c6c92a010a1ab9afc1ef230eacc391a45aa200901ba6fb3bf08') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index 862db7099..b689eae6d 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,3 +1,6 @@ +2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * skrooge 1.8.0-1 + 2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * skrooge 1.7.1-1 diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD index 803951dfc..bd7afb102 100644 --- a/community/spice-gtk3/PKGBUILD +++ b/community/spice-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93453 2013-07-03 13:44:50Z spupykin $ +# $Id: PKGBUILD 97529 2013-09-23 16:16:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Stefano Facchini <stefano.facchini@gmail.com> # Contributor: Jonathan Lestrelin <zanko@daemontux.org> @@ -6,8 +6,8 @@ # Contributor: Lucio Zara <pennega@gmail.com> pkgname=spice-gtk3 -pkgver=0.20 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)." arch=('x86_64' 'i686') url="http://spice-space.org" @@ -18,6 +18,7 @@ conflicts=('spice-gtk') options=('!libtool') source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") sha256sums=('b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df') +sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564') build() { cd "$srcdir/spice-gtk-$pkgver" diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index b8d843509..d520a8094 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94128 2013-07-14 18:31:46Z spupykin $ +# $Id: PKGBUILD 97531 2013-09-23 16:17:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.3.8 +pkgver=3.3.9 pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') @@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('ec1654d28e29bdd2ee342ffb655ecc72' +md5sums=('f08bffe795260cecca828331c579e0c4' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 276987c87..0e81c4e9a 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 92088 2013-05-31 11:33:59Z mtorromeo $ +# $Id: PKGBUILD 96970 2013-09-09 14:29:18Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=13 +pkgrel=15 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') -#url="http://sourceforge.net/projects/sshguard/" url="http://www.sshguard.net/" license=('GPL') depends=('iptables') @@ -17,12 +16,16 @@ source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver. sshguard.service sshguard-journalctl) sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' - 'e9713a067b33b8ea91d203853a033c0b9f6d40ebebd77f2e72903ed4fd355ebd' - '7423224107b28cabb69489056968581f1c9e94f3edc6a1d189e56a9df0bab4f7') + '3185cd3ceeee0bbb1f1df54baf025857200f39bd1eb747a59d6f46c562be4a51' + 'f7b307fe9dbbe8c18fe91ca751679d62b2a3ade03cfe164e76ca411cfafffca6') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" sed -i 's|^DAYNO.*|DAYNO [0-9]?[1-9]|' src/parser/attack_scanner.l +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sbindir=/usr/bin --with-firewall=iptables make } diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index fb106f5b6..e9bb14c5f 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,2 +1,4 @@ #!/bin/sh -/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/bin/sshguard -l- "$@" +DBFILE=$1 +shift +/usr/bin/journalctl -afb -p info -n1 "$@" | /usr/bin/sshguard -l- -b $DBFILE diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index d6324d459..11115727b 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -4,7 +4,7 @@ After=iptables.service ip6tables.service network.target Wants=iptables.service ip6tables.service [Service] -ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db +ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl /var/db/sshguard/blacklist.db SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 [Install] WantedBy=multi-user.target diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index 1307067fd..93103cc2f 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94931 2013-08-01 07:01:27Z bpiotrowski $ +# $Id: PKGBUILD 97145 2013-09-14 07:15:14Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> @@ -14,10 +14,8 @@ install=sxiv.install url='https://github.com/muennich/sxiv' depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils') source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz - sxiv.desktop config.h) sha256sums=('30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f' - 'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47' '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c') build() { @@ -30,6 +28,6 @@ package() { cd sxiv-$pkgver make PREFIX="$pkgdir"/usr install - install -D -m644 "$srcdir"/sxiv.desktop \ - "$pkgdir"/usr/share/applications/sxiv.desktop + install -D -m644 sxiv.desktop \ + "$pkgdir"/usr/share/applications/sxiv.desktop } diff --git a/community/sxiv/sxiv.desktop b/community/sxiv/sxiv.desktop deleted file mode 100644 index a981171c5..000000000 --- a/community/sxiv/sxiv.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=sxiv -GenericName=Image Viewer -Exec=sxiv %F -MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp; -NoDisplay=true diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index f93b63f4a..cc704560c 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92869 2013-06-17 10:57:15Z spupykin $ +# $Id: PKGBUILD 97533 2013-09-23 16:17:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.1.6 -pkgrel=2 +pkgver=10.1.7 +pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat.service lib64-fix.patch) -md5sums=('909135c84e36d780d501274e7450f924' +md5sums=('112c8cc92114c961709d09f6afa537bd' '12ba479c606620193e8b7c6e982d5088' '7ffa6bf990609d85367070f71b40a34b') diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index fa4c88209..dc4597f9f 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93973 2013-07-12 10:33:33Z spupykin $ +# $Id: PKGBUILD 97073 2013-09-12 10:15:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,9 +6,9 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=36.0.2 +pkgver=36.0.3 pkgrel=1 -pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." +pkgdesc="A Qt-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') url="http://semiletov.org/tea/" license=('GPL') @@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell') install=tea.install source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('c8657c664af35d2032a78c645cb38d16' +md5sums=('2e33f9a150f17eea62d9a805033fe16b' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index 0649939ee..0d1663b0f 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94746 2013-07-29 21:17:53Z arodseth $ +# $Id: PKGBUILD 96848 2013-09-06 14:29:02Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jeff Horelick <jdhore1@gmail.com> # Contributor: skydrome <skydrome@i2pmail.org> pkgname=the_silver_searcher -pkgver=0.15 +pkgver=0.16 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' @@ -12,17 +12,22 @@ license=('Apache') depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686' 'mips64el') source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('bb05e329148315a9791cfa5cc1f7db4681e44476729971b4b3b7c2845a635748') +sha256sums=('2be261b18a74adf4354515544a7e7bfdb970005ce1f0fc78f56a6801e629ada7') + +prepare() { + cd "$pkgname-$pkgver" + + sed -i 's:configure:configure --prefix=/usr:' build.sh +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - sed -i 's:configure:configure --prefix=/usr:' build.sh ./build.sh } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index a37192c1e..ef059484d 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94384 2013-07-22 13:59:43Z spupykin $ +# $Id: PKGBUILD 97561 2013-09-24 10:31:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.3.0 -pkgrel=2 +pkgrel=3 _xorgver=1.14.2 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') diff --git a/community/tint2/PKGBUILD b/community/tint2/PKGBUILD index c45639ddb..80cb4575b 100644 --- a/community/tint2/PKGBUILD +++ b/community/tint2/PKGBUILD @@ -1,43 +1,50 @@ -# $Id: PKGBUILD 64903 2012-02-18 20:04:04Z bpiotrowski $ +# $Id: PKGBUILD 97618 2013-09-25 18:19:34Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Blue Peppers <bluepeppers@archlinux.us> # Contributor: Stefan Husmann< stefan-husmann@t-online.de> pkgname=tint2 pkgver=0.11 -pkgrel=5 -pkgdesc="A basic, good-looking task manager for WMs" +pkgrel=6 +pkgdesc='Basic, good-looking task manager for WMs' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/tint2/" license=('GPL2') conflicts=('ttm-svn' 'tint') replaces=('tint') depends=('gtk2' 'imlib2') -optdepends=('pygtk: for using tint2conf') +optdepends=('pygtk: for tint2wizard') makedepends=('pygtk' 'cmake') provides=('tint') -source=("http://$pkgname.googlecode.com/files/$pkgname-${pkgver}.tar.bz2" - 'add-power-now-support.patch') +source=(http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2 + add-power-now-support.patch + fix_defunct_processes.patch + middle_click_on_clock.patch) md5sums=('6fc5731e7425125fa84a2add5cef4bff' - '6cfcad028f1bd2f69812167f5395f890') + '6cfcad028f1bd2f69812167f5395f890' + 'b3d052ac5ada81c56e36133b1ecdee8c' + 'f7918d29a87422aab6fb9d922867d8f8') -build() { - cd "$srcdir/$pkgname-${pkgver}" +prepare() { + cd $pkgname-$pkgver - # add support for power_now battery attribute (fixes FS#21954) patch -Np0 -i ../add-power-now-support.patch + patch -Np0 -i ../fix_defunct_processes.patch + patch -Np0 -i ../middle_click_on_clock.patch # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/tint2conf/tintwizard.py sed -i 's_python _python2 _' src/tint2conf/main.c +} + +build() { + cd $pkgname-$pkgver - [ -d build ] || mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr ../ + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } package() { - cd "$srcdir/$pkgname-${pkgver}/build" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/tint2/fix_defunct_processes.patch b/community/tint2/fix_defunct_processes.patch new file mode 100644 index 000000000..28ea6c27a --- /dev/null +++ b/community/tint2/fix_defunct_processes.patch @@ -0,0 +1,31 @@ +http://code.google.com/p/tint2/issues/detail?id=430 +Submitted By: David B. Cortarello (Nomius) <dcortarello at gmail dot com> +Date: 18-05-2013 +Initial Package Version: subversion trunk (revision 652) +Description: Fix zombie (defunct) processes created in clock_action. +This patch provides the following bugfixes: + * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by tint2 (in particular by the clock -right or left- click). This is done by a small hack in the update_clocks_min, called to "redraw" that area. + +--- src/clock/clock.c (revision 652) ++++ src/clock/clock.c (working copy) +@@ -23,6 +23,8 @@ + #include <cairo-xlib.h> + #include <pango/pangocairo.h> + #include <stdlib.h> ++#include <sys/types.h> ++#include <sys/wait.h> + + #include "window.h" + #include "server.h" +@@ -98,6 +103,10 @@ + // remember old_sec because after suspend/hibernate the clock should be updated directly, and not + // on next minute change + time_t old_sec = time_clock.tv_sec; ++ ++ // Little hack to wait executed commands in clock_action avoiding zombies ++ waitpid(-1, NULL, WNOHANG); ++ + gettimeofday(&time_clock, 0); + if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) { + int i; + diff --git a/community/tint2/middle_click_on_clock.patch b/community/tint2/middle_click_on_clock.patch new file mode 100644 index 000000000..800c15c44 --- /dev/null +++ b/community/tint2/middle_click_on_clock.patch @@ -0,0 +1,75 @@ +http://code.google.com/p/tint2/issues/detail?id=430 +Submitted By: David B. Cortarello (Nomius) <dcortarello at gmail dot com> +Date: 18-05-2013 +Initial Package Version: subversion trunk (revision 652) +Description: Implemented middle click mouse button in the clock to execute tasks. +* Implemented middle click mouse button over the clock by accepting the button 2 in the clock_action. +* A new configuration parameter was created called clock_mclick_command, which works in the same way +* clock_lclick_command and clock_rclick_command does. + +Index: src/clock/clock.c +=================================================================== +--- src/clock/clock.c (revision 652) ++++ src/clock/clock.c (working copy) +@@ -39,6 +41,7 @@ + char *time_tooltip_format; + char *time_tooltip_timezone; + char *clock_lclick_command; ++char *clock_mclick_command; + char *clock_rclick_command; + struct timeval time_clock; + PangoFontDescription *time1_font_desc; +@@ -61,6 +64,7 @@ + time_tooltip_format = 0; + time_tooltip_timezone = 0; + clock_lclick_command = 0; ++ clock_mclick_command = 0; + clock_rclick_command = 0; + time1_font_desc = 0; + time2_font_desc = 0; +@@ -77,6 +81,7 @@ + if (time2_timezone) g_free(time2_timezone); + if (time_tooltip_timezone) g_free(time_tooltip_timezone); + if (clock_lclick_command) g_free(clock_lclick_command); ++ if (clock_mclick_command) g_free(clock_mclick_command); + if (clock_rclick_command) g_free(clock_rclick_command); + if (clock_timeout) stop_timeout(clock_timeout); + } +@@ -254,6 +263,9 @@ + case 1: + command = clock_lclick_command; + break; ++ case 2: ++ command = clock_mclick_command; ++ break; + case 3: + command = clock_rclick_command; + break; +Index: src/clock/clock.h +=================================================================== +--- src/clock/clock.h (revision 652) ++++ src/clock/clock.h (working copy) +@@ -33,6 +33,7 @@ + extern PangoFontDescription *time1_font_desc; + extern PangoFontDescription *time2_font_desc; + extern char *clock_lclick_command; ++extern char *clock_mclick_command; + extern char *clock_rclick_command; + extern int clock_enabled; + +Index: src/config.c +=================================================================== +--- src/config.c (revision 652) ++++ src/config.c (working copy) +@@ -396,6 +396,10 @@ + if (strlen(value) > 0) + clock_lclick_command = strdup(value); + } ++ else if (strcmp(key, "clock_mclick_command") == 0) { ++ if (strlen(value) > 0) ++ clock_mclick_command = strdup(value); ++ } + else if (strcmp(key, "clock_rclick_command") == 0) { + if (strlen(value) > 0) + clock_rclick_command = strdup(value); + diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD index a8696e4e8..09f40e5cc 100644 --- a/community/tix/PKGBUILD +++ b/community/tix/PKGBUILD @@ -1,28 +1,41 @@ -# $Id: PKGBUILD 78264 2012-10-17 10:27:42Z allan $ +# $Id: PKGBUILD 97075 2013-09-12 10:15:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brice Méalier <mealier_brice@yahoo.fr> pkgname=tix pkgver=8.4.3 -pkgrel=4 +pkgrel=5 pkgdesc="Tk Interface eXtension, a powerful set of user interface components" arch=(i686 'x86_64' 'mips64el') url="http://tix.sourceforge.net/" license=("BSD") depends=('tk' 'libx11') -source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz - tcl-tk-path.patch) +source=("http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz" + "tix-8.4.3-tcl8.6.patch::https://bugs.archlinux.org/task/36882?getfile=10973" + "tcl-tk-path.patch") md5sums=('2b8bf4b10a852264678182652f477e59' + 'c26297f9e1744dc38308a062ef00549e' 'd4df48da39dd51872d58706a51bab505') -build() { +prepare() { cd $srcdir/Tix$pkgver + sed -i -e 's:-Os::g' -i configure tclconfig/tcl.m4 + patch -Np1 -i "${srcdir}/tix-8.4.3-tcl8.6.patch" + sed -i -e 's:generic/tclInt.h:tclInt.h:g' configure + sed -i -e 's:generic/tkInt.h:tkInt.h:g' configure +} - patch -p1 <$srcdir/tcl-tk-path.patch +build() { + cd $srcdir/Tix$pkgver export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + + ./configure --prefix=/usr \ + --with-tcl=/usr/lib \ + --with-tk=/usr/lib \ + $BIT \ - ./configure --prefix=/usr make make DESTDIR=$pkgdir install # move things around @@ -37,10 +50,9 @@ build() { cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 cd $srcdir/Tix$pkgver/man for i in *.n; do - cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 + cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 done mkdir -p $pkgdir/usr/share/licenses/tix cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ } - diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 6d70f0e29..104f5ec15 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90096 2013-05-06 19:39:45Z foutrelis $ +# $Id: PKGBUILD 97077 2013-09-12 10:16:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs pkgver=1.3.4 -pkgrel=2 +pkgrel=4 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") @@ -12,10 +12,8 @@ arch=('i686' 'x86_64' 'mips64el') depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') makedepends=('plib' 'mesa') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 - torcs.desktop) -md5sums=('07dbc9c53e2b177be1f53fe97d53d039' - '328e419e9f985c3e7b69924fe299330d') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2) +md5sums=('07dbc9c53e2b177be1f53fe97d53d039') build() { cd $srcdir/$pkgname-${pkgver/_/-} @@ -29,6 +27,6 @@ package() { cd $srcdir/$pkgname-${pkgver/_/-} make DESTDIR=${pkgdir} install install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png - install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop + install -D -m644 torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop find ${pkgdir} -type d -exec chmod 755 {} \; } diff --git a/community/torcs/torcs.desktop b/community/torcs/torcs.desktop deleted file mode 100644 index 03d1ba010..000000000 --- a/community/torcs/torcs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=TORCS -Comment=The Open Racing Car Simulator -Exec=torcs -Icon=torcs.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game; diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD deleted file mode 100644 index 454f5f257..000000000 --- a/community/tremulous/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $ -#Contributor: Daenyth <Daenyth+arch [AT] gmail [dot] com> - -pkgname=tremulous -pkgver=1.1.0 -pkgrel=9 -pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates." -url="http://tremulous.net" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2") -makedepends=(mesa) -provides=("tremulous-updated=$pkgver-$pkgrel") -conflicts=('tremulous-updated') -replaces=('trem-backport' 'tremulous-updated') -source=(http://releases.mercenariesguild.net/client/mg-client-manual.txt - http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz - http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz - http://projects.mercenariesguild.net/attachments/download/109/game.qvm - http://projects.mercenariesguild.net/attachments/download/111/lakitu7_qvm.txt - tremdedrc - tremulous.desktop - tremded.sh - tremulous.sh - tremulous.xpm - fix_fs26749.patch) - -backup=('etc/tremdedrc') -noextract=(mg_tremded_source_1.01.tar.gz) - -md5sums=('e0e1b6e03e7596da00a77fe638560402' - '95e526b961f875ba66b6fdd4842c913b' - '938bdf944dff667b74e2132a87a49780' - '90343619d140557d0c481a61ffa5756c' - 'a0b8970b33a27798c125f9152049013c' - 'f0056120d0192a0d4d591d1114439c52' - 'aef37632a2edcf74a53503a49530bad2' - 'b755d7c022cddc449ca2de508dfeee30' - '8e89473f9fdb481ad44e5cea5f6f681e' - '7e3a881608f1c7c0ccece1e07fcf92d8' - 'e85511d8a9e7309dc24fb90917463900') - -build() { - local _arch=${CARCH/i686/x86} - - # Build the server - mkdir -p "$srcdir/tremded" - bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz" - cd "$srcdir/tremded" - make -# Build the client - cd "$srcdir/Release_1.011" - patch -Np1 -i "$srcdir/fix_fs26749.patch" - make -} - -package() { - cd "$srcdir/tremded" - install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch" - install -D -m644 "$srcdir/tremdedrc" "$pkgdir/etc/tremdedrc" - install -D -m644 "$srcdir/game.qvm" "$pkgdir/opt/tremulous/game.qvm" - install -D -m755 "$srcdir/tremded.sh" "$pkgdir/usr/bin/tremded" - - cd "$srcdir/Release_1.011" - install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch" - install -D -m755 "$srcdir/tremulous.sh" "$pkgdir/usr/bin/tremulous" - - # Install the documentation - install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt" - install -Dm644 "$srcdir/lakitu7_qvm.txt" "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt" - - # Install the .desktop and icon files - install -D -m644 "$srcdir/tremulous.xpm" "$pkgdir/usr/share/pixmaps/tremulous.xpm" - install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/tremulous/fix_fs26749.patch b/community/tremulous/fix_fs26749.patch deleted file mode 100644 index 12a73138c..000000000 --- a/community/tremulous/fix_fs26749.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c ---- Release_1.011-old/src/qcommon/parse.c 2011-12-02 19:11:49.307368651 -0500 -+++ Release_1.011/src/qcommon/parse.c 2011-12-02 19:13:27.556836387 -0500 -@@ -981,7 +981,7 @@ - { - if (*string == '\"') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string)); - } - if (string[strlen(string)-1] == '\"') - { -@@ -1784,7 +1784,7 @@ - if ((*ptr == '\\' || *ptr == '/') && - (*(ptr+1) == '\\' || *(ptr+1) == '/')) - { -- strcpy(ptr, ptr+1); -+ memmove(ptr, ptr+1, strlen(ptr)); - } - else - { diff --git a/community/tremulous/tremded.sh b/community/tremulous/tremded.sh deleted file mode 100644 index 339bdd501..000000000 --- a/community/tremulous/tremded.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -CARCH=`uname -m` -ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64 - -[ -f /etc/tremdedrc ] && . /etc/tremdedrc -[ -f "$HOME/.tremdedrc" ] && . "$HOME/.tremdedrc" - -if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then - echo "Cannot find game.qvm -- linking to installed version." - if [ ! -d "$HOME/.tremulous/base/vm" ]; then - mkdir -p "$HOME/.tremulous/base/vm/" || exit 1 - fi - ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1 -fi - -cd /opt/tremulous/ -./tremded.$ext "$TREM_ARGS" "$@" diff --git a/community/tremulous/tremdedrc b/community/tremulous/tremdedrc deleted file mode 100644 index 7fbe122f6..000000000 --- a/community/tremulous/tremdedrc +++ /dev/null @@ -1 +0,0 @@ -TREM_ARGS="+set dedicated 1 +exec server.cfg" diff --git a/community/tremulous/tremulous.desktop b/community/tremulous/tremulous.desktop deleted file mode 100644 index 357c357bd..000000000 --- a/community/tremulous/tremulous.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Tremulous -Comment=A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates. -Icon=/usr/share/pixmaps/tremulous.xpm -Exec=tremulous -Terminal=false -Categories=Game;ActionGame; diff --git a/community/tremulous/tremulous.sh b/community/tremulous/tremulous.sh deleted file mode 100644 index 01575befc..000000000 --- a/community/tremulous/tremulous.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -CARCH=`uname -m` -ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64 - -if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then - echo "Cannot find game.qvm -- linking to installed version." - if [ ! -d "$HOME/.tremulous/base/vm" ]; then - mkdir -p "$HOME/.tremulous/base/vm/" || exit 1 - fi - ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1 -fi - -cd /opt/tremulous/ -./tremulous.$ext "$@" diff --git a/community/tremulous/tremulous.xpm b/community/tremulous/tremulous.xpm deleted file mode 100644 index 5e070c862..000000000 --- a/community/tremulous/tremulous.xpm +++ /dev/null @@ -1,90 +0,0 @@ -/* XPM */ -static char * tremulous_xpm[] = { -"48 48 39 1", -" c None", -". c #0F0F0F", -"+ c #181818", -"@ c #000000", -"# c #282828", -"$ c #212121", -"% c #060606", -"& c #1D1D1D", -"* c #252525", -"= c #080808", -"- c #0E0E0E", -"; c #050505", -"> c #0B0B0B", -", c #0C0C0C", -"' c #232323", -") c #1F1F1F", -"! c #030303", -"~ c #0D0D0D", -"{ c #040404", -"] c #020202", -"^ c #141414", -"/ c #1E1E1E", -"( c #131313", -"_ c #111111", -": c #010101", -"< c #191919", -"[ c #090909", -"} c #292929", -"| c #070707", -"1 c #121212", -"2 c #1B1B1B", -"3 c #161616", -"4 c #0A0A0A", -"5 c #222222", -"6 c #242424", -"7 c #1A1A1A", -"8 c #151515", -"9 c #101010", -"0 c #171717", -" ", -" ... ", -" +@@@@@# ", -" $@@@@@@% ", -" &@@@@@@@@ * ", -" =- ;@@@@@@@@> ,@- ", -" @@' ;@@@@@@@@@ ,@@ ", -" )@! ;@@@@@@@@@ ~@@; ", -" ;@{ ]@@@@@@@@@~ ,@@; ", -" ^@@] /@@@@@@@@@@@( -@@; ", -" .@@; /@@@@@@@@@@@ -@@@/ ", -" _@@] /@@@@@@@@@@@ #:@@@_ ", -" @@@; /@@@@@@@@@@< :@@@- ", -" :@@! ]@@@@@@@@@ @@@@- ", -" $@@@; ;@@@@@@@@[ ~]@@@- ", -" %@@@; }!@@@@@@@@- }|@@@@, ", -" !@@@; 1@@@@@@@@@@ 2@@@@@~ ", -" ;@@@% [@@@@@@@@@@@@@@@@, ", -" @@@@{|||:@@@@@@@@@@@@@@!- ", -" -@@@@@@@@@@@@@@@@@@@@@] ", -" .@@@@@@@@@@@@@@@@@@@{ ", -" ]@@@@@@@@@@@@@@@@@ ", -" .@@@@@@@@@@@@@@@@ ", -" +@@@@@@@@@@@@@@@@@@@@@@@@@@/ ", -" =@@@@@@@@@@@@@@@@@@@@@@@@@/ ", -" .=@@@@@@@@@@@@@@@@@@% ", -" ,@@@@@@@@@@@@@@@@@@@@@ ", -" 2>]@@@@@@@@@@@@@@@@@@@@@@@3 ", -" *:@@@@@@@@@@@@@@@@@@@@@@@@@^ ", -" @@@||| 4]@@@@@@@@@@@@@@@@@ ", -" 556 _@@@@@@@@@@@@@@@@3 ", -" >@@@@@@@@@@@@@@@@+ ", -" ;@@@@@@@@@@@@@@@@@7 ", -" &@@@@@@@@@@@@@@@@@@@+ ", -" @@@@@@@@@@@@@@@@@@@@@/ ", -" 8@@@@@@@@@@@@@@@[ =@@| ", -" ;@@:::@@@@@@@@@[ %@@[ ", -" @@9 (@@@@@@@4 =@@ ", -" ,@@ {:@@: {@! ", -" !@@ << 3@@0 ", -" !@- 3@@6 ", -" ]@( (@[ ", -" 7@@ ]@ ", -" 7@@ * ", -" 7@} ", -" 7@ ", -" . ", -" "}; diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 5d44fd6d2..8d3798210 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $ +# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> @@ -6,17 +6,18 @@ pkgname=ulogd pkgver=2.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') -depends=('libmnl' 'libnfnetlink') +depends=('libmnl' + 'libnetfilter_acct' + 'libnetfilter_conntrack' + 'libnetfilter_log' + 'libnfnetlink') backup=('etc/ulogd.conf') makedepends=('libmariadbclient' - 'libnetfilter_acct' - 'libnetfilter_conntrack' - 'libnetfilter_log' 'libpcap' 'libdbi' 'postgresql-libs' @@ -24,15 +25,14 @@ makedepends=('libmariadbclient' optdepends=("${makedepends[@]}") options=('!libtool') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - "$pkgname.logrotate" - "$pkgname.conf" - "$pkgname.service") + "$pkgname.logrotate" + "$pkgname.conf" + "$pkgname.service") md5sums=('660516de4b5b1e110c12dae414619e0f' - 'dd32eeee0949adff4188544419acd17e' - 'c21531312f95e790ed19aa267a17d35a' + '95f05af0a0c8f5fdea5bd92ccb2fd465' + '7ccdb48cd152ff502334d3f6b2a4daab' '092d72209e30c132e0a08112e4062772') - build() { cd $pkgname-$pkgver ./configure \ diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf index 822575613..f96bd1d2c 100644 --- a/community/ulogd/ulogd.conf +++ b/community/ulogd/ulogd.conf @@ -1,20 +1,19 @@ [global] -nlgroup=1 logfile="/var/log/ulogd.log" loglevel=5 rmem=131071 bufsize=150000 -plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" +plugin="/usr/lib/ulogd/ulogd_inppkt_NFLOG.so" plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" -stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU +stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -[ulog1] -nlgroup=1 +[log1] +group=1 [emu1] file=/var/log/ulogd.syslogemu diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate index 312c71acb..299e93d02 100644 --- a/community/ulogd/ulogd.logrotate +++ b/community/ulogd/ulogd.logrotate @@ -5,6 +5,6 @@ create 0640 root root postrotate - [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null + systemctl kill --signal=SIGHUP ulogd.service || true endscript } diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 2631f77cc..3eb3da923 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96581 2013-09-01 20:52:28Z bisson $ +# $Id: PKGBUILD 97464 2013-09-20 18:55:05Z 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=3 +pkgver=1.4.21 +pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') @@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'service' 'conf') -sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43' +sha1sums=('3ef4ea626e5284368d48ab618fe2207d43f2cee1' 'b543ae6f8b87423bec095fca6b335a9ee43739a8' '5d473ec2943fd85367cdb653fcd58e186f07383f') diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD index e1ee5d1d0..d8804685f 100644 --- a/community/uniconvertor/PKGBUILD +++ b/community/uniconvertor/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 78268 2012-10-17 10:27:59Z allan $ +# $Id: PKGBUILD 97864 2013-09-30 10:28:08Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=uniconvertor pkgver=1.1.5 -pkgrel=6 +pkgrel=7 pkgdesc="A universal vector graphics translator using sK1 engine." arch=('i686' 'x86_64' 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=uniconvertor" license=('GPL') -depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs') +depends=('python2' 'python2-pillow' 'python2-reportlab' 'sk1libs') makedepends=('gcc') source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz) md5sums=('d1272315a58304ece2ff588834e23f72') diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 6e2ee8b72..0a3607bcb 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 95443 2013-08-12 08:50:29Z spupykin $ +# $Id: PKGBUILD 98181 2013-10-07 10:07:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.2.7 +pkgver=2.0.1 pkgrel=1 _pkgdata=20130807 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') url="http://www.draisberghof.de/usb_modeswitch/" license=('GPL') -depends=('libusb-compat' 'tcl') +depends=('libusb' 'tcl') makedepends=('gcc' 'make') backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('18d889d72195534ae9133a8181cad42b' +md5sums=('e48d4419d0574d342bb183f7465556d0' '91feff51deba6e48e78506b8f4db2274' 'dd14f254f6c3642ce16fd7c2f43ee112') diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index 9ccc64750..a785dc9bb 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95003 2013-08-03 02:02:14Z dwallace $ +# $Id: PKGBUILD 98108 2013-10-06 00:44:23Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -9,6 +9,7 @@ pkgbase=uwsgi pkgname=(uwsgi uwsgi-plugin-common uwsgi-plugin-rack + uwsgi-plugin-psgi uwsgi-plugin-python2 uwsgi-plugin-python uwsgi-plugin-nagios @@ -22,8 +23,8 @@ pkgname=(uwsgi uwsgi-plugin-pam uwsgi-plugin-zergpool ) -pkgver=1.9.14 -pkgrel=3 +pkgver=1.9.17.1 +pkgrel=1 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" license=(GPL2) @@ -39,10 +40,11 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch) -md5sums=('ec9cf333534604f17ef4e24051d9d65d' - '899e61d6957bec57e148b92dcb1bec6d' + +md5sums=('501f29ad4538193c0ef585b4cef46bcf' + 'fcd57c37372e6afe5b1fae151dd43bc9' 'b05ba1d796e1ea608a40635bc4f3ec67' - '0b79320fbae92715c96086cf51e60bc8' + '740a7718bd341b03d916a13ddbbbe694' 'db70315bbc8cb886a278ba59d5fd8d57' '1a4516d5cdcf5b95b036f4eae2d0c152' '4d09535ce379c8acd76160f35d5d6b55' @@ -89,6 +91,8 @@ package_uwsgi-plugin-common(){ install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so ln -s uwsgi $pkgdir/usr/bin/uwsgi_$plugin done + install -Dm755 $pkgbase-$pkgver/corerouter_plugin.so $pkgdir/usr/lib/uwsgi/ + } package_uwsgi-plugin-rack(){ @@ -101,6 +105,14 @@ package_uwsgi-plugin-rack(){ install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so $pkgdir/usr/lib/uwsgi/rbthreads_plugin.so } +package_uwsgi-plugin-psgi(){ + depends=(perl uwsgi-plugin-common) + pkgdesc="Perl psgi plugin" + install -dm755 $pkgdir/usr/bin + install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so + ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} +} + package_uwsgi-plugin-python2(){ depends=(uwsgi-plugin-common python2-gevent python2-gevent) pkgdesc="Plugin for Python2 support" @@ -138,8 +150,9 @@ package_uwsgi-plugin-router(){ cd $pkgbase-$pkgver for file in router_*_plugin.so fastrouter_plugin.so sslrouter_plugin.so rawrouter_plugin.so; do - install -Dm644 $file $pkgdir/usr/lib/uwsgi/$file + install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file done + install -Dm755 router_basicauth_plugin.so $pkgdir/usr/lib/uwsgi/basicauth_plugin.so } package_uwsgi-plugin-admin(){ diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini index 4512b301a..e3770bf5b 100644 --- a/community/uwsgi/archlinux.ini +++ b/community/uwsgi/archlinux.ini @@ -14,4 +14,4 @@ yaml_implementation = auto malloc_implementation = libc embedded_plugins = echo, ping, http, corerouter plugin_dir = /usr/lib/uwsgi -plugins = rack, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter +plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter diff --git a/community/uwsgi/uwsgi@.service b/community/uwsgi/uwsgi@.service index c9e9789a0..08941b507 100644 --- a/community/uwsgi/uwsgi@.service +++ b/community/uwsgi/uwsgi@.service @@ -8,6 +8,7 @@ Restart=always Type=notify StandardError=syslog NotifyAccess=main +KillSignal=SIGQUIT [Install] WantedBy=multi-user.target diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD deleted file mode 100644 index 8c1820d0b..000000000 --- a/community/v8/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 94324 2013-07-20 14:19:20Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: tocer <tocer.deng@gmail.com> - -pkgname=v8 -pkgver=3.19.18.4 -pkgrel=1 -pkgdesc='Fast and modern Javascript engine' -arch=('i686' 'x86_64') -url='http://code.google.com/p/v8' -license=('BSD') -depends=('gcc-libs' 'readline') -makedepends=('subversion' 'python2') -source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2) -sha256sums=('10d7a51ed2769b1c2a6311a30ed1967d0a1da3f522c90b9c00f25fbe0b1aba02') - -[[ "$CARCH" = 'i686' ]] && ARCH=ia32 -[[ "$CARCH" = 'x86_64' ]] && ARCH=x64 - -prepare() { - cd $pkgname-$pkgver - - make dependencies - - export PYTHON=python2 - find build/ test/ tools/ src/ -type f \ - -exec sed -e 's_^#!/usr/bin/env python$_&2_' \ - -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \ - -e 's_^#!/usr/bin/python$_&2_' \ - -e "s_'python'_'python2'_" -i {} \; - sed -i 's/python /python2 /' Makefile -} - -build() { - cd $pkgname-$pkgver - - make $ARCH.release library=shared console=readline werror=no - - cd "$srcdir" && cp -r $pkgname-$pkgver d8-static-$pkgver - cd d8-static-$pkgver - make $ARCH.release library=static console=readline werror=no -} - -package() { - cd $pkgname-$pkgver - - install -Dm755 "$srcdir"/d8-static-$pkgver/out/$ARCH.release/d8 "$pkgdir"/usr/bin/d8 - install -Dm755 out/$ARCH.release/lib.target/libv8.so "$pkgdir"/usr/lib/libv8.so - - install -d "$pkgdir"/usr/include - install -Dm644 include/*.h "$pkgdir"/usr/include - - install -d "$pkgdir"/usr/share/licenses/v8 - install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8 -} - -# vim:set ts=2 sw=2 et: diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 6be683faa..64196d9eb 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91039 2013-05-18 13:32:51Z jlichtblau $ +# $Id: PKGBUILD 97743 2013-09-28 08:12:47Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('20d91b048d2bfbb33498af4da5dc120a3a9232ed05a4a87a3ce6e341445ef640') +sha256sums=('58e85c9792d0df62c3c9b583869bc40d6218ca01c117c05599d45e6d6b254bf1') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index 6f22365fd..78255a931 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * viking 1.4.2-1 + 2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * viking 1.4.1-1 diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 2790b0a30..eae92f3b6 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 95971 2013-08-19 07:53:19Z tpowa $ +# $Id: PKGBUILD 98211 2013-10-07 14:38:11Z andyrtr $ # 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=8 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' +makedepends=('linux-lts>=3.10' 'linux-lts<3.11' + 'linux-lts-headers>=3.10' 'linux-lts-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.0-lts +_extramodules=extramodules-3.10-lts build() { _kernver=$(cat /usr/lib/modules/$_extramodules/version) @@ -37,7 +34,7 @@ build() { package_virtualbox-host-modules-lts(){ _kernver=$(cat /usr/lib/modules/$_extramodules/version) pkgdesc='Host kernel modules for VirtualBox' - depends=('linux-lts>=3.0' 'linux-lts<3.1') + depends=('linux-lts>=3.10' 'linux-lts<3.11') replaces=('virtualbox-modules-lts') conflicts=('virtualbox-modules-lts') provides=("virtualbox-host-modules=$pkgver") @@ -53,10 +50,10 @@ package_virtualbox-guest-modules-lts(){ _kernver=$(cat /usr/lib/modules/$_extramodules/version) pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux-lts>=3.0' 'linux-lts<3.1') + depends=('linux-lts>=3.10' 'linux-lts<3.11') replaces=('virtualbox-archlinux-modules-lts') conflicts=('virtualbox-archlinux-modules-lts') - provides=("virtualbox-host-modules=$pkgver") + provides=("virtualbox-guest-modules=$pkgver") install=virtualbox-guest-modules-lts.install cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" 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..c1dd43431 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.10-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..70a6478de 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.10-lts depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 30da87a87..f3670841a 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 96546 2013-08-31 16:05:06Z foutrelis $ +# $Id: PKGBUILD 98153 2013-10-06 16:52:44Z tpowa $ # 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=6 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' +makedepends=('linux>=3.11' 'linux<3.12' + 'linux-headers>=3.11' 'linux-headers<3.12' "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 +_extramodules=extramodules-3.11-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -36,7 +33,7 @@ build() { package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.10' 'linux<3.11') + depends=('linux>=3.11' 'linux<3.12') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -51,7 +48,7 @@ package_virtualbox-guest-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.10' 'linux<3.11') + depends=('linux>=3.11' 'linux<3.12') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install 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..af7f5b278 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.11-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..cfbefde89 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.11-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/vobcopy/PKGBUILD b/community/vobcopy/PKGBUILD deleted file mode 100644 index 6760ee59c..000000000 --- a/community/vobcopy/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 66897 2012-02-29 23:21:33Z giovanni $ -# Maintainer: Daenyth -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tino Reichardt <milky-archlinux@mcmilk.de> - -pkgname=vobcopy -pkgver=1.2.0 -pkgrel=4 -pkgdesc="Copies DVD .vob files to harddisk, decrypting them on the way" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.vobcopy.org" -license=('GPL2') -depends=('libdvdread' 'libdvdcss') -options=('!docs') -source=(http://www.vobcopy.org/download/${pkgname}-${pkgver}.tar.bz2) -md5sums=('88f735ccd051093ff40dab4597bc586e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="$pkgdir" PREFIX=/usr/ MANDIR=/usr/share/man install -} diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD index 7dec691b1..febeb0aca 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' 'mips64el') url="http://www.nickgravgaard.com/windowlab" license=('GPL') depends=('xorg-server' 'libxft' 'libxext') -source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar") -md5sums=('7fcf770b3da932ac7d252572974b0d54') +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/xboard/PKGBUILD b/community/xboard/PKGBUILD index 40b6c260a..943912d3b 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90592 2013-05-13 10:00:14Z spupykin $ +# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.7.1 -pkgrel=1 +pkgver=4.7.2 +pkgrel=3 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/xboard/" @@ -13,34 +13,26 @@ license=('GPL3') depends=('gnuchess' 'texinfo' 'xdg-utils' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' 'gtk2' 'cairo' 'librsvg') -makedepends=('gendesk') optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e42383c4594c24ebf2f9fdc5dc89e255') +md5sums=('83ec086cbf5c4bc362a188654a9332fc') build() { - cd "${srcdir}" - gendesk - cd "${pkgname}-${pkgver}" sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ - --with-gtk + --with-gtk \ + --enable-zippy make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cmail \ ${pkgdir}/usr/bin/cmail } diff --git a/community/xboard/xboard.desktop b/community/xboard/xboard.desktop deleted file mode 100644 index 4bdfdbe15..000000000 --- a/community/xboard/xboard.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Xboard -Comment=A graphical user interfaces for chess -Exec=xboard -Icon=xboard.png -Terminal=false -StartupNotify=false -Categories=Application; diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index f0f6e4a00..35e51165d 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94361 2013-07-22 11:21:13Z spupykin $ +# $Id: PKGBUILD 97641 2013-09-26 10:52:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.7.51 +pkgver=3.7.52 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('a3f5d10f6f96a6298505801f4d0f6190') +md5sums=('b39a2dcce9c3844ee2e6f9b477c501f5') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/xdelta/PKGBUILD b/community/xdelta/PKGBUILD deleted file mode 100644 index 3933f9a48..000000000 --- a/community/xdelta/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 83064 2013-01-27 09:58:41Z andrea $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=xdelta -pkgver=1.1.4 -pkgrel=4.1 -pkgdesc="binary file delta generator" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/xdelta/" -license=('GPL') -depends=('glib' 'zlib') -options=('!libtool') -source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz - xdelta-1.1.4-aclocal.patch) -md5sums=('1b896c01ebf0e353b7e3c3071b05f496' - '1d8ab5909bdf977a2783c164b66906fd') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/xdelta-1.1.4-aclocal.patch - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community/xdelta/xdelta-1.1.4-aclocal.patch b/community/xdelta/xdelta-1.1.4-aclocal.patch deleted file mode 100644 index ad8c99de5..000000000 --- a/community/xdelta/xdelta-1.1.4-aclocal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xdelta-1.1.3/xdelta.m4.aclocal 2004-10-20 00:20:47.875648144 +0200 -+++ xdelta-1.1.3/xdelta.m4 2004-10-20 00:21:47.205628616 +0200 -@@ -4,7 +4,7 @@ - dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or - dnl --AC_DEFUN(AM_PATH_XDELTA, -+AC_DEFUN([AM_PATH_XDELTA], - [dnl - dnl Get the cflags and libraries from the xdelta-config script - dnl diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index e5b0be472..1fcca5cd7 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94916 2013-08-01 06:55:59Z bpiotrowski $ +# $Id: PKGBUILD 97846 2013-09-30 10:05:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=19 +pkgrel=20 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -37,15 +37,16 @@ optdepends=('alsa-lib: ALSA audio output' 'libshout: Icecast audio output' 'libvorbis: Ogg Vorbis support' 'libxml2: XSPF and podcast support' - 'mpg123: alternative MP3 plugin') -[ "$CARCH" = "mips64el" ] || optdepends+=('oss: OSS audio output') -optdepends+=('perl: Perl language bindings' + 'perl: Perl language bindings' + 'mpg123: alternative MP3 plugin' + 'perl: Perl language bindings' 'pulseaudio: PulseAudio audio output' 'pyrex: Python language bindings' 'ruby: Ruby language bindings' 'smbclient: direct CIFS/SMB access' 'speex: Speex support' 'wavpack: WavPack support') +[ "$CARCH" = "mips64el" ] || optdepends+=('oss: OSS audio output') # 'sidplay: to play a Commodore 64 music files AKA zaks' # we do not have sidplay 2 series in repos; also it's # somehow connected with resid i guess(not in repos also) diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 13fd01fa0..898a7b6da 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 94529 2013-07-26 11:27:17Z jelle $ +# $Id: PKGBUILD 96822 2013-09-06 02:46:41Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') +depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('415a7ed9449198b0e93d49ab0a4a0f72') diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 08c578503..12b88e26f 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89334 2013-04-28 16:53:06Z td123 $ +# $Id: PKGBUILD 96798 2013-09-05 16:17:45Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.11 -pkgrel=6 +pkgrel=7 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" @@ -22,7 +22,7 @@ md5sums=('5ac9dc1dae5e85dcbdfb9f70cbe312c1' build() { cd "$srcdir" ghc-pkg list - gendesk + gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd $srcdir/$pkgname-$pkgver @@ -47,4 +47,6 @@ package() { install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg + + install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop } diff --git a/community/xmonad/xmonad-gnome-session.session b/community/xmonad/xmonad-gnome-session.session deleted file mode 100644 index c0bd16781..000000000 --- a/community/xmonad/xmonad-gnome-session.session +++ /dev/null @@ -1,6 +0,0 @@ -[GNOME Session] -Name=Xmonad session -RequiredComponents=gnome-panel;gnome-settings-daemon; -RequiredProviders=windowmanager;notifications; -DefaultProvider-windowmanager=xmonad -DefaultProvider-notifications=notification-daemon diff --git a/community/xmonad/xmonad.install b/community/xmonad/xmonad.install index 6659247db..96b94dc02 100644 --- a/community/xmonad/xmonad.install +++ b/community/xmonad/xmonad.install @@ -4,9 +4,6 @@ post_install() { ${HS_DIR}/register.sh echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs" echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples" - echo - echo "If you would like to run xmonad as a window manager inside GNOME, please see" - echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad" } pre_upgrade() { diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD index cbb286493..7328b31d2 100755 --- a/community/xnoise/PKGBUILD +++ b/community/xnoise/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 90300 2013-05-11 05:30:04Z fyan $ +# $Id: PKGBUILD 97326 2013-09-18 04:04:28Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: archtux <antonio dot arias99999 at gmail dot com> pkgname=xnoise -pkgver=0.2.18 +pkgver=0.2.19 pkgrel=1 pkgdesc="Media player with a slick GUI, great speed and lots of features." arch=('i686' 'x86_64' 'mips64el') url="http://www.xnoise-media-player.com/" license=('GPL2') -depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg') +depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg' 'vala') optdepends=('gst-plugins-base: Basic media codecs' 'gst-plugins-bad: Extra media codecs' 'gst-plugins-ugly: Extra media codecs' @@ -34,4 +34,5 @@ package() { # Remove obsolete files rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala" } -sha512sums=('afe6d380f84c96d3612ed6a01a31b279b06d101252304a83be081eb25d4342e3487aa0f1955c3aa6b70297f8858d3c01be5f708a37c3741a1c2b6afd76127e9b') + +sha512sums=('3c3a735d005704342d2c27c36738b91f850e2630b431edfc1def5d26f836dc0df1ef752ca8d1eec3e90702eb27f78e46970a147a64c2156fbe53c8471eb978cb') diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD index c712242af..a9de83583 100644 --- a/community/xosd/PKGBUILD +++ b/community/xosd/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 61859 2012-01-09 10:23:17Z spupykin $ +# $Id: PKGBUILD 97848 2013-09-30 10:05:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=xosd pkgver=2.2.14 -pkgrel=5.2 +pkgrel=6 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools" arch=("i686" "x86_64" 'mips64el') license=('GPL2') url="http://www.ignavus.net/software.html" depends=('libxt' 'libxinerama' 'sh') -makedepends=('xmms' 'bmp' 'gdk-pixbuf') -optdepends=('gdk-pixbuf: for using the bmp or xmms plugin') +makedepends=('xmms' 'gdk-pixbuf') +optdepends=('gdk-pixbuf: for using the xmms plugin') options=('!libtool') source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz" "http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver-2.debian.tar.gz") diff --git a/community/xsensors/PKGBUILD b/community/xsensors/PKGBUILD index c061523d2..aa973e745 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' 'mips64el') 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; |