upg mercurial meson vlc xkeyboard-config
This commit is contained in:
parent
52cbd98654
commit
8152b24ea3
|
|
@ -0,0 +1,59 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgname=cups-filters
|
||||
pkgver=1.28.16
|
||||
pkgrel=2
|
||||
pkgdesc="OpenPrinting CUPS Filters"
|
||||
arch=('x86_64')
|
||||
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
|
||||
license=('custom')
|
||||
depends=('lcms2' 'poppler' 'qpdf' 'ijs' 'libcups>=2.2.6-2' 'systemd' 'libexif')
|
||||
makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')
|
||||
checkdepends=('ttf-dejavu') # ttf-dejavu for make check
|
||||
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
|
||||
'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||
'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||
'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||
'imagemagick: for Braille embosser support'
|
||||
'liblouis: for Braille embosser support'
|
||||
'antiword: to convert MS Word documents for Braille embosser support'
|
||||
'docx2txt: to convert Microsoft OOXML text from DOCX files for Braille embosser support')
|
||||
backup=(etc/cups/cups-browsed.conf)
|
||||
source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
|
||||
sha256sums=('3a400bfa751da2020775cd7d48d1647448551ff051f9345abc1df6357b199ac0')
|
||||
|
||||
build() {
|
||||
cd "$pkgname"-$pkgver
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--sbindir=/usr/bin \
|
||||
--localstatedir=/var \
|
||||
--with-rcdir=no \
|
||||
--enable-avahi \
|
||||
--with-browseremoteprotocols=DNSSD,CUPS \
|
||||
--with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "$pkgname"-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname"-$pkgver
|
||||
make DESTDIR="$pkgdir/" install
|
||||
|
||||
# add upstream systemd support file
|
||||
install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
|
||||
sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
|
||||
#sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
|
||||
|
||||
# use cups group from cups pkg FS#56818
|
||||
chgrp -R 209 "${pkgdir}"/etc/cups
|
||||
|
||||
# license
|
||||
mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
|
||||
install -m644 "${srcdir}"/${pkgname}-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
|
||||
}
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgname=cups-filters
|
||||
_commit=378a821080ecb140a1319ee2be4cacc1150e82d6 # master 2020-11-16
|
||||
pkgver=1.27.5+260+g378a8210
|
||||
pkgrel=1
|
||||
pkgdesc="OpenPrinting CUPS Filters"
|
||||
arch=('x86_64')
|
||||
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
|
||||
license=('custom')
|
||||
depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups' 'systemd')
|
||||
makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools' 'psutils' 'git') # ttf-dejavu for make check
|
||||
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
|
||||
'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||
'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||
'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||
'antiword: to convert MS Word documents'
|
||||
'docx2txt: to convert Microsoft OOXML text from DOCX files')
|
||||
backup=(etc/cups/cups-browsed.conf)
|
||||
#source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
|
||||
source=("git+https://github.com/OpenPrinting/cups-filters#commit=$_commit"
|
||||
buildfix.diff)
|
||||
sha256sums=('SKIP'
|
||||
'4dcb21b719df28f1b275aef091014420dce2b57fbb1dacabd1eb067167629bd0')
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
#git describe --tags | sed 's/-/+/g' | sed 's/v//'
|
||||
git describe --tags | sed 's/release-1-27-5/1.27.5/;s/-/+/g'
|
||||
#git rev-list --count HEAD # = 25
|
||||
#printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" # 0.r25.2e43897
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname"
|
||||
patch -Np1 -i ../buildfix.diff
|
||||
autoreconf -vfi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$pkgname" #-$pkgver
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--sbindir=/usr/bin \
|
||||
--localstatedir=/var \
|
||||
--with-rcdir=no \
|
||||
--enable-avahi \
|
||||
--with-browseremoteprotocols=DNSSD,CUPS \
|
||||
--with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
|
||||
|
||||
# make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
|
||||
# return 1
|
||||
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make #V=1
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "$pkgname" #-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname" #-$pkgver
|
||||
make DESTDIR="$pkgdir/" install
|
||||
|
||||
# add upstream systemd support file
|
||||
install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
|
||||
sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
|
||||
|
||||
# use cups group from cups pkg FS#56818
|
||||
chgrp -R 209 "${pkgdir}"/etc/cups
|
||||
|
||||
# license
|
||||
mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
|
||||
#install -m644 "${srcdir}"/${pkgname}-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
|
||||
install -m644 "${srcdir}"/${pkgname}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=mercurial
|
||||
pkgver=6.2.2
|
||||
pkgver=6.2.3
|
||||
pkgrel=01
|
||||
pkgdesc='A scalable distributed SCM tool'
|
||||
arch=(x86_64)
|
||||
|
|
@ -77,11 +77,13 @@ package() {
|
|||
|
||||
license=(GPL)
|
||||
|
||||
validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5
|
||||
EB851395B4223EE2F7BA0B28DA54740BF08732BA
|
||||
818D87CD1AC180C394C86E633A33DE460D9EC39F # Pulkit Goyal <7895pulkit@gmail.com>
|
||||
validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5 #
|
||||
EB851395B4223EE2F7BA0B28DA54740BF08732BA #
|
||||
818D87CD1AC180C394C86E633A33DE460D9EC39F # Pulkit Goyal <7895pulkit@gmail.com>
|
||||
1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès <alphare@raphaelgomes.dev>
|
||||
|
||||
sha256sums=(9efa9da5f497a8750ac9c48fa431c4ab72209f1360180c5d4920d1311b0420df # mercurial-6.2.2.tar.gz
|
||||
662079f5a5d4a44b8981b5b5353f5bf030a35fca4e8a0bef100fb83fc19ec78f # mercurial-6.2.2.tar.gz.asc
|
||||
sha256sums=(98d1ae002f68adf53d65c5947fe8b7a379f98cf05d9b8ea1f4077d2ca5dce9db # mercurial-6.2.3.tar.gz
|
||||
ce18248bfb508479f8117df172951a64c8098e9768af4db90adf951ff329f74b # mercurial-6.2.3.tar.gz.asc
|
||||
87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5) # mercurial.profile
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
|
||||
|
||||
pkgname=mercurial
|
||||
pkgver=6.2.2
|
||||
pkgver=6.2.3
|
||||
pkgrel=1
|
||||
pkgdesc='A scalable distributed SCM tool'
|
||||
arch=(x86_64)
|
||||
|
|
@ -27,7 +27,7 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5
|
|||
1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès <alphare@raphaelgomes.dev>
|
||||
source=(https://www.mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz{,.asc}
|
||||
mercurial.profile)
|
||||
sha512sums=('b5a89588146b58c8552c20f24a472098c6fbb9863c59571d0e70b1d4cc5ea6d4a29e9660a26dfc87aa5124df9b65182a7c65b8558a21acf0164d0d90358addbd'
|
||||
sha512sums=('0d82582e6d40ceabcc32419bf0423dd9f49b72b72c91a0f575181f92b355699a88f0426a192c46ca47f3105e47cb45dc3ac1a6499f4c83e01fa31e31c1ffdfbb'
|
||||
'SKIP'
|
||||
'710dcddb24d928efc97370e869d9caa083107929ed9a1086dd2a3ae0caaf2c71e2f29060597e29315b6b15b1616251c42412e268ce737109c48ae4d7aa1b9555')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
python-docutils
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ index 193ad184b637..e94ba68ac30f 100644
|
|||
|
||||
dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
|
||||
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
|
||||
index f120590e67da..2e1d520dae66 100644
|
||||
index 6c4012d1a056..59ed1a750b94 100644
|
||||
--- a/unittests/linuxliketests.py
|
||||
+++ b/unittests/linuxliketests.py
|
||||
@@ -357,6 +357,7 @@ class LinuxlikeTests(BasePlatformTests):
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=meson
|
||||
pkgver=0.63.2
|
||||
pkgver=0.63.3
|
||||
pkgrel=01
|
||||
pkgdesc='High productivity build system'
|
||||
url='https://mesonbuild.com/'
|
||||
|
|
@ -20,8 +20,6 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' '
|
|||
'python-pytest-xdist' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc')
|
||||
source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
|
||||
0001-Skip-broken-tests.patch
|
||||
0002-compilers-Add-optimization-plain-option.patch
|
||||
0003-Add-missing-cdata-update-in-genmarshal-tests.patch
|
||||
arch-meson
|
||||
jobo-meson)
|
||||
|
||||
|
|
@ -31,13 +29,6 @@ prepare() {
|
|||
## Arch: Our containers do not allow sanitizers to run
|
||||
patch -Np1 -i ../0001-Skip-broken-tests.patch
|
||||
|
||||
# Fix buildtype plain to not add -O0
|
||||
# https://github.com/mesonbuild/meson/pull/10593
|
||||
patch -Np1 -i ../0002-compilers-Add-optimization-plain-option.patch
|
||||
|
||||
# Fix flaky test
|
||||
# https://github.com/mesonbuild/meson/pull/10772
|
||||
patch -Np1 -i ../0003-Add-missing-cdata-update-in-genmarshal-tests.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -50,12 +41,20 @@ build() {
|
|||
# export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
|
||||
# ./run_tests.py --failfast
|
||||
#)
|
||||
#FAILED run_unittests.py::AllPlatformTests::test_testsetups - AssertionError: 'TEST_ENV is set' not found in...
|
||||
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
#!!!!!!!!!!!!!!!!!!!!!!!!!!! xdist.dsession.Interrupted: stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
#====================== 1 failed, 128 passed, 19 skipped, 9 warnings in 63.16s (0:01:03) ======================
|
||||
#Total time: 63.498 seconds
|
||||
#==> ERROR: A failure occurred in check().
|
||||
#
|
||||
#
|
||||
#
|
||||
#1/2 testsetups:buggy / Test buggy FAIL 0.09s exit status 1
|
||||
#>>> TEST_ENV=1 MALLOC_PERTURB_=165 /usr/bin/valgrind --error-exitcode=1 --leak-check=full /src/pkg/jobextra/meson/src/meson-0.63.3/tmpvv_zk5ul/buggy
|
||||
#
|
||||
#2/2 testsetups / test-env FAIL 0.08s exit status 1
|
||||
#>>> MALLOC_PERTURB_=113 TEST_ENV=1 /usr/bin/valgrind --error-exitcode=1 --leak-check=full '/src/pkg/jobextra/meson/src/meson-0.63.3/test cases/unit/2 testsetups/envcheck.py'
|
||||
#========================================== short test summary info ===========================================
|
||||
#FAILED run_unittests.py::AllPlatformTests::test_testsetups - AssertionError: 'TEST_ENV is set' not found in...
|
||||
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
#!!!!!!!!!!!!!!!!!!!!!!!!!!! xdist.dsession.Interrupted: stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
#====================== 1 failed, 133 passed, 21 skipped, 9 warnings in 68.42s (0:01:08) ======================
|
||||
#
|
||||
|
||||
package() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
|
@ -82,11 +81,10 @@ license=('Apache')
|
|||
|
||||
validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane@gmail.com>
|
||||
|
||||
sha256sums=(16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf # meson-0.63.2.tar.gz
|
||||
842b9765b9fdbbb12a9075fcbcf801bf730efd2f87dd9c6a8dbb6b250ba0a173 # meson-0.63.2.tar.gz.asc
|
||||
30e8970fb5ef37a47930a1e5156ab25625d55ea4df1a4149804579a1aa22202f # 0001-Skip-broken-tests.patch
|
||||
b3bf9f775ad4e71de47d8badef3739a0b46a8e9ea3701d3a11f31e92eef5f5d6 # 0002-compilers-Add-optimization-plain-option.patch
|
||||
7f029cf562d5109eacc068afabd7bf021429dbb25fa9ce9eecf63054d7f1adc5 # 0003-Add-missing-cdata-update-in-genmarshal-tests.patch
|
||||
sha256sums=(519c0932e1a8b208741f0fdce90aa5c0b528dd297cf337009bf63539846ac056 # meson-0.63.3.tar.gz
|
||||
cb281dfcf600f3b3c8e674cc5691d8cb029a124c8c7f62d1126cf1b382d1907e # meson-0.63.3.tar.gz.asc
|
||||
8b204bf6789dff056c01ce8b57ac2788708d4bf1b47c760e812ffec577946d35 # 0001-Skip-broken-tests.patch
|
||||
ac3387ed5759cc512b1f2a4e5b3dd940274b02f943a7e5d644792ee714e6b95e # arch-meson
|
||||
b2aeae2787cf8f3ffb8778ee7f1a434895b1512bc0bdb33528c4cb2aeb067904) # jobo-meson
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
|
||||
|
||||
pkgname=meson
|
||||
pkgver=0.63.2
|
||||
pkgver=0.63.3
|
||||
pkgrel=1
|
||||
pkgdesc='High productivity build system'
|
||||
url='https://mesonbuild.com/'
|
||||
|
|
@ -18,28 +18,16 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' '
|
|||
'python-pytest-xdist' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc')
|
||||
source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
|
||||
0001-Skip-broken-tests.patch
|
||||
0002-compilers-Add-optimization-plain-option.patch
|
||||
0003-Add-missing-cdata-update-in-genmarshal-tests.patch
|
||||
arch-meson)
|
||||
sha512sums=('770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4'
|
||||
sha512sums=('6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b'
|
||||
'SKIP'
|
||||
'b59d90b5466fcf877969a49982308b1c89f0f4521e4d3774a4531bb2c0093f46b5ea2ef569e32984632e6f9c7e91328bc3511978427b553ed8c97a64a52b79ff'
|
||||
'cb53d50775c4d6c1278be73f123bd5ce80aec21bb2790289285add4052e57c4d3885b693a44f671a8e1ab8a9af40b782add5c723924a5892d71807354562dbd0'
|
||||
'a13b2d6e4b594fbd34fe19c6e077076b062145500451089a44365407045a76fb5ad5449a3b23d8d7a8d18f7ab061abd4874c815d9fa2e7d7a5f4d288339f1128'
|
||||
'fea6b37d7c07e7f591978d2f495e759d2f6b82126eff7835f823c24848d5a7c32356fe175eefeb2bcba0edb68109d8080de5e128a5317808128dc1ba5c15e92d'
|
||||
'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
|
||||
validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane@gmail.com>
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
patch -Np1 -i ../0001-Skip-broken-tests.patch
|
||||
|
||||
# Fix buildtype plain to not add -O0
|
||||
# https://github.com/mesonbuild/meson/pull/10593
|
||||
patch -Np1 -i ../0002-compilers-Add-optimization-plain-option.patch
|
||||
|
||||
# Fix flaky test
|
||||
# https://github.com/mesonbuild/meson/pull/10772
|
||||
patch -Np1 -i ../0003-Add-missing-cdata-update-in-genmarshal-tests.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ openmpi
|
|||
nasm
|
||||
gnustep-base
|
||||
python-pytest-xdist
|
||||
python2-setuptools
|
||||
python-setuptools
|
||||
ldc
|
||||
rust-bindgen
|
||||
cuda
|
||||
|
|
@ -50,6 +50,6 @@ wayland-protocols
|
|||
libmicrohttpd
|
||||
libjpeg-turbo
|
||||
libxslt
|
||||
|
||||
|
||||
libglvnd
|
||||
|
||||
|
||||
|
|
|
|||
13
meson/time
13
meson/time
|
|
@ -1,5 +1,12 @@
|
|||
w/o check
|
||||
|
||||
real 9m33.129s
|
||||
user 32m46.719s
|
||||
sys 3m24.273s
|
||||
real 0m13.441s
|
||||
user 0m7.766s
|
||||
sys 0m2.075s
|
||||
|
||||
w/check
|
||||
|
||||
real 1m28.546s
|
||||
user 3m45.435s
|
||||
sys 0m29.367s
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ _vlcver=3.0.17.4
|
|||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=08
|
||||
pkgrel=09
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player - no systemd,avahi,dbus '
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -130,6 +130,7 @@ build() {
|
|||
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects"
|
||||
export CPPFLAGS+=" -I/usr/include/samba-4.0"
|
||||
export CXXFLAGS+=" -std=c++11"
|
||||
export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig"
|
||||
# upstream doesn't support lua 5.4 yet: https://trac.videolan.org/vlc/ticket/25036
|
||||
export LUAC=/usr/bin/luac5.2
|
||||
export LUA_LIBS="$(pkg-config --libs lua5.2)"
|
||||
|
|
@ -266,4 +267,4 @@ sha256sums=(8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 #
|
|||
08f6a07a149039255d34ff04db08c3de477966118f62339a631b53ffa2dfd85a) # vlc-live-media-2021.patch
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ _vlcver=3.0.17.4
|
|||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=8
|
||||
pkgrel=9
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -136,6 +136,7 @@ build() {
|
|||
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects"
|
||||
export CPPFLAGS+=" -I/usr/include/samba-4.0"
|
||||
export CXXFLAGS+=" -std=c++11"
|
||||
export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig"
|
||||
# upstream doesn't support lua 5.4 yet: https://trac.videolan.org/vlc/ticket/25036
|
||||
export LUAC=/usr/bin/luac5.2
|
||||
export LUA_LIBS="$(pkg-config --libs lua5.2)"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,12 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=xkeyboard-config
|
||||
_commit=382c5feb04c151833a8d10de3198d1ace4d62c0b # = master 2022-09-05
|
||||
pkgver=2.36+89+g382c5feb
|
||||
pkgver=2.37
|
||||
pkgrel=01
|
||||
pkgdesc="X keyboard configuration files"
|
||||
arch=(any)
|
||||
url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
|
||||
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson' 'git')
|
||||
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson') # 'git')
|
||||
provides=('xkbdata')
|
||||
replaces=('xkbdata')
|
||||
conflicts=('xkbdata')
|
||||
|
|
@ -20,16 +19,17 @@ conflicts=('xkbdata')
|
|||
# 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")
|
||||
source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
|
||||
#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")
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
|
||||
}
|
||||
#pkgver() {
|
||||
# cd $pkgname
|
||||
# git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
|
||||
#}
|
||||
|
||||
build() {
|
||||
arch-meson ${pkgname} build \
|
||||
arch-meson ${pkgname}-${pkgver} build \
|
||||
-D xkb-base="/usr/share/X11/xkb" \
|
||||
-D compat-rules=true \
|
||||
-D xorg-rules-symlinks=true
|
||||
|
|
@ -47,8 +47,8 @@ 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}/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}/"
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -56,11 +56,8 @@ build() {
|
|||
|
||||
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>
|
||||
|
||||
#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)
|
||||
sha256sums=(eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c # xkeyboard-config-2.37.tar.xz
|
||||
53d1ffccc5855b828e46ff49031b6bac88bf4d787cecee2e6082c6e958f73641) # xkeyboard-config-2.37.tar.xz.sig
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgname=xkeyboard-config
|
||||
_commit=382c5feb04c151833a8d10de3198d1ace4d62c0b # = master 2022-09-05
|
||||
pkgver=2.36+89+g382c5feb
|
||||
pkgver=2.37
|
||||
pkgrel=1
|
||||
pkgdesc="X keyboard configuration files"
|
||||
arch=(any)
|
||||
|
|
@ -13,20 +12,13 @@ provides=('xkbdata')
|
|||
replaces=('xkbdata')
|
||||
conflicts=('xkbdata')
|
||||
# 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=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
|
||||
}
|
||||
source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
|
||||
validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
|
||||
sha256sums=('eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c'
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
# arch-meson ${pkgname}-${pkgver} build \
|
||||
arch-meson ${pkgname} build \
|
||||
arch-meson ${pkgname}-${pkgver} build \
|
||||
-D xkb-base="/usr/share/X11/xkb" \
|
||||
-D compat-rules=true \
|
||||
-D xorg-rules-symlinks=true
|
||||
|
|
@ -44,6 +36,5 @@ 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}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||
install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,5 @@ meson
|
|||
python
|
||||
libxslt
|
||||
xorg-xkbcomp
|
||||
git
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue