upg at-spi2-core cups-filters lighttpd neon obs-studio python-cairo qt5-base tmux zbar
This commit is contained in:
parent
8bc9b0935d
commit
5b7121637a
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgbase=at-spi2-core
|
pkgbase=at-spi2-core
|
||||||
pkgname=(at-spi2-core) # at-spi2-core-docs) # uncomment the docs sections and modify this pkg list to build the docs documents
|
pkgname=(at-spi2-core) # at-spi2-core-docs) # uncomment the docs sections and modify this pkg list to build the docs documents
|
||||||
pkgver=2.48.2
|
pkgver=2.48.3
|
||||||
pkgrel=01
|
pkgrel=01
|
||||||
# Arch replaced makedependency from libsystemd to systemd, the reason for the rerun 2.44.0-2
|
# Arch replaced makedependency from libsystemd to systemd, the reason for the rerun 2.44.0-2
|
||||||
# Let's see if it makes a difference to us :) :P
|
# Let's see if it makes a difference to us :) :P
|
||||||
|
|
@ -16,7 +16,7 @@ url="https://gitlab.gnome.org/GNOME/at-spi2-core"
|
||||||
depends=(dbus glib2 libxtst libx11 libxml2 gsettings-desktop-schemas)
|
depends=(dbus glib2 libxtst libx11 libxml2 gsettings-desktop-schemas)
|
||||||
makedepends=(gobject-introspection git meson gi-docgen python-sphinx)
|
makedepends=(gobject-introspection git meson gi-docgen python-sphinx)
|
||||||
checkdepends=(at-spi2-core)
|
checkdepends=(at-spi2-core)
|
||||||
_commit=36b6bae1542a5201ff25ed16e4c026512f4fecdb # tags/AT_SPI2_CORE_2_48_2^0
|
_commit=c0c1b0477ab643e900cecfaf8d3af70ed9400b82 # tags/AT_SPI2_CORE_2_48_3^0
|
||||||
# options=(debug) ## uncomment this to have the debug package built
|
# options=(debug) ## uncomment this to have the debug package built
|
||||||
source=("git+$url.git#commit=$_commit")
|
source=("git+$url.git#commit=$_commit")
|
||||||
|
|
||||||
|
|
@ -94,4 +94,4 @@ license=(GPL2)
|
||||||
|
|
||||||
sha256sums=('SKIP')
|
sha256sums=('SKIP')
|
||||||
|
|
||||||
## 429302d2fa33c0ccad4c3beb63e627ad40329ca83241d2abfa899a201004e230 at-spi2-core-2.48.2-01-x86_64.pkg.tar.lz
|
## fddbc4a043ec502c1ec4cd37ffaf81b04e82517c9c0d850f34b544014215b731 at-spi2-core-2.48.3-01-x86_64.pkg.tar.lz
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ pkgname=(
|
||||||
at-spi2-core
|
at-spi2-core
|
||||||
at-spi2-core-docs
|
at-spi2-core-docs
|
||||||
)
|
)
|
||||||
pkgver=2.48.2
|
pkgver=2.48.3
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
|
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
|
||||||
url="https://gitlab.gnome.org/GNOME/at-spi2-core"
|
url="https://gitlab.gnome.org/GNOME/at-spi2-core"
|
||||||
|
|
@ -32,7 +32,7 @@ makedepends=(
|
||||||
checkdepends=(
|
checkdepends=(
|
||||||
at-spi2-core
|
at-spi2-core
|
||||||
)
|
)
|
||||||
_commit=36b6bae1542a5201ff25ed16e4c026512f4fecdb # tags/AT_SPI2_CORE_2_48_2^0
|
_commit=c0c1b0477ab643e900cecfaf8d3af70ed9400b82 # tags/AT_SPI2_CORE_2_48_3^0
|
||||||
source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit")
|
source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit")
|
||||||
b2sums=('SKIP')
|
b2sums=('SKIP')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,11 @@
|
||||||
|
|
||||||
pkgname=cups-filters
|
pkgname=cups-filters
|
||||||
pkgver=1.28.17
|
pkgver=1.28.17
|
||||||
pkgrel=03
|
pkgrel=04
|
||||||
pkgdesc="OpenPrinting CUPS Filters w/o systemd"
|
pkgdesc="OpenPrinting CUPS Filters w/o systemd"
|
||||||
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
|
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
|
||||||
checkdepends=('ttf-dejavu') # ttf-dejavu for make check
|
checkdepends=('ttf-dejavu') # ttf-dejavu for make check
|
||||||
depends=('lcms2' 'poppler' 'qpdf' 'ijs' 'libcups>=2.2.4-02' 'libexif')
|
depends=('lcms2' 'poppler' 'qpdf' 'libcups>=2.2.4-02' 'libexif')
|
||||||
makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')
|
makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')
|
||||||
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
|
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: drivers use Ghostscript to convert PostScript to a printable form directly'
|
||||||
|
|
@ -74,5 +74,4 @@ license=('custom')
|
||||||
sha256sums=(270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d8185c9bb9 # cups-filters-1.28.17.tar.xz
|
sha256sums=(270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d8185c9bb9 # cups-filters-1.28.17.tar.xz
|
||||||
c79f9bb558ce02117c09c461d760844d5de79e7f753a48971bb5f9aed1a9f913) # cups-filters-CVE-2023-24805.patch
|
c79f9bb558ce02117c09c461d760844d5de79e7f753a48971bb5f9aed1a9f913) # cups-filters-CVE-2023-24805.patch
|
||||||
|
|
||||||
## c7483d708c22f11b39d0545881ed256b313fbc73cfcbb00acc5f9db148a0edad cups-filters-1.28.17-03-x86_64.pkg.tar.lz
|
## 4b7a37dfc04026b738136913ed6a15ed715c2cad2ffd664911cd287cb185fe50 cups-filters-1.28.17-04-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
pkgname=cups-filters
|
pkgname=cups-filters
|
||||||
pkgver=1.28.17
|
pkgver=1.28.17
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
pkgdesc="OpenPrinting CUPS Filters"
|
pkgdesc="OpenPrinting CUPS Filters"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
|
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
|
||||||
license=('custom')
|
license=('custom')
|
||||||
depends=('lcms2' 'poppler' 'qpdf' 'ijs' 'libcups>=2.2.6-2' 'systemd' 'libexif')
|
depends=('lcms2' 'poppler' 'qpdf' 'libcups>=2.2.6-2' 'systemd' 'libexif')
|
||||||
makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')
|
makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')
|
||||||
checkdepends=('ttf-dejavu') # ttf-dejavu for make check
|
checkdepends=('ttf-dejavu') # ttf-dejavu for make check
|
||||||
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
|
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ lcms2
|
||||||
poppler
|
poppler
|
||||||
qpdf
|
qpdf
|
||||||
liblouis
|
liblouis
|
||||||
ijs
|
|
||||||
libcups
|
libcups
|
||||||
ghostscript
|
ghostscript
|
||||||
ttf-dejavu
|
ttf-dejavu
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,12 @@
|
||||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||||
|
|
||||||
pkgname=lighttpd
|
pkgname=lighttpd
|
||||||
pkgver=1.4.70
|
pkgver=1.4.71
|
||||||
pkgrel=01
|
pkgrel=01
|
||||||
pkgdesc='A secure, fast, compliant and very flexible web-server w/o systemd'
|
pkgdesc='A secure, fast, compliant and very flexible web-server w/o systemd'
|
||||||
arch=('x86_64')
|
|
||||||
url="https://www.lighttpd.net/"
|
url="https://www.lighttpd.net/"
|
||||||
depends=('pcre2' 'util-linux')
|
depends=('pcre2' 'util-linux' 'brotli')
|
||||||
makedepends=('mariadb-libs' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
|
makedepends=('mariadb-libs' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'pkgconfig')
|
||||||
optdepends=('libxml2: mod_webdav'
|
optdepends=('libxml2: mod_webdav'
|
||||||
'lua: mod_cml/mod_magnet'
|
'lua: mod_cml/mod_magnet'
|
||||||
'mariadb-libs: mod_mysql_vhost/mod_authn_mysql'
|
'mariadb-libs: mod_mysql_vhost/mod_authn_mysql'
|
||||||
|
|
@ -37,10 +36,11 @@ build() {
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-webdav-props \
|
--with-webdav-props \
|
||||||
--with-webdav-locks \
|
--with-webdav-locks \
|
||||||
--with-gdbm \
|
|
||||||
--with-lua \
|
--with-lua \
|
||||||
--with-systemd=no \
|
--with-systemd=no \
|
||||||
|
--with-brotli \
|
||||||
--with-pcre2
|
--with-pcre2
|
||||||
|
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
@ -66,7 +66,9 @@ package() {
|
||||||
install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
|
install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
|
||||||
}
|
}
|
||||||
|
|
||||||
#---- license gpg-key sha256sums ----
|
#---- arch license gpg-key & sha256sums ----
|
||||||
|
|
||||||
|
arch=(x86_64)
|
||||||
|
|
||||||
license=('custom')
|
license=('custom')
|
||||||
|
|
||||||
|
|
@ -74,10 +76,10 @@ validpgpkeys=('C7CA1E9E29DC77F5480894B2E0E7D0171E95BAD7'
|
||||||
'649D0DD767FF206202A76C5158F14A786FE198C8'
|
'649D0DD767FF206202A76C5158F14A786FE198C8'
|
||||||
'EAAF41A8BE3BB8D001CACD136DE62CA242909B84')
|
'EAAF41A8BE3BB8D001CACD136DE62CA242909B84')
|
||||||
|
|
||||||
sha256sums=(921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85 # lighttpd-1.4.70.tar.xz
|
sha256sums=(b8b6915da20396fdc354df3324d5e440169b2e5ea7859e3a775213841325afac # lighttpd-1.4.71.tar.xz
|
||||||
74c064ee19694f280495eb8074c24a3f409a29fb33abce9443a47d162b168577 # lighttpd-1.4.70.tar.xz.asc
|
686a78f6f1ec7fc759d4864c9ca1e41addd96645047f8b6b9f5f7cf9405e45f7 # lighttpd-1.4.71.tar.xz.asc
|
||||||
41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe # lighttpd.logrotate.d
|
41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe # lighttpd.logrotate.d
|
||||||
fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f # lighttpd.conf
|
fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f # lighttpd.conf
|
||||||
d8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871) # lighttpd.tmpfiles
|
d8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871) # lighttpd.tmpfiles
|
||||||
|
|
||||||
## 1c94b08be37012cdf6ed7bd45d2e3ad309c8bee6f27fbfd7d0e64d52cc8799a0 lighttpd-1.4.70-01-x86_64.pkg.tar.lz
|
## 6bf02943b314c63eb41a30fa1f6eb152e963e03193e7ebeb536338129a05cbf7 lighttpd-1.4.71-01-x86_64.pkg.tar.lz
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
|
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
|
||||||
|
|
||||||
pkgname=lighttpd
|
pkgname=lighttpd
|
||||||
pkgver=1.4.70
|
pkgver=1.4.71
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='A secure, fast, compliant and very flexible web-server'
|
pkgdesc='A secure, fast, compliant and very flexible web-server'
|
||||||
license=('custom')
|
license=('custom')
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://www.lighttpd.net/"
|
url="https://www.lighttpd.net/"
|
||||||
depends=('pcre2' 'util-linux' 'systemd')
|
depends=('pcre2' 'systemd' 'brotli')
|
||||||
makedepends=('mariadb-libs' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
|
makedepends=('mariadb-libs' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'pkgconfig')
|
||||||
optdepends=('libxml2: mod_webdav'
|
optdepends=('libxml2: mod_webdav'
|
||||||
'lua: mod_cml/mod_magnet'
|
'lua: mod_cml/mod_magnet'
|
||||||
'mariadb-libs: mod_mysql_vhost/mod_authn_mysql'
|
'mariadb-libs: mod_mysql_vhost/mod_authn_mysql'
|
||||||
|
|
@ -17,7 +17,7 @@ backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
|
||||||
options=('emptydirs')
|
options=('emptydirs')
|
||||||
source=("https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"{,.asc}
|
source=("https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"{,.asc}
|
||||||
'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
|
'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
|
||||||
sha256sums=('921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85'
|
sha256sums=('b8b6915da20396fdc354df3324d5e440169b2e5ea7859e3a775213841325afac'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
|
'41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
|
||||||
'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
|
'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
|
||||||
|
|
@ -40,9 +40,9 @@ build() {
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-webdav-props \
|
--with-webdav-props \
|
||||||
--with-webdav-locks \
|
--with-webdav-locks \
|
||||||
--with-gdbm \
|
|
||||||
--with-lua \
|
--with-lua \
|
||||||
--with-pcre2
|
--with-pcre2 \
|
||||||
|
--with-brotli
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,10 @@
|
||||||
|
|
||||||
pkgname=neon
|
pkgname=neon
|
||||||
pkgver=0.32.5
|
pkgver=0.32.5
|
||||||
pkgrel=01
|
pkgrel=02
|
||||||
pkgdesc="HTTP and WebDAV client library with a C interface"
|
pkgdesc='HTTP/1.1 and WebDAV client library with a C interface'
|
||||||
arch=('x86_64')
|
|
||||||
url="https://notroj.github.io/neon/"
|
url="https://notroj.github.io/neon/"
|
||||||
depends=('krb5' 'expat' 'ca-certificates' 'zlib')
|
depends=('krb5' 'expat' 'ca-certificates' 'zlib' 'openssl')
|
||||||
makedepends=('xmlto' 'docbook-xsl')
|
makedepends=('xmlto' 'docbook-xsl')
|
||||||
options=('libtool') # FS#16067
|
options=('libtool') # FS#16067
|
||||||
source=(https://notroj.github.io/neon/$pkgname-$pkgver.tar.gz)
|
source=(https://notroj.github.io/neon/$pkgname-$pkgver.tar.gz)
|
||||||
|
|
@ -24,20 +23,31 @@ build() {
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-ssl=openssl \
|
--with-ssl=openssl \
|
||||||
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
|
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
|
||||||
|
# sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check() {
|
||||||
|
cd $pkgname-$pkgver
|
||||||
|
make check
|
||||||
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd ${pkgname}-${pkgver}
|
cd ${pkgname}-${pkgver}
|
||||||
make DESTDIR="${pkgdir}" install
|
make DESTDIR="${pkgdir}" install
|
||||||
}
|
}
|
||||||
|
|
||||||
#---- license gpg-key sha256sums ----
|
#---- arch license gpg-key & sha256sums ----
|
||||||
|
|
||||||
license=('GPL' 'LGPL')
|
arch=('x86_64')
|
||||||
|
|
||||||
|
license=('LGPL2.1')
|
||||||
|
#license=('GPL' 'LGPL') license change??
|
||||||
|
|
||||||
validpgpkeys=('190555472DCC589BEF01609C608A86DF9833CC49') # Joe Orton
|
validpgpkeys=('190555472DCC589BEF01609C608A86DF9833CC49') # Joe Orton
|
||||||
|
|
||||||
sha256sums=(4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a) # neon-0.32.5.tar.gz
|
sha256sums=(4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a) # neon-0.32.5.tar.gz
|
||||||
|
|
||||||
|
## 7f1a9d6c3f0137d1a2dd5b9f9c7348433485086b9e1f7bab424e38a8ea120ffd neon-0.32.5-02-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,35 @@
|
||||||
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
|
||||||
|
# Contributor: Jan de Groot <jgc@archlinux.org>
|
||||||
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
|
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
|
||||||
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
|
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
|
||||||
|
|
||||||
pkgname=neon
|
pkgname=neon
|
||||||
pkgver=0.32.5
|
pkgver=0.32.5
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="HTTP and WebDAV client library with a C interface"
|
pkgdesc='HTTP/1.1 and WebDAV client library'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://notroj.github.io/neon/"
|
url='https://notroj.github.io/neon/'
|
||||||
license=('GPL' 'LGPL')
|
license=('LGPL2.1')
|
||||||
depends=('krb5' 'expat' 'ca-certificates' 'zlib')
|
depends=('ca-certificates' 'expat' 'glibc' 'krb5' 'openssl' 'zlib')
|
||||||
makedepends=('xmlto' 'docbook-xsl')
|
source=("https://notroj.github.io/neon/$pkgname-$pkgver.tar.gz")
|
||||||
options=('libtool') # FS#16067
|
sha256sums=('4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a')
|
||||||
source=(https://notroj.github.io/neon/$pkgname-$pkgver.tar.gz)
|
|
||||||
sha512sums=('97a067fcea6156e2d5cf981e8d8fc9b0a709b8175bc8061a1f254bff7b11a27fdafc5e8425665523e917133084ea3a11e11de7c1210a8d2eb3f6b1cca26ea844')
|
|
||||||
validpgpkeys=('190555472DCC589BEF01609C608A86DF9833CC49') # Joe Orton
|
validpgpkeys=('190555472DCC589BEF01609C608A86DF9833CC49') # Joe Orton
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd ${pkgname}-${pkgver}
|
cd $pkgname-$pkgver
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--with-expat \
|
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--disable-static \
|
|
||||||
--with-ssl=openssl \
|
--with-ssl=openssl \
|
||||||
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
|
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
check() {
|
||||||
cd ${pkgname}-${pkgver}
|
cd $pkgname-$pkgver
|
||||||
make DESTDIR="${pkgdir}" install
|
make check
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd $pkgname-$pkgver
|
||||||
|
make DESTDIR="$pkgdir" install
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
|
|
||||||
real 0m16.383s
|
real 1m2.957s
|
||||||
user 0m14.866s
|
user 0m21.686s
|
||||||
sys 0m2.770s
|
sys 0m5.028s
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=obs-studio
|
pkgname=obs-studio
|
||||||
pkgver=29.1.1
|
pkgver=29.1.1
|
||||||
pkgrel=01
|
pkgrel=02
|
||||||
pkgdesc="Free and open source software for video recording and live streaming. w/o systemd pipewire pulseaudio"
|
pkgdesc="Free and open source software for video recording and live streaming. w/o systemd pipewire pulseaudio"
|
||||||
depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'mbedtls' 'rnnoise' 'pciutils'
|
depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'mbedtls' 'rnnoise' 'pciutils'
|
||||||
'qt5-svg' 'curl' 'jack2' 'gtk-update-icon-cache' 'libxcomposite')
|
'qt5-svg' 'curl' 'jack2' 'gtk-update-icon-cache' 'libxcomposite')
|
||||||
|
|
@ -21,28 +21,25 @@ optdepends=('libfdk-aac: FDK AAC codec support'
|
||||||
'luajit: scripting support'
|
'luajit: scripting support'
|
||||||
'python: scripting support'
|
'python: scripting support'
|
||||||
'sndio: Sndio input client'
|
'sndio: Sndio input client'
|
||||||
'v4l2loopback-dkms: virtual camera support'
|
'v4l2loopback-dkms: virtual camera support')
|
||||||
"jack2: The JACK low-latency audio server")
|
|
||||||
provides=("obs-studio=$pkgver")
|
provides=("obs-studio=$pkgver")
|
||||||
conflicts=("obs-studio-git" "obs-studio-rc")
|
conflicts=("obs-studio-git" "obs-studio-rc")
|
||||||
|
|
||||||
source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
|
source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
|
||||||
fix_python_binary_loading.patch
|
fix_python_binary_loading.patch
|
||||||
ignore_unused_submodules.patch)
|
ignore_unused_submodules.patch)
|
||||||
# https://github.com/obsproject/obs-studio/commit/2e79d4c9.patch)
|
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $pkgname-$pkgver
|
cd $pkgname-$pkgver
|
||||||
patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
|
patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
|
||||||
patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
|
patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
|
||||||
# patch -Np1 < "$srcdir"/2e79d4c9.patch # Fix build with FFmpeg 6
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cmake -B build -S $pkgname-$pkgver \
|
cmake -B build -S $pkgname-$pkgver \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||||
-DBUILD_BROWSER=OFF \
|
-DENABLE_BROWSER=OFF \
|
||||||
-DCEF_ROOT_DIR="/opt/cef-obs" \
|
-DCEF_ROOT_DIR="/opt/cef-obs" \
|
||||||
-DENABLE_VST=ON \
|
-DENABLE_VST=ON \
|
||||||
-DENABLE_VLC=OFF \
|
-DENABLE_VLC=OFF \
|
||||||
|
|
@ -75,6 +72,5 @@ license=(GPL2)
|
||||||
sha256sums=(9a37148449d715b3c7cc3e622c291aba9fa45bd354a39453b3e922eb558cf21e # obs-studio-29.1.1.tar.gz
|
sha256sums=(9a37148449d715b3c7cc3e622c291aba9fa45bd354a39453b3e922eb558cf21e # obs-studio-29.1.1.tar.gz
|
||||||
bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd # fix_python_binary_loading.patch
|
bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd # fix_python_binary_loading.patch
|
||||||
60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3) # ignore_unused_submodules.patch
|
60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3) # ignore_unused_submodules.patch
|
||||||
# 96ea913149377b324d132aa56964a72e5263e06a8b8d2103c1708b04752f3b9d) # 2e79d4c9.patch
|
|
||||||
|
|
||||||
## 5325d619e6342550d8f045b25fc5c4544aadf46c00186bfefb3e737be1798357 obs-studio-29.1.1-01-x86_64.pkg.tar.lz
|
## 28efae5f088a180e49f9923315c2657489021c853f616eecef22bc2062cea039 obs-studio-29.1.1-02-x86_64.pkg.tar.lz
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
# Contributor: Benjamin Klettbach <b.klettbach@gmail.com>
|
# Contributor: Benjamin Klettbach <b.klettbach@gmail.com>
|
||||||
|
|
||||||
pkgname=obs-studio
|
pkgname=obs-studio
|
||||||
pkgver=29.0.2
|
pkgver=29.1.1
|
||||||
pkgrel=6
|
pkgrel=2
|
||||||
pkgdesc="Free, open source software for live streaming and recording"
|
pkgdesc="Free, open source software for live streaming and recording"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://obsproject.com"
|
url="https://obsproject.com"
|
||||||
|
|
@ -20,18 +20,15 @@ optdepends=('libfdk-aac: FDK AAC codec support'
|
||||||
'v4l2loopback-dkms: virtual camera support')
|
'v4l2loopback-dkms: virtual camera support')
|
||||||
source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
|
source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
|
||||||
fix_python_binary_loading.patch
|
fix_python_binary_loading.patch
|
||||||
ignore_unused_submodules.patch
|
ignore_unused_submodules.patch)
|
||||||
https://github.com/obsproject/obs-studio/commit/2e79d4c9.patch)
|
sha256sums=('9a37148449d715b3c7cc3e622c291aba9fa45bd354a39453b3e922eb558cf21e'
|
||||||
sha256sums=('0e6260800b80c3fc9f67c4c3fb12ffae740ab1dd188e526a55e0fc8949168db2'
|
|
||||||
'bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd'
|
'bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd'
|
||||||
'60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3'
|
'60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3')
|
||||||
'96ea913149377b324d132aa56964a72e5263e06a8b8d2103c1708b04752f3b9d')
|
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $pkgname-$pkgver
|
cd $pkgname-$pkgver
|
||||||
patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
|
patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
|
||||||
patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
|
patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
|
||||||
patch -Np1 < "$srcdir"/2e79d4c9.patch # Fix build with FFmpeg 6
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
||||||
|
|
@ -16,3 +16,4 @@ sndio
|
||||||
libgit2
|
libgit2
|
||||||
jack2
|
jack2
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=python-cairo
|
pkgname=python-cairo
|
||||||
pkgver=1.23.0
|
pkgver=1.23.0
|
||||||
pkgrel=04
|
pkgrel=06
|
||||||
pkgdesc="Python bindings for the cairo graphics library"
|
pkgdesc="Python bindings for the cairo graphics library"
|
||||||
url="https://pycairo.readthedocs.io/en/latest/"
|
url="https://pycairo.readthedocs.io/en/latest/"
|
||||||
depends=(cairo python)
|
depends=(cairo python)
|
||||||
|
|
@ -44,6 +44,16 @@ package() {
|
||||||
python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
|
python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# docs are docs, arch docs are good enough for us
|
||||||
|
#package_python-cairo-docs() {
|
||||||
|
# pkgdesc="Developer documentation for Pycairo"
|
||||||
|
# depends=()
|
||||||
|
#
|
||||||
|
# python -m sphinx -b html pycairo-$pkgver/docs "$pkgdir/usr/share/doc/pycairo/html"
|
||||||
|
# rm -r "$pkgdir/usr/share/doc/pycairo/html/.doctrees"
|
||||||
|
#}
|
||||||
|
#
|
||||||
|
|
||||||
#---- arch license gpg-key & sha256sums ----
|
#---- arch license gpg-key & sha256sums ----
|
||||||
|
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
@ -55,5 +65,5 @@ validpgpkeys=(0EBF782C5D53F7E5FB02A66746BD761F7A49B0EC) # 46BD761F7A49B0EC: "Chr
|
||||||
sha256sums=(9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c # pycairo-1.23.0.tar.gz
|
sha256sums=(9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c # pycairo-1.23.0.tar.gz
|
||||||
330b78edd63f25e589e8af67e97b79cbd19e02d82297a2c706234a31288a986c) # pycairo-1.23.0.tar.gz.sig
|
330b78edd63f25e589e8af67e97b79cbd19e02d82297a2c706234a31288a986c) # pycairo-1.23.0.tar.gz.sig
|
||||||
|
|
||||||
## c16bafe7ed33da61764b50fdc706d40066a961b947c50b5713194a7793354a99 python-cairo-1.23.0-04-x86_64.pkg.tar.lz
|
## 4c431e7378c2ef0daad96283e50683bbf54c85a1144d1449cb33382e1a634eeb python-cairo-1.23.0-06-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,28 @@
|
||||||
# Contributor: Angel Velasquez <angvp@archlinux.org>
|
# Contributor: Angel Velasquez <angvp@archlinux.org>
|
||||||
# Contributor: Jan de Groot <jgc@archlinux.org>
|
# Contributor: Jan de Groot <jgc@archlinux.org>
|
||||||
|
|
||||||
pkgname=python-cairo
|
pkgbase=python-cairo
|
||||||
|
pkgname=(python-cairo python-cairo-docs)
|
||||||
pkgver=1.23.0
|
pkgver=1.23.0
|
||||||
pkgrel=4
|
pkgrel=6
|
||||||
pkgdesc="Python bindings for the cairo graphics library"
|
pkgdesc="Python bindings for the cairo graphics library"
|
||||||
url="https://pycairo.readthedocs.io/en/latest/"
|
url="https://pycairo.readthedocs.io/en/latest/"
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
license=(LGPL2.1 MPL)
|
license=(LGPL2.1 MPL)
|
||||||
depends=(cairo python)
|
depends=(cairo python)
|
||||||
makedepends=(meson)
|
makedepends=(meson python-sphinx python-sphinx_rtd_theme)
|
||||||
checkdepends=(python-pytest)
|
checkdepends=(python-pytest)
|
||||||
source=(https://github.com/pygobject/pycairo/releases/download/v$pkgver/pycairo-$pkgver.tar.gz{,.sig})
|
source=(https://github.com/pygobject/pycairo/releases/download/v$pkgver/pycairo-$pkgver.tar.gz{,.sig}
|
||||||
|
pycairo-sphinx6.patch)
|
||||||
sha256sums=('9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c'
|
sha256sums=('9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c'
|
||||||
'SKIP')
|
'SKIP'
|
||||||
|
'5fa2e013da5d2a985c244b0b9d18a08435c207149f94a21f97837e79e15b71c0')
|
||||||
validpgpkeys=(0EBF782C5D53F7E5FB02A66746BD761F7A49B0EC) # Christoph Reiter <reiter.christoph@gmail.com>
|
validpgpkeys=(0EBF782C5D53F7E5FB02A66746BD761F7A49B0EC) # Christoph Reiter <reiter.christoph@gmail.com>
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd pycairo-$pkgver
|
cd pycairo-$pkgver
|
||||||
|
# https://github.com/pygobject/pycairo/pull/318
|
||||||
|
patch -Np1 -i ../pycairo-sphinx6.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
@ -29,7 +34,7 @@ check() {
|
||||||
meson test -C build --print-errorlogs
|
meson test -C build --print-errorlogs
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package_python-cairo() {
|
||||||
meson install -C build --destdir="$pkgdir"
|
meson install -C build --destdir="$pkgdir"
|
||||||
|
|
||||||
# compile Python bytecode
|
# compile Python bytecode
|
||||||
|
|
@ -37,4 +42,12 @@ package() {
|
||||||
python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
|
python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package_python-cairo-docs() {
|
||||||
|
pkgdesc="Developer documentation for Pycairo"
|
||||||
|
depends=()
|
||||||
|
|
||||||
|
python -m sphinx -b html pycairo-$pkgver/docs "$pkgdir/usr/share/doc/pycairo/html"
|
||||||
|
rm -r "$pkgdir/usr/share/doc/pycairo/html/.doctrees"
|
||||||
|
}
|
||||||
|
|
||||||
# vim:set sw=2 sts=-1 et:
|
# vim:set sw=2 sts=-1 et:
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@
|
||||||
pkgbase=qt5-base
|
pkgbase=qt5-base
|
||||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||||
_basever=5.15.9
|
_basever=5.15.9
|
||||||
pkgver=5.15.9+kde+r152
|
pkgver=5.15.9+kde+r154
|
||||||
_commit=2103f2487f709dd9546c503820d9ad509e9a63b3
|
_commit=a196623892558623e467f20b67edb78794252a09
|
||||||
pkgrel=01
|
pkgrel=01
|
||||||
url='https://www.qt.io'
|
url='https://www.qt.io'
|
||||||
pkgdesc='A cross-platform application and UI framework'
|
pkgdesc='A cross-platform application and UI framework'
|
||||||
|
|
@ -125,5 +125,5 @@ sha256sums=(SKIP
|
||||||
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
|
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
|
||||||
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch
|
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch
|
||||||
|
|
||||||
## 44302eceec6031ee9f3d1360a7208754c4a1c5d3c2bbd0b355e668efe0f51a77 qt5-base-5.15.9+kde+r152-01-x86_64.pkg.tar.lz
|
## 1ea898ed25f17ddc3dbc62735e2412914b96eec750ca03f1a98be8ae0ee15c81 qt5-base-5.15.9+kde+r154-01-x86_64.pkg.tar.lz
|
||||||
## a7c0ebfca4bd34535605b684ef5c83f1371f314f593c8baed8342761db3e3194 qt5-xcb-private-headers-5.15.9+kde+r152-01-x86_64.pkg.tar.lz
|
## 85a4bacdf2903be22b2d8a424d8b26294ec70283087d052783ac2b116cde633e qt5-xcb-private-headers-5.15.9+kde+r154-01-x86_64.pkg.tar.lz
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,9 @@
|
||||||
pkgbase=qt5-base
|
pkgbase=qt5-base
|
||||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||||
_basever=5.15.9
|
_basever=5.15.9
|
||||||
pkgver=5.15.9+kde+r151
|
pkgver=5.15.9+kde+r154
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
_commit=84152777a48af444a902bbf4df8b38146171c20d
|
_commit=a196623892558623e467f20b67edb78794252a09
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url='https://www.qt.io'
|
url='https://www.qt.io'
|
||||||
license=('GPL3' 'LGPL3' 'FDL' 'custom')
|
license=('GPL3' 'LGPL3' 'FDL' 'custom')
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
From 99960fcb9c8fefb3c929c8442c98f4cb0f83557d Mon Sep 17 00:00:00 2001
|
From 33b5788ef7534cf9b3492dda5fd15056042f3e1b Mon Sep 17 00:00:00 2001
|
||||||
From: nicm <nicm>
|
From: nicm <nicm>
|
||||||
Date: Tue, 25 Apr 2023 09:31:50 +0000
|
Date: Tue, 25 Apr 2023 09:31:50 +0000
|
||||||
Subject: [PATCH 1/2] Tidy tparm wrapper functions to have more obvious names
|
Subject: [PATCH 1/3] Tidy tparm wrapper functions to have more obvious names
|
||||||
and check tparm return value.
|
and check tparm return value.
|
||||||
|
|
||||||
(cherry picked from commit 8f34504736cf3547992c4ba948c1e65f3813715c)
|
(cherry picked from commit 8f34504736cf3547992c4ba948c1e65f3813715c)
|
||||||
|
|
@ -551,10 +551,10 @@ index 49cf9795..a4d744d0 100644
|
||||||
2.40.1
|
2.40.1
|
||||||
|
|
||||||
|
|
||||||
From 05729d716a303d0247bf15edcad855ed9c37172a Mon Sep 17 00:00:00 2001
|
From de51c8eb81b9db49fa34a8ea7886c9fe4164f46d Mon Sep 17 00:00:00 2001
|
||||||
From: Nicholas Marriott <nicholas.marriott@gmail.com>
|
From: Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||||
Date: Fri, 28 Apr 2023 06:44:40 +0100
|
Date: Fri, 28 Apr 2023 06:44:40 +0100
|
||||||
Subject: [PATCH 2/2] Use ncurses' new tparm_s function (added in 6.4-20230424)
|
Subject: [PATCH 2/3] Use ncurses' new tparm_s function (added in 6.4-20230424)
|
||||||
instead of tparm so it does not object to string arguments in capabilities it
|
instead of tparm so it does not object to string arguments in capabilities it
|
||||||
doesn't already know.
|
doesn't already know.
|
||||||
|
|
||||||
|
|
@ -673,3 +673,87 @@ index 32dd849a..18b17420 100644
|
||||||
--
|
--
|
||||||
2.40.1
|
2.40.1
|
||||||
|
|
||||||
|
|
||||||
|
From 732135ed357566d65749fde1967f5639026d9418 Mon Sep 17 00:00:00 2001
|
||||||
|
From: nicm <nicm>
|
||||||
|
Date: Fri, 28 Apr 2023 05:59:35 +0000
|
||||||
|
Subject: [PATCH 3/3] Do not fatal if tparm fails, instead just log it (not
|
||||||
|
working sequences are better than exiting).
|
||||||
|
|
||||||
|
(cherry picked from commit bf636d9575806134ca7efd917ee0d54e9330ae86)
|
||||||
|
---
|
||||||
|
tty-term.c | 30 ++++++++++++++++++++----------
|
||||||
|
1 file changed, 20 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tty-term.c b/tty-term.c
|
||||||
|
index 18b17420..e489f610 100644
|
||||||
|
--- a/tty-term.c
|
||||||
|
+++ b/tty-term.c
|
||||||
|
@@ -771,8 +771,10 @@ tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a)
|
||||||
|
#else
|
||||||
|
s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
#endif
|
||||||
|
- if (s == NULL)
|
||||||
|
- fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ if (s == NULL) {
|
||||||
|
+ log_debug("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return ("");
|
||||||
|
+ }
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -788,8 +790,10 @@ tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b)
|
||||||
|
#else
|
||||||
|
s = tparm((char *)x, a, b, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
#endif
|
||||||
|
- if (s == NULL)
|
||||||
|
- fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ if (s == NULL) {
|
||||||
|
+ log_debug("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return ("");
|
||||||
|
+ }
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -806,8 +810,10 @@ tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a,
|
||||||
|
#else
|
||||||
|
s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0);
|
||||||
|
#endif
|
||||||
|
- if (s == NULL)
|
||||||
|
- fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ if (s == NULL) {
|
||||||
|
+ log_debug("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return ("");
|
||||||
|
+ }
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -823,8 +829,10 @@ tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a)
|
||||||
|
#else
|
||||||
|
s = tparm((char *)x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
#endif
|
||||||
|
- if (s == NULL)
|
||||||
|
- fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ if (s == NULL) {
|
||||||
|
+ log_debug("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return ("");
|
||||||
|
+ }
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -841,8 +849,10 @@ tty_term_string_ss(struct tty_term *term, enum tty_code_code code,
|
||||||
|
#else
|
||||||
|
s = tparm((char *)x, (long)a, b, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
#endif
|
||||||
|
- if (s == NULL)
|
||||||
|
- fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ if (s == NULL) {
|
||||||
|
+ log_debug("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return ("");
|
||||||
|
+ }
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,675 @@
|
||||||
|
From 99960fcb9c8fefb3c929c8442c98f4cb0f83557d Mon Sep 17 00:00:00 2001
|
||||||
|
From: nicm <nicm>
|
||||||
|
Date: Tue, 25 Apr 2023 09:31:50 +0000
|
||||||
|
Subject: [PATCH 1/2] Tidy tparm wrapper functions to have more obvious names
|
||||||
|
and check tparm return value.
|
||||||
|
|
||||||
|
(cherry picked from commit 8f34504736cf3547992c4ba948c1e65f3813715c)
|
||||||
|
---
|
||||||
|
tmux.h | 26 ++++++------
|
||||||
|
tty-term.c | 47 ++++++++++++++++-----
|
||||||
|
tty.c | 118 ++++++++++++++++++++++++++---------------------------
|
||||||
|
3 files changed, 108 insertions(+), 83 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tmux.h b/tmux.h
|
||||||
|
index 53084b8b..5a90352e 100644
|
||||||
|
--- a/tmux.h
|
||||||
|
+++ b/tmux.h
|
||||||
|
@@ -2250,12 +2250,12 @@ void tty_margin_off(struct tty *);
|
||||||
|
void tty_cursor(struct tty *, u_int, u_int);
|
||||||
|
void tty_clipboard_query(struct tty *);
|
||||||
|
void tty_putcode(struct tty *, enum tty_code_code);
|
||||||
|
-void tty_putcode1(struct tty *, enum tty_code_code, int);
|
||||||
|
-void tty_putcode2(struct tty *, enum tty_code_code, int, int);
|
||||||
|
-void tty_putcode3(struct tty *, enum tty_code_code, int, int, int);
|
||||||
|
-void tty_putcode_ptr1(struct tty *, enum tty_code_code, const void *);
|
||||||
|
-void tty_putcode_ptr2(struct tty *, enum tty_code_code, const void *,
|
||||||
|
- const void *);
|
||||||
|
+void tty_putcode_i(struct tty *, enum tty_code_code, int);
|
||||||
|
+void tty_putcode_ii(struct tty *, enum tty_code_code, int, int);
|
||||||
|
+void tty_putcode_iii(struct tty *, enum tty_code_code, int, int, int);
|
||||||
|
+void tty_putcode_s(struct tty *, enum tty_code_code, const char *);
|
||||||
|
+void tty_putcode_ss(struct tty *, enum tty_code_code, const char *,
|
||||||
|
+ const char *);
|
||||||
|
void tty_puts(struct tty *, const char *);
|
||||||
|
void tty_putc(struct tty *, u_char);
|
||||||
|
void tty_putn(struct tty *, const void *, size_t, u_int);
|
||||||
|
@@ -2318,15 +2318,15 @@ int tty_term_read_list(const char *, int, char ***, u_int *,
|
||||||
|
void tty_term_free_list(char **, u_int);
|
||||||
|
int tty_term_has(struct tty_term *, enum tty_code_code);
|
||||||
|
const char *tty_term_string(struct tty_term *, enum tty_code_code);
|
||||||
|
-const char *tty_term_string1(struct tty_term *, enum tty_code_code, int);
|
||||||
|
-const char *tty_term_string2(struct tty_term *, enum tty_code_code, int,
|
||||||
|
+const char *tty_term_string_i(struct tty_term *, enum tty_code_code, int);
|
||||||
|
+const char *tty_term_string_ii(struct tty_term *, enum tty_code_code, int,
|
||||||
|
int);
|
||||||
|
-const char *tty_term_string3(struct tty_term *, enum tty_code_code, int,
|
||||||
|
+const char *tty_term_string_iii(struct tty_term *, enum tty_code_code, int,
|
||||||
|
int, int);
|
||||||
|
-const char *tty_term_ptr1(struct tty_term *, enum tty_code_code,
|
||||||
|
- const void *);
|
||||||
|
-const char *tty_term_ptr2(struct tty_term *, enum tty_code_code,
|
||||||
|
- const void *, const void *);
|
||||||
|
+const char *tty_term_string_s(struct tty_term *, enum tty_code_code,
|
||||||
|
+ const char *);
|
||||||
|
+const char *tty_term_string_ss(struct tty_term *, enum tty_code_code,
|
||||||
|
+ const char *, const char *);
|
||||||
|
int tty_term_number(struct tty_term *, enum tty_code_code);
|
||||||
|
int tty_term_flag(struct tty_term *, enum tty_code_code);
|
||||||
|
const char *tty_term_describe(struct tty_term *, enum tty_code_code);
|
||||||
|
diff --git a/tty-term.c b/tty-term.c
|
||||||
|
index fdf0c4fa..32dd849a 100644
|
||||||
|
--- a/tty-term.c
|
||||||
|
+++ b/tty-term.c
|
||||||
|
@@ -760,35 +760,60 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
|
||||||
|
+tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a)
|
||||||
|
{
|
||||||
|
- return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
|
||||||
|
+ const char *x = tty_term_string(term, code), *s;
|
||||||
|
+
|
||||||
|
+ s = tparm((char *)x, a);
|
||||||
|
+ if (s == NULL)
|
||||||
|
+ fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
|
||||||
|
+tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b)
|
||||||
|
{
|
||||||
|
- return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
|
||||||
|
+ const char *x = tty_term_string(term, code), *s;
|
||||||
|
+
|
||||||
|
+ s = tparm((char *)x, a, b);
|
||||||
|
+ if (s == NULL)
|
||||||
|
+ fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b,
|
||||||
|
+tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b,
|
||||||
|
int c)
|
||||||
|
{
|
||||||
|
- return (tparm((char *) tty_term_string(term, code), a, b, c, 0, 0, 0, 0, 0, 0));
|
||||||
|
+ const char *x = tty_term_string(term, code), *s;
|
||||||
|
+
|
||||||
|
+ s = tparm((char *)x, a, b, c);
|
||||||
|
+ if (s == NULL)
|
||||||
|
+ fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
|
||||||
|
+tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a)
|
||||||
|
{
|
||||||
|
- return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
|
||||||
|
+ const char *x = tty_term_string(term, code), *s;
|
||||||
|
+
|
||||||
|
+ s = tparm((char *)x, (long)a);
|
||||||
|
+ if (s == NULL)
|
||||||
|
+ fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a,
|
||||||
|
- const void *b)
|
||||||
|
+tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a,
|
||||||
|
+ const char *b)
|
||||||
|
{
|
||||||
|
- return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
|
||||||
|
+ const char *x = tty_term_string(term, code), *s;
|
||||||
|
+
|
||||||
|
+ s = tparm((char *)x, (long)a, (long)b);
|
||||||
|
+ if (s == NULL)
|
||||||
|
+ fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
+ return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
diff --git a/tty.c b/tty.c
|
||||||
|
index 49cf9795..a4d744d0 100644
|
||||||
|
--- a/tty.c
|
||||||
|
+++ b/tty.c
|
||||||
|
@@ -399,7 +399,7 @@ tty_stop_tty(struct tty *tty)
|
||||||
|
if (tcsetattr(c->fd, TCSANOW, &tty->tio) == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
- tty_raw(tty, tty_term_string2(tty->term, TTYC_CSR, 0, ws.ws_row - 1));
|
||||||
|
+ tty_raw(tty, tty_term_string_ii(tty->term, TTYC_CSR, 0, ws.ws_row - 1));
|
||||||
|
if (tty_acs_needed(tty))
|
||||||
|
tty_raw(tty, tty_term_string(tty->term, TTYC_RMACS));
|
||||||
|
tty_raw(tty, tty_term_string(tty->term, TTYC_SGR0));
|
||||||
|
@@ -409,7 +409,7 @@ tty_stop_tty(struct tty *tty)
|
||||||
|
if (tty_term_has(tty->term, TTYC_SE))
|
||||||
|
tty_raw(tty, tty_term_string(tty->term, TTYC_SE));
|
||||||
|
else if (tty_term_has(tty->term, TTYC_SS))
|
||||||
|
- tty_raw(tty, tty_term_string1(tty->term, TTYC_SS, 0));
|
||||||
|
+ tty_raw(tty, tty_term_string_i(tty->term, TTYC_SS, 0));
|
||||||
|
}
|
||||||
|
if (tty->mode & MODE_BRACKETPASTE)
|
||||||
|
tty_raw(tty, tty_term_string(tty->term, TTYC_DSBP));
|
||||||
|
@@ -506,42 +506,42 @@ tty_putcode(struct tty *tty, enum tty_code_code code)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-tty_putcode1(struct tty *tty, enum tty_code_code code, int a)
|
||||||
|
+tty_putcode_i(struct tty *tty, enum tty_code_code code, int a)
|
||||||
|
{
|
||||||
|
if (a < 0)
|
||||||
|
return;
|
||||||
|
- tty_puts(tty, tty_term_string1(tty->term, code, a));
|
||||||
|
+ tty_puts(tty, tty_term_string_i(tty->term, code, a));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-tty_putcode2(struct tty *tty, enum tty_code_code code, int a, int b)
|
||||||
|
+tty_putcode_ii(struct tty *tty, enum tty_code_code code, int a, int b)
|
||||||
|
{
|
||||||
|
if (a < 0 || b < 0)
|
||||||
|
return;
|
||||||
|
- tty_puts(tty, tty_term_string2(tty->term, code, a, b));
|
||||||
|
+ tty_puts(tty, tty_term_string_ii(tty->term, code, a, b));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-tty_putcode3(struct tty *tty, enum tty_code_code code, int a, int b, int c)
|
||||||
|
+tty_putcode_iii(struct tty *tty, enum tty_code_code code, int a, int b, int c)
|
||||||
|
{
|
||||||
|
if (a < 0 || b < 0 || c < 0)
|
||||||
|
return;
|
||||||
|
- tty_puts(tty, tty_term_string3(tty->term, code, a, b, c));
|
||||||
|
+ tty_puts(tty, tty_term_string_iii(tty->term, code, a, b, c));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-tty_putcode_ptr1(struct tty *tty, enum tty_code_code code, const void *a)
|
||||||
|
+tty_putcode_s(struct tty *tty, enum tty_code_code code, const char *a)
|
||||||
|
{
|
||||||
|
if (a != NULL)
|
||||||
|
- tty_puts(tty, tty_term_ptr1(tty->term, code, a));
|
||||||
|
+ tty_puts(tty, tty_term_string_s(tty->term, code, a));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-tty_putcode_ptr2(struct tty *tty, enum tty_code_code code, const void *a,
|
||||||
|
- const void *b)
|
||||||
|
+tty_putcode_ss(struct tty *tty, enum tty_code_code code, const char *a,
|
||||||
|
+ const char *b)
|
||||||
|
{
|
||||||
|
if (a != NULL && b != NULL)
|
||||||
|
- tty_puts(tty, tty_term_ptr2(tty->term, code, a, b));
|
||||||
|
+ tty_puts(tty, tty_term_string_ss(tty->term, code, a, b));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -603,7 +603,7 @@ tty_putc(struct tty *tty, u_char ch)
|
||||||
|
* it works on sensible terminals as well.
|
||||||
|
*/
|
||||||
|
if (tty->term->flags & TERM_NOAM)
|
||||||
|
- tty_putcode2(tty, TTYC_CUP, tty->cy, tty->cx);
|
||||||
|
+ tty_putcode_ii(tty, TTYC_CUP, tty->cy, tty->cx);
|
||||||
|
} else
|
||||||
|
tty->cx++;
|
||||||
|
}
|
||||||
|
@@ -682,7 +682,7 @@ tty_force_cursor_colour(struct tty *tty, int c)
|
||||||
|
else {
|
||||||
|
colour_split_rgb(c, &r, &g, &b);
|
||||||
|
xsnprintf(s, sizeof s, "rgb:%02hhx/%02hhx/%02hhx", r, g, b);
|
||||||
|
- tty_putcode_ptr1(tty, TTYC_CS, s);
|
||||||
|
+ tty_putcode_s(tty, TTYC_CS, s);
|
||||||
|
}
|
||||||
|
tty->ccolour = c;
|
||||||
|
}
|
||||||
|
@@ -743,7 +743,7 @@ tty_update_cursor(struct tty *tty, int mode, struct screen *s)
|
||||||
|
if (tty_term_has(tty->term, TTYC_SE))
|
||||||
|
tty_putcode(tty, TTYC_SE);
|
||||||
|
else
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 0);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 0);
|
||||||
|
}
|
||||||
|
if (cmode & (MODE_CURSOR_BLINKING|MODE_CURSOR_VERY_VISIBLE))
|
||||||
|
tty_putcode(tty, TTYC_CVVIS);
|
||||||
|
@@ -751,27 +751,27 @@ tty_update_cursor(struct tty *tty, int mode, struct screen *s)
|
||||||
|
case SCREEN_CURSOR_BLOCK:
|
||||||
|
if (tty_term_has(tty->term, TTYC_SS)) {
|
||||||
|
if (cmode & MODE_CURSOR_BLINKING)
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 1);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 1);
|
||||||
|
else
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 2);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 2);
|
||||||
|
} else if (cmode & MODE_CURSOR_BLINKING)
|
||||||
|
tty_putcode(tty, TTYC_CVVIS);
|
||||||
|
break;
|
||||||
|
case SCREEN_CURSOR_UNDERLINE:
|
||||||
|
if (tty_term_has(tty->term, TTYC_SS)) {
|
||||||
|
if (cmode & MODE_CURSOR_BLINKING)
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 3);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 3);
|
||||||
|
else
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 4);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 4);
|
||||||
|
} else if (cmode & MODE_CURSOR_BLINKING)
|
||||||
|
tty_putcode(tty, TTYC_CVVIS);
|
||||||
|
break;
|
||||||
|
case SCREEN_CURSOR_BAR:
|
||||||
|
if (tty_term_has(tty->term, TTYC_SS)) {
|
||||||
|
if (cmode & MODE_CURSOR_BLINKING)
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 5);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 5);
|
||||||
|
else
|
||||||
|
- tty_putcode1(tty, TTYC_SS, 6);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SS, 6);
|
||||||
|
} else if (cmode & MODE_CURSOR_BLINKING)
|
||||||
|
tty_putcode(tty, TTYC_CVVIS);
|
||||||
|
break;
|
||||||
|
@@ -833,7 +833,7 @@ tty_emulate_repeat(struct tty *tty, enum tty_code_code code,
|
||||||
|
enum tty_code_code code1, u_int n)
|
||||||
|
{
|
||||||
|
if (tty_term_has(tty->term, code))
|
||||||
|
- tty_putcode1(tty, code, n);
|
||||||
|
+ tty_putcode_i(tty, code, n);
|
||||||
|
else {
|
||||||
|
while (n-- > 0)
|
||||||
|
tty_putcode(tty, code1);
|
||||||
|
@@ -1122,7 +1122,7 @@ tty_clear_line(struct tty *tty, const struct grid_cell *defaults, u_int py,
|
||||||
|
/* Section of line. Use ECH if possible. */
|
||||||
|
if (tty_term_has(tty->term, TTYC_ECH)) {
|
||||||
|
tty_cursor(tty, px, py);
|
||||||
|
- tty_putcode1(tty, TTYC_ECH, nx);
|
||||||
|
+ tty_putcode_i(tty, TTYC_ECH, nx);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1263,7 +1263,7 @@ tty_clear_area(struct tty *tty, const struct grid_cell *defaults, u_int py,
|
||||||
|
tty_term_has(tty->term, TTYC_INDN)) {
|
||||||
|
tty_region(tty, py, py + ny - 1);
|
||||||
|
tty_margin_off(tty);
|
||||||
|
- tty_putcode1(tty, TTYC_INDN, ny);
|
||||||
|
+ tty_putcode_i(tty, TTYC_INDN, ny);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1278,7 +1278,7 @@ tty_clear_area(struct tty *tty, const struct grid_cell *defaults, u_int py,
|
||||||
|
tty_term_has(tty->term, TTYC_INDN)) {
|
||||||
|
tty_region(tty, py, py + ny - 1);
|
||||||
|
tty_margin(tty, px, px + nx - 1);
|
||||||
|
- tty_putcode1(tty, TTYC_INDN, ny);
|
||||||
|
+ tty_putcode_i(tty, TTYC_INDN, ny);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1579,7 +1579,7 @@ tty_sync_start(struct tty *tty)
|
||||||
|
|
||||||
|
if (tty_term_has(tty->term, TTYC_SYNC)) {
|
||||||
|
log_debug("%s sync start", tty->client->name);
|
||||||
|
- tty_putcode1(tty, TTYC_SYNC, 1);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SYNC, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1594,7 +1594,7 @@ tty_sync_end(struct tty *tty)
|
||||||
|
|
||||||
|
if (tty_term_has(tty->term, TTYC_SYNC)) {
|
||||||
|
log_debug("%s sync end", tty->client->name);
|
||||||
|
- tty_putcode1(tty, TTYC_SYNC, 2);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SYNC, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1793,7 +1793,7 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
|
||||||
|
if (tty_term_has(tty->term, TTYC_RI))
|
||||||
|
tty_putcode(tty, TTYC_RI);
|
||||||
|
else
|
||||||
|
- tty_putcode1(tty, TTYC_RIN, 1);
|
||||||
|
+ tty_putcode_i(tty, TTYC_RIN, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1872,7 +1872,7 @@ tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx)
|
||||||
|
tty_cursor(tty, 0, 0);
|
||||||
|
else
|
||||||
|
tty_cursor(tty, 0, tty->cy);
|
||||||
|
- tty_putcode1(tty, TTYC_INDN, ctx->num);
|
||||||
|
+ tty_putcode_i(tty, TTYC_INDN, ctx->num);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1902,7 +1902,7 @@ tty_cmd_scrolldown(struct tty *tty, const struct tty_ctx *ctx)
|
||||||
|
tty_cursor_pane(tty, ctx, ctx->ocx, ctx->orupper);
|
||||||
|
|
||||||
|
if (tty_term_has(tty->term, TTYC_RIN))
|
||||||
|
- tty_putcode1(tty, TTYC_RIN, ctx->num);
|
||||||
|
+ tty_putcode_i(tty, TTYC_RIN, ctx->num);
|
||||||
|
else {
|
||||||
|
for (i = 0; i < ctx->num; i++)
|
||||||
|
tty_putcode(tty, TTYC_RI);
|
||||||
|
@@ -2101,7 +2101,7 @@ tty_set_selection(struct tty *tty, const char *buf, size_t len)
|
||||||
|
|
||||||
|
b64_ntop(buf, len, encoded, size);
|
||||||
|
tty->flags |= TTY_NOBLOCK;
|
||||||
|
- tty_putcode_ptr2(tty, TTYC_MS, "", encoded);
|
||||||
|
+ tty_putcode_ss(tty, TTYC_MS, "", encoded);
|
||||||
|
|
||||||
|
free(encoded);
|
||||||
|
}
|
||||||
|
@@ -2246,7 +2246,7 @@ tty_region(struct tty *tty, u_int rupper, u_int rlower)
|
||||||
|
tty_cursor(tty, 0, tty->cy);
|
||||||
|
}
|
||||||
|
|
||||||
|
- tty_putcode2(tty, TTYC_CSR, tty->rupper, tty->rlower);
|
||||||
|
+ tty_putcode_ii(tty, TTYC_CSR, tty->rupper, tty->rlower);
|
||||||
|
tty->cx = tty->cy = UINT_MAX;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2274,7 +2274,7 @@ tty_margin(struct tty *tty, u_int rleft, u_int rright)
|
||||||
|
if (tty->rleft == rleft && tty->rright == rright)
|
||||||
|
return;
|
||||||
|
|
||||||
|
- tty_putcode2(tty, TTYC_CSR, tty->rupper, tty->rlower);
|
||||||
|
+ tty_putcode_ii(tty, TTYC_CSR, tty->rupper, tty->rlower);
|
||||||
|
|
||||||
|
tty->rleft = rleft;
|
||||||
|
tty->rright = rright;
|
||||||
|
@@ -2282,7 +2282,7 @@ tty_margin(struct tty *tty, u_int rleft, u_int rright)
|
||||||
|
if (rleft == 0 && rright == tty->sx - 1)
|
||||||
|
tty_putcode(tty, TTYC_CLMG);
|
||||||
|
else
|
||||||
|
- tty_putcode2(tty, TTYC_CMG, rleft, rright);
|
||||||
|
+ tty_putcode_ii(tty, TTYC_CMG, rleft, rright);
|
||||||
|
tty->cx = tty->cy = UINT_MAX;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2392,7 +2392,7 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
|
||||||
|
* the cursor with CUB/CUF.
|
||||||
|
*/
|
||||||
|
if ((u_int) abs(change) > cx && tty_term_has(term, TTYC_HPA)) {
|
||||||
|
- tty_putcode1(tty, TTYC_HPA, cx);
|
||||||
|
+ tty_putcode_i(tty, TTYC_HPA, cx);
|
||||||
|
goto out;
|
||||||
|
} else if (change > 0 &&
|
||||||
|
tty_term_has(term, TTYC_CUB) &&
|
||||||
|
@@ -2402,12 +2402,12 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
|
||||||
|
tty_putcode(tty, TTYC_CUB1);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
- tty_putcode1(tty, TTYC_CUB, change);
|
||||||
|
+ tty_putcode_i(tty, TTYC_CUB, change);
|
||||||
|
goto out;
|
||||||
|
} else if (change < 0 &&
|
||||||
|
tty_term_has(term, TTYC_CUF) &&
|
||||||
|
!tty_use_margin(tty)) {
|
||||||
|
- tty_putcode1(tty, TTYC_CUF, -change);
|
||||||
|
+ tty_putcode_i(tty, TTYC_CUF, -change);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
} else if (cx == thisx) {
|
||||||
|
@@ -2440,21 +2440,21 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
|
||||||
|
(change < 0 && cy - change > tty->rlower) ||
|
||||||
|
(change > 0 && cy - change < tty->rupper)) {
|
||||||
|
if (tty_term_has(term, TTYC_VPA)) {
|
||||||
|
- tty_putcode1(tty, TTYC_VPA, cy);
|
||||||
|
+ tty_putcode_i(tty, TTYC_VPA, cy);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
} else if (change > 0 && tty_term_has(term, TTYC_CUU)) {
|
||||||
|
- tty_putcode1(tty, TTYC_CUU, change);
|
||||||
|
+ tty_putcode_i(tty, TTYC_CUU, change);
|
||||||
|
goto out;
|
||||||
|
} else if (change < 0 && tty_term_has(term, TTYC_CUD)) {
|
||||||
|
- tty_putcode1(tty, TTYC_CUD, -change);
|
||||||
|
+ tty_putcode_i(tty, TTYC_CUD, -change);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
absolute:
|
||||||
|
/* Absolute movement. */
|
||||||
|
- tty_putcode2(tty, TTYC_CUP, cy, cx);
|
||||||
|
+ tty_putcode_ii(tty, TTYC_CUP, cy, cx);
|
||||||
|
|
||||||
|
out:
|
||||||
|
tty->cx = cx;
|
||||||
|
@@ -2533,13 +2533,13 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc,
|
||||||
|
!tty_term_has(tty->term, TTYC_SMULX))
|
||||||
|
tty_putcode(tty, TTYC_SMUL);
|
||||||
|
else if (changed & GRID_ATTR_UNDERSCORE_2)
|
||||||
|
- tty_putcode1(tty, TTYC_SMULX, 2);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SMULX, 2);
|
||||||
|
else if (changed & GRID_ATTR_UNDERSCORE_3)
|
||||||
|
- tty_putcode1(tty, TTYC_SMULX, 3);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SMULX, 3);
|
||||||
|
else if (changed & GRID_ATTR_UNDERSCORE_4)
|
||||||
|
- tty_putcode1(tty, TTYC_SMULX, 4);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SMULX, 4);
|
||||||
|
else if (changed & GRID_ATTR_UNDERSCORE_5)
|
||||||
|
- tty_putcode1(tty, TTYC_SMULX, 5);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SMULX, 5);
|
||||||
|
}
|
||||||
|
if (changed & GRID_ATTR_BLINK)
|
||||||
|
tty_putcode(tty, TTYC_BLINK);
|
||||||
|
@@ -2593,14 +2593,14 @@ tty_colours(struct tty *tty, const struct grid_cell *gc)
|
||||||
|
if (have_ax)
|
||||||
|
tty_puts(tty, "\033[39m");
|
||||||
|
else if (tc->fg != 7)
|
||||||
|
- tty_putcode1(tty, TTYC_SETAF, 7);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAF, 7);
|
||||||
|
tc->fg = gc->fg;
|
||||||
|
}
|
||||||
|
if (COLOUR_DEFAULT(gc->bg) && !COLOUR_DEFAULT(tc->bg)) {
|
||||||
|
if (have_ax)
|
||||||
|
tty_puts(tty, "\033[49m");
|
||||||
|
else if (tc->bg != 0)
|
||||||
|
- tty_putcode1(tty, TTYC_SETAB, 0);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAB, 0);
|
||||||
|
tc->bg = gc->bg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2768,12 +2768,12 @@ tty_colours_fg(struct tty *tty, const struct grid_cell *gc)
|
||||||
|
xsnprintf(s, sizeof s, "\033[%dm", gc->fg);
|
||||||
|
tty_puts(tty, s);
|
||||||
|
} else
|
||||||
|
- tty_putcode1(tty, TTYC_SETAF, gc->fg - 90 + 8);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAF, gc->fg - 90 + 8);
|
||||||
|
goto save;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Otherwise set the foreground colour. */
|
||||||
|
- tty_putcode1(tty, TTYC_SETAF, gc->fg);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAF, gc->fg);
|
||||||
|
|
||||||
|
save:
|
||||||
|
/* Save the new values in the terminal current cell. */
|
||||||
|
@@ -2800,12 +2800,12 @@ tty_colours_bg(struct tty *tty, const struct grid_cell *gc)
|
||||||
|
xsnprintf(s, sizeof s, "\033[%dm", gc->bg + 10);
|
||||||
|
tty_puts(tty, s);
|
||||||
|
} else
|
||||||
|
- tty_putcode1(tty, TTYC_SETAB, gc->bg - 90 + 8);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAB, gc->bg - 90 + 8);
|
||||||
|
goto save;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Otherwise set the background colour. */
|
||||||
|
- tty_putcode1(tty, TTYC_SETAB, gc->bg);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAB, gc->bg);
|
||||||
|
|
||||||
|
save:
|
||||||
|
/* Save the new values in the terminal current cell. */
|
||||||
|
@@ -2841,10 +2841,10 @@ tty_colours_us(struct tty *tty, const struct grid_cell *gc)
|
||||||
|
* non-RGB version may be wrong.
|
||||||
|
*/
|
||||||
|
if (tty_term_has(tty->term, TTYC_SETULC))
|
||||||
|
- tty_putcode1(tty, TTYC_SETULC, c);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETULC, c);
|
||||||
|
else if (tty_term_has(tty->term, TTYC_SETAL) &&
|
||||||
|
tty_term_has(tty->term, TTYC_RGB))
|
||||||
|
- tty_putcode1(tty, TTYC_SETAL, c);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAL, c);
|
||||||
|
|
||||||
|
save:
|
||||||
|
/* Save the new values in the terminal current cell. */
|
||||||
|
@@ -2858,18 +2858,18 @@ tty_try_colour(struct tty *tty, int colour, const char *type)
|
||||||
|
|
||||||
|
if (colour & COLOUR_FLAG_256) {
|
||||||
|
if (*type == '3' && tty_term_has(tty->term, TTYC_SETAF))
|
||||||
|
- tty_putcode1(tty, TTYC_SETAF, colour & 0xff);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAF, colour & 0xff);
|
||||||
|
else if (tty_term_has(tty->term, TTYC_SETAB))
|
||||||
|
- tty_putcode1(tty, TTYC_SETAB, colour & 0xff);
|
||||||
|
+ tty_putcode_i(tty, TTYC_SETAB, colour & 0xff);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (colour & COLOUR_FLAG_RGB) {
|
||||||
|
colour_split_rgb(colour & 0xffffff, &r, &g, &b);
|
||||||
|
if (*type == '3' && tty_term_has(tty->term, TTYC_SETRGBF))
|
||||||
|
- tty_putcode3(tty, TTYC_SETRGBF, r, g, b);
|
||||||
|
+ tty_putcode_iii(tty, TTYC_SETRGBF, r, g, b);
|
||||||
|
else if (tty_term_has(tty->term, TTYC_SETRGBB))
|
||||||
|
- tty_putcode3(tty, TTYC_SETRGBB, r, g, b);
|
||||||
|
+ tty_putcode_iii(tty, TTYC_SETRGBB, r, g, b);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2953,7 +2953,7 @@ tty_clipboard_query(struct tty *tty)
|
||||||
|
|
||||||
|
if ((~tty->flags & TTY_STARTED) || (tty->flags & TTY_OSC52QUERY))
|
||||||
|
return;
|
||||||
|
- tty_putcode_ptr2(tty, TTYC_MS, "", "?");
|
||||||
|
+ tty_putcode_ss(tty, TTYC_MS, "", "?");
|
||||||
|
|
||||||
|
tty->flags |= TTY_OSC52QUERY;
|
||||||
|
evtimer_set(&tty->clipboard_timer, tty_clipboard_query_callback, tty);
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
|
|
||||||
|
From 05729d716a303d0247bf15edcad855ed9c37172a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||||
|
Date: Fri, 28 Apr 2023 06:44:40 +0100
|
||||||
|
Subject: [PATCH 2/2] Use ncurses' new tparm_s function (added in 6.4-20230424)
|
||||||
|
instead of tparm so it does not object to string arguments in capabilities it
|
||||||
|
doesn't already know.
|
||||||
|
|
||||||
|
(cherry picked from commit 39d41d0810d4e8ae6ce8d27776dfbb96722d9319)
|
||||||
|
---
|
||||||
|
configure.ac | 4 ++++
|
||||||
|
tty-term.c | 48 +++++++++++++++++++++++++++++++++++++++---------
|
||||||
|
2 files changed, 43 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 2b8b3b11..3c3c1873 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -344,6 +344,10 @@ else
|
||||||
|
AC_MSG_ERROR("curses not found")
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
+AC_CHECK_FUNCS([ \
|
||||||
|
+ tiparm \
|
||||||
|
+ tiparm_s \
|
||||||
|
+])
|
||||||
|
|
||||||
|
# Look for utempter.
|
||||||
|
AC_ARG_ENABLE(
|
||||||
|
diff --git a/tty-term.c b/tty-term.c
|
||||||
|
index 32dd849a..18b17420 100644
|
||||||
|
--- a/tty-term.c
|
||||||
|
+++ b/tty-term.c
|
||||||
|
@@ -764,7 +764,13 @@ tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a)
|
||||||
|
{
|
||||||
|
const char *x = tty_term_string(term, code), *s;
|
||||||
|
|
||||||
|
- s = tparm((char *)x, a);
|
||||||
|
+#if defined(HAVE_TIPARM_S)
|
||||||
|
+ s = tiparm_s(1, 0, x, a);
|
||||||
|
+#elif defined(HAVE_TIPARM)
|
||||||
|
+ s = tiparm(x, a);
|
||||||
|
+#else
|
||||||
|
+ s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
+#endif
|
||||||
|
if (s == NULL)
|
||||||
|
fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
return (s);
|
||||||
|
@@ -775,19 +781,31 @@ tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b)
|
||||||
|
{
|
||||||
|
const char *x = tty_term_string(term, code), *s;
|
||||||
|
|
||||||
|
- s = tparm((char *)x, a, b);
|
||||||
|
+#if defined(HAVE_TIPARM_S)
|
||||||
|
+ s = tiparm_s(2, 0, x, a, b);
|
||||||
|
+#elif defined(HAVE_TIPARM)
|
||||||
|
+ s = tiparm(x, a, b);
|
||||||
|
+#else
|
||||||
|
+ s = tparm((char *)x, a, b, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
+#endif
|
||||||
|
if (s == NULL)
|
||||||
|
fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b,
|
||||||
|
- int c)
|
||||||
|
+tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a,
|
||||||
|
+ int b, int c)
|
||||||
|
{
|
||||||
|
const char *x = tty_term_string(term, code), *s;
|
||||||
|
|
||||||
|
- s = tparm((char *)x, a, b, c);
|
||||||
|
+#if defined(HAVE_TIPARM_S)
|
||||||
|
+ s = tiparm_s(3, 0, x, a, b, c);
|
||||||
|
+#elif defined(HAVE_TIPARM)
|
||||||
|
+ s = tiparm(x, a, b, c);
|
||||||
|
+#else
|
||||||
|
+ s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0);
|
||||||
|
+#endif
|
||||||
|
if (s == NULL)
|
||||||
|
fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
return (s);
|
||||||
|
@@ -798,19 +816,31 @@ tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a)
|
||||||
|
{
|
||||||
|
const char *x = tty_term_string(term, code), *s;
|
||||||
|
|
||||||
|
- s = tparm((char *)x, (long)a);
|
||||||
|
+#if defined(HAVE_TIPARM_S)
|
||||||
|
+ s = tiparm_s(1, 1, x, a);
|
||||||
|
+#elif defined(HAVE_TIPARM)
|
||||||
|
+ s = tiparm(x, a);
|
||||||
|
+#else
|
||||||
|
+ s = tparm((char *)x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
+#endif
|
||||||
|
if (s == NULL)
|
||||||
|
fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
return (s);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
-tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a,
|
||||||
|
- const char *b)
|
||||||
|
+tty_term_string_ss(struct tty_term *term, enum tty_code_code code,
|
||||||
|
+ const char *a, const char *b)
|
||||||
|
{
|
||||||
|
const char *x = tty_term_string(term, code), *s;
|
||||||
|
|
||||||
|
- s = tparm((char *)x, (long)a, (long)b);
|
||||||
|
+#if defined(HAVE_TIPARM_S)
|
||||||
|
+ s = tiparm_s(2, 3, x, a, b);
|
||||||
|
+#elif defined(HAVE_TIPARM)
|
||||||
|
+ s = tiparm(x, a, b);
|
||||||
|
+#else
|
||||||
|
+ s = tparm((char *)x, (long)a, b, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
+#endif
|
||||||
|
if (s == NULL)
|
||||||
|
fatalx("could not expand %s", tty_term_codes[code].name);
|
||||||
|
return (s);
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=tmux
|
pkgname=tmux
|
||||||
pkgver=3.3_a
|
pkgver=3.3_a
|
||||||
pkgrel=04
|
pkgrel=07
|
||||||
pkgdesc='A terminal multiplexer without systemd'
|
pkgdesc='A terminal multiplexer without systemd'
|
||||||
url='https://github.com/tmux/tmux/wiki'
|
url='https://github.com/tmux/tmux/wiki'
|
||||||
depends=('ncurses' 'libevent' 'libutempter')
|
depends=('ncurses' 'libevent' 'libutempter')
|
||||||
|
|
@ -49,6 +49,8 @@ license=('BSD')
|
||||||
|
|
||||||
sha256sums=(e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f # tmux-3.3a.tar.gz
|
sha256sums=(e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f # tmux-3.3a.tar.gz
|
||||||
58fb690833e086b71b52555aa8eced695ace0a0bc51b8bccfda441e35a47ca93 # CVE-2022-47016.patch
|
58fb690833e086b71b52555aa8eced695ace0a0bc51b8bccfda441e35a47ca93 # CVE-2022-47016.patch
|
||||||
ec46d35d980e2d63d60069567f8456ecafdf48d4d0b4f629de585d7575d797e1) # 0002-ncurses.patch
|
70e8cc2a95dd4a19ff54bcf0abaeff6464ebecbaace5ed0aec06ca93a84d415a) # 0002-ncurses.patch
|
||||||
|
|
||||||
## 33b38ca8bdf8f2ffd01132f243c5e6152d3378e3776831300d562e5355313802 tmux-3.3_a-04-x86_64.pkg.tar.lz
|
## 89cee0c3426b7309edaf7988b8c4801c2a4a7056904b7feb08c82b4f23844f29 tmux-3.3_a-07-x86_64.pkg.tar.lz
|
||||||
|
89cee0c3426b7309edaf7988b8c4801c2a4a7056904b7feb08c82b4f23844f29 tmux-3.3_a-07-x86_64.pkg.tar.lz
|
||||||
|
e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
pkgname=tmux
|
pkgname=tmux
|
||||||
pkgver=3.3_a
|
pkgver=3.3_a
|
||||||
pkgrel=4
|
pkgrel=7
|
||||||
pkgdesc='Terminal multiplexer'
|
pkgdesc='Terminal multiplexer'
|
||||||
url='https://github.com/tmux/tmux/wiki'
|
url='https://github.com/tmux/tmux/wiki'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
|
@ -15,7 +15,7 @@ source=("https://github.com/tmux/tmux/releases/download/${pkgver/_/}/tmux-${pkgv
|
||||||
'0002-ncurses.patch')
|
'0002-ncurses.patch')
|
||||||
sha256sums=('e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f'
|
sha256sums=('e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f'
|
||||||
'58fb690833e086b71b52555aa8eced695ace0a0bc51b8bccfda441e35a47ca93'
|
'58fb690833e086b71b52555aa8eced695ace0a0bc51b8bccfda441e35a47ca93'
|
||||||
'ec46d35d980e2d63d60069567f8456ecafdf48d4d0b4f629de585d7575d797e1')
|
'70e8cc2a95dd4a19ff54bcf0abaeff6464ebecbaace5ed0aec06ca93a84d415a')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "$pkgname-${pkgver/_/}"
|
cd "$pkgname-${pkgver/_/}"
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,10 @@
|
||||||
|
|
||||||
pkgname=zbar
|
pkgname=zbar
|
||||||
pkgver=0.23.90
|
pkgver=0.23.90
|
||||||
pkgrel=02
|
pkgrel=03
|
||||||
pkgdesc="Application and library for reading bar codes from various sources"
|
pkgdesc="Application and library for reading bar codes from various sources"
|
||||||
url="https://github.com/mchehab/zbar"
|
url="https://github.com/mchehab/zbar"
|
||||||
depends=('dbus' 'imagemagick' 'libsm' 'libxv' 'v4l-utils')
|
depends=('dbus' 'imagemagick' 'libxv' 'v4l-utils')
|
||||||
makedepends=('gtk3' 'qt5-x11extras' 'python' 'xmlto' 'docbook-xsl' 'gobject-introspection')
|
makedepends=('gtk3' 'qt5-x11extras' 'python' 'xmlto' 'docbook-xsl' 'gobject-introspection')
|
||||||
optdepends=('gtk3: for zbar-gtk'
|
optdepends=('gtk3: for zbar-gtk'
|
||||||
'qt5-x11extras: for zbar-qt'
|
'qt5-x11extras: for zbar-qt'
|
||||||
|
|
@ -19,10 +19,12 @@ conflicts=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
||||||
provides=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
provides=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
||||||
replaces=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
replaces=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
||||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz"
|
source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz"
|
||||||
$pkgname-0.23.90-python3.11.patch) # backport of https://github.com/mchehab/zbar/pull/231
|
"$pkgname-0.23.90-python3.11.patch" # backport of https://github.com/mchehab/zbar/pull/231
|
||||||
|
"$pkgname-0.23.90-pkgconfig.patch::https://github.com/mchehab/zbar/commit/2d109b9ecb8a84ccfd20fbf0a018cdb44b4f757f.patch")
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.90-python3.11.patch
|
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.90-python3.11.patch
|
||||||
|
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.90-pkgconfig.patch
|
||||||
cd zbar-$pkgver
|
cd zbar-$pkgver
|
||||||
autoreconf -vfi
|
autoreconf -vfi
|
||||||
}
|
}
|
||||||
|
|
@ -45,14 +47,8 @@ arch=(x86_64)
|
||||||
|
|
||||||
license=(LGPL)
|
license=(LGPL)
|
||||||
|
|
||||||
sha512sums=('d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb'
|
|
||||||
'4f8518fd93fe5209c2e615801f158cdd64cffaf232c38b3ef2883dc29f9938a72485133e44ab048fddf9f4ffa4da55fe13bdc64829a2f4ffa6cfde8c5fb348ad')
|
|
||||||
|
|
||||||
b2sums=('5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d'
|
|
||||||
'8a6a0c788db8bc3eba7a6787dd786ee8b9de14b95f1fd57a43a8eb9a0ab15f8495a31a57d4476373503ccb55c5148baa308bc4f8e9bd6edf07f6f572202b3b3b')
|
|
||||||
|
|
||||||
sha256sums=(25fdd6726d5c4c6f95c95d37591bfbb2dde63d13d0b10cb1350923ea8b11963b # zbar-0.23.90.tar.gz
|
sha256sums=(25fdd6726d5c4c6f95c95d37591bfbb2dde63d13d0b10cb1350923ea8b11963b # zbar-0.23.90.tar.gz
|
||||||
d22dc56452d3da03c97dd3e6037caaee861454b420a07daa08ab5692911d7872) # zbar-0.23.90-python3.11.patch
|
d22dc56452d3da03c97dd3e6037caaee861454b420a07daa08ab5692911d7872 # zbar-0.23.90-python3.11.patch
|
||||||
|
864384515f111354a926c6797b081c2907b2d052fc22ab6e1dcb1baac654535b) # zbar-0.23.90-pkgconfig.patch
|
||||||
|
|
||||||
|
## 13f36ad2922c0478fb704069401ef005e1a1a6757c76374a90738e827ac18c81 zbar-0.23.90-03-x86_64.pkg.tar.lz
|
||||||
## fa811a6fbdb1ce3d42755f2695617bf5bbaa48465d37543575f0efc7ff73ed8c zbar-0.23.90-02-x86_64.pkg.tar.lz
|
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,12 @@
|
||||||
|
|
||||||
pkgname=zbar
|
pkgname=zbar
|
||||||
pkgver=0.23.90
|
pkgver=0.23.90
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc="Application and library for reading bar codes from various sources"
|
pkgdesc="Application and library for reading bar codes from various sources"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://github.com/mchehab/zbar"
|
url="https://github.com/mchehab/zbar"
|
||||||
license=('LGPL')
|
license=('LGPL')
|
||||||
depends=('dbus' 'imagemagick' 'libsm' 'libxv' 'v4l-utils')
|
depends=('dbus' 'imagemagick' 'libxv' 'v4l-utils')
|
||||||
makedepends=('gtk3' 'qt5-x11extras' 'python' 'xmlto' 'docbook-xsl' 'gobject-introspection')
|
makedepends=('gtk3' 'qt5-x11extras' 'python' 'xmlto' 'docbook-xsl' 'gobject-introspection')
|
||||||
optdepends=('gtk3: for zbar-gtk'
|
optdepends=('gtk3: for zbar-gtk'
|
||||||
'qt5-x11extras: for zbar-qt'
|
'qt5-x11extras: for zbar-qt'
|
||||||
|
|
@ -20,15 +20,19 @@ provides=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
||||||
replaces=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
replaces=('zbar-gtk' 'zbar-qt' 'python-zbar')
|
||||||
source=(
|
source=(
|
||||||
"$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/refs/tags/$pkgver.tar.gz"
|
"$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/refs/tags/$pkgver.tar.gz"
|
||||||
$pkgname-0.23.90-python3.11.patch # backport of https://github.com/mchehab/zbar/pull/231
|
"$pkgname-0.23.90-python3.11.patch" # backport of https://github.com/mchehab/zbar/pull/231
|
||||||
|
"$pkgname-0.23.90-pkgconfig.patch::https://github.com/mchehab/zbar/commit/2d109b9ecb8a84ccfd20fbf0a018cdb44b4f757f.patch"
|
||||||
)
|
)
|
||||||
sha512sums=('d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb'
|
sha512sums=('d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb'
|
||||||
'4f8518fd93fe5209c2e615801f158cdd64cffaf232c38b3ef2883dc29f9938a72485133e44ab048fddf9f4ffa4da55fe13bdc64829a2f4ffa6cfde8c5fb348ad')
|
'4f8518fd93fe5209c2e615801f158cdd64cffaf232c38b3ef2883dc29f9938a72485133e44ab048fddf9f4ffa4da55fe13bdc64829a2f4ffa6cfde8c5fb348ad'
|
||||||
|
'511c665dfa458a01a88d6d087d00f09463f935770b8fd81816039be15d4e7002340778f9843c87284484c299462e48bafa8c34b86dac151a11ae78686fc92334')
|
||||||
b2sums=('5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d'
|
b2sums=('5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d'
|
||||||
'8a6a0c788db8bc3eba7a6787dd786ee8b9de14b95f1fd57a43a8eb9a0ab15f8495a31a57d4476373503ccb55c5148baa308bc4f8e9bd6edf07f6f572202b3b3b')
|
'8a6a0c788db8bc3eba7a6787dd786ee8b9de14b95f1fd57a43a8eb9a0ab15f8495a31a57d4476373503ccb55c5148baa308bc4f8e9bd6edf07f6f572202b3b3b'
|
||||||
|
'c250842fc25bb67360437c14c2ec793738a9f4d67f7254afda47a1a7d23c5c9b566f2b0e60238735d4af74052953e1128aa5bf720cdb50553a0dd289a0dc3045')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.90-python3.11.patch
|
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.90-python3.11.patch
|
||||||
|
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.90-pkgconfig.patch
|
||||||
cd zbar-$pkgver
|
cd zbar-$pkgver
|
||||||
autoreconf -vfi
|
autoreconf -vfi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
imagemagick
|
imagemagick
|
||||||
libsm
|
|
||||||
libxv
|
libxv
|
||||||
v4l-utils
|
v4l-utils
|
||||||
gtk3
|
gtk3
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
From 2d109b9ecb8a84ccfd20fbf0a018cdb44b4f757f Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
|
||||||
|
Date: Tue, 7 Mar 2023 12:00:46 +0100
|
||||||
|
Subject: [PATCH] Substitute gtk version in .pc file
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Use the right gtk version when generating the .pc file.
|
||||||
|
|
||||||
|
Signed-off-by: Balló György <ballogyor@gmail.com>
|
||||||
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||||
|
---
|
||||||
|
zbar-gtk.pc.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/zbar-gtk.pc.in b/zbar-gtk.pc.in
|
||||||
|
index fc712a25..c82c1697 100644
|
||||||
|
--- a/zbar-gtk.pc.in
|
||||||
|
+++ b/zbar-gtk.pc.in
|
||||||
|
@@ -7,6 +7,6 @@ Name: zbar-gtk
|
||||||
|
Description: bar code scanning and decoding GTK widget
|
||||||
|
URL: http://zbar.sourceforge.net
|
||||||
|
Version: @VERSION@
|
||||||
|
-Requires: zbar, gtk+-2.0, gthread-2.0
|
||||||
|
+Requires: zbar, gtk+-@GTK_VERSION_MAJOR@, gthread-2.0
|
||||||
|
Libs: -L${libdir} -lzbargtk
|
||||||
|
Cflags: -I${includedir}
|
||||||
Loading…
Reference in New Issue