joborun-pkg/jobextra
joborun-pkg
/
jobextra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upg xkeyboard-config

This commit is contained in:
joborun linux 2022-09-06 23:42:56 +03:00
parent be38f6a3fe
commit 402d79adfe
7 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qt5-base/PKGBUILD
View File

@ -8,8 +8,8 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.5
pkgver=5.15.5+kde+r180
_commit=663c277cab488c9fd3e0759900a59b87244fde3e
pkgver=5.15.5+kde+r182
_commit=a001e58a3f33ba3f6d250e10646af56bf7b415f0
pkgrel=01
arch=('x86_64')
url='https://www.qt.io'

4
qt5-base/PKGBUILD-arch
View File

@ -4,9 +4,9 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.5
pkgver=5.15.5+kde+r180
pkgver=5.15.5+kde+r182
pkgrel=1
_commit=663c277cab488c9fd3e0759900a59b87244fde3e
_commit=a001e58a3f33ba3f6d250e10646af56bf7b415f0
arch=('x86_64')
url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom')

43
xkeyboard-config/PKGBUILD
View File

@ -6,28 +6,30 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=xkeyboard-config
pkgver=2.36
pkgrel=03
_commit=382c5feb04c151833a8d10de3198d1ace4d62c0b # = master 2022-09-05
pkgver=2.36+89+g382c5feb
pkgrel=01
pkgdesc="X keyboard configuration files"
arch=(any)
url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson')
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson' 'git')
provides=('xkbdata')
replaces=('xkbdata')
conflicts=('xkbdata')
source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
alujiskeys.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/dc1534b4b0cf2153e4b8848310efc8393fb73830.patch
backslahes-instead-of-slashes.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2.patch)
#source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
# alujiskeys.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/dc1534b4b0cf2153e4b8848310efc8393fb73830.patch
# backslahes-instead-of-slashes.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2.patch)
# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
source=(#https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
"git+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git#commit=$_commit")
prepare() {
cd ${pkgname}-${pkgver}
# FS##75007 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325
patch -Np1 -i ../alujiskeys.patch
patch -Np1 -i ../backslahes-instead-of-slashes.patch
pkgver() {
cd $pkgname
git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
}
build() {
arch-meson ${pkgname}-${pkgver} build \
arch-meson ${pkgname} build \
-D xkb-base="/usr/share/X11/xkb" \
-D compat-rules=true \
-D xorg-rules-symlinks=true
@ -45,17 +47,20 @@ build() {
install -m755 -d "${pkgdir}/var/lib/xkb"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
#install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
install -m644 ${pkgname}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
}
#---- license gpg-key sha256sums ----
license=('custom')
validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
#validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu@gnome.org>"
#validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
##validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu@gnome.org>"
sha256sums=(1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 # xkeyboard-config-2.36.tar.xz
340382d3d7f90f6457ee1de73e0fc0c0ff32d01fb4fce601a29f99f6e1d7704d # xkeyboard-config-2.36.tar.xz.sig
e3ae0fedc48ff32e707372efa211d06620bec8b58b0cca5f1eb991639b2867b8 # alujiskeys.patch
7a16283051c6bba396ebd81756e02a5c185566f1b843456afa80876155140c14) # backslahes-instead-of-slashes.patch
#sha256sums=(1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 # xkeyboard-config-2.36.tar.xz
# 340382d3d7f90f6457ee1de73e0fc0c0ff32d01fb4fce601a29f99f6e1d7704d # xkeyboard-config-2.36.tar.xz.sig
# e3ae0fedc48ff32e707372efa211d06620bec8b58b0cca5f1eb991639b2867b8 # alujiskeys.patch
# 7a16283051c6bba396ebd81756e02a5c185566f1b843456afa80876155140c14) # backslahes-instead-of-slashes.patch
sha256sums=(SKIP)

34
xkeyboard-config/PKGBUILD-arch
View File

@ -1,35 +1,32 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=xkeyboard-config
pkgver=2.36
pkgrel=3
_commit=382c5feb04c151833a8d10de3198d1ace4d62c0b # = master 2022-09-05
pkgver=2.36+89+g382c5feb
pkgrel=1
pkgdesc="X keyboard configuration files"
arch=(any)
license=('custom')
url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson')
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson' 'git')
provides=('xkbdata')
replaces=('xkbdata')
conflicts=('xkbdata')
source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
alujiskeys.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/dc1534b4b0cf2153e4b8848310efc8393fb73830.patch
backslahes-instead-of-slashes.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2.patch)
validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
source=(#https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
"git+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git#commit=$_commit")
#validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
#validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu@gnome.org>"
sha256sums=('1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595'
'SKIP'
'SKIP'
'SKIP')
sha256sums=('SKIP')
prepare() {
cd ${pkgname}-${pkgver}
# FS##75007 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325
patch -Np1 -i ../alujiskeys.patch
patch -Np1 -i ../backslahes-instead-of-slashes.patch
pkgver() {
cd $pkgname
git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
}
build() {
arch-meson ${pkgname}-${pkgver} build \
# arch-meson ${pkgname}-${pkgver} build \
arch-meson ${pkgname} build \
-D xkb-base="/usr/share/X11/xkb" \
-D compat-rules=true \
-D xorg-rules-symlinks=true
@ -47,5 +44,6 @@ build() {
install -m755 -d "${pkgdir}/var/lib/xkb"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
#install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
install -m644 ${pkgname}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
}

5
xkeyboard-config/deps
View File

@ -2,3 +2,8 @@ meson
python
libxslt
xorg-xkbcomp
git

3
yaourt/PKGBUILD
View File

@ -19,7 +19,7 @@
pkgname=yaourt
pkgver=1.9
pkgrel=02
pkgrel=03
pkgdesc='A pacman wrapper with extended features and AUR support'
arch=('any')
url='https://framagit.org/yilinux/yaourt'
@ -57,3 +57,4 @@ package() {
license=('GPL')
sha256sums=(SKIP)

5
yaourt/deps
View File

@ -1 +1,4 @@
git gettext
git
gettext