[arch-commits] Commit in libx11/trunk (PKGBUILD add-define-XK_SINHALA.patch xorg.csh)

[Jan de Groot]

Date: Thursday, April 7, 2011 @ 02:55:14
  Author: jgc
Revision: 118455

upgpkg: libx11 1.4.3-1
Update to 1.4.3, add csh profile.d script (FS#23583)

Added:
  libx11/trunk/xorg.csh
Modified:
  libx11/trunk/PKGBUILD
Deleted:
  libx11/trunk/add-define-XK_SINHALA.patch

-+
 PKGBUILD|   17 -
 add-define-XK_SINHALA.patch |   25 -
 xorg.csh|   15 +++
 3 files changed, 23 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-07 01:46:36 UTC (rev 118454)
+++ PKGBUILD2011-04-07 06:55:14 UTC (rev 118455)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=libx11
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.4.3
+pkgrel=1
 pkgdesc=X11 client-side library
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -12,15 +12,14 @@
 options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
-add-define-XK_SINHALA.patch
-xorg.sh)
-sha1sums=('c93fc44dcc028319bee76f3e629ec43cfce42673'
-  '4f5ccff733042a6ea0fe41082903c332336a173c'
-  '4b756387426afb2a5bb7a155631ec42348abf5c1')
+xorg.sh
+xorg.csh)
+sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8'
+  '4b756387426afb2a5bb7a155631ec42348abf5c1'
+  '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8')
 
 build() {
   cd ${srcdir}/libX11-${pkgver}
-  patch -Np1 -i ${srcdir}/add-define-XK_SINHALA.patch
   ./configure --prefix=/usr --disable-static --disable-xf86bigfont
   make
   make check
@@ -31,7 +30,7 @@
   make DESTDIR=${pkgdir} install
 
   install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/xorg.sh ${pkgdir}/etc/profile.d/
+  install -m755 ${srcdir}/xorg.{sh,csh} ${pkgdir}/etc/profile.d/
 
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/

Deleted: add-define-XK_SINHALA.patch
===
--- add-define-XK_SINHALA.patch 2011-04-07 01:46:36 UTC (rev 118454)
+++ add-define-XK_SINHALA.patch 2011-04-07 06:55:14 UTC (rev 118455)
@@ -1,25 +0,0 @@
-From 25eb76b3d2726f2f1de759901971ae53b2539dc4 Mon Sep 17 00:00:00 2001
-From: Harshula Jayasuriya harsh...@gmail.com
-Date: Mon, 21 Mar 2011 14:49:37 +
-Subject: Add #define XK_SINHALA
-
-Add #define XK_SINHALA so that the Sinhala keysyms can be used by
-the lk xkb keymap.
-
-Signed-off-by: Harshula Jayasuriya harsh...@gmail.com
-Reviewed-by: Daniel Stone dan...@fooishbar.org

-diff --git a/src/KeyBind.c b/src/KeyBind.c
-index ac25ce2..221cedd 100644
 a/src/KeyBind.c
-+++ b/src/KeyBind.c
-@@ -44,6 +44,7 @@ in this Software without prior written authorization from 
The Open Group.
- #define XK_CAUCASUS
- #define XK_VIETNAMESE
- #define XK_XKB_KEYS
-+#define XK_SINHALA
- #include X11/keysymdef.h
- #include stdio.h
- 
---
-cgit v0.8.3-6-g21f6

Added: xorg.csh
===
--- xorg.csh(rev 0)
+++ xorg.csh2011-04-07 06:55:14 UTC (rev 118455)
@@ -0,0 +1,15 @@
+setenv XDG_DATA_HOME ${HOME}/.local/share
+setenv XDG_CONFIG_HOME ${HOME}/.config
+setenv XDG_CACHE_HOME ${HOME}/.cache
+
+if (! ($?XDG_DATA_DIRS) ) then
+   setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/
+else
+   setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS}
+endif
+
+if (! ($?XDG_CONFIG_DIRS) ) then
+   setenv XDG_CONFIG_DIRS /etc/xdg
+else
+   setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS}
+endif

[arch-commits] Commit in libx11/trunk (PKGBUILD add-define-XK_SINHALA.patch)

[Jan de Groot]

Date: Monday, April 4, 2011 @ 04:36:52
  Author: jgc
Revision: 117498

upgpkg: libx11 1.4.2-2
Add required patch for xkeyboard-config update

Added:
  libx11/trunk/add-define-XK_SINHALA.patch
Modified:
  libx11/trunk/PKGBUILD

-+
 PKGBUILD|5 -
 add-define-XK_SINHALA.patch |   25 +
 2 files changed, 29 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-04 07:43:48 UTC (rev 117497)
+++ PKGBUILD2011-04-04 08:36:52 UTC (rev 117498)
@@ -3,7 +3,7 @@
 
 pkgname=libx11
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc=X11 client-side library
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -12,12 +12,15 @@
 options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
+add-define-XK_SINHALA.patch
 xorg.sh)
 sha1sums=('c93fc44dcc028319bee76f3e629ec43cfce42673'
+  '4f5ccff733042a6ea0fe41082903c332336a173c'
   '4b756387426afb2a5bb7a155631ec42348abf5c1')
 
 build() {
   cd ${srcdir}/libX11-${pkgver}
+  patch -Np1 -i ${srcdir}/add-define-XK_SINHALA.patch
   ./configure --prefix=/usr --disable-static --disable-xf86bigfont
   make
   make check

Added: add-define-XK_SINHALA.patch
===
--- add-define-XK_SINHALA.patch (rev 0)
+++ add-define-XK_SINHALA.patch 2011-04-04 08:36:52 UTC (rev 117498)
@@ -0,0 +1,25 @@
+From 25eb76b3d2726f2f1de759901971ae53b2539dc4 Mon Sep 17 00:00:00 2001
+From: Harshula Jayasuriya harsh...@gmail.com
+Date: Mon, 21 Mar 2011 14:49:37 +
+Subject: Add #define XK_SINHALA
+
+Add #define XK_SINHALA so that the Sinhala keysyms can be used by
+the lk xkb keymap.
+
+Signed-off-by: Harshula Jayasuriya harsh...@gmail.com
+Reviewed-by: Daniel Stone dan...@fooishbar.org
+---
+diff --git a/src/KeyBind.c b/src/KeyBind.c
+index ac25ce2..221cedd 100644
+--- a/src/KeyBind.c
 b/src/KeyBind.c
+@@ -44,6 +44,7 @@ in this Software without prior written authorization from 
The Open Group.
+ #define XK_CAUCASUS
+ #define XK_VIETNAMESE
+ #define XK_XKB_KEYS
++#define XK_SINHALA
+ #include X11/keysymdef.h
+ #include stdio.h
+ 
+--
+cgit v0.8.3-6-g21f6