Fri Oct 19 08:15:38 PDT 2012

16 files changed, 342 insertions, 6 deletions

diff --git a/community-testing/lxdm/PKGBUILD b/community-testing/lxdm/PKGBUILD
new file mode 100644
index 000000000..e569381bd
--- /dev/null
+++ b/community-testing/lxdm/PKGBUILD
@@ -0,0 +1,68 @@
+# $Id: PKGBUILD 78454 2012-10-18 22:15:34Z allan $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: kiefer <jorgelmadrid@gmail.com>
+
+pkgname=lxdm
+pkgver=0.4.1
+pkgrel=17
+pkgdesc='Lightweight X11 Display Manager'
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/lxdm/"
+license=('GPL')
+groups=('lxde')
+depends=('gtk2' 'xorg-server')
+makedepends=('intltool')
+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
+        glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
+        greeter-session.patch pam-env-vars.patch industrial-greeterui.patch
+        rc.d lxdm-pam service)
+
+build() {
+    cd $srcdir/$pkgname-$pkgver
+
+    patch -Np1 -i $srcdir/glib2-2.32.0.patch
+    patch -Np1 -i $srcdir/greeter-session.patch
+    patch -Np1 -i $srcdir/pam-env-vars.patch
+
+    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
+    make
+  	
+    patch -Np0 -i $srcdir/lxdm.patch
+    patch -Np0 -i $srcdir/lxdm.conf.patch
+    patch -Np0 -i $srcdir/Xsession.patch
+    patch -Np0 -i $srcdir/industrial-greeterui.patch
+}
+
+
+package() {
+    cd $srcdir/$pkgname-$pkgver
+    make DESTDIR=$pkgdir install
+
+    install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
+    install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
+    install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
+    install -d $pkgdir/var/{lib,run}/lxdm
+
+    # fix the greeter location
+    sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
+
+    # avoid conflict with filesystem>=2012.06
+    rm -r $pkgdir/var/run
+}
+
+md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         'a1e3c46a8bef691bc544028f5b6cfe22'
+         'baed9055e8825a5511712bc095197519'
+         'c50dd01b715b0a236407d48066191601'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
+         '28475239d0c8b4fd778ec49f5ec72962'
+         '4c1d43e81e9a256e8d1ea7686c24b3d3'
+         '2c4afdbe3532be4f90d8f6240d352766'
+         '705f394052fdd0dec22e95321d170de0'
+         '34908bc0ec15b6ae4e1074f39fce44df'
+         'e8cc66eb1a2405d2d9d184a727cbd9d8')
diff --git a/community-testing/lxdm/Xsession.patch b/community-testing/lxdm/Xsession.patch
new file mode 100644
index 000000000..035ff0383
--- /dev/null
+++ b/community-testing/lxdm/Xsession.patch
@@ -0,0 +1,11 @@
+--- 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-testing/lxdm/glib2-2.32.0.patch b/community-testing/lxdm/glib2-2.32.0.patch
new file mode 100644
index 000000000..cebfc6133
--- /dev/null
+++ b/community-testing/lxdm/glib2-2.32.0.patch
@@ -0,0 +1,21 @@
+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-testing/lxdm/greeter-session.patch b/community-testing/lxdm/greeter-session.patch
new file mode 100644
index 000000000..f3b94a57a
--- /dev/null
+++ b/community-testing/lxdm/greeter-session.patch
@@ -0,0 +1,13 @@
+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-testing/lxdm/industrial-greeterui.patch b/community-testing/lxdm/industrial-greeterui.patch
new file mode 100644
index 000000000..a2a366809
--- /dev/null
+++ b/community-testing/lxdm/industrial-greeterui.patch
@@ -0,0 +1,13 @@
+--- 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-testing/lxdm/lxdm-pam b/community-testing/lxdm/lxdm-pam
new file mode 100644
index 000000000..c62f62721
--- /dev/null
+++ b/community-testing/lxdm/lxdm-pam
@@ -0,0 +1,10 @@
+#%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_systemd.so
+-session optional pam_loginuid.so
diff --git a/community-testing/lxdm/lxdm.conf.patch b/community-testing/lxdm/lxdm.conf.patch
new file mode 100644
index 000000000..1744e557e
--- /dev/null
+++ b/community-testing/lxdm/lxdm.conf.patch
@@ -0,0 +1,11 @@
+--- 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-testing/lxdm/lxdm.install b/community-testing/lxdm/lxdm.install
new file mode 100644
index 000000000..4d1285dc5
--- /dev/null
+++ b/community-testing/lxdm/lxdm.install
@@ -0,0 +1,18 @@
+post_install() {
+    if ! getent group lxdm > /dev/null ; then
+        groupadd --system lxdm
+        chgrp -R lxdm /var/lib/lxdm
+        chgrp lxdm /etc/lxdm/lxdm.conf
+        chmod +r /etc/lxdm/lxdm.conf
+    fi
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    if ! getent group lxdm > /dev/null ; then
+        groupdel lxdm
+    fi
+}
diff --git a/community-testing/lxdm/lxdm.patch b/community-testing/lxdm/lxdm.patch
new file mode 100644
index 000000000..a703a386d
--- /dev/null
+++ b/community-testing/lxdm/lxdm.patch
@@ -0,0 +1,26 @@
+--- 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-testing/lxdm/pam-env-vars.patch b/community-testing/lxdm/pam-env-vars.patch
new file mode 100644
index 000000000..ab8605ff1
--- /dev/null
+++ b/community-testing/lxdm/pam-env-vars.patch
@@ -0,0 +1,50 @@
+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-testing/lxdm/rc.d b/community-testing/lxdm/rc.d
new file mode 100644
index 000000000..68eb6225d
--- /dev/null
+++ b/community-testing/lxdm/rc.d
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID `which lxdm-binary`)
+case "$1" in
+  start)
+    stat_busy "Starting LXDM Display Manager"
+    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon lxdm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping LXDM Display Manager"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon lxdm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community-testing/lxdm/service b/community-testing/lxdm/service
new file mode 100644
index 000000000..e1840476c
--- /dev/null
+++ b/community-testing/lxdm/service
@@ -0,0 +1,9 @@
+[Unit]
+Description=LXDE Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/sbin/lxdm
+
+[Install]
+Alias=display-manager.service
diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD
index e0af9d0c7..a65aeda04 100644
--- a/community-testing/qtcreator/PKGBUILD
+++ b/community-testing/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76389 2012-09-17 08:13:07Z svenstaro $
+# $Id: PKGBUILD 78436 2012-10-18 11:43:26Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,8 +7,8 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname="qtcreator"
-pkgver=2.6.0beta
-_pkgver=2.6.0-beta
+pkgver=2.6.0rc
+_pkgver=2.6.0-rc
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
@@ -28,8 +28,8 @@ optdepends=('qt-doc: for the integrated Qt documentation'
 install=qtcreator.install
 source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
         'qtcreator.desktop')
