summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/fcitx/PKGBUILD18
-rw-r--r--extra/pygobject/PKGBUILD8
-rw-r--r--extra/slim/PKGBUILD11
-rw-r--r--extra/slim/fix-numlock-1.3.3.patch46
-rw-r--r--extra/vpnc/PKGBUILD8
5 files changed, 75 insertions, 16 deletions
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index e4a36666e..7b1b688aa 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157020 2012-04-23 09:27:29Z ibiru $
+# $Id: PKGBUILD 158796 2012-05-10 06:10:24Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: csslayer <wengxt AT gmail com>
pkgbase=fcitx
pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.2.2
+pkgver=4.2.3
pkgrel=1
arch=('i686' 'x86_64')
url="http://code.google.com/p/fcitx/"
license=('GPL')
-makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu')
source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('09d2e7110f652027ea7c285c5845070f8a353f38')
+sha1sums=('8cd33487d1d6ad9c9c63743af8d76e667de4b859')
build() {
cd "${srcdir}"
@@ -21,11 +21,17 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_OPENCC=OFF \
+ -DENABLE_TEST=ON \
-DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_QT_IM_MODULE=ON
make
}
+check() {
+ cd "${srcdir}"/build
+ make test
+}
+
package_fcitx() {
pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
depends=('dbus-core' 'pango' 'libxinerama' 'gtk-update-icon-cache' \
@@ -40,7 +46,7 @@ package_fcitx() {
package_fcitx-gtk2() {
pkgdesc='GTK2 IM Module for fcitx'
- depends=('gtk2' 'dbus-glib' 'fcitx')
+ depends=('gtk2' 'fcitx')
install=fcitx-gtk2.install
cd "${srcdir}"/build/src/frontend/gtk2
@@ -49,7 +55,7 @@ package_fcitx-gtk2() {
package_fcitx-gtk3() {
pkgdesc='GTK3 IM Module for fcitx'
- depends=('gtk3' 'dbus-glib' 'fcitx')
+ depends=('gtk3' 'fcitx')
install=fcitx-gtk3.install
cd "${srcdir}"/build/src/frontend/gtk3
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 7ab25d12c..a5bbd95ca 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157407 2012-04-28 09:26:56Z allan $
+# $Id: PKGBUILD 158812 2012-05-10 19:18:57Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=pygobject
pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
arch=('i686' 'x86_64')
url="https://live.gnome.org/PyGObject"
license=('LGPL')
makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
options=('!libtool')
-sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3')
+sha256sums=('0f07401289fa33e8caee7a9342f5c838bb44cd0a386cb99093505edb5e42817a')
build() {
cp -a "$pkgbase-$pkgver" python2-build
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index f968b228c..1ef39a739 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158739 2012-05-08 16:15:26Z tpowa $
+# $Id: PKGBUILD 158801 2012-05-10 13:44:49Z tpowa $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
pkgname=slim
pkgver=1.3.3
-pkgrel=2
+pkgrel=3
pkgdesc='Desktop-independent graphical login manager for X11'
arch=('i686' 'x86_64')
url='http://slim.berlios.de/'
@@ -20,7 +20,8 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'logrotate'
'slim.service'
'ptr_pam.patch'
- 'session-name.patch')
+ 'session-name.patch'
+ 'fix-numlock-1.3.3.patch')
install=install
@@ -29,6 +30,7 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
patch -p1 -i ../session-name.patch # FS#26693: fix default session name
+ patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling
cd ${srcdir}
mkdir build
cd build
@@ -60,4 +62,5 @@ md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
'43da096480bf72c3ccec8ad8400f34f0'
'aef560f5a765582b2a7fc1fac5b323a7'
'ae4b237d472ec5d373e30080aa0ff804'
- 'ebcb6829028615686de7b64ceeaaf8ed')
+ 'ebcb6829028615686de7b64ceeaaf8ed'
+ '6c29c93370e44ed310ff30132424b619')
diff --git a/extra/slim/fix-numlock-1.3.3.patch b/extra/slim/fix-numlock-1.3.3.patch
new file mode 100644
index 000000000..179fffcbf
--- /dev/null
+++ b/extra/slim/fix-numlock-1.3.3.patch
@@ -0,0 +1,46 @@
+--- trunk/app.cpp 2012/02/21 23:57:28 211
++++ trunk/app.cpp 2012/04/16 23:28:34 212
+@@ -332,6 +332,15 @@
+ Login();
+ }
+ }
++
++ // Set NumLock
++ string numlock = cfg->getOption("numlock");
++ if (numlock == "on") {
++ NumLock::setOn(Dpy);
++ } else if (numlock == "off") {
++ NumLock::setOff(Dpy);
++ }
++
+ // Start looping
+ int panelclosed = 1;
+ Panel::ActionType Action;
+@@ -971,13 +980,6 @@
+ break;
+ }
+
+- string numlock = cfg->getOption("numlock");
+- if (numlock == "on") {
+- NumLock::setOn(Dpy);
+- } else if (numlock == "off") {
+- NumLock::setOff(Dpy);
+- }
+-
+ delete args;
+
+ serverStarted = true;
+--- trunk/numlock.cpp 2012/02/21 23:57:28 211
++++ trunk/numlock.cpp 2012/04/16 23:28:34 212
+@@ -68,9 +68,9 @@
+ return;
+
+ if( flag == true )
+- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+- else
+ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
++ else
++ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+ }
+
+ void NumLock::setOn(Display *dpy) {
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index 392e7b401..652625760 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 154323 2012-03-26 10:17:14Z dreisner $
+# $Id: PKGBUILD 158810 2012-05-10 18:37:11Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=vpnc
_vpncver=0.5.3
+_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
pkgver=$_vpncver.svn516
-pkgrel=1
+pkgrel=2
pkgdesc="VPN client for cisco3000 VPN Concentrators"
url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
license=('GPL')
@@ -13,9 +14,11 @@ depends=('libgcrypt' 'openssl' 'iproute2')
optdepends=('openresolv: Let vpnc manage resolv.conf')
arch=('i686' 'x86_64')
source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"
+ "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script"
'vpnc.conf')
backup=('etc/vpnc/default.conf')
md5sums=('2118c5ccc464250c0892be57dbfabdf7'
+ '6293c15ef6e7a3365ed7add5e336b806'
'a3f4e0cc682f437e310a1c86ae198e45')
mktarball() {
@@ -52,4 +55,5 @@ package() {
make DESTDIR="$pkgdir" PREFIX=/usr install
install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf
+ install -Dm755 "$srcdir"/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script
}