Date: Thursday, October 8, 2020 @ 16:19:30 Author: andyrtr Revision: 397576
archrelease: copy trunk to extra-any Added: xkeyboard-config/repos/extra-any/PKGBUILD (from rev 397575, xkeyboard-config/trunk/PKGBUILD) Deleted: xkeyboard-config/repos/extra-any/PKGBUILD xkeyboard-config/repos/extra-any/fix_symbols_syntax_error.diff -------------------------------+ PKGBUILD | 88 ++++++++++++++++++---------------------- fix_symbols_syntax_error.diff | 13 ----- 2 files changed, 40 insertions(+), 61 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-10-08 16:19:25 UTC (rev 397575) +++ PKGBUILD 2020-10-08 16:19:30 UTC (rev 397576) @@ -1,48 +0,0 @@ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xkeyboard-config -pkgver=2.30 -pkgrel=2 -pkgdesc="X keyboard configuration files" -arch=(any) -license=('custom') -# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config -url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" -makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python') -provides=('xkbdata') -replaces=('xkbdata') -conflicts=('xkbdata') -source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} - fix_symbols_syntax_error.diff) -validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') -validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <s...@gnome.org>" -sha512sums=('2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4' - 'SKIP' - 'b8463f877f671be5ebf5b1baf1f5c287a14f57de56cc67ea71c6094b40b501c12fbbab3d6cb79926aac80546919a74d0fb77a13ea1a58791a968ee1a1bbe25f6') - -prepare() { - cd ${pkgname}-${pkgver} - # FS#66898 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/212 - patch -Np1 -i ../fix_symbols_syntax_error.diff -} - -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 397575, xkeyboard-config/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-10-08 16:19:30 UTC (rev 397576) @@ -0,0 +1,40 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xkeyboard-config +pkgver=2.31 +pkgrel=1 +pkgdesc="X keyboard configuration files" +arch=(any) +license=('custom') +# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config +url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" +makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python') +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) <s...@gnome.org>" +sha512sums=('f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669' + '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: fix_symbols_syntax_error.diff =================================================================== --- fix_symbols_syntax_error.diff 2020-10-08 16:19:25 UTC (rev 397575) +++ fix_symbols_syntax_error.diff 2020-10-08 16:19:30 UTC (rev 397576) @@ -1,13 +0,0 @@ -diff --git a/symbols/in b/symbols/in -index 3ca78a20664d803d92e87315b6372909f31594e8..b3a5ca9ef613876b668a521a8f464596ab835d9e 100644 ---- a/symbols/in -+++ b/symbols/in -@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" { - key <AB09> { [ period, U0964, U0965, U093d ] }; - key <AB10> { [ U092f, question, slash, question ] }; - }; --======= -+ - // EXTRAS: - - // Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.