-md5sums=('ea7c9a94369b6424e98b442a14145bc9'
-         'f1f4680b9838ff0b8f4cf11eb850d662')
+md5sums=('df82e307dc9212fd69c1ee4e40501169'
+         '1bc38c4541cad4eafd83db7ac1524a42')
 
 build() {
   cd ${srcdir}
diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop
index 0fd562bd9..fbe06b7a2 100644
--- a/community-testing/qtcreator/qtcreator.desktop
+++ b/community-testing/qtcreator/qtcreator.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=/usr/bin/qtcreator
-Name=Qt-Creator
+Name=Qt Creator
 GenericName=C++ IDE
 X-KDE-StartupNotify=true
 Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD
new file mode 100644
index 000000000..d8c81738d
--- /dev/null
+++ b/community-testing/shotwell/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 78460 2012-10-18 22:34:19Z 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.13.1
+pkgrel=1
+pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
+arch=('i686' 'x86_64')
+url="http://yorba.org/shotwell/"
+license=('LGPL2.1')
+depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
+	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib')
+makedepends=('intltool' 'vala>=0.17.2')
+install=shotwell.install
+source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz")
+md5sums=('71eb1346093705ca2b37c12a21994d14')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+	--disable-schemas-compile \
+	--disable-desktop-update \
+	--disable-icon-update
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install
new file mode 100644
index 000000000..bab8ecd29
--- /dev/null
+++ b/community-testing/shotwell/shotwell.install
@@ -0,0 +1,17 @@
+pkgname=shotwell
+
+post_install() {
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  update-desktop-database -q
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}