upg zstd kbd
This commit is contained in:
parent
2051aaa9f8
commit
378432f961
5 changed files with 52 additions and 64 deletions
19
kbd/PKGBUILD
19
kbd/PKGBUILD
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=kbd
|
||||
pkgver=2.5.0
|
||||
pkgrel=02
|
||||
pkgver=2.5.1
|
||||
pkgrel=01
|
||||
pkgdesc="Keytable files and keyboard utilities"
|
||||
arch=('x86_64')
|
||||
url="http://www.kbd-project.org"
|
||||
|
|
@ -15,10 +15,8 @@ depends=('glibc' 'pam')
|
|||
makedepends=('check' 'git' 'gettext' 'autoconf' 'automake')
|
||||
source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
|
||||
https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
|
||||
#source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver?signed
|
||||
'fix-euro2.patch'
|
||||
'vlock.pam'
|
||||
https://github.com/legionus/kbd/commit/48b7f7d657da8a31476435f1c83bf6b46fbe8aed.patch)
|
||||
'vlock.pam')
|
||||
backup=('etc/pam.d/vlock')
|
||||
provides=('vlock')
|
||||
conflicts=('vlock')
|
||||
|
|
@ -37,9 +35,6 @@ prepare() {
|
|||
mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
|
||||
# fix euro2 #28213
|
||||
patch -Np1 -i ../fix-euro2.patch
|
||||
# fix https://github.com/legionus/kbd/issues/78
|
||||
# fix https://bugs.archlinux.org/task/74969
|
||||
patch -Np1 -i ../48b7f7d657da8a31476435f1c83bf6b46fbe8aed.patch
|
||||
autoreconf -if
|
||||
}
|
||||
|
||||
|
|
@ -71,8 +66,8 @@ license=('GPL')
|
|||
|
||||
validpgpkeys=('7F2A3D07298149A0793C9A4EA45ABA544CFFD434') # Alexey Gladkov
|
||||
|
||||
sha256sums=(ada7e410c2d3b92718758695343b18b5aa70e8b644ca8e72d3bc8eb7cd000d22 # kbd-2.5.0.tar.gz
|
||||
97cfe4069b0549e050ab33c1b49a8a7e853b07fbda558276da04872b7b594662 # kbd-2.5.0.tar.sign
|
||||
sha256sums=(b3db018458ea7a19c54de9c5680532bd9c3c836d45fefbd20e7e8a49b8e81b1b # kbd-2.5.1.tar.gz
|
||||
34031727a51396b2b37ffa1e318821940e10afdee48cc8fc635831f90405f217 # kbd-2.5.1.tar.sign
|
||||
a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8 # fix-euro2.patch
|
||||
5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4 # vlock.pam
|
||||
091a040e2af694a07eacc8cd92937019fd7c687faf60462d9cceaf40d6e517a9) # 48b7f7d657da8a31476435f1c83bf6b46fbe8aed.patch
|
||||
5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4) # vlock.pam
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
pkgname=kbd
|
||||
pkgver=2.5.0
|
||||
pkgrel=2
|
||||
pkgver=2.5.1
|
||||
pkgrel=1
|
||||
pkgdesc="Keytable files and keyboard utilities"
|
||||
arch=('x86_64')
|
||||
url="http://www.kbd-project.org"
|
||||
|
|
@ -13,16 +13,14 @@ makedepends=('check' 'git')
|
|||
# https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
|
||||
source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver?signed
|
||||
'fix-euro2.patch'
|
||||
'vlock.pam'
|
||||
https://github.com/legionus/kbd/commit/48b7f7d657da8a31476435f1c83bf6b46fbe8aed.patch)
|
||||
'vlock.pam')
|
||||
backup=('etc/pam.d/vlock')
|
||||
provides=('vlock')
|
||||
conflicts=('vlock')
|
||||
replaces=('vlock')
|
||||
sha256sums=('SKIP'
|
||||
'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8'
|
||||
'5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4'
|
||||
'091a040e2af694a07eacc8cd92937019fd7c687faf60462d9cceaf40d6e517a9')
|
||||
'5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4')
|
||||
validpgpkeys=(
|
||||
'7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov
|
||||
)
|
||||
|
|
@ -40,9 +38,6 @@ prepare() {
|
|||
mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
|
||||
# fix euro2 #28213
|
||||
patch -Np1 -i ../fix-euro2.patch
|
||||
# fix https://github.com/legionus/kbd/issues/78
|
||||
# fix https://bugs.archlinux.org/task/74969
|
||||
patch -Np1 -i ../48b7f7d657da8a31476435f1c83bf6b46fbe8aed.patch
|
||||
autoreconf -if
|
||||
}
|
||||
|
||||
|
|
|
|||
1
kbd/deps
1
kbd/deps
|
|
@ -4,3 +4,4 @@ automake
|
|||
autoconf
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,55 +6,50 @@
|
|||
|
||||
pkgname=zstd
|
||||
pkgver=1.5.2
|
||||
pkgrel=06
|
||||
pkgdesc='Zstandard - Fast real-time FACEBOOK compression... - avoid as possible'
|
||||
pkgrel=07
|
||||
pkgdesc='Zstandard - not so Fast unreal-time FACEBOOK compression... - avoid as possible'
|
||||
url='https://facebook.github.io/zstd/'
|
||||
arch=(x86_64)
|
||||
depends=(glibc gcc-libs zlib xz lz4)
|
||||
makedepends=(cmake gtest ninja)
|
||||
provides=(libzstd.so)
|
||||
# options=(debug staticlibs) ## uncomment this to produce the debug pkg
|
||||
options=(staticlibs)
|
||||
#options=(staticlibs)
|
||||
source=(https://github.com/facebook/zstd/releases/download/v${pkgver}/zstd-${pkgver}.tar.zst{,.sig})
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# avoid error on tests without static libs, we use LD_LIBRARY_PATH
|
||||
sed '/build static library to build tests/d' -i build/cmake/CMakeLists.txt
|
||||
sed 's/libzstd_static/libzstd_shared/g' -i build/cmake/tests/CMakeLists.txt
|
||||
}
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
export CFLAGS+=' -ffat-lto-objects'
|
||||
export CXXFLAGS+=' -ffat-lto-objects'
|
||||
cmake -S ${pkgname}-${pkgver}/build/cmake -B build-shared -G Ninja \
|
||||
|
||||
cmake -S build/cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DZSTD_BUILD_CONTRIB=ON \
|
||||
-DZSTD_BUILD_STATIC=OFF \
|
||||
-DZSTD_BUILD_TESTS=OFF \
|
||||
-DZSTD_PROGRAMS_LINK_SHARED=ON
|
||||
cmake --build build-shared
|
||||
cmake -S ${pkgname}-${pkgver}/build/cmake -B build-static -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DZSTD_BUILD_CONTRIB=ON \
|
||||
-DZSTD_BUILD_STATIC=ON \
|
||||
-DZSTD_BUILD_TESTS=ON \
|
||||
-DZSTD_PROGRAMS_LINK_SHARED=OFF
|
||||
cmake --build build-static
|
||||
-DZSTD_PROGRAMS_LINK_SHARED=ON
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
check() {
|
||||
cd build-static/tests
|
||||
ctest
|
||||
cd ${pkgname}-${pkgver}
|
||||
export LD_LIBRARY_PATH="$(pwd)/build/lib"
|
||||
ctest -VV --test-dir build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="${pkgdir}" cmake --install build-shared
|
||||
cd ${pkgname}-${pkgver}
|
||||
DESTDIR="${pkgdir}" cmake --install build
|
||||
ln -sf /usr/bin/zstd "${pkgdir}/usr/bin/zstdmt"
|
||||
install -Dm 644 ${pkgname}-${pkgver}/LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
pkgname=zstd
|
||||
pkgver=1.5.2
|
||||
pkgrel=6
|
||||
pkgrel=7
|
||||
pkgdesc='Zstandard - Fast real-time compression algorithm'
|
||||
url='https://facebook.github.io/zstd/'
|
||||
arch=(x86_64)
|
||||
|
|
@ -13,7 +13,7 @@ license=(BSD GPL2)
|
|||
depends=(glibc gcc-libs zlib xz lz4)
|
||||
makedepends=(cmake gtest ninja)
|
||||
provides=(libzstd.so)
|
||||
options=(debug staticlibs)
|
||||
options=(debug)
|
||||
source=(https://github.com/facebook/zstd/releases/download/v${pkgver}/zstd-${pkgver}.tar.zst{,.sig})
|
||||
sha256sums=('3ea06164971edec7caa2045a1932d757c1815858e4c2b68c7ef812647535c23f'
|
||||
'SKIP')
|
||||
|
|
@ -21,38 +21,40 @@ b2sums=('513e4526a92bcb59416b3457d186a30e554f9e0cf21d7114eb3e9fbcbd9d662c8d95cf0
|
|||
'SKIP')
|
||||
validpgpkeys=(4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD)
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# avoid error on tests without static libs, we use LD_LIBRARY_PATH
|
||||
sed '/build static library to build tests/d' -i build/cmake/CMakeLists.txt
|
||||
sed 's/libzstd_static/libzstd_shared/g' -i build/cmake/tests/CMakeLists.txt
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
export CFLAGS+=' -ffat-lto-objects'
|
||||
export CXXFLAGS+=' -ffat-lto-objects'
|
||||
cmake -S ${pkgname}-${pkgver}/build/cmake -B build-shared -G Ninja \
|
||||
|
||||
cmake -S build/cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DZSTD_BUILD_CONTRIB=ON \
|
||||
-DZSTD_BUILD_STATIC=OFF \
|
||||
-DZSTD_BUILD_TESTS=OFF \
|
||||
-DZSTD_PROGRAMS_LINK_SHARED=ON
|
||||
cmake --build build-shared
|
||||
cmake -S ${pkgname}-${pkgver}/build/cmake -B build-static -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DZSTD_BUILD_CONTRIB=ON \
|
||||
-DZSTD_BUILD_STATIC=ON \
|
||||
-DZSTD_BUILD_TESTS=ON \
|
||||
-DZSTD_PROGRAMS_LINK_SHARED=OFF
|
||||
cmake --build build-static
|
||||
-DZSTD_PROGRAMS_LINK_SHARED=ON
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
check() {
|
||||
cd build-static/tests
|
||||
ctest
|
||||
cd ${pkgname}-${pkgver}
|
||||
export LD_LIBRARY_PATH="$(pwd)/build/lib"
|
||||
ctest -VV --test-dir build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="${pkgdir}" cmake --install build-shared
|
||||
cd ${pkgname}-${pkgver}
|
||||
DESTDIR="${pkgdir}" cmake --install build
|
||||
ln -sf /usr/bin/zstd "${pkgdir}/usr/bin/zstdmt"
|
||||
install -Dm 644 ${pkgname}-${pkgver}/LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
|
|||
Loading…
Reference in a new issue