Date: Monday, August 8, 2022 @ 15:37:51 Author: maximbaz Revision: 1261121
archrelease: copy trunk to community-x86_64 Added: wldash/repos/community-x86_64/PKGBUILD (from rev 1261120, wldash/trunk/PKGBUILD) wldash/repos/community-x86_64/fix-cargo-lock.patch (from rev 1261120, wldash/trunk/fix-cargo-lock.patch) wldash/repos/community-x86_64/update-fontconfig.patch (from rev 1261120, wldash/trunk/update-fontconfig.patch) Deleted: wldash/repos/community-x86_64/PKGBUILD wldash/repos/community-x86_64/fix-cargo-lock.patch -------------------------+ PKGBUILD | 63 ++++++++++++++------------- fix-cargo-lock.patch | 38 ++++++++-------- update-fontconfig.patch | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 49 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-08-08 15:37:45 UTC (rev 1261120) +++ PKGBUILD 2022-08-08 15:37:51 UTC (rev 1261121) @@ -1,30 +0,0 @@ -# Maintainer: Maxim Baz <$pkgname at maximbaz dot com> - -pkgname=wldash -pkgver=0.3.0 -pkgrel=1 -pkgdesc='Wayland launcher and dashboard' -arch=('x86_64') -url='https://git.sr.ht/~kennylevinsen/wldash' -license=('GPL3') -depends=('alsa-lib' 'dbus' 'fontconfig' 'gcc-libs' 'glibc' 'libpulse') -makedepends=('cargo') -source=("${pkgname}-${pkgver}.tar.gz::https://git.sr.ht/~kennylevinsen/${pkgname}/archive/v${pkgver}.tar.gz" - "fix-cargo-lock.patch") -sha512sums=('48f5356e76f77f9284b5533ee410b9a6ea2cb279da29f45d827ee521c4a46213909298e4c08c05cf1964b280d0cfb5124b0b85e85437c8289d7557194b95548d' - '887a94e2af4aac20c118f75a63b5b12f41b925efa3a685792953dda4b02d94d08c1048cc9db61794d296470c2b85fca1fc947ba0b6f5b60dfc0ffcbba11c242a') - -prepare() { - cd "${pkgname}-v${pkgver}" - patch -Np1 -i "${srcdir}/fix-cargo-lock.patch" -} - -build() { - cd "${pkgname}-v${pkgver}" - cargo build --release --locked -} - -package() { - cd "${pkgname}-v${pkgver}" - install -Dm755 "target/release/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" -} Copied: wldash/repos/community-x86_64/PKGBUILD (from rev 1261120, wldash/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-08-08 15:37:51 UTC (rev 1261121) @@ -0,0 +1,33 @@ +# Maintainer: Maxim Baz <$pkgname at maximbaz dot com> + +pkgname=wldash +pkgver=0.3.0 +pkgrel=2 +pkgdesc='Wayland launcher and dashboard' +arch=('x86_64') +url='https://git.sr.ht/~kennylevinsen/wldash' +license=('GPL3') +depends=('alsa-lib' 'dbus' 'fontconfig' 'gcc-libs' 'glibc' 'libpulse') +makedepends=('cargo') +source=("${pkgname}-${pkgver}.tar.gz::https://git.sr.ht/~kennylevinsen/${pkgname}/archive/v${pkgver}.tar.gz" + "fix-cargo-lock.patch" + "update-fontconfig.patch") +sha512sums=('48f5356e76f77f9284b5533ee410b9a6ea2cb279da29f45d827ee521c4a46213909298e4c08c05cf1964b280d0cfb5124b0b85e85437c8289d7557194b95548d' + '887a94e2af4aac20c118f75a63b5b12f41b925efa3a685792953dda4b02d94d08c1048cc9db61794d296470c2b85fca1fc947ba0b6f5b60dfc0ffcbba11c242a' + 'b9a03d3f9f752225e27f2273f136712de89695575a8e40e16434b03eebfba0d185b552d163006acedad70983d2d5bfdfef996b7855bf66f2b2ceb9f371ba8d43') + +prepare() { + cd "${pkgname}-v${pkgver}" + patch -Np1 -i "${srcdir}/fix-cargo-lock.patch" + patch -Np1 -i "${srcdir}/update-fontconfig.patch" +} + +build() { + cd "${pkgname}-v${pkgver}" + cargo build --release --locked +} + +package() { + cd "${pkgname}-v${pkgver}" + install -Dm755 "target/release/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" +} Deleted: fix-cargo-lock.patch =================================================================== --- fix-cargo-lock.patch 2022-08-08 15:37:45 UTC (rev 1261120) +++ fix-cargo-lock.patch 2022-08-08 15:37:51 UTC (rev 1261121) @@ -1,19 +0,0 @@ -commit 2538e41f001fa363d3459efe3b8102a354b06dd0 -Author: Kenny Levinsen <k...@kl.wtf> -Date: Sun Jan 16 23:16:30 2022 +0100 - - Update Cargo.lock - -diff --git a/Cargo.lock b/Cargo.lock -index 3da9a07..1ad4a86 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -796,7 +796,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "wldash" --version = "0.2.0" -+version = "0.3.0" - dependencies = [ - "alsa", - "bitflags", Copied: wldash/repos/community-x86_64/fix-cargo-lock.patch (from rev 1261120, wldash/trunk/fix-cargo-lock.patch) =================================================================== --- fix-cargo-lock.patch (rev 0) +++ fix-cargo-lock.patch 2022-08-08 15:37:51 UTC (rev 1261121) @@ -0,0 +1,19 @@ +commit 2538e41f001fa363d3459efe3b8102a354b06dd0 +Author: Kenny Levinsen <k...@kl.wtf> +Date: Sun Jan 16 23:16:30 2022 +0100 + + Update Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +index 3da9a07..1ad4a86 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -796,7 +796,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "wldash" +-version = "0.2.0" ++version = "0.3.0" + dependencies = [ + "alsa", + "bitflags", Copied: wldash/repos/community-x86_64/update-fontconfig.patch (from rev 1261120, wldash/trunk/update-fontconfig.patch) =================================================================== --- update-fontconfig.patch (rev 0) +++ update-fontconfig.patch 2022-08-08 15:37:51 UTC (rev 1261121) @@ -0,0 +1,105 @@ +commit b2ae30bab412472f1d2ff90439134a8a465fdf9a +Author: Kenny Levinsen <k...@kl.wtf> +Date: Mon May 2 11:21:47 2022 +0200 + + Update fontconfig + +diff --git a/Cargo.lock b/Cargo.lock +index 1ad4a86..6821181 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -137,7 +137,16 @@ version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" + dependencies = [ +- "libloading", ++ "libloading 0.6.7", ++] ++ ++[[package]] ++name = "dlib" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" ++dependencies = [ ++ "libloading 0.7.3", + ] + + [[package]] +@@ -166,9 +175,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + + [[package]] + name = "fontconfig" +-version = "0.2.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a5570e7ce35ffb621b31934530c4b3b8ce9fdd8bf8436e98f9c7ebadff2ef259" ++checksum = "a25320ad784a9578ada0b395dd7dcd2321109404bbb341ec27e64b01a1e49b47" + dependencies = [ + "yeslogic-fontconfig-sys", + ] +@@ -237,6 +246,16 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "libloading" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "winapi", ++] ++ + [[package]] + name = "libpulse-binding" + version = "2.23.0" +@@ -398,9 +417,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.5.2" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" ++checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" + + [[package]] + name = "opaque-debug" +@@ -803,7 +822,7 @@ dependencies = [ + "byteorder", + "chrono", + "dbus", +- "dlib", ++ "dlib 0.4.2", + "fontconfig", + "fuzzy-matcher", + "itertools", +@@ -843,11 +862,12 @@ dependencies = [ + + [[package]] + name = "yeslogic-fontconfig-sys" +-version = "2.11.1" ++version = "3.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e194a0c5cd1b5c87215eed9d26aca9799fa1b599fe2e178977d6f8ccc812e3d3" ++checksum = "cb3f5a91c31bef6650d3a1b69192b4217fd88e4cfedc8101813e4dc3394ecbb8" + dependencies = [ + "const-cstr", +- "libc", ++ "dlib 0.5.0", ++ "once_cell", + "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index abb3807..691daa7 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -46,5 +46,5 @@ serde_yaml = { version = "0.8", optional = true } + + libpulse-binding = { version = "2.22", optional = true } + alsa = { version = "0.4.0", optional = true } +-fontconfig = "0.2.0" ++fontconfig = "0.5.0" + unicode-segmentation = "1.6.0"