upg libblockdev libvirt qt6-base
This commit is contained in:
parent
ee33ef6821
commit
c6f17d90a7
8 changed files with 78 additions and 48 deletions
|
|
@ -10,8 +10,8 @@ pkgbase=libblockdev
|
|||
pkgname=(libblockdev) #
|
||||
# we are building the ones that need systemd so they don't, the rest
|
||||
# can be provided by arch
|
||||
pkgver=3.1.1
|
||||
pkgrel=02
|
||||
pkgver=3.2.0
|
||||
pkgrel=01
|
||||
pkgdesc="A library for manipulating block devices w/o systemd"
|
||||
#url="https://github.com/rhinstaller/libblockdev"
|
||||
url="https://github.com/storaged-project/libblockdev"
|
||||
|
|
@ -30,10 +30,13 @@ makedepends=(
|
|||
'glibc'
|
||||
'gobject-introspection'
|
||||
'gtk-doc'
|
||||
'json-glib'
|
||||
'kmod'
|
||||
'keyutils'
|
||||
'libatasmart'
|
||||
'libbytesize'
|
||||
'libnvme'
|
||||
'libyaml'
|
||||
'lvm2'
|
||||
'mdadm'
|
||||
'ndctl'
|
||||
|
|
@ -45,7 +48,7 @@ makedepends=(
|
|||
'volume_key'
|
||||
)
|
||||
#source=("$pkgname-$pkgver.tar.gz::https://github.com/rhinstaller/libblockdev/archive/$pkgver-1.tar.gz")
|
||||
source=("$url/releases/download/$pkgver-1/$pkgname-$pkgver.tar.gz")
|
||||
source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
|
||||
|
||||
_pick() {
|
||||
local p="$1" f d; shift
|
||||
|
|
@ -96,6 +99,7 @@ package_libblockdev() {
|
|||
'libblockdev-nvdimm: for NVDIMM support'
|
||||
'libblockdev-nvme: for NVME support'
|
||||
'libblockdev-part: for partitioning support'
|
||||
'libblockdev-smart: for S.M.A.R.T. support'
|
||||
'libblockdev-swap: for swap support'
|
||||
'python-libblockdev: for Python support'
|
||||
)
|
||||
|
|
@ -146,6 +150,9 @@ package_libblockdev() {
|
|||
|
||||
_pick $pkgbase-part usr/include/blockdev/part.h
|
||||
_pick $pkgbase-part usr/lib/libbd_part.*
|
||||
|
||||
_pick $pkgbase-smart usr/include/blockdev/smart.h
|
||||
_pick $pkgbase-smart usr/lib/libbd_smart*
|
||||
|
||||
_pick $pkgbase-swap usr/include/blockdev/swap.h
|
||||
_pick $pkgbase-swap usr/lib/libbd_swap.*
|
||||
|
|
@ -159,9 +166,9 @@ arch=(x86_64)
|
|||
|
||||
license=('LGPL')
|
||||
|
||||
sha512sums=('44628d9e68a467f8a5d5e65e12d5d6ffb4d9b953c846acd9f6da257eab5ccd79309651d6b20092fa700fb4340f1f718ceef11141203da676d088824aa9d03481')
|
||||
b2sums=('b3dbdc7226524d544193b609ced8a9fee725268ba2201b639c22103fcae6d047c94fb1b848e489525300242cb235d688934193894a06279a4dc0e0b33dff6e96')
|
||||
sha256sums=(a5cb33a53ff5969067982704f45399d02555fdb2313ed0c56eac9555397dc2db) # libblockdev-3.1.1.tar.gz
|
||||
sha512sums=('02a56f566a768a4f4bc68e3e40c80a080cb5ced58675dfae7986f55aea57f887425ebab19d9c2659887d489f08ace082aca0cf97ed3d95e266fb83a236a2f66c')
|
||||
b2sums=('1ab26e4fc3098f6aa1eac6bf2660961b9339e3553039f2d99ba5f6b96b53cd13bac174a8e310af442f35a7b9d49fc95c6ea14e66058150cefbd6794e98199a6a')
|
||||
sha256sums=(f2918de9ce1b54ac1aee5e5757e555947896a74674cdca9d05940a53d19e32a8) # libblockdev-3.2.0.tar.gz
|
||||
|
||||
## 57fba53f58e8a54d53b37ade4c31d115db325817ecd9bdbb02add17bbe01f6b4 libblockdev-3.1.1-02-x86_64.pkg.tar.lz
|
||||
## cfc1a4f4122b2fe6d6ed1a7968bcfcc0681a02fbb59bce88e572ed6173d67e09 libblockdev-3.2.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
pkgbase=libblockdev
|
||||
pkgname=(
|
||||
libblockdev
|
||||
libblockdev-{btrfs,crypto,dm,fs,loop,lvm,mdraid,mpath,nvdimm,nvme,part,swap}
|
||||
libblockdev-{btrfs,crypto,dm,fs,loop,lvm,mdraid,mpath,nvdimm,nvme,part,smart,swap}
|
||||
python-libblockdev
|
||||
)
|
||||
pkgver=3.1.1
|
||||
pkgrel=2
|
||||
pkgver=3.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="A library for manipulating block devices"
|
||||
arch=('x86_64')
|
||||
url="https://github.com/storaged-project/libblockdev"
|
||||
|
|
@ -25,10 +25,13 @@ makedepends=(
|
|||
'glibc'
|
||||
'gobject-introspection'
|
||||
'gtk-doc'
|
||||
'json-glib'
|
||||
'kmod'
|
||||
'keyutils'
|
||||
'libatasmart'
|
||||
'libbytesize'
|
||||
'libnvme'
|
||||
'libyaml'
|
||||
'lvm2'
|
||||
'mdadm'
|
||||
'ndctl'
|
||||
|
|
@ -41,10 +44,10 @@ makedepends=(
|
|||
'volume_key'
|
||||
)
|
||||
source=(
|
||||
"$url/releases/download/$pkgver-1/$pkgname-$pkgver.tar.gz"
|
||||
"$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
|
||||
)
|
||||
sha512sums=('44628d9e68a467f8a5d5e65e12d5d6ffb4d9b953c846acd9f6da257eab5ccd79309651d6b20092fa700fb4340f1f718ceef11141203da676d088824aa9d03481')
|
||||
b2sums=('b3dbdc7226524d544193b609ced8a9fee725268ba2201b639c22103fcae6d047c94fb1b848e489525300242cb235d688934193894a06279a4dc0e0b33dff6e96')
|
||||
sha512sums=('02a56f566a768a4f4bc68e3e40c80a080cb5ced58675dfae7986f55aea57f887425ebab19d9c2659887d489f08ace082aca0cf97ed3d95e266fb83a236a2f66c')
|
||||
b2sums=('1ab26e4fc3098f6aa1eac6bf2660961b9339e3553039f2d99ba5f6b96b53cd13bac174a8e310af442f35a7b9d49fc95c6ea14e66058150cefbd6794e98199a6a')
|
||||
|
||||
_pick() {
|
||||
local p="$1" f d; shift
|
||||
|
|
@ -93,6 +96,7 @@ package_libblockdev() {
|
|||
'libblockdev-nvdimm: for NVDIMM support'
|
||||
'libblockdev-nvme: for NVME support'
|
||||
'libblockdev-part: for partitioning support'
|
||||
'libblockdev-smart: for S.M.A.R.T. support'
|
||||
'libblockdev-swap: for swap support'
|
||||
'python-libblockdev: for Python support'
|
||||
)
|
||||
|
|
@ -145,6 +149,9 @@ package_libblockdev() {
|
|||
_pick $pkgbase-part usr/include/blockdev/part.h
|
||||
_pick $pkgbase-part usr/lib/libbd_part.*
|
||||
|
||||
_pick $pkgbase-smart usr/include/blockdev/smart.h
|
||||
_pick $pkgbase-smart usr/lib/libbd_smart*
|
||||
|
||||
_pick $pkgbase-swap usr/include/blockdev/swap.h
|
||||
_pick $pkgbase-swap usr/lib/libbd_swap.*
|
||||
|
||||
|
|
@ -246,6 +253,7 @@ package_libblockdev-lvm() {
|
|||
glib2 libglib-2.0.so
|
||||
glibc
|
||||
"libblockdev=$pkgver" libbd_utils.so libblockdev.so
|
||||
libyaml
|
||||
libbytesize
|
||||
)
|
||||
provides=(
|
||||
|
|
@ -332,6 +340,26 @@ package_libblockdev-part() {
|
|||
mv -v $pkgname/* "$pkgdir"
|
||||
}
|
||||
|
||||
package_libblockdev-smart() {
|
||||
pkgdesc+=" - S.M.A.R.T. support"
|
||||
depends=(
|
||||
glib2 libglib-2.0.so
|
||||
glibc
|
||||
json-glib
|
||||
libatasmart
|
||||
"libblockdev=$pkgver" libbd_utils.so
|
||||
)
|
||||
optdepends=(
|
||||
'smartmontools: for experimental smartmontools-based plugin'
|
||||
)
|
||||
provides=(
|
||||
libbd_smart.so
|
||||
libbd_smartmontools.so
|
||||
)
|
||||
|
||||
mv -v $pkgname/* "$pkgdir"
|
||||
}
|
||||
|
||||
package_libblockdev-swap() {
|
||||
pkgdesc+=" - swap device support"
|
||||
depends=(
|
||||
|
|
|
|||
|
|
@ -19,3 +19,7 @@ exfatprogs
|
|||
lvm2
|
||||
|
||||
|
||||
json-glib
|
||||
libatasmart
|
||||
libyaml
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
|
||||
pkgname=(libvirt) # (libvirt-storage-gluster libvirt-storage-iscsi-direct libvirt-storage-rbd)
|
||||
epoch=1
|
||||
pkgver=10.7.0
|
||||
pkgrel=02
|
||||
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc) w/o zstd iscsi systemd"
|
||||
pkgver=10.8.0
|
||||
pkgrel=01
|
||||
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc) w/o iscsi systemd"
|
||||
url="https://libvirt.org/"
|
||||
depends=('fuse3' 'gnutls' 'libnbd' 'libnl' 'libpciaccess' 'libssh' 'libxml2' 'numactl' 'parted' 'polkit' 'yajl')
|
||||
#makedepends=('open-iscsi' 'ceph-libs') # need systemd-libs
|
||||
|
|
@ -83,13 +83,11 @@ backup=(
|
|||
# options=(debug) # enable this if you want the debug package made
|
||||
source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}
|
||||
libvirt.sysusers
|
||||
libvirt.tmpfiles
|
||||
"fix-uuid.patch::https://gitlab.com/libvirt/libvirt/-/commit/008214842011d77fa4feda8d1ff586d29791f8ab.patch")
|
||||
|
||||
libvirt.tmpfiles)
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
patch -Np1 < ../fix-uuid.patch
|
||||
# patch -Np1 < ../fix-uuid.patch
|
||||
sed -i 's|/sysconfig/|/conf.d/|g' \
|
||||
src/remote/libvirtd.service.in \
|
||||
tools/{libvirt-guests.service,libvirt-guests.sh}.in \
|
||||
|
|
@ -221,12 +219,12 @@ license=('LGPL-2.1-or-later' 'GPL-3.0-or-later') # libvirt_parthelper links to l
|
|||
|
||||
validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
|
||||
|
||||
sha256sums=(ca757322eed998013b21f474c6c0c15dc08320ba6c8bae54aa16a93a1c3b7054 # libvirt-10.7.0.tar.xz
|
||||
79381b20a9017f72ffb4c2510b037680cc75addb442130bc7176d60c731569a8 # libvirt-10.7.0.tar.xz.asc
|
||||
sha256sums=(57e3e8238d31a197f1b26b958bd2be71f99f271a822132afa66f70b7c2100984 # libvirt-10.8.0.tar.xz
|
||||
22d1b6e5f86609646da69f7a27152932922f7e8ef94039d9eba2bb8078b2c391 # libvirt-10.8.0.tar.xz.asc
|
||||
6dc7907d6d4d883ac5ea15c195af673c97cff13f4c0493d23196e94bc87f04db # libvirt.sysusers
|
||||
465a3e535cdc5549beaf82b41f53b27d5352aab1313277fd0c2f33004d0d59ba # libvirt.tmpfiles
|
||||
c814c9233718c92324ba150f32892b3174d970940e8eb2f7098f989bb4aa8953) # fix-uuid.patch
|
||||
465a3e535cdc5549beaf82b41f53b27d5352aab1313277fd0c2f33004d0d59ba) # libvirt.tmpfiles
|
||||
|
||||
## WARNING epoch change from : to _
|
||||
|
||||
## 7484924f6b3dc325bcb2e0c178e10ebe62979ea24f3e572c0d7903054dc7f954 libvirt-1_10.7.0-02-x86_64.pkg.tar.lz
|
||||
# b6b64d869147653d09a270dc39a53c8354e9ad5c33ea7d90027e40957e3349c0 libvirt-1_10.8.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct)
|
||||
epoch=1
|
||||
pkgver=10.7.0
|
||||
pkgrel=2
|
||||
pkgver=10.8.0
|
||||
pkgrel=1
|
||||
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
|
||||
arch=('x86_64')
|
||||
url="https://libvirt.org/"
|
||||
|
|
@ -112,18 +112,13 @@ backup=(
|
|||
)
|
||||
source=(
|
||||
"https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}
|
||||
"fix-uuid.patch::https://gitlab.com/libvirt/libvirt/-/commit/008214842011d77fa4feda8d1ff586d29791f8ab.patch"
|
||||
)
|
||||
sha256sums=('ca757322eed998013b21f474c6c0c15dc08320ba6c8bae54aa16a93a1c3b7054'
|
||||
'SKIP'
|
||||
'c814c9233718c92324ba150f32892b3174d970940e8eb2f7098f989bb4aa8953')
|
||||
sha256sums=('57e3e8238d31a197f1b26b958bd2be71f99f271a822132afa66f70b7c2100984'
|
||||
'SKIP')
|
||||
validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
|
||||
patch -Np1 < ../fix-uuid.patch
|
||||
|
||||
sed -i 's|/sysconfig/|/conf.d/|g' \
|
||||
src/remote/libvirtd.service.in \
|
||||
tools/{libvirt-guests.service,libvirt-guests.sh}.in \
|
||||
|
|
|
|||
|
|
@ -16,3 +16,4 @@ qemu-base
|
|||
libnbd-light
|
||||
dbus
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ pkgbase=qt6-base
|
|||
pkgname=(qt6-base qt6-xcb-private-headers)
|
||||
#_qtver=6.7.2
|
||||
pkgver=6.7.3
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
url='https://www.qt.io'
|
||||
pkgdesc='A cross-platform application and UI framework w/o systemd'
|
||||
depends=(brotli dbus double-conversion fontconfig freetype2 gcc-libs
|
||||
|
|
@ -43,11 +43,12 @@ prepare() {
|
|||
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
|
||||
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
|
||||
cd $_pkgfn
|
||||
git cherry-pick -n f05cf3f11f4e42e05d069b5d9249d4b9aff41ffe # Fix locale issues
|
||||
git cherry-pick -n a8ef8ea55014546e0e835cd0eacf694919702a11 # https://bugreports.qt.io/browse/QTBUG-124386
|
||||
git cherry-pick -n 062f701a11d2c46660f5c5edd73f245477918a47 # Fix dependencies in pc files
|
||||
git cherry-pick -n 5ee9da89af7efe31ac45858bf1eb04e5155a3b50 # Fix dependencies in pc files
|
||||
git cherry-pick -n 0f35729f2cb43f0eb94e2a8d5e2d478a2c6a5007 # Fix potential Plasma crashes
|
||||
# git cherry-pick -n f05cf3f11f4e42e05d069b5d9249d4b9aff41ffe # Fix locale issues
|
||||
# git cherry-pick -n a8ef8ea55014546e0e835cd0eacf694919702a11 # https://bugreports.qt.io/browse/QTBUG-124386
|
||||
# git cherry-pick -n 062f701a11d2c46660f5c5edd73f245477918a47 # Fix dependencies in pc files
|
||||
# git cherry-pick -n 5ee9da89af7efe31ac45858bf1eb04e5155a3b50 # Fix dependencies in pc files
|
||||
# git cherry-pick -n 0f35729f2cb43f0eb94e2a8d5e2d478a2c6a5007 # Fix potential Plasma crashes
|
||||
git revert -n 9c1f39b93e6fd5261da4324d17a5ecd40db5f05b # Fix https://bugreports.qt.io/browse/QTBUG-129509
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -117,6 +118,6 @@ sha256sums=(3da3df07b4bbd6a963af0c975ab6ff18c8c0aa73454048b0318899362c4adab9 #
|
|||
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch
|
||||
4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch
|
||||
|
||||
## a5273abbf42b7514e808e6e9cfbe7eb55fde93c2ac2dfd111fdf69bc5a2b6f0d qt6-xcb-private-headers-6.7.3-01-x86_64.pkg.tar.lz
|
||||
## 42337579c4f193f5dc21a5cd86a4af24021e004843cc5a29be4d5ab3f6283b7e qt6-base-6.7.3-01-x86_64.pkg.tar.lz
|
||||
## c06127d4365a85a78bdf1638c6a9a1a0dd350f7508cc524bc64e884366343035 qt6-base-6.7.3-02-x86_64.pkg.tar.lz
|
||||
## 4e2c655e4d8058a25811f079ccc0d5b20aadee752a3587b19b2ee6cc8c11b77d qt6-xcb-private-headers-6.7.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ pkgbase=qt6-base
|
|||
pkgname=(qt6-base
|
||||
qt6-xcb-private-headers)
|
||||
pkgver=6.7.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=(x86_64)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
@ -92,11 +92,7 @@ prepare() {
|
|||
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
|
||||
|
||||
cd $_pkgfn
|
||||
git cherry-pick -n f05cf3f11f4e42e05d069b5d9249d4b9aff41ffe # Fix locale issues
|
||||
git cherry-pick -n a8ef8ea55014546e0e835cd0eacf694919702a11 # https://bugreports.qt.io/browse/QTBUG-124386
|
||||
git cherry-pick -n 062f701a11d2c46660f5c5edd73f245477918a47 # Fix dependencies in pc files
|
||||
git cherry-pick -n 5ee9da89af7efe31ac45858bf1eb04e5155a3b50 # Fix dependencies in pc files
|
||||
git cherry-pick -n 0f35729f2cb43f0eb94e2a8d5e2d478a2c6a5007 # Fix potential Plasma crashes
|
||||
git revert -n 9c1f39b93e6fd5261da4324d17a5ecd40db5f05b # Fix https://bugreports.qt.io/browse/QTBUG-129509
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue