From ff9fbd2917ec26031f8c0f92ce623a0d0b0fd557 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 23 Mar 2011 12:04:00 +1000 Subject: [PATCH] xproto 7.0.21 0001-Add-XF86XK_TouchpadOn-Off.patch: drop, 5d3428de974d 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch: drop, 423f5faddbb1023d --- .gitignore | 1 + 0001-Add-XF86XK_TouchpadOn-Off.patch | 32 ----- ...s-for-Unicode-Sinhala-to-keysymdef.h.patch | 126 ------------------ sources | 1 + xorg-x11-proto-devel.spec | 18 ++- 5 files changed, 10 insertions(+), 168 deletions(-) delete mode 100644 0001-Add-XF86XK_TouchpadOn-Off.patch delete mode 100644 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch diff --git a/.gitignore b/.gitignore index 277a8e4..78038e5 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ inputproto-2.0.1.tar.bz2 /randrproto-20110224-git105a161.tar.bz2 /xextproto-7.2.0.tar.bz2 /fixesproto-5.0.tar.bz2 +/xproto-7.0.21.tar.bz2 diff --git a/0001-Add-XF86XK_TouchpadOn-Off.patch b/0001-Add-XF86XK_TouchpadOn-Off.patch deleted file mode 100644 index b2517b6..0000000 --- a/0001-Add-XF86XK_TouchpadOn-Off.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5d3428de974d15357b0ad407f4c5222cfaa8f9f3 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 8 Nov 2010 15:24:55 +1000 -Subject: [PATCH] Add XF86XK_TouchpadOn/Off - -Those keysyms will be used to report events from the hardware. Hardware -like the HP laptops emit 2 separate keycodes when the touchpad is enabled -or disabled. So we can catch those in user-space and display a popup. - -https://bugs.freedesktop.org/show_bug.cgi?id=31300 - -Signed-off-by: Peter Hutterer ---- - XF86keysym.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/XF86keysym.h b/XF86keysym.h -index 200f5c1..fd3af4f 100644 ---- a/XF86keysym.h -+++ b/XF86keysym.h -@@ -207,6 +207,8 @@ - #define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */ - #define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */ - #define XF86XK_TouchpadToggle 0x1008FFA9 /* Toggle between touchpad/trackstick */ -+#define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */ -+#define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */ - - /* Keys for special action keys (hot keys) */ - /* Virtual terminals on some operating systems */ --- -1.7.3.2 - diff --git a/0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch b/0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch deleted file mode 100644 index 4fbce2c..0000000 --- a/0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 423f5faddbb1023d0c1cf55b9d1da4397aa1aa26 Mon Sep 17 00:00:00 2001 -From: Harshula Jayasuriya -Date: Tue, 15 Mar 2011 10:46:48 +0000 -Subject: [PATCH] Add #defines for Unicode Sinhala to keysymdef.h - -Add #defines for Unicode Sinhala so that they can be used in the lk XKB -keyboard layout. - -Signed-off-by: Harshula Jayasuriya -Reviewed-by: Daniel Stone ---- - keysym.h | 1 + - keysymdef.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 89 insertions(+), 0 deletions(-) - -diff --git a/keysym.h b/keysym.h -index 641b25b..4f58488 100644 ---- a/keysym.h -+++ b/keysym.h -@@ -68,6 +68,7 @@ SOFTWARE. - #define XK_CURRENCY - #define XK_MATHEMATICAL - #define XK_BRAILLE -+#define XK_SINHALA - - #include - -diff --git a/keysymdef.h b/keysymdef.h -index ec125a6..a4a760d 100644 ---- a/keysymdef.h -+++ b/keysymdef.h -@@ -2387,3 +2387,91 @@ SOFTWARE. - #define XK_braille_dots_2345678 0x10028fe /* U+28fe BRAILLE PATTERN DOTS-2345678 */ - #define XK_braille_dots_12345678 0x10028ff /* U+28ff BRAILLE PATTERN DOTS-12345678 */ - #endif /* XK_BRAILLE */ -+ -+/* -+ * Sinhala (http://unicode.org/charts/PDF/U0D80.pdf) -+ * http://www.nongnu.org/sinhala/doc/transliteration/sinhala-transliteration_6.html -+ */ -+ -+#ifdef XK_SINHALA -+#define XK_Sinh_ng 0x1000d82 /* U+0D82 SINHALA ANUSVARAYA */ -+#define XK_Sinh_h2 0x1000d83 /* U+0D83 SINHALA VISARGAYA */ -+#define XK_Sinh_a 0x1000d85 /* U+0D85 SINHALA AYANNA */ -+#define XK_Sinh_aa 0x1000d86 /* U+0D86 SINHALA AAYANNA */ -+#define XK_Sinh_ae 0x1000d87 /* U+0D87 SINHALA AEYANNA */ -+#define XK_Sinh_aee 0x1000d88 /* U+0D88 SINHALA AEEYANNA */ -+#define XK_Sinh_i 0x1000d89 /* U+0D89 SINHALA IYANNA */ -+#define XK_Sinh_ii 0x1000d8a /* U+0D8A SINHALA IIYANNA */ -+#define XK_Sinh_u 0x1000d8b /* U+0D8B SINHALA UYANNA */ -+#define XK_Sinh_uu 0x1000d8c /* U+0D8C SINHALA UUYANNA */ -+#define XK_Sinh_ri 0x1000d8d /* U+0D8D SINHALA IRUYANNA */ -+#define XK_Sinh_rii 0x1000d8e /* U+0D8E SINHALA IRUUYANNA */ -+#define XK_Sinh_lu 0x1000d8f /* U+0D8F SINHALA ILUYANNA */ -+#define XK_Sinh_luu 0x1000d90 /* U+0D90 SINHALA ILUUYANNA */ -+#define XK_Sinh_e 0x1000d91 /* U+0D91 SINHALA EYANNA */ -+#define XK_Sinh_ee 0x1000d92 /* U+0D92 SINHALA EEYANNA */ -+#define XK_Sinh_ai 0x1000d93 /* U+0D93 SINHALA AIYANNA */ -+#define XK_Sinh_o 0x1000d94 /* U+0D94 SINHALA OYANNA */ -+#define XK_Sinh_oo 0x1000d95 /* U+0D95 SINHALA OOYANNA */ -+#define XK_Sinh_au 0x1000d96 /* U+0D96 SINHALA AUYANNA */ -+#define XK_Sinh_ka 0x1000d9a /* U+0D9A SINHALA KAYANNA */ -+#define XK_Sinh_kha 0x1000d9b /* U+0D9B SINHALA MAHA. KAYANNA */ -+#define XK_Sinh_ga 0x1000d9c /* U+0D9C SINHALA GAYANNA */ -+#define XK_Sinh_gha 0x1000d9d /* U+0D9D SINHALA MAHA. GAYANNA */ -+#define XK_Sinh_ng2 0x1000d9e /* U+0D9E SINHALA KANTAJA NAASIKYAYA */ -+#define XK_Sinh_nga 0x1000d9f /* U+0D9F SINHALA SANYAKA GAYANNA */ -+#define XK_Sinh_ca 0x1000da0 /* U+0DA0 SINHALA CAYANNA */ -+#define XK_Sinh_cha 0x1000da1 /* U+0DA1 SINHALA MAHA. CAYANNA */ -+#define XK_Sinh_ja 0x1000da2 /* U+0DA2 SINHALA JAYANNA */ -+#define XK_Sinh_jha 0x1000da3 /* U+0DA3 SINHALA MAHA. JAYANNA */ -+#define XK_Sinh_nya 0x1000da4 /* U+0DA4 SINHALA TAALUJA NAASIKYAYA */ -+#define XK_Sinh_jnya 0x1000da5 /* U+0DA5 SINHALA TAALUJA SANYOOGA NAASIKYAYA */ -+#define XK_Sinh_nja 0x1000da6 /* U+0DA6 SINHALA SANYAKA JAYANNA */ -+#define XK_Sinh_tta 0x1000da7 /* U+0DA7 SINHALA TTAYANNA */ -+#define XK_Sinh_ttha 0x1000da8 /* U+0DA8 SINHALA MAHA. TTAYANNA */ -+#define XK_Sinh_dda 0x1000da9 /* U+0DA9 SINHALA DDAYANNA */ -+#define XK_Sinh_ddha 0x1000daa /* U+0DAA SINHALA MAHA. DDAYANNA */ -+#define XK_Sinh_nna 0x1000dab /* U+0DAB SINHALA MUURDHAJA NAYANNA */ -+#define XK_Sinh_ndda 0x1000dac /* U+0DAC SINHALA SANYAKA DDAYANNA */ -+#define XK_Sinh_tha 0x1000dad /* U+0DAD SINHALA TAYANNA */ -+#define XK_Sinh_thha 0x1000dae /* U+0DAE SINHALA MAHA. TAYANNA */ -+#define XK_Sinh_dha 0x1000daf /* U+0DAF SINHALA DAYANNA */ -+#define XK_Sinh_dhha 0x1000db0 /* U+0DB0 SINHALA MAHA. DAYANNA */ -+#define XK_Sinh_na 0x1000db1 /* U+0DB1 SINHALA DANTAJA NAYANNA */ -+#define XK_Sinh_ndha 0x1000db3 /* U+0DB3 SINHALA SANYAKA DAYANNA */ -+#define XK_Sinh_pa 0x1000db4 /* U+0DB4 SINHALA PAYANNA */ -+#define XK_Sinh_pha 0x1000db5 /* U+0DB5 SINHALA MAHA. PAYANNA */ -+#define XK_Sinh_ba 0x1000db6 /* U+0DB6 SINHALA BAYANNA */ -+#define XK_Sinh_bha 0x1000db7 /* U+0DB7 SINHALA MAHA. BAYANNA */ -+#define XK_Sinh_ma 0x1000db8 /* U+0DB8 SINHALA MAYANNA */ -+#define XK_Sinh_mba 0x1000db9 /* U+0DB9 SINHALA AMBA BAYANNA */ -+#define XK_Sinh_ya 0x1000dba /* U+0DBA SINHALA YAYANNA */ -+#define XK_Sinh_ra 0x1000dbb /* U+0DBB SINHALA RAYANNA */ -+#define XK_Sinh_la 0x1000dbd /* U+0DBD SINHALA DANTAJA LAYANNA */ -+#define XK_Sinh_va 0x1000dc0 /* U+0DC0 SINHALA VAYANNA */ -+#define XK_Sinh_sha 0x1000dc1 /* U+0DC1 SINHALA TAALUJA SAYANNA */ -+#define XK_Sinh_ssha 0x1000dc2 /* U+0DC2 SINHALA MUURDHAJA SAYANNA */ -+#define XK_Sinh_sa 0x1000dc3 /* U+0DC3 SINHALA DANTAJA SAYANNA */ -+#define XK_Sinh_ha 0x1000dc4 /* U+0DC4 SINHALA HAYANNA */ -+#define XK_Sinh_lla 0x1000dc5 /* U+0DC5 SINHALA MUURDHAJA LAYANNA */ -+#define XK_Sinh_fa 0x1000dc6 /* U+0DC6 SINHALA FAYANNA */ -+#define XK_Sinh_al 0x1000dca /* U+0DCA SINHALA AL-LAKUNA */ -+#define XK_Sinh_aa2 0x1000dcf /* U+0DCF SINHALA AELA-PILLA */ -+#define XK_Sinh_ae2 0x1000dd0 /* U+0DD0 SINHALA AEDA-PILLA */ -+#define XK_Sinh_aee2 0x1000dd1 /* U+0DD1 SINHALA DIGA AEDA-PILLA */ -+#define XK_Sinh_i2 0x1000dd2 /* U+0DD2 SINHALA IS-PILLA */ -+#define XK_Sinh_ii2 0x1000dd3 /* U+0DD3 SINHALA DIGA IS-PILLA */ -+#define XK_Sinh_u2 0x1000dd4 /* U+0DD4 SINHALA PAA-PILLA */ -+#define XK_Sinh_uu2 0x1000dd6 /* U+0DD6 SINHALA DIGA PAA-PILLA */ -+#define XK_Sinh_ru2 0x1000dd8 /* U+0DD8 SINHALA GAETTA-PILLA */ -+#define XK_Sinh_e2 0x1000dd9 /* U+0DD9 SINHALA KOMBUVA */ -+#define XK_Sinh_ee2 0x1000dda /* U+0DDA SINHALA DIGA KOMBUVA */ -+#define XK_Sinh_ai2 0x1000ddb /* U+0DDB SINHALA KOMBU DEKA */ -+#define XK_Sinh_o2 0x1000ddc /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA*/ -+#define XK_Sinh_oo2 0x1000ddd /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA*/ -+#define XK_Sinh_au2 0x1000dde /* U+0DDE SINHALA KOMBUVA HAA GAYANUKITTA */ -+#define XK_Sinh_lu2 0x1000ddf /* U+0DDF SINHALA GAYANUKITTA */ -+#define XK_Sinh_ruu2 0x1000df2 /* U+0DF2 SINHALA DIGA GAETTA-PILLA */ -+#define XK_Sinh_luu2 0x1000df3 /* U+0DF3 SINHALA DIGA GAYANUKITTA */ -+#define XK_Sinh_kunddaliya 0x1000df4 /* U+0DF4 SINHALA KUNDDALIYA */ -+#endif /* XK_SINHALA */ --- -1.7.4 - diff --git a/sources b/sources index 5c1e42a..b81eabc 100644 --- a/sources +++ b/sources @@ -26,3 +26,4 @@ e793ecefeaecfeabd1aed6a01095174e xf86vidmodeproto-2.3.1.tar.bz2 700f8663c23713c2a81a6038a7d358f0 xproto-7.0.19.tar.bz2 9de22ca1522008c28fb03dfc41ba2d30 xproxymanagementprotocol-1.0.3.tar.bz2 e7431ab84d37b2678af71e29355e101d fixesproto-5.0.tar.bz2 +c5a93a69b701cf81925fab02b35b0d0e xproto-7.0.21.tar.bz2 diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec index c78c3d1..7e6a22a 100644 --- a/xorg-x11-proto-devel.spec +++ b/xorg-x11-proto-devel.spec @@ -7,7 +7,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.6 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: Development/System URL: http://www.x.org @@ -38,14 +38,11 @@ Source24: http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1. Source25: http://xorg.freedesktop.org/archive/individual/proto/xf86miscproto-0.9.3.tar.bz2 Source27: http://xorg.freedesktop.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 Source28: http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.1.tar.bz2 -Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.19.tar.bz2 +Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.21.tar.bz2 Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2 Source40: make-git-snapshot.sh -Patch1: 0001-Add-XF86XK_TouchpadOn-Off.patch -Patch2: 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch - BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.0.2-1 @@ -61,11 +58,6 @@ X.Org X11 Protocol headers %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31 -pushd xproto-* -%patch1 -p1 -b .xf86touchpad -%patch2 -p1 -b .sinhala -popd - %build # Proceed through each proto package directory, building them all @@ -274,6 +266,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pkgconfig/xproxymngproto.pc %changelog +* Wed Mar 23 2011 Peter Hutterer 7.6-8 +- xproto 7.0.21 +- 0001-Add-XF86XK_TouchpadOn-Off.patch: drop, 5d3428de974d +- 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch: drop, + 423f5faddbb1023d + * Wed Mar 16 2011 Peter Hutterer 7.6-7 - 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch: add defines for Unicode Sinhala