[arch-commits] Commit in xkeyboard-config/repos/extra-any (3 files)
Andreas Radke
andyrtr at archlinux.org
Fri May 31 05:37:34 UTC 2019
Date: Friday, May 31, 2019 @ 05:37:34
Author: andyrtr
Revision: 354551
archrelease: copy trunk to extra-any
Added:
xkeyboard-config/repos/extra-any/PKGBUILD
(from rev 354550, xkeyboard-config/trunk/PKGBUILD)
Deleted:
xkeyboard-config/repos/extra-any/PKGBUILD
xkeyboard-config/repos/extra-any/pt-layout.patch
-----------------+
PKGBUILD | 86 ++++++++++++++++++++++++------------------------------
pt-layout.patch | 85 -----------------------------------------------------
2 files changed, 39 insertions(+), 132 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-31 05:37:26 UTC (rev 354550)
+++ PKGBUILD 2019-05-31 05:37:34 UTC (rev 354551)
@@ -1,47 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xkeyboard-config
-pkgver=2.26
-pkgrel=2
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
-provides=('xkbdata')
-replaces=('xkbdata')
-conflicts=('xkbdata')
-source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
- pt-layout.patch)
-validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
-validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
-sha512sums=('5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef'
- 'SKIP'
- '98c8b47e9a36ba3f130454fdd68c508f54b78eb65ddb071ca85bdcc3b324699e51155e3fc425ccae98350bb6430fea4771c0338024c1e06063a54b879bb707db')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- # fix broken pt layout - FS#61634
- patch -Np1 -i ../pt-layout.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --with-xkb-base=/usr/share/X11/xkb \
- --with-xkb-rules-symlink=xorg \
- --enable-compat-rules=yes
- make
- }
-
- package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
- rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
-
- install -m755 -d "${pkgdir}/var/lib/xkb"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xkeyboard-config/repos/extra-any/PKGBUILD (from rev 354550, xkeyboard-config/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-31 05:37:34 UTC (rev 354551)
@@ -0,0 +1,39 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xkeyboard-config
+pkgver=2.27
+pkgrel=1
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
+provides=('xkbdata')
+replaces=('xkbdata')
+conflicts=('xkbdata')
+source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
+validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
+sha512sums=('ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e'
+ 'SKIP')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --with-xkb-base=/usr/share/X11/xkb \
+ --with-xkb-rules-symlink=xorg \
+ --enable-compat-rules=yes
+ make
+ }
+
+ package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
+
+ install -m755 -d "${pkgdir}/var/lib/xkb"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: pt-layout.patch
===================================================================
--- pt-layout.patch 2019-05-31 05:37:26 UTC (rev 354550)
+++ pt-layout.patch 2019-05-31 05:37:34 UTC (rev 354551)
@@ -1,85 +0,0 @@
-From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov <sergey.udaltsov at gmail.com>
-Date: Thu, 7 Feb 2019 20:40:35 +0000
-Subject: [PATCH] Fixed broken pt layout
-
-Backticks broke it, removed
----
- symbols/pt | 62 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/symbols/pt b/symbols/pt
-index 73a1b7b..3ec0981 100644
---- a/symbols/pt
-+++ b/symbols/pt
-@@ -221,35 +221,35 @@ xkb_symbols "colemak" {
-
- name[Group1]="Portuguese (Colemak)";
-
-- key `<AD01>` { [ q, Q, at, Greek_OMEGA ] };
-- key `<AD02>` { [ w, W, lstroke, Lstroke ] };
-- key `<AD03>` { [ f, F, dstroke, ordfeminine ] };
-- key `<AD04>` { [ p, P, thorn, THORN ] };
-- key `<AD05>` { [ g, G, eng, ENG ] };
-- key `<AD06>` { [ j, J, dead_hook, dead_horn ] };
-- key `<AD07>` { [ l, L, lstroke, Lstroke ] };
-- key `<AD08>` { [ u, U, downarrow, uparrow ] };
-- key `<AD09>` { [ y, Y, leftarrow, yen ] };
-- key `<AD10>` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
--
-- key `<AC01>` { [ a, A, ae, AE ] };
-- key `<AC02>` { [ r, R, paragraph, registered ] };
-- key `<AC03>` { [ s, S, ssharp, section ] };
-- key `<AC04>` { [ t, T, tslash, Tslash ] };
-- key `<AC05>` { [ d, D, eth, ETH ] };
-- key `<AC06>` { [ h, H, hstroke, Hstroke ] };
-- key `<AC07>` { [ n, N, n, N ] };
-- key `<AC08>` { [ e, E, EuroSign, cent ] };
-- key `<AC09>` { [ i, I, rightarrow, idotless ] };
-- key `<AC10>` { [ o, O, oslash, Ooblique ] };
--
-- key `<AB01>` { [ z, Z, guillemotleft, less ] };
-- key `<AB02>` { [ x, X, guillemotright, greater ] };
-- key `<AB03>` { [ c, C, cent, copyright ] };
-- key `<AB04>` { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
-- key `<AB05>` { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
-- key `<AB08>` { [ k, K, kra, ampersand ] };
-- key `<AB07>` { [ m, M, mu, masculine ] };
--
-- key `<CAPS>` { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
-+ key <AD01> { [ q, Q, at, Greek_OMEGA ] };
-+ key <AD02> { [ w, W, lstroke, Lstroke ] };
-+ key <AD03> { [ f, F, dstroke, ordfeminine ] };
-+ key <AD04> { [ p, P, thorn, THORN ] };
-+ key <AD05> { [ g, G, eng, ENG ] };
-+ key <AD06> { [ j, J, dead_hook, dead_horn ] };
-+ key <AD07> { [ l, L, lstroke, Lstroke ] };
-+ key <AD08> { [ u, U, downarrow, uparrow ] };
-+ key <AD09> { [ y, Y, leftarrow, yen ] };
-+ key <AD10> { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
-+
-+ key <AC01> { [ a, A, ae, AE ] };
-+ key <AC02> { [ r, R, paragraph, registered ] };
-+ key <AC03> { [ s, S, ssharp, section ] };
-+ key <AC04> { [ t, T, tslash, Tslash ] };
-+ key <AC05> { [ d, D, eth, ETH ] };
-+ key <AC06> { [ h, H, hstroke, Hstroke ] };
-+ key <AC07> { [ n, N, n, N ] };
-+ key <AC08> { [ e, E, EuroSign, cent ] };
-+ key <AC09> { [ i, I, rightarrow, idotless ] };
-+ key <AC10> { [ o, O, oslash, Ooblique ] };
-+
-+ key <AB01> { [ z, Z, guillemotleft, less ] };
-+ key <AB02> { [ x, X, guillemotright, greater ] };
-+ key <AB03> { [ c, C, cent, copyright ] };
-+ key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
-+ key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
-+ key <AB08> { [ k, K, kra, ampersand ] };
-+ key <AB07> { [ m, M, mu, masculine ] };
-+
-+ key <CAPS> { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
- };
---
-2.18.1
-
-
More information about the arch-commits
mailing list