[arch-commits] CVS update of arch/build/x11-libs/libx11 (3 files)
Alexander Baldeck
alexander at archlinux.org
Thu Jun 14 11:52:12 UTC 2007
Date: Thursday, June 14, 2007 @ 07:52:12
Author: alexander
Path: /home/cvs-arch/arch/build/x11-libs/libx11
Added: libX11-1.1.2-fix-XGetMotionEvents.patch (1.1)
Modified: PKGBUILD (1.18 -> 1.19)
Removed: 012_ru_RU_UTF-8_XLC_LOCALE.diff (1.1)
* XGetMotionEvents fixed to get gimp & partially xine working with libx11 1.1.2
-----------------------------------------+
012_ru_RU_UTF-8_XLC_LOCALE.diff | 237 ------------------------------
PKGBUILD | 24 +--
libX11-1.1.2-fix-XGetMotionEvents.patch | 15 +
3 files changed, 24 insertions(+), 252 deletions(-)
Index: arch/build/x11-libs/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff
diff -u arch/build/x11-libs/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff:1.1 arch/build/x11-libs/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff:removed
--- arch/build/x11-libs/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff:1.1 Fri Nov 24 17:06:29 2006
+++ arch/build/x11-libs/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff Thu Jun 14 07:52:11 2007
@@ -1,237 +0,0 @@
-Index: libx11/nls/locale.dir.pre
-===================================================================
---- libx11.orig/nls/locale.dir.pre 2006-08-02 22:04:01.000000000 +0000
-+++ libx11/nls/locale.dir.pre 2006-08-02 22:04:04.000000000 +0000
-@@ -436,7 +436,7 @@
- pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
- en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
- en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
--en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
-+ru_RU.UTF-8/XLC_LOCALE: ru_RU.UTF-8
- en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
- en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
- en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
-Index: libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre 2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1,169 @@
-+XCOMM
-+XCOMM XLocale Database Sample for ru_RU.UTF-8
-+XCOMM Derived from en_US.UTF-8
-+XCOMM
-+
-+XCOMM
-+XCOMM XLC_FONTSET category
-+XCOMM
-+XLC_FONTSET
-+
-+on_demand_loading True
-+
-+object_name generic
-+
-+XCOMM fs0 class (7 bit ASCII)
-+fs0 {
-+ charset {
-+ name ISO8859-1:GL
-+ }
-+ font {
-+ primary ISO8859-1:GL
-+ vertical_rotate all
-+ }
-+}
-+XCOMM fs1 class (ISO8859 families)
-+fs1 {
-+ charset {
-+ name ISO8859-1:GR
-+ }
-+ font {
-+ primary ISO8859-1:GR
-+ }
-+}
-+XCOMM fs2 class (KOI8-R)
-+fs2 {
-+ charset {
-+ name KOI8-R:GR
-+ }
-+ font {
-+ primary KOI8-R:GR
-+ }
-+}
-+XCOMM fs3 class (MICROSOFT-CP1251)
-+fs3 {
-+ charset {
-+ name MICROSOFT-CP1251:GR
-+ }
-+ font {
-+ primary MICROSOFT-CP1251:GR
-+ }
-+}
-+XCOMM fs4 class (ISO8859-5)
-+fs4 {
-+ charset {
-+ name ISO8859-5:GR
-+ }
-+ font {
-+ primary ISO8859-5:GR
-+ }
-+}
-+XCOMM fs5 class (Kanji)
-+fs5 {
-+ charset {
-+ name JISX0208.1983-0:GL
-+ }
-+ font {
-+ primary JISX0208.1983-0:GL
-+ }
-+}
-+XCOMM fs6 class (Korean Character)
-+fs6 {
-+ charset {
-+ name KSC5601.1987-0:GL
-+ }
-+ font {
-+ primary KSC5601.1987-0:GL
-+ }
-+}
-+XCOMM fs7 class (Chinese Han Character)
-+fs7 {
-+ charset {
-+ name GB2312.1980-0:GL
-+ }
-+ font {
-+ primary GB2312.1980-0:GL
-+ }
-+}
-+XCOMM fs8 class (Half Kana)
-+fs8 {
-+ charset {
-+ name JISX0201.1976-0:GR
-+ }
-+ font {
-+ primary JISX0201.1976-0:GR
-+ vertical_rotate all
-+ }
-+}
-+XCOMM ISO10646 should come last so the fonts above will actually be used
-+XCOMM fs9 class
-+fs9 {
-+ charset {
-+ name ISO10646-1
-+ }
-+ font {
-+ primary ISO10646-1
-+ }
-+}
-+END XLC_FONTSET
-+
-+XCOMM
-+XCOMM XLC_XLOCALE category
-+XCOMM
-+XLC_XLOCALE
-+
-+encoding_name UTF-8
-+mb_cur_max 6
-+state_depend_encoding False
-+
-+XCOMM cs0 class
-+cs0 {
-+ side GL:Default
-+ length 1
-+ ct_encoding ISO8859-1:GL
-+}
-+
-+XCOMM cs1 class
-+cs1 {
-+ side GR:Default
-+ length 1
-+ ct_encoding ISO8859-1:GR
-+}
-+
-+XCOMM cs2 class
-+cs2 {
-+ side GR
-+ length 2
-+ ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR
-+
-+}
-+
-+XCOMM cs3 class
-+cs3 {
-+ side GL
-+ length 2
-+ ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR; KSC5601.1987-1:GL; KSC5601.1987-1:GR
-+
-+}
-+
-+XCOMM cs4 class
-+cs4 {
-+ side GR
-+ length 2
-+ ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
-+}
-+
-+XCOMM cs5 class
-+cs5 {
-+ side GR
-+ length 1
-+ ct_encoding JISX0201.1976-0:GR
-+}
-+
-+XCOMM cs6 class
-+cs6 {
-+ side none
-+ ct_encoding ISO10646-1
-+}
-+
-+END XLC_XLOCALE
-Index: libx11/nls/ru_RU.UTF-8/XI18N_OBJS
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/XI18N_OBJS 2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1,7 @@
-+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
-+#
-+# XI18N objects table for en_US.UTF-8 locale
-+#
-+XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
-+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
-+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
-Index: libx11/configure.ac
-===================================================================
---- libx11.orig/configure.ac 2006-08-02 20:31:39.000000000 +0000
-+++ libx11/configure.ac 2006-08-02 22:04:04.000000000 +0000
-@@ -400,6 +400,7 @@
- nls/mulelao-1/Makefile
- nls/nokhchi-1/Makefile
- nls/pt_BR.UTF-8/Makefile
-+ nls/ru_RU.UTF-8/Makefile
- nls/tatar-cyr/Makefile
- nls/th_TH/Makefile
- nls/th_TH.UTF-8/Makefile
-Index: libx11/nls/Makefile.am
-===================================================================
---- libx11.orig/nls/Makefile.am 2006-08-02 20:31:30.000000000 +0000
-+++ libx11/nls/Makefile.am 2006-08-02 22:04:04.000000000 +0000
-@@ -52,6 +52,7 @@
- mulelao-1 \
- nokhchi-1 \
- pt_BR.UTF-8 \
-+ ru_RU.UTF-8 \
- tatar-cyr \
- th_TH \
- th_TH.UTF-8 \
-Index: libx11/nls/ru_RU.UTF-8/Compose.pre
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/Compose.pre 2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1 @@
-+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
-Index: libx11/nls/ru_RU.UTF-8/Makefile.am
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/Makefile.am 2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1,3 @@
-+x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
-+
-+include $(top_srcdir)/nls/localerules.in
Index: arch/build/x11-libs/libx11/PKGBUILD
diff -u arch/build/x11-libs/libx11/PKGBUILD:1.18 arch/build/x11-libs/libx11/PKGBUILD:1.19
--- arch/build/x11-libs/libx11/PKGBUILD:1.18 Wed Jun 6 13:27:30 2007
+++ arch/build/x11-libs/libx11/PKGBUILD Thu Jun 14 07:52:11 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.18 2007/06/06 17:27:30 alexander Exp $
-#Maintainer: Jan de Groot <jgc at archlinux.org>
-force=y
+# $Id: PKGBUILD,v 1.19 2007/06/14 11:52:11 alexander Exp $
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Contributor Jan de Groot <jgc at archlinux.org>
pkgname=libx11
-pkgver=1.1.1
-pkgrel=4
+pkgver=1.1.2
+pkgrel=1
pkgdesc="X11 client-side library"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -11,21 +11,15 @@
makedepends=('pkgconfig' 'xcmiscproto' 'xextproto' 'xf86bigfontproto' 'xtrans' 'xorg-util-macros')
options=('nolibtool')
source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
- ${url}/archive/X11R7.2/patches/xorg-libX11-1.1.1-xinitimage.diff
- 012_ru_RU_UTF-8_XLC_LOCALE.diff)
-md5sums=('848b80f77b20ae1fa5c882bbfa531ebc'
- 'd52da02163cd401b99b6e3a08d7ff068'
- 'c7e38a68b932ed557bc71979eed2a8a1')
+ libX11-1.1.2-fix-XGetMotionEvents.patch)
build() {
cd ${startdir}/src/libX11-${pkgver}
- patch -Np1 -i ${startdir}/src/012_ru_RU_UTF-8_XLC_LOCALE.diff
- patch -Np1 -i ${startdir}/src/xorg-libX11-1.1.1-xinitimage.diff
- aclocal
- autoconf
- automake
+ patch -Np1 -i ${startdir}/src/libX11-1.1.2-fix-XGetMotionEvents.patch || return 1
./configure --prefix=/usr \
--build=${CHOST} --host=${CHOST} --without-xcb
make || return 1
make DESTDIR=${startdir}/pkg install || return 1
}
+md5sums=('710bf38a9477a5a1b235bc94f1d0593c'
+ '7bfd6a4034d549b3d08d85876f51de7d')
Index: arch/build/x11-libs/libx11/libX11-1.1.2-fix-XGetMotionEvents.patch
diff -u /dev/null arch/build/x11-libs/libx11/libX11-1.1.2-fix-XGetMotionEvents.patch:1.1
--- /dev/null Thu Jun 14 07:52:11 2007
+++ arch/build/x11-libs/libx11/libX11-1.1.2-fix-XGetMotionEvents.patch Thu Jun 14 07:52:12 2007
@@ -0,0 +1,15 @@
+diff --git a/src/GetMoEv.c b/src/GetMoEv.c
+index 2aa6c1a..dac1bfc 100644
+--- a/src/GetMoEv.c
++++ b/src/GetMoEv.c
+@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group.
+
+ XTimeCoord *XGetMotionEvents(
+ register Display *dpy,
++ Window w,
+ Time start,
+ Time stop,
+- Window w,
+ int *nEvents) /* RETURN */
+ {
+ xGetMotionEventsReply rep;
More information about the arch-commits
mailing list