From 1c16bb52fdc63878e5fd0e58851b23447409c2b9 Mon Sep 17 00:00:00 2001 From: Kevin Figueroa Date: Sat, 5 Oct 2024 18:26:09 -0600 Subject: [PATCH] Multiple fixes and corrections in srcpkgs - Many packages are being rebuilt since I made a mistake with CFLAGS when building, making them unusable outside my PC. This should fix it. - Some packages were removed since they are unused or no longer required (like most Picom forks since now Picom officially supports animations). Maybe I make a repository gathering all these WIP or discarded templates. - The URL of many Cereus-related packages were changed from GitHub to Codeberg. - And some other fixes. --- srcpkgs/alttab-git/template | 2 +- srcpkgs/betterlockscreen-gui/template | 8 +- srcpkgs/blesh-git/template | 2 +- srcpkgs/blesh/template | 2 +- srcpkgs/bt-dualboot/template | 2 +- srcpkgs/budgie-extras/template | 2 +- srcpkgs/calamares-branding/template | 10 +- srcpkgs/calamares-modules-cereus/template | 8 +- srcpkgs/calamares/template | 2 +- srcpkgs/cereus-artwork/template | 6 +- srcpkgs/cereus-global-presets/template | 4 +- srcpkgs/cereus-lightdm-presets/template | 9 +- srcpkgs/cereus-lxqt-presets/template | 4 +- srcpkgs/cereus-lxqt-themes/template | 7 +- srcpkgs/cereus-neofetch/template | 4 +- srcpkgs/cereus-plymouth-theme/template | 4 +- srcpkgs/cereus-themes-presets/template | 4 +- srcpkgs/cereus-welcome/template | 0 srcpkgs/cereus-xfce-presets/template | 4 +- srcpkgs/compfy/template | 2 +- srcpkgs/dockbarx-lxqt-plugin/template | 2 +- srcpkgs/dockbarx/template | 2 +- srcpkgs/ds4drv/template | 2 +- srcpkgs/flwm/template | 2 +- srcpkgs/grub-cereus/template | 2 +- srcpkgs/igsc-devel | 1 - srcpkgs/igsc/template | 26 - srcpkgs/intel-compute-runtime-bin-devel | 1 - srcpkgs/intel-compute-runtime-bin/template | 31 - srcpkgs/intel-compute-runtime-bin/update | 2 - srcpkgs/intel-compute-runtime/template | 36 - srcpkgs/intel-graphics-compiler-devel | 1 - .../patches/avoid-duplicate-entries.patch | 51 -- .../patches/fix-zlib-linking.patch | 14 - .../patches/rework-kernel-metadata.patch | 76 -- srcpkgs/intel-graphics-compiler/template | 59 -- srcpkgs/intel-metee-devel | 1 - srcpkgs/intel-metee/template | 30 - srcpkgs/intel-opencl-clang/template | 22 - srcpkgs/komorebi/template | 2 +- srcpkgs/level-zero-devel | 1 - srcpkgs/level-zero/template | 29 - srcpkgs/libadwaita-without-adwaita/template | 2 +- srcpkgs/libfm-qt-legacy/template | 2 +- srcpkgs/libqtxdg-legacy/template | 2 +- srcpkgs/libxfce4ui-nocsd/template | 2 +- .../licorice-openbox-theme-cereus/template | 8 +- srcpkgs/lightdm-gtk-greeter-cereus/template | 4 +- srcpkgs/lightly-git/template | 2 +- srcpkgs/lightly-qt6/template | 2 +- srcpkgs/lxqt-build-tools-legacy/template | 2 +- srcpkgs/lxqt-qtplugin-legacy/template | 2 +- srcpkgs/material-black-cereus-xfwm/template | 11 +- .../deprecated-safeconfigparser-fix.patch | 13 - srcpkgs/oblogout/template | 10 +- srcpkgs/octoxbps-git/template | 2 +- srcpkgs/os-prober-cereus/template | 2 +- srcpkgs/pasystray-git/template | 2 +- srcpkgs/picom-arian8j2/template | 28 - .../picom-dccsillag/patches/pijulius.patch | 727 ------------------ srcpkgs/picom-dccsillag/template | 27 - srcpkgs/picom-ftlabs/template | 28 - srcpkgs/picom-git/template | 4 +- srcpkgs/picom-ibhagwan/template | 35 - srcpkgs/picom-jonaburg-fix/template | 33 - srcpkgs/picom-jonaburg/template | 32 - .../picom-manager/files/picom-manager.desktop | 5 - srcpkgs/picom-manager/template | 25 - srcpkgs/pix/template | 2 +- srcpkgs/qelectrotech/template | 2 +- srcpkgs/qt-sudo/template | 2 +- srcpkgs/redshift-qt/template | 2 +- srcpkgs/resolution-hooks/template | 8 +- srcpkgs/runit-cereus/template | 2 +- srcpkgs/sgnotes/template | 2 +- srcpkgs/sierra-dark-fluxbox-theme/template | 9 +- srcpkgs/touche/template | 2 +- srcpkgs/touchegg-gce/template | 21 - srcpkgs/vc-intrinsics/template | 20 - srcpkgs/voidnsrun-setup/template | 8 +- srcpkgs/voidnsrun/template | 7 +- srcpkgs/voidnsundo/template | 7 +- srcpkgs/wapanel/template | 2 +- srcpkgs/waterfox-g4-bin/INSTALL.msg | 2 - .../waterfox-g4-bin/files/waterfox.desktop | 347 --------- srcpkgs/waterfox-g4-bin/template | 59 -- .../waterfox-g5-bin/files/waterfox.desktop | 347 --------- srcpkgs/waterfox-g5-bin/template | 58 -- srcpkgs/waterfox-g5-bin/update | 2 - srcpkgs/wayfire-firedecor/template | 2 +- srcpkgs/whatsdesk-bin/template | 44 -- srcpkgs/xed-xapps/template | 2 +- srcpkgs/xeventbind/template | 2 +- srcpkgs/xfce4-dockbarx-plugin/template | 2 +- srcpkgs/xfwm4-gaps/template | 2 +- srcpkgs/xfwm4-lxqt/template | 2 +- srcpkgs/xrankmirrors/template | 4 +- srcpkgs/xviewer-plugins/template | 4 +- srcpkgs/xviewer/template | 2 +- 99 files changed, 119 insertions(+), 2349 deletions(-) delete mode 100644 srcpkgs/cereus-welcome/template delete mode 120000 srcpkgs/igsc-devel delete mode 100644 srcpkgs/igsc/template delete mode 120000 srcpkgs/intel-compute-runtime-bin-devel delete mode 100644 srcpkgs/intel-compute-runtime-bin/template delete mode 100644 srcpkgs/intel-compute-runtime-bin/update delete mode 100644 srcpkgs/intel-compute-runtime/template delete mode 120000 srcpkgs/intel-graphics-compiler-devel delete mode 100644 srcpkgs/intel-graphics-compiler/patches/avoid-duplicate-entries.patch delete mode 100644 srcpkgs/intel-graphics-compiler/patches/fix-zlib-linking.patch delete mode 100644 srcpkgs/intel-graphics-compiler/patches/rework-kernel-metadata.patch delete mode 100644 srcpkgs/intel-graphics-compiler/template delete mode 120000 srcpkgs/intel-metee-devel delete mode 100644 srcpkgs/intel-metee/template delete mode 100644 srcpkgs/intel-opencl-clang/template delete mode 120000 srcpkgs/level-zero-devel delete mode 100644 srcpkgs/level-zero/template delete mode 100644 srcpkgs/oblogout/patches/deprecated-safeconfigparser-fix.patch delete mode 100644 srcpkgs/picom-arian8j2/template delete mode 100644 srcpkgs/picom-dccsillag/patches/pijulius.patch delete mode 100644 srcpkgs/picom-dccsillag/template delete mode 100644 srcpkgs/picom-ftlabs/template delete mode 100644 srcpkgs/picom-ibhagwan/template delete mode 100644 srcpkgs/picom-jonaburg-fix/template delete mode 100644 srcpkgs/picom-jonaburg/template delete mode 100644 srcpkgs/picom-manager/files/picom-manager.desktop delete mode 100644 srcpkgs/picom-manager/template delete mode 100644 srcpkgs/touchegg-gce/template delete mode 100644 srcpkgs/vc-intrinsics/template delete mode 100644 srcpkgs/waterfox-g4-bin/INSTALL.msg delete mode 100644 srcpkgs/waterfox-g4-bin/files/waterfox.desktop delete mode 100644 srcpkgs/waterfox-g4-bin/template delete mode 100644 srcpkgs/waterfox-g5-bin/files/waterfox.desktop delete mode 100644 srcpkgs/waterfox-g5-bin/template delete mode 100644 srcpkgs/waterfox-g5-bin/update delete mode 100644 srcpkgs/whatsdesk-bin/template diff --git a/srcpkgs/alttab-git/template b/srcpkgs/alttab-git/template index 6c919ce..bfeea23 100644 --- a/srcpkgs/alttab-git/template +++ b/srcpkgs/alttab-git/template @@ -1,7 +1,7 @@ # Template file for 'alttab-git' pkgname=alttab-git version=2024.09.26 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" repository="cereus-extra" diff --git a/srcpkgs/betterlockscreen-gui/template b/srcpkgs/betterlockscreen-gui/template index 11efa9e..a7a00a5 100644 --- a/srcpkgs/betterlockscreen-gui/template +++ b/srcpkgs/betterlockscreen-gui/template @@ -1,17 +1,17 @@ # Template file for 'betterlockscreen-gui' pkgname=betterlockscreen-gui -version=2023.01.28 -revision=2 +version=2024.04.12 +revision=1 repository="cereus-extra" depends="python3-psutil betterlockscreen python3-gobject resolution-hooks bc" _commit="f6c5b95f17d903684ee7cdc19c078c83e69c9a38" short_desc="Betterlockscreen GUI configuration tool" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/betterlockscreen-gui" +homepage="https://codeberg.org/cereus-linux/${pkgname}" changelog="${homepage}/commits/master" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=8d7547c5cbc15f41f16a2a514b013f95b542e95252de16314baa1945d7967b64 +checksum=7a040523437cfc741a542db049ffece68bf66ed2acdb4d1b186ebc815c25f14f do_install() { vcopy usr ./ diff --git a/srcpkgs/blesh-git/template b/srcpkgs/blesh-git/template index 840e796..d0db13a 100644 --- a/srcpkgs/blesh-git/template +++ b/srcpkgs/blesh-git/template @@ -1,7 +1,7 @@ # Template file for 'blesh-git' pkgname=blesh-git version=2024.09.24 -revision=1 +revision=2 makedepends="git" depends="bash git" build_style="gnu-makefile" diff --git a/srcpkgs/blesh/template b/srcpkgs/blesh/template index c2d937a..fd78d9f 100644 --- a/srcpkgs/blesh/template +++ b/srcpkgs/blesh/template @@ -1,7 +1,7 @@ # Template file for 'blesh' pkgname=blesh version=0.3.4 -revision=1 +revision=2 depends="bash" repository=cereus-extra wrksrc="ble-${version}" diff --git a/srcpkgs/bt-dualboot/template b/srcpkgs/bt-dualboot/template index c4f7185..dc888fd 100644 --- a/srcpkgs/bt-dualboot/template +++ b/srcpkgs/bt-dualboot/template @@ -1,7 +1,7 @@ # Template file for 'bt-dualboot' pkgname=bt-dualboot version=1.0.1 -revision=1 +revision=2 build_style=fetch hostmakedepends="git" makedepends="python3-wheel python3-installer" diff --git a/srcpkgs/budgie-extras/template b/srcpkgs/budgie-extras/template index cff38c0..15654b5 100644 --- a/srcpkgs/budgie-extras/template +++ b/srcpkgs/budgie-extras/template @@ -1,7 +1,7 @@ # Template file for 'budgie-extras' pkgname=budgie-extras version=1.8.0 -revision=1 +revision=2 repository=cereus-extra build_style=meson hostmakedepends="pkg-config glib" diff --git a/srcpkgs/calamares-branding/template b/srcpkgs/calamares-branding/template index 02a00d4..38534df 100644 --- a/srcpkgs/calamares-branding/template +++ b/srcpkgs/calamares-branding/template @@ -1,16 +1,16 @@ # Template file for 'calamares-branding' pkgname=calamares-branding -version=2023.01.30 -revision=2 +version=2023.01.31 +revision=1 _brandingdir="etc/calamares/branding/cereus" repository="cereus-core" short_desc="Calamares branding for Cereus Linux" maintainer="Kevin Figueroa " license="CC-BY-SA-4.0" -homepage="https://github.com/CereusLinuxProject/Cereus-Artwork/tree/main/calamares-branding" +homepage="https://codeberg.org/cereus-linux/artwork/src/branch/main/calamares-branding" _commit="7d2c92125dae9db643e490194fd6188d322427d5" -distfiles="https://github.com/CereusLinuxProject/Cereus-Artwork/archive/${_commit}.tar.gz" -checksum=2655eaa96d3a62cc0ac06996682335c5a9094dd8392442e046e2cfdb9b0c068d +distfiles="https://codeberg.org/cereus-linux/artwork/archive/${_commit}.tar.gz" +checksum=22cbf5270ccff6ca876d88fbcfc5c7438411c83b7498741d116659f2034f5d8f do_install() { vmkdir ${_brandingdir} diff --git a/srcpkgs/calamares-modules-cereus/template b/srcpkgs/calamares-modules-cereus/template index ccb1005..dec6e8a 100644 --- a/srcpkgs/calamares-modules-cereus/template +++ b/srcpkgs/calamares-modules-cereus/template @@ -1,7 +1,7 @@ # Template file for 'calamares-modules-cereus' pkgname=calamares-modules-cereus -version=2023.02.14 -revision=3 +version=2023.02.15 +revision=1 depends="python3-setuptools" _modules_dir="usr/lib/calamares/modules/" repository="cereus-core" @@ -9,9 +9,9 @@ _commit="1b0ce33acc98c5caf06065ad20dd8077acdd9526" short_desc="Additional Cereus Linux modules for Calamares installer" maintainer="Kevin Figueroa " license="GPL-2.0" -homepage="https://github.com/CereusLinuxProject/calamares-modules" +homepage="https://codeberg.org/cereus-linux/calamares-modules" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=60c8879d164bc099b1a30b2e87c4bf0aa7f7b6ac3cfbe2a982d8889ce458258b +checksum=ff762bba3a4fb7351e2e783357d4f6dd2a3cd2a44a53572f08a7639cd6781760 do_install() { vmkdir ${_modules_dir} diff --git a/srcpkgs/calamares/template b/srcpkgs/calamares/template index 1c39008..bc080e2 100644 --- a/srcpkgs/calamares/template +++ b/srcpkgs/calamares/template @@ -1,7 +1,7 @@ # Template file for 'calamares' pkgname=calamares version=3.3.9 -revision=1 +revision=2 build_style=cmake repository=cereus-extra configure_args=" diff --git a/srcpkgs/cereus-artwork/template b/srcpkgs/cereus-artwork/template index 67cfe73..75b6644 100644 --- a/srcpkgs/cereus-artwork/template +++ b/srcpkgs/cereus-artwork/template @@ -1,6 +1,6 @@ # Template file for 'cereus-artwork' pkgname=cereus-artwork -version=2023.01.30 +version=2023.01.31 revision=1 _wallpaperdir="usr/share/backgrounds" _icondir="usr/share/icons/hicolor" @@ -10,9 +10,9 @@ repository="cereus-core" short_desc="Cereus Linux artwork" maintainer="Kevin Figueroa " license="CC-BY-SA-4.0" -homepage="https://github.com/CereusLinuxProject/Cereus-Artwork/" +homepage="https://codeberg.org/cereus-linux/artwork" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=2655eaa96d3a62cc0ac06996682335c5a9094dd8392442e046e2cfdb9b0c068d +checksum=22cbf5270ccff6ca876d88fbcfc5c7438411c83b7498741d116659f2034f5d8f do_install() { # Create directories in targetdir diff --git a/srcpkgs/cereus-global-presets/template b/srcpkgs/cereus-global-presets/template index a4eddd2..8b7679a 100644 --- a/srcpkgs/cereus-global-presets/template +++ b/srcpkgs/cereus-global-presets/template @@ -11,10 +11,10 @@ _commit="a0f759925101fb0724e5e54afb997efe3981798d" short_desc="Cereus Linux global default configurations" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/presets" +homepage="https://codeberg.org/cereus-linux/presets" changelog="${homepage}/commits/main/global" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=ed3b3dfa51be20ed361779fa65700b7b45af250d1850284c40c4fabd95897bb6 +checksum=690bab356a19b03f768c582ed841b4e12fab7af1890998da8ca5aaeb60f250de do_install() { cd global/etc diff --git a/srcpkgs/cereus-lightdm-presets/template b/srcpkgs/cereus-lightdm-presets/template index 23d7d15..f0089b8 100644 --- a/srcpkgs/cereus-lightdm-presets/template +++ b/srcpkgs/cereus-lightdm-presets/template @@ -9,12 +9,11 @@ hostmakedepends="git" short_desc="Cereus Linux default configurations for LightDM" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/presets" +homepage="https://codeberg.org/cereus-linux/presets" changelog="${homepage}/commits/main/global/etc/lightdm" - -do_fetch() { - git clone ${homepage} ${wrksrc} -} +_commit="a0f759925101fb0724e5e54afb997efe3981798d" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=690bab356a19b03f768c582ed841b4e12fab7af1890998da8ca5aaeb60f250de do_install() { cd global/etc/lightdm/lightdm.conf.d diff --git a/srcpkgs/cereus-lxqt-presets/template b/srcpkgs/cereus-lxqt-presets/template index f601eea..acb572f 100644 --- a/srcpkgs/cereus-lxqt-presets/template +++ b/srcpkgs/cereus-lxqt-presets/template @@ -19,11 +19,11 @@ gvfs-smb blueman flameshot pasystray-git ksuperkey network-manager-applet pavuco short_desc="Cereus Linux default configurations for LXQt edition" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/presets" +homepage="https://codeberg.org/cereus-linux/presets" changelog="${homepage}/commits/main/lxqt" _commit="a0f759925101fb0724e5e54afb997efe3981798d" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=ed3b3dfa51be20ed361779fa65700b7b45af250d1850284c40c4fabd95897bb6 +checksum=690bab356a19b03f768c582ed841b4e12fab7af1890998da8ca5aaeb60f250de do_install() { vcopy lxqt/* ./ diff --git a/srcpkgs/cereus-lxqt-themes/template b/srcpkgs/cereus-lxqt-themes/template index 94d5331..cddb253 100644 --- a/srcpkgs/cereus-lxqt-themes/template +++ b/srcpkgs/cereus-lxqt-themes/template @@ -7,10 +7,11 @@ _theme_dir="usr/share/lxqt/themes" short_desc="Cereus Linux custom themes for LXQt desktop" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/cereus-lxqt-themes" +homepage="https://codeberg.org/cereus-linux/cereus-lxqt-themes" changelog="${homepage}/commits/main" -distfiles="${homepage}/archive/refs/heads/main.zip" -checksum=73f325b870b2e39b8b15d61faf18a73c84e641dc8710f6d42ad8161e6db2673d +_commit="bef0d6c74f388fedd0d37eac383505a8605e975c" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=d9abc0face80c9dc64b90a500eade2917fe5e004c9ff6daff8127008decb9302 do_install() { vmkdir ${_theme_dir} diff --git a/srcpkgs/cereus-neofetch/template b/srcpkgs/cereus-neofetch/template index 48eb96c..3ca532d 100644 --- a/srcpkgs/cereus-neofetch/template +++ b/srcpkgs/cereus-neofetch/template @@ -1,11 +1,11 @@ # Template file for 'cereus-neofetch' pkgname=cereus-neofetch version=7.1.0 -revision=7 +revision=8 repository=cereus-core wrksrc=neofetch-${version} build_style=gnu-makefile -depends="bash nerd-fonts-symbols" +depends="bash nerd-fonts-symbols-ttf" short_desc="Simple system information script (Cereus patched edition)" maintainer="Kevin Figueroa " license="MIT" diff --git a/srcpkgs/cereus-plymouth-theme/template b/srcpkgs/cereus-plymouth-theme/template index adc4c7d..e6a04af 100644 --- a/srcpkgs/cereus-plymouth-theme/template +++ b/srcpkgs/cereus-plymouth-theme/template @@ -9,9 +9,9 @@ _commit="1f2f6344f3563430fd7b7facf86dc22a41e6de44" short_desc="A simple Plymouth theme for Cereus Linux" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/cereus_simply" +homepage="https://codeberg.org/cereus-linux/plymouth-theme" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=c37e57ab807104160f711d8c87948143e04814a6759e7f3adfda2442f9b89179 +checksum=9d1bd5a4b1c1b19f568605ba40d3ce351d38e307393a28d29009f67f88190d87 do_install() { vmkdir ${_themedir} diff --git a/srcpkgs/cereus-themes-presets/template b/srcpkgs/cereus-themes-presets/template index 78c5868..323cfbe 100644 --- a/srcpkgs/cereus-themes-presets/template +++ b/srcpkgs/cereus-themes-presets/template @@ -12,10 +12,10 @@ _commit="a0f759925101fb0724e5e54afb997efe3981798d" short_desc="Cereus Linux default theme configurations" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/presets" +homepage="https://codeberg.org/cereus-linux/presets" changelog="${homepage}/commits/main/global" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=ed3b3dfa51be20ed361779fa65700b7b45af250d1850284c40c4fabd95897bb6 +checksum=690bab356a19b03f768c582ed841b4e12fab7af1890998da8ca5aaeb60f250de do_install() { cd global/etc diff --git a/srcpkgs/cereus-welcome/template b/srcpkgs/cereus-welcome/template deleted file mode 100644 index e69de29..0000000 diff --git a/srcpkgs/cereus-xfce-presets/template b/srcpkgs/cereus-xfce-presets/template index a71871e..69c52c6 100644 --- a/srcpkgs/cereus-xfce-presets/template +++ b/srcpkgs/cereus-xfce-presets/template @@ -17,10 +17,10 @@ _commit="a0f759925101fb0724e5e54afb997efe3981798d" short_desc="Cereus Linux default configurations for XFCE edition" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/presets" +homepage="https://codeberg.org/cereus-linux/presets" changelog="${homepage}/commits/main/xfce" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=ed3b3dfa51be20ed361779fa65700b7b45af250d1850284c40c4fabd95897bb6 +checksum=690bab356a19b03f768c582ed841b4e12fab7af1890998da8ca5aaeb60f250de do_install() { vcopy xfce/* ./ diff --git a/srcpkgs/compfy/template b/srcpkgs/compfy/template index 9fc2998..586e7d1 100644 --- a/srcpkgs/compfy/template +++ b/srcpkgs/compfy/template @@ -1,7 +1,7 @@ # Template file for 'compfy' pkgname="compfy" version=1.7.2 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_docs=true" hostmakedepends="pkg-config asciidoc" diff --git a/srcpkgs/dockbarx-lxqt-plugin/template b/srcpkgs/dockbarx-lxqt-plugin/template index d796342..5509f29 100644 --- a/srcpkgs/dockbarx-lxqt-plugin/template +++ b/srcpkgs/dockbarx-lxqt-plugin/template @@ -1,7 +1,7 @@ # Template file for 'dockbarx-lxqt-plugin' pkgname=dockbarx-lxqt-plugin version=0.9.1 -revision=1 +revision=2 repository="cereus-extra" build_style=cmake hostmakedepends="pkg-config" diff --git a/srcpkgs/dockbarx/template b/srcpkgs/dockbarx/template index 0bbd8df..0c1a6fd 100644 --- a/srcpkgs/dockbarx/template +++ b/srcpkgs/dockbarx/template @@ -2,7 +2,7 @@ pkgname=dockbarx version=1.0.beta4 _pkgrel=${version//.b/-b} -revision=1 +revision=2 repository="cereus-extra" build_style=python3-module hostmakedepends="python3-polib python3-setuptools" diff --git a/srcpkgs/ds4drv/template b/srcpkgs/ds4drv/template index 813e410..a151e9c 100644 --- a/srcpkgs/ds4drv/template +++ b/srcpkgs/ds4drv/template @@ -1,7 +1,7 @@ # Template file for 'ds4drv' pkgname=ds4drv version=2021.04.19 -revision=1 +revision=2 build_style=python3-module repository="cereus-extra" makedepends="python3-devel python3-setuptools" diff --git a/srcpkgs/flwm/template b/srcpkgs/flwm/template index 994cf7c..629d71c 100644 --- a/srcpkgs/flwm/template +++ b/srcpkgs/flwm/template @@ -1,7 +1,7 @@ # Template file for 'flwm' pkgname=flwm version=1.16 -revision=2 +revision=3 repository="cereus-extra" build_style=gnu-configure makedepends="fltk-devel" diff --git a/srcpkgs/grub-cereus/template b/srcpkgs/grub-cereus/template index 31d0524..16bf1fc 100644 --- a/srcpkgs/grub-cereus/template +++ b/srcpkgs/grub-cereus/template @@ -1,7 +1,7 @@ # Template file for 'grub-cereus' pkgname=grub-cereus version=2.12 -revision=1 +revision=2 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man automake gettext-devel-tools" makedepends="libusb-compat-devel ncurses-devel freetype-devel diff --git a/srcpkgs/igsc-devel b/srcpkgs/igsc-devel deleted file mode 120000 index f30d782..0000000 --- a/srcpkgs/igsc-devel +++ /dev/null @@ -1 +0,0 @@ -igsc \ No newline at end of file diff --git a/srcpkgs/igsc/template b/srcpkgs/igsc/template deleted file mode 100644 index 655c0e1..0000000 --- a/srcpkgs/igsc/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'igsc' -pkgname=igsc -version=0.9.4 -revision=1 -repository="cereus-extra" -build_style=cmake -configure_args="-DENABLE_WERROR:BOOL='OFF'" -makedepends="intel-metee-devel eudev-libudev-devel" -depends="intel-metee eudev-libudev" -short_desc="Intel graphics system controller firmware update library" -maintainer="Kevin Figueroa " -license="Apache-2.0" -homepage="https://github.com/intel/igsc" -changelog="${homepage}/releases/tag/V${version}" -distfiles="${homepage}/archive/V${version}/${pkgname}-${version}.tar.gz" -checksum=83cba1edf133f1917e0e3809c73fae6eaf42cdd21b7c9ce3fd3d2b14b38814e4 - -igsc-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/intel-compute-runtime-bin-devel b/srcpkgs/intel-compute-runtime-bin-devel deleted file mode 120000 index 2a506b4..0000000 --- a/srcpkgs/intel-compute-runtime-bin-devel +++ /dev/null @@ -1 +0,0 @@ -intel-compute-runtime-bin \ No newline at end of file diff --git a/srcpkgs/intel-compute-runtime-bin/template b/srcpkgs/intel-compute-runtime-bin/template deleted file mode 100644 index e946ded..0000000 --- a/srcpkgs/intel-compute-runtime-bin/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'intel-compute-runtime-bin' -pkgname=intel-compute-runtime-bin -version=22.43.24595 -revision=1 -archs="x86_64" -build_style=fetch -hostmakedepends="tar xz" -depends="libgcc intel-gmmlib intel-graphics-compiler" -short_desc="Intel(R) Graphics Compute Runtime for oneAPI Level Zero and OpenCL(TM) Driver - binary package" -maintainer="Kevin Figueroa " -license="MIT" -homepage="https://github.com/intel/compute-runtime" -changelog="${homepage}/releases/tag/${version}" -distfiles="${homepage}/releases/download/${version}/intel-opencl-icd_${version}_amd64.deb" -checksum= - -do_install() { - ar x intel-opencl-icd_${version}_amd64.deb - tar -xf data.tar.xz -C ${DESTDIR} - mv ${DESTDIR}/usr/lib/x86_64-linux-gnu/*.so ${DESTDIR}/usr/lib/ - mv ${DESTDIR}/usr/lib/x86_64-linux-gnu/intel-opencl/*.so ${DESTDIR}/usr/lib/ -} - -intel-compute-runtime-bin-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/intel-compute-runtime-bin/update b/srcpkgs/intel-compute-runtime-bin/update deleted file mode 100644 index 4cbf05f..0000000 --- a/srcpkgs/intel-compute-runtime-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site='https://github.com/intel/compute-runtime/releases' -pattern='[0-9]*\.[0-9]+[0-9]*\.[0-9]+' diff --git a/srcpkgs/intel-compute-runtime/template b/srcpkgs/intel-compute-runtime/template deleted file mode 100644 index 8226f3e..0000000 --- a/srcpkgs/intel-compute-runtime/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'intel-compute-runtime' - -## IMPORTANT NOTE: This package is currently broken as fails when building. We kept it with testing purposes. -## If you need intel-compute-runtime, you should instead use intel-compute-runtime-bin, which uses prebuilt binaries instead (only x86_64, maybe it can work containerized for musl). - -pkgname=intel-compute-runtime -version=22.49.25018.14 -revision=1 -wrksrc=compute-runtime-${version} -build_style=cmake -configure_args="-DNEO_OCL_VERSION_MAJOR=${version%%.*} \ - -DNEO_OCL_VERSION_MINOR=$(echo ${version} | cut -d . -f2) \ - -DNEO_VERSION_BUILD=${version##*.} \ - -DSUPPORT_DG1=ON \ - -Wno-dev" -hostmakedepends="pkg-config" -makedepends="libva-devel level-zero-devel igsc-devel intel-graphics-compiler-devel intel-gmmlib-devel" -provides="opencl-driver level-zero-driver" -depends="libgcc intel-gmmlib intel-graphics-compiler" -short_desc="Intel(R) Graphics Compute Runtime for oneAPI Level Zero and OpenCL(TM) Driver" -repository=cereus-extra -maintainer="Kevin Figueroa " -license="MIT" -homepage="https://github.com/intel/compute-runtime" -changelog="${homepage}/releases/tag/${version}" -distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=28ded5a13596d8524effc250413dd8b4a4c4bd2d9aa0b4e190b10acd8f506baf - -intel-compute-runtime-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/intel-graphics-compiler-devel b/srcpkgs/intel-graphics-compiler-devel deleted file mode 120000 index 3b09034..0000000 --- a/srcpkgs/intel-graphics-compiler-devel +++ /dev/null @@ -1 +0,0 @@ -intel-graphics-compiler \ No newline at end of file diff --git a/srcpkgs/intel-graphics-compiler/patches/avoid-duplicate-entries.patch b/srcpkgs/intel-graphics-compiler/patches/avoid-duplicate-entries.patch deleted file mode 100644 index 0c45a73..0000000 --- a/srcpkgs/intel-graphics-compiler/patches/avoid-duplicate-entries.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 12332c1ee8e92238c919ad7c2aa36119259cb622 Mon Sep 17 00:00:00 2001 -From: Artem Gindinson -Date: Thu, 30 Jun 2022 10:22:31 +0000 -Subject: [PATCH] Avoid duplicate entries into !opencl.kernels metadata with - LLVM 14 - -The LLVM 14 version of the SPIR-V Translator (and, consequently, OpenCL Clang) -introduces the kernel entry point wrappers functionality (see commit KhronosGroup/SPIRV-LLVM-Translator@85815e7). -As IGC's SPIR-V Reader collects root nodes for kernel argument metadata into -the `!opencl.kernels` module metadata, it treats SPIR-V entry point wrappers as -separate kernels despite that they are mapped onto the same LLVM function. -Consequently, each LLVM IR kernel function recieves a "duplicate" set of kernel -argument metadata, which breaks our kernel argument analysis passes upon a -switch to LLVM 14. - -Do not update the module metadata upon encountering previously seen LLVM -functions. - -This fixes https://github.com/intel/intel-graphics-compiler/issues/245. ---- - IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp b/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp -index 708d96edd97..33441cf620c 100644 ---- a/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp -+++ b/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp -@@ -58,6 +58,7 @@ THE SOFTWARE. - #include - #include - #include -+#include - #include "libSPIRV/SPIRVDebugInfoExt.h" - #include "llvmWrapper/Transforms/Utils/Cloning.h" - #include "common/LLVMWarningsPop.hpp" -@@ -4706,11 +4707,15 @@ SPIRVToLLVM::transKernelMetadata() - transCapsIntoMetadata(MD); - - NamedMDNode *KernelMDs = M->getOrInsertNamedMetadata(SPIR_MD_KERNELS); -+ SmallSet HandledLLVMKernels; - for (unsigned I = 0, E = BM->getNumFunctions(); I != E; ++I) - { - SPIRVFunction *BF = BM->getFunction(I); - Function *F = static_cast(getTranslatedValue(BF)); - IGC_ASSERT_MESSAGE(F, "Invalid translated function"); -+ if (HandledLLVMKernels.count(F)) -+ continue; -+ HandledLLVMKernels.insert(F); - - // __attribute__((annotate("some_user_annotation"))) are passed via - // UserSemantic decoration on functions. diff --git a/srcpkgs/intel-graphics-compiler/patches/fix-zlib-linking.patch b/srcpkgs/intel-graphics-compiler/patches/fix-zlib-linking.patch deleted file mode 100644 index c037df7..0000000 --- a/srcpkgs/intel-graphics-compiler/patches/fix-zlib-linking.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/IGC/cmake/igc_find_liblldELF.cmake -+++ b/IGC/cmake/igc_find_liblldELF.cmake -@@ -136,6 +136,11 @@ elseif(IGC_BUILD__LLVM_PREBUILDS) - ${LLD_ELF_LLVM_DEPS} - lldCommon) - -+ if(LLVM_ENABLE_ZLIB) -+ find_package(ZLIB) -+ target_link_libraries(lldELF INTERFACE ZLIB::ZLIB) -+ endif() -+ - find_path( - LLD_INCLUDE_DIR - NAMES "Driver.h" diff --git a/srcpkgs/intel-graphics-compiler/patches/rework-kernel-metadata.patch b/srcpkgs/intel-graphics-compiler/patches/rework-kernel-metadata.patch deleted file mode 100644 index b73208e..0000000 --- a/srcpkgs/intel-graphics-compiler/patches/rework-kernel-metadata.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 6a13fa903f380e17378286a7cd43995b0ae162ad Mon Sep 17 00:00:00 2001 -From: Artem Gindinson -Date: Thu, 7 Jul 2022 08:49:48 +0000 -Subject: [PATCH] Rework kernel metadata handling in SPIR-V Reader - -After the introduction of kernel entry point wrappers within -KhronosGroup/SPIRV-LLVM-Translator@85815e7, initial approach to avoiding kernel -metadata duplication within our internal SPIR-V consumer has been to skip -metadata generation whenever we encounter the entry point kernel (we would -assume that all necessary metadata had already been assigned to the LLVM -function upon encountering the "actual" SPIR-V kernel). For more details on the -initial approach, see intel/intel-graphics-compiler@12332c1. - -The change, however, did not take into account that all SPIR-V information -regarding the kernel execution mode was being stored exclusively for the entry -point wrapper kernel. Therefore, by skipping the SPIR-V entry point wrappers we -end up losing certain metadata entries, e.g. "required WG size". - -Assume that the entry point wrappers contain fuller information and generate -LLVM metadata based on these SPIR-V functions instead. This fixes kernel -attributes' lowering with LLVM 14. - -An alternative SPIR-V Reader solution would imply copying over all SPIR-V -information from entry point wrappers to the actual kernel body, and then -dropping entry point wrappers from the `SPIRVModule`'s/`SPIRVToLLVM`'s -function collections. ---- - IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp b/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp -index 33441cf620c..29d098d7337 100644 ---- a/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp -+++ b/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp -@@ -58,7 +58,6 @@ THE SOFTWARE. - #include - #include - #include --#include - #include "libSPIRV/SPIRVDebugInfoExt.h" - #include "llvmWrapper/Transforms/Utils/Cloning.h" - #include "common/LLVMWarningsPop.hpp" -@@ -4707,15 +4706,11 @@ SPIRVToLLVM::transKernelMetadata() - transCapsIntoMetadata(MD); - - NamedMDNode *KernelMDs = M->getOrInsertNamedMetadata(SPIR_MD_KERNELS); -- SmallSet HandledLLVMKernels; - for (unsigned I = 0, E = BM->getNumFunctions(); I != E; ++I) - { - SPIRVFunction *BF = BM->getFunction(I); - Function *F = static_cast(getTranslatedValue(BF)); - IGC_ASSERT_MESSAGE(F, "Invalid translated function"); -- if (HandledLLVMKernels.count(F)) -- continue; -- HandledLLVMKernels.insert(F); - - // __attribute__((annotate("some_user_annotation"))) are passed via - // UserSemantic decoration on functions. -@@ -4727,6 +4722,17 @@ SPIRVToLLVM::transKernelMetadata() - - if (F->getCallingConv() != CallingConv::SPIR_KERNEL || F->isDeclaration()) - continue; -+ // Kernel entry point wrappers and SPIR-V functions with actual kernel -+ // body resolve to the same LLVM functions. Only generate metadata upon -+ // encountering entry point wrappers, as SPIR-V stores all execution -+ // mode information at the entry point wrapper site. -+ // TODO: Instead, consider copying all SPIR-V function information from -+ // entry point wrappers to the actual SPIR-V funtions, and then -+ // erasing entry point wrappers as such from the SPIRVModule/ -+ // SPIRVToLLVM classes. Preferably, such a rework should be done in the -+ // Khronos SPIR-V Translator and then downstreamed. -+ if (!isOpenCLKernel(BF)) -+ continue; - std::vector KernelMD; - KernelMD.push_back(ValueAsMetadata::get(F)); - diff --git a/srcpkgs/intel-graphics-compiler/template b/srcpkgs/intel-graphics-compiler/template deleted file mode 100644 index 5bb66ac..0000000 --- a/srcpkgs/intel-graphics-compiler/template +++ /dev/null @@ -1,59 +0,0 @@ -# Template file for 'intel-graphics-compiler' -pkgname=intel-graphics-compiler -version=1.0.12504.5 -revision=1 -wrksrc=${pkgname}-igc-${version} -build_style=cmake -configure_args="-DIGC_OPTION__LLVM_PREFERRED_VERSION='12.0.1' \ - -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON \ - -DIGC_OPTION__CLANG_MODE=Prebuilds \ - -DIGC_OPTION__LLD_MODE=Prebuilds \ - -DIGC_OPTION__LLVM_MODE=Prebuilds \ - -DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS=ON \ - -DIGC_OPTION__SPIRV_TOOLS_MODE=Sources \ - -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds \ - -DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds \ - -DINSTALL_GENX_IR=ON \ - -Wno-dev" -repository="cereus-extra" -makedepends="git clang lld-devel llvm python3-devel libunwind-devel SPIRV-Headers clang-tools-extra libxml2-devel zlib-devel SPIRV-LLVM-Translator-devel SPIRV-Tools-devel vc-intrinsics protobuf-devel libprotoc-devel intel-opencl-clang bison flex" -depends="libllvm12 ncurses SPIRV-Tools zlib" -short_desc="Intel Graphics Compiler for OpenCL" -maintainer="Kevin Figueroa " -license="MIT" -homepage="https://github.com/intel/intel-graphics-compiler" -changelog="${homepage}/releases/tag/igc-${version}" -distfiles="${homepage}/archive/igc-${version}.tar.gz" -_spirv_url="https://github.com/KhronosGroup" -checksum=7715e92889ad95235af3c844058fdf614b0cb37c5ab072c0bc53b37f417caaf0 - -post_extract() { - # Clone extra required build dependencies - # As for now, the compiler does not detect the prebuilt SPIRV-Tools and Headers. - - if [ -d ../SPIRV-* ]; then - rm -rf ../SPIRV-* - fi - - for repo in Tools Headers; do - git -C ../ clone ${_spirv_url}/SPIRV-${repo}.git - done -} - -post_install() { - vlicense LICENSE.md - vlicense ${DESTDIR}/usr/lib/igc/NOTICES.txt - - # Remove SPIRV builddir - rm -rf ../SPIRV* -} - -intel-graphics-compiler-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/intel-metee-devel b/srcpkgs/intel-metee-devel deleted file mode 120000 index 2219243..0000000 --- a/srcpkgs/intel-metee-devel +++ /dev/null @@ -1 +0,0 @@ -intel-metee \ No newline at end of file diff --git a/srcpkgs/intel-metee/template b/srcpkgs/intel-metee/template deleted file mode 100644 index 54d4b47..0000000 --- a/srcpkgs/intel-metee/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'intel-metee' -pkgname=intel-metee -version=4.2.1 -revision=1 -wrksrc=metee-${version} -build_style=cmake -repository="cereus-extra" -configure_args="-DBUILD_SHARED_LIBS:BOOL='ON'" -makedepends="doxygen" -short_desc="Access library for Intel CSME HECI interface" -maintainer="Kevin Figueroa " -license="Apache-2.0" -homepage="https://github.com/intel/metee/" -changelog="${homepage}/releases/tag/${version}" -distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=bc796f6f07e98106d0303711302633046d6b918f16b3cbce4a49dc406a9a1090 -shlib_provides="libmetee.so.${version}" - -post_install() { - vlicense COPYING -} - -intel-metee-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/intel-opencl-clang/template b/srcpkgs/intel-opencl-clang/template deleted file mode 100644 index 630aebb..0000000 --- a/srcpkgs/intel-opencl-clang/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'intel-opencl-clang' -pkgname=intel-opencl-clang -version=12.0.0 -revision=1 -wrksrc=opencl-clang-${version} -build_style=cmake -repository=cereus-extra -configure_args="-DLLVMSPIRV_INCLUDED_IN_LLVM=ON -DLLVM_NO_DEAD_STRIP=ON -Wno-dev" -hostmakedepends="gcc" -makedepends="llvm clang-tools-extra SPIRV-LLVM-Translator-devel zlib-devel libxml2-devel libllvm12" -depends="clang libllvm12 SPIRV-LLVM-Translator" -short_desc="Wrapper library around clang that can compile OpenCL C kernels to SPIR-V modules" -maintainer="Kevin Figueroa " -license="LLVM Release License" -homepage="https://github.com/intel/opencl-clang" -changelog="https://github.com/intel/opencl-clang/releases/tag/v${version}" -distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=da3cde9c3b360526371d255d99283f390a01a984fef84378d2df1e34021dda27 - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/komorebi/template b/srcpkgs/komorebi/template index e8f3628..dcfc9d7 100644 --- a/srcpkgs/komorebi/template +++ b/srcpkgs/komorebi/template @@ -1,7 +1,7 @@ # Template file for 'komorebi' pkgname=komorebi version=2.2.1 -revision=2 +revision=3 build_style=meson repository="cereus-extra" hostmakedepends="libgee08-devel cmake" diff --git a/srcpkgs/level-zero-devel b/srcpkgs/level-zero-devel deleted file mode 120000 index 96ee8ad..0000000 --- a/srcpkgs/level-zero-devel +++ /dev/null @@ -1 +0,0 @@ -level-zero \ No newline at end of file diff --git a/srcpkgs/level-zero/template b/srcpkgs/level-zero/template deleted file mode 100644 index 64a581f..0000000 --- a/srcpkgs/level-zero/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'level-zero' -pkgname=level-zero -version=1.17.45 -revision=1 -build_style=cmake -makedepends="opencl2-headers" -depends="opencl2-headers libgcc" -short_desc="API for accessing low level interfaces in openAPI platform devices (headers and loader)" -repository=cereus-extra -maintainer="Kevin Figueroa " -license="MIT" -homepage="https://github.com/oneapi-src/level-zero" -changelog="${homepage}/releases/tag/v${version}" -distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=c7e4d3e98ee71ba4992f5891191fa792e0affe6da2bbb93a537b192eb0d24f57 - -post_install() { - vlicense LICENSE -} - -level-zero-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/libadwaita-without-adwaita/template b/srcpkgs/libadwaita-without-adwaita/template index 3e9d250..e76315f 100644 --- a/srcpkgs/libadwaita-without-adwaita/template +++ b/srcpkgs/libadwaita-without-adwaita/template @@ -1,7 +1,7 @@ # Template file for 'libadwaita-without-adwaita' pkgname=libadwaita-without-adwaita version=1.5.1 -revision=1 +revision=2 repository="cereus-extra" build_style=meson build_helper="gir" diff --git a/srcpkgs/libfm-qt-legacy/template b/srcpkgs/libfm-qt-legacy/template index 65e5e09..185e7c4 100644 --- a/srcpkgs/libfm-qt-legacy/template +++ b/srcpkgs/libfm-qt-legacy/template @@ -1,7 +1,7 @@ # Template file for 'libfm-qt-legacy' pkgname=libfm-qt-legacy version=1.4.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools-legacy qt5-qmake qt5-host-tools perl" makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel diff --git a/srcpkgs/libqtxdg-legacy/template b/srcpkgs/libqtxdg-legacy/template index f72edf2..0cb846d 100644 --- a/srcpkgs/libqtxdg-legacy/template +++ b/srcpkgs/libqtxdg-legacy/template @@ -2,7 +2,7 @@ # Template file for 'libqtxdg-legacy' pkgname=libqtxdg-legacy version=3.12.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools-legacy" makedepends="qt5-svg-devel libglib-devel" diff --git a/srcpkgs/libxfce4ui-nocsd/template b/srcpkgs/libxfce4ui-nocsd/template index 3ef3b2a..dccd11c 100644 --- a/srcpkgs/libxfce4ui-nocsd/template +++ b/srcpkgs/libxfce4ui-nocsd/template @@ -1,7 +1,7 @@ # Template file for 'libxfce4ui-nocsd' pkgname=libxfce4ui-nocsd version=4.17.0 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args="--with-locales-dir=/usr/share/locale --disable-static diff --git a/srcpkgs/licorice-openbox-theme-cereus/template b/srcpkgs/licorice-openbox-theme-cereus/template index 5a4dde2..1aceae7 100644 --- a/srcpkgs/licorice-openbox-theme-cereus/template +++ b/srcpkgs/licorice-openbox-theme-cereus/template @@ -4,13 +4,13 @@ version=2022.06.14 revision=1 repository="cereus-extra" _themedir=usr/share/themes/Licorice-Cereus -wrksrc="licorice-openbox-theme-main" short_desc="Cereus Linux custom version of Licorice Openbox theme" maintainer="Kevin Figueroa " license="GPL-3.0" -homepage="https://github.com/CereusLinuxProject/licorice-openbox-theme" -distfiles="${homepage}/archive/refs/heads/main.zip" -checksum=fa62862a9d04df14e6b1fb287b8a1966046ea372283d300fc06bae02591b42ba +homepage="https://codeberg.org/cereus-linux/licorice-openbox-theme" +_commit="0b2cdea6831c6eb719289cf5a957f151deca9c36" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=0790e83b0e1ce05183505fb0f6944da5a715d560aeed94b2cf9bca1c9d4b4b8c do_install() { vmkdir ${_themedir} diff --git a/srcpkgs/lightdm-gtk-greeter-cereus/template b/srcpkgs/lightdm-gtk-greeter-cereus/template index 50a6604..d773fc8 100644 --- a/srcpkgs/lightdm-gtk-greeter-cereus/template +++ b/srcpkgs/lightdm-gtk-greeter-cereus/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-gtk-greeter-cereus' pkgname=lightdm-gtk-greeter-cereus version=2.0.9 -revision=1 +revision=2 repository="cereus-core" build_style=gnu-configure configure_args="--disable-static --disable-maintainer-mode" @@ -16,7 +16,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/Xubuntu/lightdm-gtk-greeter" distfiles="https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-$version/lightdm-gtk-greeter-$version.tar.gz" checksum=c8fdf198aa9a3f9d0dad0b48dfe23c2277b79107e8fcfc62965290f1081f645d -conflicts="lightdm-gtk3-greeter" +conflicts="lightdm-gtk-greeter" provides="lightdm-greeter-1_0" lightdm-gtk3-greeter-cereus_package() { diff --git a/srcpkgs/lightly-git/template b/srcpkgs/lightly-git/template index 68afd62..a82229b 100644 --- a/srcpkgs/lightly-git/template +++ b/srcpkgs/lightly-git/template @@ -1,7 +1,7 @@ # Template file for 'lightly-git' pkgname=lightly-git version=2023.12.29 -revision=3 +revision=4 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules" diff --git a/srcpkgs/lightly-qt6/template b/srcpkgs/lightly-qt6/template index 78e3b53..9fbb040 100644 --- a/srcpkgs/lightly-qt6/template +++ b/srcpkgs/lightly-qt6/template @@ -1,7 +1,7 @@ # Template file for 'lightly-qt6' pkgname=lightly-qt6 version=0.5.2 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules" diff --git a/srcpkgs/lxqt-build-tools-legacy/template b/srcpkgs/lxqt-build-tools-legacy/template index 484a65a..a418675 100644 --- a/srcpkgs/lxqt-build-tools-legacy/template +++ b/srcpkgs/lxqt-build-tools-legacy/template @@ -1,7 +1,7 @@ # Template file for 'lxqt-build-tools-legacy' pkgname=lxqt-build-tools-legacy version=0.13.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config" makedepends="qt5-devel" diff --git a/srcpkgs/lxqt-qtplugin-legacy/template b/srcpkgs/lxqt-qtplugin-legacy/template index 96f764f..949a417 100644 --- a/srcpkgs/lxqt-qtplugin-legacy/template +++ b/srcpkgs/lxqt-qtplugin-legacy/template @@ -1,7 +1,7 @@ # Template file for 'lxqt-qtplugin-legacy' pkgname=lxqt-qtplugin-legacy version=1.4.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="lxqt-build-tools-legacy qt5-qmake qt5-host-tools libfm-qt-legacy-devel" makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-legacy-devel libqtxdg-legacy-devel diff --git a/srcpkgs/material-black-cereus-xfwm/template b/srcpkgs/material-black-cereus-xfwm/template index 943a917..2c7878e 100644 --- a/srcpkgs/material-black-cereus-xfwm/template +++ b/srcpkgs/material-black-cereus-xfwm/template @@ -1,16 +1,17 @@ # Template file for 'material-black-cereus-xfwm' pkgname=material-black-cereus-xfwm -version=2022.05.26 +reverts="2022.05.26_1" +version=0.1 revision=1 repository="cereus-extra" _themedir=usr/share/themes/material-black-cereus/ -wrksrc="Material-Black-Cereus-main" +#wrksrc="Material-Black-Cereus-main" short_desc="Cereus Linux custom version of material-black-colors xfwm theme" maintainer="Kevin Figueroa " license="Unlicensed" -homepage="https://github.com/ItzSelenux/Material-Black-Cereus" -distfiles="${homepage}/archive/refs/heads/main.zip" -checksum=b84d0644f7f2a0c1c757667862d80416149126001dcd1c259389ccbafac9d4e9 +homepage="https://codeberg.org/cereus-linux/material-black-cereus-xfwm" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=9e411daea7b99e07d5f8e2804c441f6ff6b761f649622777d4dfb9b67b666388 do_install() { vmkdir ${_themedir} diff --git a/srcpkgs/oblogout/patches/deprecated-safeconfigparser-fix.patch b/srcpkgs/oblogout/patches/deprecated-safeconfigparser-fix.patch deleted file mode 100644 index c296d74..0000000 --- a/srcpkgs/oblogout/patches/deprecated-safeconfigparser-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/oblogout/__init__.py b/oblogout/__init__.py -index 2202739..74115e5 100755 ---- a/oblogout/__init__.py -+++ b/oblogout/__init__.py -@@ -190,7 +190,7 @@ class OpenboxLogout(): - """ Load the configuration file and parse entries, when encountering a issue - change safe defaults """ - -- self.parser = configparser.SafeConfigParser() -+ self.parser = configparser.ConfigParser() - self.parser.read(config) - - # Set some safe defaults diff --git a/srcpkgs/oblogout/template b/srcpkgs/oblogout/template index 9cc518e..f2fff93 100644 --- a/srcpkgs/oblogout/template +++ b/srcpkgs/oblogout/template @@ -1,19 +1,19 @@ # Template file for 'oblogout' pkgname=oblogout -version=2021.06.26 -revision=3 -wrksrc=oblogout-py3-master +version=2024.04.28 +revision=1 conf_files="/etc/oblogout.conf" build_style=python3-module repository="cereus-extra" makedepends="python3-distutils-extra intltool" depends="python3-Pillow python3-cairo python3-gobject" +_commit="ff2b0595ac7f3f07f7f67bd3210b0e7a2027953a" short_desc="Openbox Logout Menu, ported to Python 3" maintainer="Kevin Figueroa " license="GPL-2.0" homepage="https://github.com/trizen/oblogout-py3" -distfiles="${homepage}/archive/refs/heads/master.zip" -checksum=e2ae4fdbc499fcb351d585666133abcff4cf0244e1cf46de42788c0401dac5ab +distfiles=${homepage}/archive/${_commit}.tar.gz +checksum=edb7ed4c815198314a2e36af745a65b02427592bfaeea6fe19950c979b1256d8 post_install() { vinstall data/oblogout.conf 644 etc/ diff --git a/srcpkgs/octoxbps-git/template b/srcpkgs/octoxbps-git/template index 496eebf..891d522 100644 --- a/srcpkgs/octoxbps-git/template +++ b/srcpkgs/octoxbps-git/template @@ -1,7 +1,7 @@ # Template file for 'octoxbps-git' pkgname=octoxbps-git version=2024.07.29 -revision=1 +revision=2 build_style=qmake repository="cereus-extra" depends="curl qt-sudo" diff --git a/srcpkgs/os-prober-cereus/template b/srcpkgs/os-prober-cereus/template index ec5a7f9..2beb975 100644 --- a/srcpkgs/os-prober-cereus/template +++ b/srcpkgs/os-prober-cereus/template @@ -1,7 +1,7 @@ # Template file for 'os-prober-cereus' pkgname=os-prober-cereus version=1.81 -revision=1 +revision=2 repository="cereus-extra" conflicts="os-prober" replaces="os-prober" diff --git a/srcpkgs/pasystray-git/template b/srcpkgs/pasystray-git/template index 1bd3c51..d7cb11d 100644 --- a/srcpkgs/pasystray-git/template +++ b/srcpkgs/pasystray-git/template @@ -1,7 +1,7 @@ # Template file for 'pasystray-git' pkgname=pasystray-git version=2023.08.29 -revision=1 +revision=2 build_style=gnu-configure repository="cereus-extra" hostmakedepends="pkg-config intltool automake git" diff --git a/srcpkgs/picom-arian8j2/template b/srcpkgs/picom-arian8j2/template deleted file mode 100644 index a1cd23b..0000000 --- a/srcpkgs/picom-arian8j2/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'picom-arian8j2' -pkgname=picom-arian8j2 -version=2023.12.11 -revision=1 -build_style=meson -configure_args="-Dwith_docs=true" -hostmakedepends="pkg-config asciidoc" -makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre2-devel - pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash libglvnd-devel" -depends="desktop-file-utils" -_commit="8f99f5a4690bf4c3afe572aee073f1187de3e5e2" -short_desc="Picom fork which includes transition animations" -maintainer="Kevin Figueroa " -license="MIT, MPL-2.0" -homepage="https://github.com/arian8j2/picom/" -repository="cereus-extra" -provides="picom" -conflicts="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan picom-git picom-dccsillag picom-ftlabs" -replaces="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan picom-git picom-dccsillag picom-ftlabs" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=06d299d547baadb6a9a13cd9459d75b02c6e82ab3005330766e94fa0bd693c84 - -post_install() { - vlicense LICENSES/MIT - vlicense COPYING - vsconf picom.sample.conf -} diff --git a/srcpkgs/picom-dccsillag/patches/pijulius.patch b/srcpkgs/picom-dccsillag/patches/pijulius.patch deleted file mode 100644 index 65b7751..0000000 --- a/srcpkgs/picom-dccsillag/patches/pijulius.patch +++ /dev/null @@ -1,727 +0,0 @@ -diff --git a/src/atom.h b/src/atom.h -index 6f4eae6..baf3360 100644 ---- a/src/atom.h -+++ b/src/atom.h -@@ -23,7 +23,8 @@ - WM_CLIENT_MACHINE, \ - _NET_ACTIVE_WINDOW, \ - _COMPTON_SHADOW, \ -- _NET_WM_WINDOW_TYPE -+ _NET_WM_WINDOW_TYPE, \ -+ _NET_CURRENT_DESKTOP - - #define ATOM_LIST2 \ - _NET_WM_WINDOW_TYPE_DESKTOP, \ -diff --git a/src/common.h b/src/common.h -index 239b66d..d5dda60 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -184,6 +184,10 @@ typedef struct session { - int root_height; - /// Width of root window. - int root_width; -+ /// Current desktop number of root window -+ int root_desktop_num; -+ /// Desktop switch direction -+ int root_desktop_switch_direction; - // Damage of root window. - // Damage root_damage; - /// X Composite overlay window. -diff --git a/src/config.c b/src/config.c -index 3225d8c..71e4fdb 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -504,6 +504,18 @@ void set_default_winopts(options_t *opt, win_option_mask_t *mask, bool shadow_en - mask[i].animation = OPEN_WINDOW_ANIMATION_INVALID; - opt->wintype_option[i].animation = OPEN_WINDOW_ANIMATION_INVALID; - } -+ if (!mask[i].animation_unmap) { -+ mask[i].animation_unmap = OPEN_WINDOW_ANIMATION_INVALID; -+ opt->wintype_option[i].animation_unmap = OPEN_WINDOW_ANIMATION_INVALID; -+ } -+ if (!mask[i].animation_workspace_in) { -+ mask[i].animation_workspace_in = OPEN_WINDOW_ANIMATION_INVALID; -+ opt->wintype_option[i].animation_workspace_in = OPEN_WINDOW_ANIMATION_INVALID; -+ } -+ if (!mask[i].animation_workspace_out) { -+ mask[i].animation_workspace_out = OPEN_WINDOW_ANIMATION_INVALID; -+ opt->wintype_option[i].animation_workspace_out = OPEN_WINDOW_ANIMATION_INVALID; -+ } - if (!mask[i].clip_shadow_above) { - mask[i].clip_shadow_above = true; - opt->wintype_option[i].clip_shadow_above = false; -@@ -514,6 +526,8 @@ void set_default_winopts(options_t *opt, win_option_mask_t *mask, bool shadow_en - enum open_window_animation parse_open_window_animation(const char *src) { - if (strcmp(src, "none") == 0) { - return OPEN_WINDOW_ANIMATION_NONE; -+ }else if (strcmp(src, "auto") == 0) { -+ return OPEN_WINDOW_ANIMATION_AUTO; - } else if (strcmp(src, "fly-in") == 0) { - return OPEN_WINDOW_ANIMATION_FLYIN; - } else if (strcmp(src, "zoom") == 0) { -@@ -576,9 +590,14 @@ char *parse_config(options_t *opt, const char *config_file, bool *shadow_enable, - .animations = false, - .animation_for_open_window = OPEN_WINDOW_ANIMATION_NONE, - .animation_for_transient_window = OPEN_WINDOW_ANIMATION_NONE, -+ .animation_for_unmap_window = OPEN_WINDOW_ANIMATION_AUTO, -+ .animation_for_workspace_switch_in = OPEN_WINDOW_ANIMATION_AUTO, -+ .animation_for_workspace_switch_out = OPEN_WINDOW_ANIMATION_AUTO, - .animation_stiffness = 200.0, - .animation_window_mass = 1.0, - .animation_dampening = 25, -+ .animation_delta = 10, -+ .animation_force_steps = false, - .animation_clamping = true, - - .inactive_opacity = 1.0, -diff --git a/src/config.h b/src/config.h -index 234ccfd..c65f9b9 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -39,12 +39,15 @@ enum backend { - - enum open_window_animation { - OPEN_WINDOW_ANIMATION_NONE = 0, -+ OPEN_WINDOW_ANIMATION_AUTO, - OPEN_WINDOW_ANIMATION_FLYIN, - OPEN_WINDOW_ANIMATION_ZOOM, - OPEN_WINDOW_ANIMATION_SLIDE_UP, - OPEN_WINDOW_ANIMATION_SLIDE_DOWN, - OPEN_WINDOW_ANIMATION_SLIDE_LEFT, - OPEN_WINDOW_ANIMATION_SLIDE_RIGHT, -+ OPEN_WINDOW_ANIMATION_SLIDE_IN, -+ OPEN_WINDOW_ANIMATION_SLIDE_OUT, - OPEN_WINDOW_ANIMATION_INVALID, - }; - -@@ -58,6 +61,9 @@ typedef struct win_option_mask { - bool opacity : 1; - bool clip_shadow_above : 1; - enum open_window_animation animation; -+ enum open_window_animation animation_unmap; -+ enum open_window_animation animation_workspace_in; -+ enum open_window_animation animation_workspace_out; - } win_option_mask_t; - - typedef struct win_option { -@@ -70,6 +76,9 @@ typedef struct win_option { - double opacity; - bool clip_shadow_above; - enum open_window_animation animation; -+ enum open_window_animation animation_unmap; -+ enum open_window_animation animation_workspace_in; -+ enum open_window_animation animation_workspace_out; - } win_option_t; - - enum blur_method { -@@ -189,12 +198,23 @@ typedef struct options { - enum open_window_animation animation_for_open_window; - /// Which animation to run when opening a transient window - enum open_window_animation animation_for_transient_window; -+ /// Which animation to run when unmapping (e.g. minimizing) a window -+ enum open_window_animation animation_for_unmap_window; -+ /// Which animation to run when switching workspace -+ /// IMPORTANT: will only work if window manager updates -+ /// _NET_CURRENT_DESKTOP before doing the hide/show of windows -+ enum open_window_animation animation_for_workspace_switch_in; -+ enum open_window_animation animation_for_workspace_switch_out; - /// Spring stiffness for animation - double animation_stiffness; - /// Window mass for animation - double animation_window_mass; - /// Animation dampening - double animation_dampening; -+ /// Animation delta. In milliseconds. -+ double animation_delta; -+ /// Whether to force animations to not miss a beat -+ bool animation_force_steps; - /// Whether to clamp animations - bool animation_clamping; - /// TODO: window animation blacklist -diff --git a/src/config_libconfig.c b/src/config_libconfig.c -index 181c7a0..5abae81 100644 ---- a/src/config_libconfig.c -+++ b/src/config_libconfig.c -@@ -297,6 +297,30 @@ static inline void parse_wintype_config(const config_t *cfg, const char *member_ - o->animation = animation; - mask->animation = OPEN_WINDOW_ANIMATION_INVALID; - } -+ if (config_setting_lookup_string(setting, "animation-unmap", &sval)) { -+ enum open_window_animation animation = parse_open_window_animation(sval); -+ if (animation >= OPEN_WINDOW_ANIMATION_INVALID) -+ animation = OPEN_WINDOW_ANIMATION_NONE; -+ -+ o->animation_unmap = animation; -+ mask->animation_unmap = OPEN_WINDOW_ANIMATION_INVALID; -+ } -+ if (config_setting_lookup_string(setting, "animation-workspace-in", &sval)) { -+ enum open_window_animation animation = parse_open_window_animation(sval); -+ if (animation >= OPEN_WINDOW_ANIMATION_INVALID) -+ animation = OPEN_WINDOW_ANIMATION_NONE; -+ -+ o->animation_workspace_in = animation; -+ mask->animation_workspace_in = OPEN_WINDOW_ANIMATION_INVALID; -+ } -+ if (config_setting_lookup_string(setting, "animation-workspace-out", &sval)) { -+ enum open_window_animation animation = parse_open_window_animation(sval); -+ if (animation >= OPEN_WINDOW_ANIMATION_INVALID) -+ animation = OPEN_WINDOW_ANIMATION_NONE; -+ -+ o->animation_workspace_out = animation; -+ mask->animation_workspace_out = OPEN_WINDOW_ANIMATION_INVALID; -+ } - - double fval; - if (config_setting_lookup_float(setting, "opacity", &fval)) { -@@ -545,17 +569,48 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad - if (config_lookup_string(&cfg, "animation-for-transient-window", &sval)) { - enum open_window_animation animation = parse_open_window_animation(sval); - if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { -- log_fatal("Invalid open-window animation %s", sval); -+ log_fatal("Invalid transient-window animation %s", sval); - goto err; - } - opt->animation_for_transient_window = animation; - } -+ // --animation-for-unmap-window -+ if (config_lookup_string(&cfg, "animation-for-unmap-window", &sval)) { -+ enum open_window_animation animation = parse_open_window_animation(sval); -+ if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { -+ log_fatal("Invalid unmap-window animation %s", sval); -+ goto err; -+ } -+ opt->animation_for_unmap_window = animation; -+ } -+ // --animation-for-workspace-switch-in -+ if (config_lookup_string(&cfg, "animation-for-workspace-switch-in", &sval)) { -+ enum open_window_animation animation = parse_open_window_animation(sval); -+ if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { -+ log_fatal("Invalid workspace-switch-in animation %s", sval); -+ goto err; -+ } -+ opt->animation_for_workspace_switch_in = animation; -+ } -+ // --animation-for-workspace-switch-out -+ if (config_lookup_string(&cfg, "animation-for-workspace-switch-out", &sval)) { -+ enum open_window_animation animation = parse_open_window_animation(sval); -+ if (animation >= OPEN_WINDOW_ANIMATION_INVALID) { -+ log_fatal("Invalid workspace-switch-out animation %s", sval); -+ goto err; -+ } -+ opt->animation_for_workspace_switch_out = animation; -+ } - // --animation-stiffness - config_lookup_float(&cfg, "animation-stiffness", &opt->animation_stiffness); - // --animation-window-mass - config_lookup_float(&cfg, "animation-window-mass", &opt->animation_window_mass); - // --animation-dampening - config_lookup_float(&cfg, "animation-dampening", &opt->animation_dampening); -+ // --animation-delta -+ config_lookup_float(&cfg, "animation-delta", &opt->animation_delta); -+ // --animation-force-steps -+ lcfg_lookup_bool(&cfg, "animation-force-steps", &opt->animation_force_steps); - // --animation-clamping - lcfg_lookup_bool(&cfg, "animation-clamping", &opt->animation_clamping); - // --focus-exclude -diff --git a/src/event.c b/src/event.c -index e6052f1..beec195 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -449,6 +449,17 @@ static inline void ev_property_notify(session_t *ps, xcb_property_notify_event_t - } - - if (ps->root == ev->window) { -+ // If desktop number property changes -+ if (ev->atom == ps->atoms->a_NET_CURRENT_DESKTOP) { -+ auto prop = x_get_prop(ps->c, ps->root, ps->atoms->a_NET_CURRENT_DESKTOP, -+ 1L, XCB_ATOM_CARDINAL, 32); -+ -+ if (prop.nitems) { -+ ps->root_desktop_switch_direction = ((int)*prop.c32) - ps->root_desktop_num; -+ ps->root_desktop_num = (int)*prop.c32; -+ } -+ } -+ - if (ps->o.use_ewmh_active_win && ps->atoms->a_NET_ACTIVE_WINDOW == ev->atom) { - // to update focus - ps->pending_updates = true; -diff --git a/src/options.c b/src/options.c -index 36f511c..3683f0e 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -86,6 +86,33 @@ static void usage(const char *argv0, int ret) { - " `slide-down`, `slide-up`, `slide-left`, `slide-right`\n" - " (default: none).\n" - "\n" -+ "--animation-for-unmap-window\n" -+ " Which animation to run when hiding (e.g. minimize) a window.\n" -+ " Must be one of `auto`, `none`, `fly-in`, `zoom`,\n" -+ " `slide-down`, `slide-up`, `slide-left`, `slide-right`\n" -+ " `slide-in`, `slide-out`\n" -+ " (default: auto).\n" -+ "\n" -+ "--animation-for-workspace-switch-in\n" -+ " Which animation to run on switching workspace for windows\n" -+ " comming into view.\n" -+ " IMPORTANT: window manager must set _NET_CURRENT_DESKTOP\n" -+ " before doing the hide/show of windows\n" -+ " Must be one of `auto`, `none`, `fly-in`, `zoom`,\n" -+ " `slide-down`, `slide-up`, `slide-left`, `slide-right`\n" -+ " `slide-in`, `slide-out`\n" -+ " (default: auto).\n" -+ "\n" -+ "--animation-for-workspace-switch-out\n" -+ " Which animation to run on switching workspace for windows\n" -+ " going out of view.\n" -+ " IMPORTANT: window manager must set _NET_CURRENT_DESKTOP\n" -+ " before doing the hide/show of windows\n" -+ " Must be one of `auto`, `none`, `fly-in`, `zoom`,\n" -+ " `slide-down`, `slide-up`, `slide-left`, `slide-right`\n" -+ " `slide-in`, `slide-out`\n" -+ " (default: auto).\n" -+ "\n" - "--animation-stiffness\n" - " Stiffness (a.k.a. tension) parameter for animation (default: 200.0).\n" - "\n" -@@ -95,6 +122,13 @@ static void usage(const char *argv0, int ret) { - "--animation-window-mass\n" - " Mass parameter for animation (default: 1.0).\n" - "\n" -+ "--animation-delta\n" -+ " The time between steps in animation, in milliseconds. (> 0, defaults to 10).\n" -+ "\n" -+ "--animation-force-steps\n" -+ " Force animations to go step by step even if cpu usage is high \n" -+ " (default: false)\n" -+ "\n" - "--animation-clamping\n" - " Whether to clamp animations (default: true)\n" - "\n" -diff --git a/src/picom.c b/src/picom.c -index 3467e24..18254a5 100644 ---- a/src/picom.c -+++ b/src/picom.c -@@ -558,6 +558,14 @@ static void configure_root(session_t *ps) { - ps->root_width = r->width; - ps->root_height = r->height; - -+ auto prop = x_get_prop(ps->c, ps->root, ps->atoms->a_NET_CURRENT_DESKTOP, -+ 1L, XCB_ATOM_CARDINAL, 32); -+ -+ ps->root_desktop_switch_direction = 0; -+ if (prop.nitems) { -+ ps->root_desktop_num = (int)*prop.c32; -+ } -+ - rebuild_screen_reg(ps); - rebuild_shadow_exclude_reg(ps); - -@@ -640,10 +648,17 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - } - ps->fade_time += steps * ps->o.fade_delta; - -- if (ps->o.animations && !ps->animation_time) -- ps->animation_time = now; -+ double animation_delta = 0; -+ if (ps->o.animations) { -+ if (!ps->animation_time) -+ ps->animation_time = now; -+ -+ animation_delta = (double)(now - ps->animation_time) / -+ (ps->o.animation_delta*100); - -- double delta_secs = (double)(now - ps->animation_time) / 1000; -+ if (ps->o.animation_force_steps) -+ animation_delta = min2(animation_delta, ps->o.animation_delta/1000); -+ } - - // First, let's process fading - win_stack_foreach_managed_safe(w, &ps->window_stack) { -@@ -653,7 +668,7 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - - // IMPORTANT: These window animation steps must happen before any other - // [pre]processing. This is because it changes the window's geometry. -- if (ps->o.animations && -+ if (ps->o.animations && - !isnan(w->animation_progress) && w->animation_progress != 1.0 && - ps->o.wintype_option[w->window_type].animation != 0 && - win_is_mapped_in_x(w)) -@@ -680,20 +695,20 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - (ps->o.animation_stiffness * neg_displacement_h - - ps->o.animation_dampening * w->animation_velocity_h) / - ps->o.animation_window_mass; -- w->animation_velocity_x += acceleration_x * delta_secs; -- w->animation_velocity_y += acceleration_y * delta_secs; -- w->animation_velocity_w += acceleration_w * delta_secs; -- w->animation_velocity_h += acceleration_h * delta_secs; -+ w->animation_velocity_x += acceleration_x * animation_delta; -+ w->animation_velocity_y += acceleration_y * animation_delta; -+ w->animation_velocity_w += acceleration_w * animation_delta; -+ w->animation_velocity_h += acceleration_h * animation_delta; - - // Animate window geometry - double new_animation_x = -- w->animation_center_x + w->animation_velocity_x * delta_secs; -+ w->animation_center_x + w->animation_velocity_x * animation_delta; - double new_animation_y = -- w->animation_center_y + w->animation_velocity_y * delta_secs; -+ w->animation_center_y + w->animation_velocity_y * animation_delta; - double new_animation_w = -- w->animation_w + w->animation_velocity_w * delta_secs; -+ w->animation_w + w->animation_velocity_w * animation_delta; - double new_animation_h = -- w->animation_h + w->animation_velocity_h * delta_secs; -+ w->animation_h + w->animation_velocity_h * animation_delta; - - // Negative new width/height causes segfault and it can happen - // when clamping disabled and shading a window -@@ -775,7 +790,9 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - pixman_region32_init_rect(&w->bounding_shape, 0, 0, - (uint)w->widthb, (uint)w->heightb); - -- win_clear_flags(w, WIN_FLAGS_PIXMAP_STALE); -+ if (w->state != WSTATE_DESTROYING) -+ win_clear_flags(w, WIN_FLAGS_PIXMAP_STALE); -+ - win_process_image_flags(ps, w); - } - // Mark new window region with damage -@@ -794,6 +811,27 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - w->animation_velocity_h = 0.0; - } - -+ if (!ps->root_desktop_switch_direction) { -+ if (w->state == WSTATE_UNMAPPING || w->state == WSTATE_DESTROYING) { -+ steps = 0; -+ double new_opacity = clamp( -+ w->opacity_target_old-w->animation_progress, -+ w->opacity_target, 1); -+ -+ if (new_opacity < w->opacity) -+ w->opacity = new_opacity; -+ -+ } else if (w->state == WSTATE_MAPPING) { -+ steps = 0; -+ double new_opacity = clamp( -+ w->animation_progress, -+ 0.0, w->opacity_target); -+ -+ if (new_opacity > w->opacity) -+ w->opacity = new_opacity; -+ } -+ } -+ - *animation_running = true; - } - -@@ -838,7 +876,7 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - } - } - -- if (animation_running) -+ if (*animation_running) - ps->animation_time = now; - - // Opacity will not change, from now on. -@@ -867,7 +905,10 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) { - if (w->state == WSTATE_UNMAPPED || - unlikely(w->base.id == ps->debug_window || - w->client_win == ps->debug_window)) { -- to_paint = false; -+ -+ if (!*fade_running || w->opacity == w->opacity_target) -+ to_paint = false; -+ - } else if (!w->ever_damaged && w->state != WSTATE_UNMAPPING && - w->state != WSTATE_DESTROYING) { - // Unmapping clears w->ever_damaged, but the fact that the window -@@ -1652,6 +1693,7 @@ static void draw_callback_impl(EV_P_ session_t *ps, int revents attr_unused) { - } - if (!animation_running) { - ps->animation_time = 0L; -+ ps->root_desktop_switch_direction = 0; - } - - // TODO(yshui) Investigate how big the X critical section needs to be. There are -diff --git a/src/win.c b/src/win.c -index 5ce9845..0678949 100644 ---- a/src/win.c -+++ b/src/win.c -@@ -442,16 +442,23 @@ static void win_update_properties(session_t *ps, struct managed_win *w) { - static void init_animation(session_t *ps, struct managed_win *w) { - enum open_window_animation animation = ps->o.animation_for_open_window; - -- if (w->window_type != WINTYPE_TOOLTIP && -- wid_has_prop(ps, w->client_win, ps->atoms->aWM_TRANSIENT_FOR)) -- { -+ w->animation_transient = wid_has_prop(ps, w->client_win, ps->atoms->aWM_TRANSIENT_FOR); -+ -+ if (w->window_type != WINTYPE_TOOLTIP && w->animation_transient) - animation = ps->o.animation_for_transient_window; -- } - - if (ps->o.wintype_option[w->window_type].animation < OPEN_WINDOW_ANIMATION_INVALID) - animation = ps->o.wintype_option[w->window_type].animation; - -+ if (ps->root_desktop_switch_direction != 0) { -+ if (ps->o.animation_for_workspace_switch_in == OPEN_WINDOW_ANIMATION_AUTO) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_IN; -+ else -+ animation = ps->o.animation_for_workspace_switch_in; -+ } -+ - switch (animation) { -+ case OPEN_WINDOW_ANIMATION_AUTO: - case OPEN_WINDOW_ANIMATION_NONE: { // No animation - w->animation_center_x = w->pending_g.x + w->pending_g.width * 0.5; - w->animation_center_y = w->pending_g.y + w->pending_g.height * 0.5; -@@ -507,6 +514,150 @@ static void init_animation(session_t *ps, struct managed_win *w) { - w->animation_h = w->pending_g.height; - break; - } -+ case OPEN_WINDOW_ANIMATION_SLIDE_IN: { -+ w->animation_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_center_y = w->pending_g.y + w->pending_g.height * 0.5 - -+ ps->root_height * -+ ((ps->root_desktop_switch_direction < 0 && -+ ps->root_desktop_switch_direction >= -1) || -+ ps->root_desktop_switch_direction > 1?1:-1); -+ w->animation_w = w->pending_g.width; -+ w->animation_h = w->pending_g.height; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_OUT: { -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height * 0.5 - -+ ps->root_height * -+ ((ps->root_desktop_switch_direction < 0 && -+ ps->root_desktop_switch_direction >= -1) || -+ ps->root_desktop_switch_direction > 1?-1:1); -+ w->animation_dest_w = w->pending_g.width; -+ w->animation_dest_h = w->pending_g.height; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_INVALID: assert(false); break; -+ } -+} -+ -+static void init_animation_unmap(session_t *ps, struct managed_win *w) { -+ enum open_window_animation animation; -+ -+ if (ps->o.animation_for_unmap_window == OPEN_WINDOW_ANIMATION_AUTO) { -+ animation = ps->o.animation_for_open_window; -+ -+ if (w->window_type != WINTYPE_TOOLTIP && w->animation_transient) -+ animation = ps->o.animation_for_transient_window; -+ -+ if (ps->o.wintype_option[w->window_type].animation < OPEN_WINDOW_ANIMATION_INVALID) -+ animation = ps->o.wintype_option[w->window_type].animation; -+ -+ if (animation == OPEN_WINDOW_ANIMATION_SLIDE_UP) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_DOWN; -+ else if (animation == OPEN_WINDOW_ANIMATION_SLIDE_DOWN) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_UP; -+ else if (animation == OPEN_WINDOW_ANIMATION_SLIDE_LEFT) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_RIGHT; -+ else if (animation == OPEN_WINDOW_ANIMATION_SLIDE_RIGHT) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_LEFT; -+ else if (animation == OPEN_WINDOW_ANIMATION_SLIDE_IN) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_OUT; -+ else if (animation == OPEN_WINDOW_ANIMATION_SLIDE_OUT) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_IN; -+ -+ } else { -+ animation = ps->o.animation_for_unmap_window; -+ -+ if (ps->o.wintype_option[w->window_type].animation_unmap < OPEN_WINDOW_ANIMATION_INVALID) -+ animation = ps->o.wintype_option[w->window_type].animation_unmap; -+ } -+ -+ if (ps->root_desktop_switch_direction != 0) { -+ if (ps->o.animation_for_workspace_switch_out == OPEN_WINDOW_ANIMATION_AUTO) -+ animation = OPEN_WINDOW_ANIMATION_SLIDE_OUT; -+ else -+ animation = ps->o.animation_for_workspace_switch_out; -+ } -+ -+ switch (animation) { -+ case OPEN_WINDOW_ANIMATION_AUTO: -+ case OPEN_WINDOW_ANIMATION_NONE: { // No animation -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height * 0.5; -+ w->animation_dest_w = w->pending_g.width; -+ w->animation_dest_h = w->pending_g.height; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_FLYIN: { // Fly-out from a random point outside the screen -+ // Compute random point off screen -+ double angle = 2 * M_PI * ((double)rand() / RAND_MAX); -+ const double radius = -+ sqrt(ps->root_width * ps->root_width + ps->root_height * ps->root_height); -+ -+ // Set animation -+ w->animation_dest_center_x = ps->root_width * 0.5 + radius * cos(angle); -+ w->animation_dest_center_y = ps->root_height * 0.5 + radius * sin(angle); -+ w->animation_dest_w = 0; -+ w->animation_dest_h = 0; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_ZOOM: { // Zoom-out the image, without changing its location -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height * 0.5; -+ w->animation_dest_w = 0; -+ w->animation_dest_h = 0; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_UP: { // Slide up the image, without changing its location -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_dest_center_y = w->pending_g.y; -+ w->animation_dest_w = w->pending_g.width; -+ w->animation_dest_h = 0; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_DOWN: { // Slide down the image, without changing its location -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height; -+ w->animation_dest_w = w->pending_g.width; -+ w->animation_dest_h = 0; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_LEFT: { // Slide left the image, without changing its location -+ w->animation_dest_center_x = w->pending_g.x; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height * 0.5; -+ w->animation_dest_w = 0; -+ w->animation_dest_h = w->pending_g.height; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_RIGHT: { // Slide right the image, without changing its location -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height * 0.5; -+ w->animation_dest_w = 0; -+ w->animation_dest_h = w->pending_g.height; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_IN: { -+ w->animation_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_center_y = w->pending_g.y + w->pending_g.height * 0.5 - -+ ps->root_height * -+ ((ps->root_desktop_switch_direction < 0 && -+ ps->root_desktop_switch_direction >= -1) || -+ ps->root_desktop_switch_direction > 1?1:-1); -+ w->animation_w = w->pending_g.width; -+ w->animation_h = w->pending_g.height; -+ break; -+ } -+ case OPEN_WINDOW_ANIMATION_SLIDE_OUT: { -+ w->animation_dest_center_x = w->pending_g.x + w->pending_g.width * 0.5; -+ w->animation_dest_center_y = w->pending_g.y + w->pending_g.height * 0.5 - -+ ps->root_height * -+ ((ps->root_desktop_switch_direction < 0 && -+ ps->root_desktop_switch_direction >= -1) || -+ ps->root_desktop_switch_direction > 1?-1:1); -+ w->animation_dest_w = w->pending_g.width; -+ w->animation_dest_h = w->pending_g.height; -+ break; -+ } - case OPEN_WINDOW_ANIMATION_INVALID: assert(false); break; - } - } -@@ -925,6 +1076,9 @@ double win_calc_opacity_target(session_t *ps, const struct managed_win *w) { - return 0; - } - if (w->state == WSTATE_UNMAPPING || w->state == WSTATE_DESTROYING) { -+ if (ps->root_desktop_switch_direction) -+ return w->opacity; -+ - return 0; - } - // Try obeying opacity property and window type opacity firstly -@@ -1316,7 +1470,9 @@ void win_on_win_size_change(session_t *ps, struct managed_win *w) { - w->state != WSTATE_UNMAPPING); - - // Invalidate the shadow we built -- win_set_flags(w, WIN_FLAGS_IMAGES_STALE); -+ if (w->state != WSTATE_DESTROYING) -+ win_set_flags(w, WIN_FLAGS_IMAGES_STALE); -+ - ps->pending_updates = true; - free_paint(ps, &w->shadow_paint); - } -@@ -2446,6 +2602,32 @@ void unmap_win_start(session_t *ps, struct managed_win *w) { - w->opacity_target_old = fmax(w->opacity_target, w->opacity_target_old); - w->opacity_target = win_calc_opacity_target(ps, w); - -+ if (ps->o.animations && -+ ps->o.animation_for_unmap_window != OPEN_WINDOW_ANIMATION_NONE && -+ ps->o.wintype_option[w->window_type].animation != 0) -+ { -+ init_animation_unmap(ps, w); -+ -+ double x_dist = w->animation_dest_center_x - w->animation_center_x; -+ double y_dist = w->animation_dest_center_y - w->animation_center_y; -+ double w_dist = w->animation_dest_w - w->animation_w; -+ double h_dist = w->animation_dest_h - w->animation_h; -+ w->animation_inv_og_distance = -+ 1.0 / sqrt(x_dist * x_dist + y_dist * y_dist + -+ w_dist * w_dist + h_dist * h_dist); -+ -+ if (isinf(w->animation_inv_og_distance)) -+ w->animation_inv_og_distance = 0; -+ -+ w->animation_progress = 0.0; -+ -+ if (w->old_win_image) { -+ ps->backend_data->ops->release_image(ps->backend_data, -+ w->old_win_image); -+ w->old_win_image = NULL; -+ } -+ } -+ - #ifdef CONFIG_DBUS - // Send D-Bus signal - if (ps->o.dbus) { -@@ -2473,6 +2655,7 @@ bool win_check_fade_finished(session_t *ps, struct managed_win *w) { - assert(w->opacity_target == w->opacity); - return false; - } -+ - if (w->opacity == w->opacity_target) { - switch (w->state) { - case WSTATE_UNMAPPING: unmap_win_finish(ps, w); return false; -@@ -2497,6 +2680,15 @@ bool win_skip_fading(session_t *ps, struct managed_win *w) { - } - log_debug("Skipping fading process of window %#010x (%s)", w->base.id, w->name); - w->opacity = w->opacity_target; -+ -+ if (w->animation_progress < 1) { -+ w->animation_progress = 1; -+ w->g.x = w->pending_g.x; -+ w->g.y = w->pending_g.y; -+ w->g.width = w->pending_g.width; -+ w->g.height = w->pending_g.height; -+ } -+ - return win_check_fade_finished(ps, w); - } - -@@ -2919,5 +3111,6 @@ win_stack_find_next_managed(const session_t *ps, const struct list_node *i) { - /// Return whether this window is mapped on the X server side - bool win_is_mapped_in_x(const struct managed_win *w) { - return w->state == WSTATE_MAPPING || w->state == WSTATE_FADING || -- w->state == WSTATE_MAPPED || (w->flags & WIN_FLAGS_MAPPED); -+ w->state == WSTATE_MAPPED || w->state == WSTATE_UNMAPPING || -+ w->state == WSTATE_DESTROYING || (w->flags & WIN_FLAGS_MAPPED); - } -diff --git a/src/win.h b/src/win.h -index 432ff66..86504ab 100644 ---- a/src/win.h -+++ b/src/win.h -@@ -171,6 +171,8 @@ struct managed_win { - bool unredir_if_possible_excluded; - /// Whether this window is in open/close state. - bool in_openclose; -+ /// Whether this window was transient when animated on open -+ bool animation_transient; - /// Current position and destination, for animation - double animation_center_x, animation_center_y; - double animation_dest_center_x, animation_dest_center_y; diff --git a/srcpkgs/picom-dccsillag/template b/srcpkgs/picom-dccsillag/template deleted file mode 100644 index cde2e1d..0000000 --- a/srcpkgs/picom-dccsillag/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'picom-dccsillag' -pkgname=picom-dccsillag -version=2022.05.29 -revision=4 -build_style=meson -configure_args="-Dwith_docs=true" -wrksrc="picom-implement-window-animations" -hostmakedepends="pkg-config asciidoc git" -makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel - pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash" -depends="desktop-file-utils" -short_desc="Picom fork with fancy windows animations" -maintainer="Kevin Figueroa " -license="MIT, MPL-2.0" -repository="cereus-extra" -homepage="https://github.com/dccsillag/picom/" -provides="picom" -conflicts="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan picom-git picom-arian8j2 picom-ftlabs" -replaces="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan picom-git picom-arian8j2 picom-ftlabs" -distfiles="https://github.com/dccsillag/picom/archive/refs/heads/implement-window-animations.zip" -checksum=ac8bf6e95f58f83b39dbbd44d9e1e8213767a0d3b48dad6fe1acd8953c76d757 - -post_install() { - vlicense LICENSES/{MIT,MPL-2.0} - vsconf picom.sample.conf -} diff --git a/srcpkgs/picom-ftlabs/template b/srcpkgs/picom-ftlabs/template deleted file mode 100644 index b232d15..0000000 --- a/srcpkgs/picom-ftlabs/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'picom-ftlabs' -pkgname="picom-ftlabs" -version=2024.02.16 -revision=1 -build_style=meson -configure_args="-Dwith_docs=true" -hostmakedepends="pkg-config asciidoc" -makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre2-devel - pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash libglvnd-devel libepoxy-devel" -depends="desktop-file-utils" -_commit="df4c6a3d9b11e14ed7f3142540babea4c775ddb1" -short_desc="Picom fork which features more than 10 unique animation supported (open window, tag change, fading ...)" -maintainer="Kevin Figueroa " -license="MIT, MPL-2.0" -homepage="https://github.com/FT-Labs/picom/" -repository="cereus-extra" -provides="picom" -conflicts="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan picom-arian8j2 picom-dccsillag picom-git" -replaces="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan picom-arian8j2 picom-dccsillag picom-git" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=5f02e1ac8a24624206f447f6de217fca8abdbe1019056378d3ca356cc4f55675 - -post_install() { - vlicense LICENSES/MIT - vlicense COPYING - vsconf picom.sample.conf -} diff --git a/srcpkgs/picom-git/template b/srcpkgs/picom-git/template index ce31437..5496b9e 100644 --- a/srcpkgs/picom-git/template +++ b/srcpkgs/picom-git/template @@ -1,7 +1,7 @@ # Template file for 'picom-git' pkgname="picom-git" version=2024.10.02 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_docs=true" hostmakedepends="pkg-config asciidoc" @@ -10,7 +10,7 @@ makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre2-devel libxdg-basedir-devel uthash libepoxy-devel ruby-asciidoctor" depends="desktop-file-utils" _commit="904a111033e4359e9b112ea574fc56389743e4b3" -short_desc="Lightweight compositor for X11 (previously a compton fork) - git development branch" +short_desc="Lightweight compositor for X11 (previously a compton fork) - git development version" maintainer="Kevin Figueroa " license="MIT, MPL-2.0" homepage="https://github.com/yshui/picom/" diff --git a/srcpkgs/picom-ibhagwan/template b/srcpkgs/picom-ibhagwan/template deleted file mode 100644 index c137088..0000000 --- a/srcpkgs/picom-ibhagwan/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'picom-ibhagwan' -pkgname=picom-ibhagwan -version=2021.11.04 -revision=4 -wrksrc=picom -build_style=meson -repository="cereus-extra" -configure_args="-Dwith_docs=true" -hostmakedepends="pkg-config asciidoc" -makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel - pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash" -depends="desktop-file-utils" -_commit="c4107bb6cc17773fdc6c48bb2e475ef957513c7a" -short_desc="Picom fork which includes blur effects and fade animations" -maintainer="Kevin Figueroa " -license="MIT, MPL-2.0" -homepage="https://github.com/ibhagwan/picom/" -provides="picom" -conflicts="picom picom-jonaburg picom-jonaburg-fix picom-dccsillag picom-git picom-arian8j2 picom-ftlabs" -replaces="picom picom-jonaburg picom-jonaburg-fix picom-dccsillag picom-git picom-arian8j2 picom-ftlabs" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=18df179c01d1663a62e378482eb6a7f40b4df0f961dbf91cdcef4ac8b1cbbde9 - -post_install() { - vlicense LICENSES/MIT - vlicense LICENSES/MPL-2.0 - vsconf picom.sample.conf -} - -picom-ibhagwan_package() { - depends="${sourcepkg}>=${version}_${revision}" - build_style=meta - short_desc+=" (transitional dummy package)" -} diff --git a/srcpkgs/picom-jonaburg-fix/template b/srcpkgs/picom-jonaburg-fix/template deleted file mode 100644 index 77495da..0000000 --- a/srcpkgs/picom-jonaburg-fix/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'picom-jonaburg-fix' -pkgname=picom-jonaburg-fix -reverts="2022.04.17_4" -version=2021.12.21 -revision=1 -wrksrc=picom -build_style=meson -repository="cereus-extra" -configure_args="-Dwith_docs=true" -hostmakedepends="pkg-config asciidoc" -makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel - pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash" -depends="desktop-file-utils" -_commit="31d25da22b44f37cbb9be49fe5c239ef8d00df12" -short_desc="Picom fork which includes rounded corners, animations and blur support (featuring round corners fix)" -maintainer="Kevin Figueroa " -license="MIT, MPL-2.0" -homepage="https://github.com/Arian8j2/picom-jonaburg-fix" -provides="picom" -conflicts="picom picom-jonaburg picom-dccsillag picom-ibhagwan picom-git picom-arian8j2 picom-ftlabs" -replaces="picom picom-jonaburg picom-dccsillag picom-ibhagwan picom-git picom-arian8j2 picom-ftlabs" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=f4675bc96f19ec8ce9d8d59fa470976f432728b00de331f63ffe481383b3b04d - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="Can't build for musl. It's recommended to use picom-dccsillag, picom-ftlabs or picom-git instead" ;; -esac - -post_install() { - vlicense LICENSES/MIT - vsconf picom.sample.conf -} diff --git a/srcpkgs/picom-jonaburg/template b/srcpkgs/picom-jonaburg/template deleted file mode 100644 index 9bb07ed..0000000 --- a/srcpkgs/picom-jonaburg/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'picom-jonaburg' -pkgname=picom-jonaburg -version=2022.03.19 -revision=5 -wrksrc=picom -build_style=meson -repository="cereus-extra" -configure_args="-Dwith_docs=true" -hostmakedepends="pkg-config asciidoc" -makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel - pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel uthash" -depends="desktop-file-utils" -_commit="e3c19cd7d1108d114552267f302548c113278d45" -short_desc="Picom fork which includes rounded corners, basic animations and blur support" -maintainer="Kevin Figueroa " -license="MIT, MPL-2.0" -homepage="https://github.com/jonaburg/picom" -provides="picom" -conflicts="picom picom-dccsillag picom-jonaburg-fix picom-ibhagwan picom-git picom-arian8j2 picom-ftlabs" -replaces="picom picom-dccsillag picom-jonaburg-fix picom-ibhagwan picom-git picom-arian8j2 picom-ftlabs" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=b74fdcba119645f71203abf90fba78b888ae126ab0308b4bfd65868e91b8c4c1 - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="Can't build for musl. It's recommended to use picom-dccsillag, picom-ftlabs or picom-git instead" ;; -esac - -post_install() { - vlicense LICENSES/MIT - vsconf picom.sample.conf -} diff --git a/srcpkgs/picom-manager/files/picom-manager.desktop b/srcpkgs/picom-manager/files/picom-manager.desktop deleted file mode 100644 index dc1d15f..0000000 --- a/srcpkgs/picom-manager/files/picom-manager.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Exec=picom-manager -t -Name=Compositor -Type=Application -Version=1.0 diff --git a/srcpkgs/picom-manager/template b/srcpkgs/picom-manager/template deleted file mode 100644 index 39bd6cd..0000000 --- a/srcpkgs/picom-manager/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'picom-manager' -pkgname=picom-manager -version=2022.11.25 -revision=1 -hostmakedepends="git" -repository="cereus-extra" -short_desc="Custom tool to manage Picom behavior on Cereus Linux" -maintainer="Kevin Figueroa " -license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/picom-manager" -changelog="${homepage}/commits/main" -_conf_dir="/etc/default/picom.conf.d/" - -do_fetch() { - git clone ${homepage} ${wrksrc} -} - -do_install() { - for conf in picom.conf.d/{compatibility,opengl,blur} - do vinstall ${conf} 0644 ${_conf_dir} - done - vinstall ${FILESDIR}/${pkgname}.desktop 0644 etc/xdg/autostart - vbin picom-manager - vlicense LICENSE -} diff --git a/srcpkgs/pix/template b/srcpkgs/pix/template index 0e49178..609a4c0 100644 --- a/srcpkgs/pix/template +++ b/srcpkgs/pix/template @@ -1,7 +1,7 @@ # Template file for 'pix' pkgname=pix version=3.4.3 -revision=1 +revision=2 repository=cereus-extra build_style=meson makedepends="make intltool itstool liboauth-devel libchamplain-devel exiv2-devel glib-devel pkg-config yelp-tools gettext-devel libtool gsettings-desktop-schemas-devel libjpeg-turbo-devel tiff-devel gst-plugins-base1-devel gstreamer1-devel libopenraw-devel clutter-devel clutter-gtk-devel liboauth-devel libchamplain-devel brasero-devel libsecret-devel xapps-devel bison flex libxkbfile-devel" diff --git a/srcpkgs/qelectrotech/template b/srcpkgs/qelectrotech/template index ec17112..e3a5fb6 100644 --- a/srcpkgs/qelectrotech/template +++ b/srcpkgs/qelectrotech/template @@ -1,7 +1,7 @@ # Template file for 'qelectrotech' pkgname=qelectrotech version=0.9 -revision=1 +revision=2 repository="cereus-extra" build_style="qmake" wrksrc=qet-${version} diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template index 79a4f8a..ac20bfa 100644 --- a/srcpkgs/qt-sudo/template +++ b/srcpkgs/qt-sudo/template @@ -1,7 +1,7 @@ # Template file for 'qt-sudo' pkgname=qt-sudo version=2.0.1 -revision=1 +revision=2 #archs="i686 x86_64" build_style=qmake build_helper=qmake6 diff --git a/srcpkgs/redshift-qt/template b/srcpkgs/redshift-qt/template index a97186e..9581e7a 100644 --- a/srcpkgs/redshift-qt/template +++ b/srcpkgs/redshift-qt/template @@ -1,7 +1,7 @@ # Template file for 'redshift-qt' pkgname=redshift-qt version=0.6 -revision=1 +revision=2 build_style=qmake makedepends="qt5-devel" depends="redshift" diff --git a/srcpkgs/resolution-hooks/template b/srcpkgs/resolution-hooks/template index 6cf356a..b1ac40d 100644 --- a/srcpkgs/resolution-hooks/template +++ b/srcpkgs/resolution-hooks/template @@ -1,16 +1,16 @@ # Template file for 'resolution-hooks' pkgname=resolution-hooks -version=2023.01.21 +version=2024.04.12 revision=1 depends="xeventbind" repository="cereus-extra" -_commit="e82aff8546423308e5834703c0b76136073dcfeb" +_commit="adb7c746b94bdf708b9708a81a94b2dc9ffd0eed" short_desc="Custom hooks when monitor resolution changes" maintainer="Kevin Figueroa " license="GPL-3.0-or-later" -homepage="https://github.com/CereusLinuxProject/resolution-hooks" +homepage="https://codeberg.org/cereus-linux/resolution-hooks" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=b70f5a2be4979e6cbf63cb8c4bcb348ab5432b3f5095fc5fccb54df128058b3b +checksum=c7777804c108b7a587be8e7802a6089e75cf7f897a0dbb1f0b52adad76398857 do_install() { for f in resolution-{hooks,monitor}; do diff --git a/srcpkgs/runit-cereus/template b/srcpkgs/runit-cereus/template index 2a8c7b1..6e0ee6d 100644 --- a/srcpkgs/runit-cereus/template +++ b/srcpkgs/runit-cereus/template @@ -2,7 +2,7 @@ pkgname=runit-cereus version=2023.11.24 _version=${version//./} -revision=1 +revision=2 repository=cereus-core wrksrc="void-runit-${_version}" build_style=gnu-makefile diff --git a/srcpkgs/sgnotes/template b/srcpkgs/sgnotes/template index f632217..3b2c672 100644 --- a/srcpkgs/sgnotes/template +++ b/srcpkgs/sgnotes/template @@ -1,7 +1,7 @@ # Template file for 'sgnotes' pkgname=sgnotes version=2024.09.29 -revision=1 +revision=2 build_style=gnu-makefile makedepends="gtk+3-devel gtksourceview-devel pkg-config" _commit="9318a20251447462d1cd55ead4cf58d008db838e" diff --git a/srcpkgs/sierra-dark-fluxbox-theme/template b/srcpkgs/sierra-dark-fluxbox-theme/template index 7e45fc9..dfa7780 100644 --- a/srcpkgs/sierra-dark-fluxbox-theme/template +++ b/srcpkgs/sierra-dark-fluxbox-theme/template @@ -1,6 +1,6 @@ # Template file for 'sierra-dark-fluxbox-theme' pkgname=sierra-dark-fluxbox-theme -version=2022.02.02 +version=2024.04.12 revision=1 theme_dir=usr/share/fluxbox/styles/${pkgname} repository="cereus-extra" @@ -9,9 +9,10 @@ depends="fonts-roboto-ttf" short_desc="MacOS Sierra inspired dark theme for Fluxbox window manager" maintainer="Kevin Figueroa " license="GPL-3.0" -homepage="https://github.com/KF-Art/Sierra-Dark-Fluxbox" -distfiles="${homepage}/archive/refs/heads/main.zip" -checksum=e1bd2fe9874b3004f6c3759d3c800e6b4b112a4a342b3404f161c27fb6c1b452 +homepage="https://codeberg.org/kf_art/sierra-dark-fluxbox" +_commit="4928dc6aa26d67172f1ecd5a4441f2120f1915d8" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=f3178488df88b2892df6b2e881089c5371721edec0a90b569c89ee2338bc6faf do_install() { vmkdir ${theme_dir} diff --git a/srcpkgs/touche/template b/srcpkgs/touche/template index 5e2f273..3539bee 100644 --- a/srcpkgs/touche/template +++ b/srcpkgs/touche/template @@ -1,7 +1,7 @@ # Template file for 'touche' pkgname=touche version=2.0.14 -revision=1 +revision=2 repository="cereus-extra" build_style=meson hostmakedepends="cmake" diff --git a/srcpkgs/touchegg-gce/template b/srcpkgs/touchegg-gce/template deleted file mode 100644 index ecbbabe..0000000 --- a/srcpkgs/touchegg-gce/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'touchegg-gce' -pkgname=touchegg-gce -version=2020.07.22 -repository="cereus-extra" -revision=1 -build_style=qmake -hostmakedepends="git qt5-qmake" -makedepends="qt5-host-tools qt5-devel" -depends="qt5-core" -short_desc="A graphical user interface for touchégg - git branch" -maintainer="Kevin Figueroa " -license="GPL-3.0" -homepage="https://github.com/Raffarti/Touchegg-gce" - -do_fetch() { - git clone ${homepage} ${wrksrc} -} - -post_install() { - vlicense COPYING -} diff --git a/srcpkgs/vc-intrinsics/template b/srcpkgs/vc-intrinsics/template deleted file mode 100644 index 913fb1a..0000000 --- a/srcpkgs/vc-intrinsics/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'vc-intrinsics' -pkgname=vc-intrinsics -version=0.20.1 -revision=1 -build_style=cmake -configure_args="-DLLVM_DIR=/usr/lib/cmake/llvm" -repository="cereus-extra" -hostmakedepends="clang" -makedepends="python3-devel llvm17-devel clang-tools-extra" -short_desc="Set of new intrinsics on top of core LLVM IR instructions that represent SIMD semantics of a program targeting GPU" -maintainer="Kevin Figueroa " -license="MIT" -homepage="https://github.com/intel/vc-intrinsics" -changelog="${homepage}/releases/tag/v${version}" -distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=01a68a3c8299075ad2b094264bef5109d660f1d53faf614f4f95745ad05f4e3e - -post_install() { - vlicense LICENSE.md -} diff --git a/srcpkgs/voidnsrun-setup/template b/srcpkgs/voidnsrun-setup/template index 91435bd..cc848da 100644 --- a/srcpkgs/voidnsrun-setup/template +++ b/srcpkgs/voidnsrun-setup/template @@ -1,6 +1,6 @@ # Template file for 'voidnsrun-setup' pkgname=voidnsrun-setup -version=2022.10.20 +version=2022.10.21 revision=1 wrksrc=voidnsrun-setup-main archs="x86_64-musl x86_64" @@ -11,10 +11,10 @@ short_desc="voidnsrun setup script" maintainer="Kevin Figueroa " license="GPL-3.0" homepage="https://github.com/CereusLinuxProject/voidnsrun-setup" +_commit="9c7c4aa72949cf8ae042f6be0ec3a9667ef0bddf" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=bc3c791355f57e929dcaecb1534527afc8c721269c919cc8bff92ed82f2f3c19 -do_fetch() { - git clone ${homepage} ${wrksrc} -} do_install() { vbin voidnsrun-setup diff --git a/srcpkgs/voidnsrun/template b/srcpkgs/voidnsrun/template index 86c6822..70f39d2 100644 --- a/srcpkgs/voidnsrun/template +++ b/srcpkgs/voidnsrun/template @@ -1,16 +1,17 @@ # Template file for 'voidnsrun' pkgname=voidnsrun version=2021.07.30 -revision=1 +revision=2 wrksrc=voidnsrun-master repository="cereus-extra" hostmakedepends="make gcc" short_desc="Run glibc binaries in musl libc Void Linux (and derivatives) environment and vice-versa" +_commit="6375cdde63ccbbe7b01f650822d4f441093e2afd" maintainer="Kevin Figueroa " license="BSD-2-Clause" homepage="https://github.com/gch1p/voidnsrun" -distfiles="${homepage}/archive/refs/heads/master.zip" -checksum=693ec1c3e225fb5605c5aeb5d06d769d857b95482558fc490f189921d9341850 +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=cbe4493ffa29b50eb79f8a40075f53392029feb9904d146dd6e709789a03a77b do_build() { make run diff --git a/srcpkgs/voidnsundo/template b/srcpkgs/voidnsundo/template index 851a489..420a184 100644 --- a/srcpkgs/voidnsundo/template +++ b/srcpkgs/voidnsundo/template @@ -1,16 +1,17 @@ # Template file for 'voidnsundo' pkgname=voidnsundo version=2021.07.30 -revision=1 +revision=2 wrksrc=voidnsrun-master repository="cereus-extra" hostmakedepends="make gcc" short_desc="Run binaries in the parent mount namespace from within the mount namespace created by voidnsrun" +_commit="6375cdde63ccbbe7b01f650822d4f441093e2afd" maintainer="Kevin Figueroa " license="BSD-2-Clause" homepage="https://github.com/gch1p/voidnsrun" -distfiles="${homepage}/archive/refs/heads/master.zip" -checksum=693ec1c3e225fb5605c5aeb5d06d769d857b95482558fc490f189921d9341850 +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=cbe4493ffa29b50eb79f8a40075f53392029feb9904d146dd6e709789a03a77b do_build() { make undo diff --git a/srcpkgs/wapanel/template b/srcpkgs/wapanel/template index b726426..1b4ddeb 100644 --- a/srcpkgs/wapanel/template +++ b/srcpkgs/wapanel/template @@ -1,7 +1,7 @@ # Template file for 'wapanel' pkgname=wapanel version=1.1.0 -revision=1 +revision=2 build_style=meson hostmakedepends="clang pkg-config git" makedepends="gtk-layer-shell-devel gtk+3-devel wayland-scanner++ pulseaudio-devel" diff --git a/srcpkgs/waterfox-g4-bin/INSTALL.msg b/srcpkgs/waterfox-g4-bin/INSTALL.msg deleted file mode 100644 index 0149b9a..0000000 --- a/srcpkgs/waterfox-g4-bin/INSTALL.msg +++ /dev/null @@ -1,2 +0,0 @@ -The newest generation of Waterfox is G5. -You can find it in our repository as waterfox-g5-bin. diff --git a/srcpkgs/waterfox-g4-bin/files/waterfox.desktop b/srcpkgs/waterfox-g4-bin/files/waterfox.desktop deleted file mode 100644 index e25165c..0000000 --- a/srcpkgs/waterfox-g4-bin/files/waterfox.desktop +++ /dev/null @@ -1,347 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Waterfox G4 -Comment=Browse the World Wide Web -Comment[ar]=تصفح الشبكة العنكبوتية العالمية -Comment[ast]=Restola pela Rede -Comment[bn]=ইন্টারনেট ব্রাউজ করুন -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížení stránek World Wide Webu -Comment[da]=Surf på internettet -Comment[de]=Im Internet surfen -Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) -Comment[es]=Navegue por la web -Comment[et]=Lehitse veebi -Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Naviguer sur le Web -Comment[gl]=Navegar pola rede -Comment[he]=גלישה ברחבי האינטרנט -Comment[hr]=Pretražite web -Comment[hu]=A világháló böngészése -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[ku]=Li torê bigere -Comment[lt]=Naršykite internete -Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pl]=Przeglądaj strony WWW -Comment[pt]=Explorar a Internet com o Waterfox -Comment[pt_BR]=Navegue na Internet -Comment[ro]=Navigați pe Internet -Comment[ru]=Доступ в Интернет -Comment[sk]=Prehliadanie internetu -Comment[sl]=Brskajte po spletu -Comment[sv]=Surfa på webben -Comment[tr]=İnternet'te Gezinin -Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ -Comment[uk]=Перегляд сторінок Інтернету -Comment[vi]=Để duyệt các trang web -Comment[zh_CN]=浏览互联网 -Comment[zh_TW]=瀏覽網際網路 -GenericName=Web Browser -GenericName[ar]=متصفح ويب -GenericName[ast]=Restolador Web -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[ca]=Navegador web -GenericName[cs]=Webový prohlížeč -GenericName[da]=Webbrowser -GenericName[el]=Περιηγητής διαδικτύου -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[it]=Browser web -GenericName[ja]=ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[ku]=Geroka torê -GenericName[lt]=Interneto naršyklė -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=Internetový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Веб-браузер -GenericName[vi]=Trình duyệt Web -GenericName[zh_CN]=网络浏览器 -GenericName[zh_TW]=網路瀏覽器 -Keywords=Internet;WWW;Browser;Web;Explorer; -Keywords[ar]=انترنت;إنترنت;متصفح;ويب;وب; -Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador; -Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer; -Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer; -Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet; -Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen; -Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;Waterfox;Φιρεφοχ;Ιντερνετ; -Keywords[es]=Explorador;Internet;WWW; -Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa; -Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur; -Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה; -Keywords[hr]=Internet;WWW;preglednik;Web; -Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer; -Keywords[it]=Internet;WWW;Browser;Web;Navigatore; -Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk; -Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ; -Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside; -Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online; -Keywords[pl]=Internet;WWW;Przeglądarka;Sieć;Surfowanie;Strona internetowa;Strona;Przeglądanie; -Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador; -Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador; -Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис; -Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer; -Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet; -Keywords[tr]=İnternet;WWW;Tarayıcı;Web;Gezgin;Web sitesi;Site;sörf;çevrimiçi;tara; -Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд; -Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web; -Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;水狐;Waterfox;wf;互联网;网站; -Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;水狐; -Exec=waterfox %u -Terminal=false -X-MuiltpleArgs=false -Type=Application -Icon=waterfox -Categories=Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; -StartupNotify=true -Actions=NewWindow;NewPrivateWindow;ProfileManagerWindow; - -[Desktop Action NewWindow] -Name=Open a New Window -Name[ach]=Dirica manyen -Name[af]=Nuwe venster -Name[an]=Nueva finestra -Name[ar]=نافذة جديدة -Name[as]=নতুন উইন্ডো -Name[ast]=Ventana nueva -Name[az]=Yeni Pəncərə -Name[be]=Новае акно -Name[bg]=Нов прозорец -Name[bn_BD]=নতুন উইন্ডো (N) -Name[bn_IN]=নতুন উইন্ডো -Name[br]=Prenestr nevez -Name[brx]=गोदान उइन्ड'(N) -Name[bs]=Novi prozor -Name[ca]=Finestra nova -Name[cak]=K'ak'a' tzuwäch -Name[cs]=Nové okno -Name[cy]=Ffenestr Newydd -Name[da]=Nyt vindue -Name[de]=Neues Fenster -Name[dsb]=Nowe wokno -Name[el]=Νέο παράθυρο -Name[en_GB]=New Window -Name[en_US]=New Window -Name[en_ZA]=New Window -Name[eo]=Nova fenestro -Name[es_AR]=Nueva ventana -Name[es_CL]=Nueva ventana -Name[es_ES]=Nueva ventana -Name[es_MX]=Nueva ventana -Name[et]=Uus aken -Name[eu]=Leiho berria -Name[fa]=پنجره جدید‌ -Name[ff]=Henorde Hesere -Name[fi]=Uusi ikkuna -Name[fr]=Nouvelle fenêtre -Name[fy_NL]=Nij finster -Name[ga_IE]=Fuinneog Nua -Name[gd]=Uinneag ùr -Name[gl]=Nova xanela -Name[gn]=Ovetã pyahu -Name[gu_IN]=નવી વિન્ડો -Name[he]=חלון חדש -Name[hi_IN]=नया विंडो -Name[hr]=Novi prozor -Name[hsb]=Nowe wokno -Name[hu]=Új ablak -Name[hy_AM]=Նոր Պատուհան -Name[id]=Jendela Baru -Name[is]=Nýr gluggi -Name[it]=Nuova finestra -Name[ja]=新しいウィンドウ -Name[ja_JP-mac]=新規ウインドウ -Name[ka]=ახალი ფანჯარა -Name[kk]=Жаңа терезе -Name[km]=បង្អួច​​​ថ្មី -Name[kn]=ಹೊಸ ಕಿಟಕಿ -Name[ko]=새 창 -Name[kok]=नवें जनेल -Name[ks]=نئئ وِنڈو -Name[lij]=Neuvo barcon -Name[lo]=ຫນ້າຕ່າງໃຫມ່ -Name[lt]=Naujas langas -Name[ltg]=Jauns lūgs -Name[lv]=Jauns logs -Name[mai]=नव विंडो -Name[mk]=Нов прозорец -Name[ml]=പുതിയ ജാലകം -Name[mr]=नवीन पटल -Name[ms]=Tetingkap Baru -Name[my]=ဝင်းဒိုးအသစ် -Name[nb_NO]=Nytt vindu -Name[ne_NP]=नयाँ सञ्झ्याल -Name[nl]=Nieuw venster -Name[nn_NO]=Nytt vindauge -Name[or]=ନୂତନ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ -Name[pl]=Nowe okno -Name[pt_BR]=Nova janela -Name[pt_PT]=Nova janela -Name[rm]=Nova fanestra -Name[ro]=Fereastră nouă -Name[ru]=Новое окно -Name[sat]=नावा विंडो (N) -Name[si]=නව කවුළුවක් -Name[sk]=Nové okno -Name[sl]=Novo okno -Name[son]=Zanfun taaga -Name[sq]=Dritare e Re -Name[sr]=Нови прозор -Name[sv_SE]=Nytt fönster -Name[ta]=புதிய சாளரம் -Name[te]=కొత్త విండో -Name[th]=หน้าต่างใหม่ -Name[tr]=Yeni pencere -Name[tsz]=Eraatarakua jimpani -Name[uk]=Нове вікно -Name[ur]=نیا دریچہ -Name[uz]=Yangi oyna -Name[vi]=Cửa sổ mới -Name[wo]=Palanteer bu bees -Name[xh]=Ifestile entsha -Name[zh_CN]=新建窗口 -Name[zh_TW]=開新視窗 -Exec=waterfox --new-window - -[Desktop Action NewPrivateWindow] -Name=Open a New Private Window -Name[ach]=Dirica manyen me mung -Name[af]=Nuwe privaatvenster -Name[an]=Nueva finestra privada -Name[ar]=نافذة خاصة جديدة -Name[as]=নতুন ব্যক্তিগত উইন্ডো -Name[ast]=Ventana privada nueva -Name[az]=Yeni Məxfi Pəncərə -Name[be]=Новае акно адасаблення -Name[bg]=Нов прозорец за поверително сърфиране -Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো -Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো -Name[br]=Prenestr merdeiñ prevez nevez -Name[brx]=गोदान प्राइभेट उइन्ड' -Name[bs]=Novi privatni prozor -Name[ca]=Finestra privada nova -Name[cak]=K'ak'a' ichinan tzuwäch -Name[cs]=Nové anonymní okno -Name[cy]=Ffenestr Breifat Newydd -Name[da]=Nyt privat vindue -Name[de]=Neues privates Fenster -Name[dsb]=Nowe priwatne wokno -Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης -Name[en_GB]=New Private Window -Name[en_US]=New Private Window -Name[en_ZA]=New Private Window -Name[eo]=Nova privata fenestro -Name[es_AR]=Nueva ventana privada -Name[es_CL]=Nueva ventana privada -Name[es_ES]=Nueva ventana privada -Name[es_MX]=Nueva ventana privada -Name[et]=Uus privaatne aken -Name[eu]=Leiho pribatu berria -Name[fa]=پنجره ناشناس جدید -Name[ff]=Henorde Suturo Hesere -Name[fi]=Uusi yksityinen ikkuna -Name[fr]=Nouvelle fenêtre de navigation privée -Name[fy_NL]=Nij priveefinster -Name[ga_IE]=Fuinneog Nua Phríobháideach -Name[gd]=Uinneag phrìobhaideach ùr -Name[gl]=Nova xanela privada -Name[gn]=Ovetã ñemi pyahu -Name[gu_IN]=નવી ખાનગી વિન્ડો -Name[he]=חלון פרטי חדש -Name[hi_IN]=नयी निजी विंडो -Name[hr]=Novi privatni prozor -Name[hsb]=Nowe priwatne wokno -Name[hu]=Új privát ablak -Name[hy_AM]=Սկսել Գաղտնի դիտարկում -Name[id]=Jendela Mode Pribadi Baru -Name[is]=Nýr huliðsgluggi -Name[it]=Nuova finestra anonima -Name[ja]=新しいプライベートウィンドウ -Name[ja_JP-mac]=新規プライベートウインドウ -Name[ka]=ახალი პირადი ფანჯარა -Name[kk]=Жаңа жекелік терезе -Name[km]=បង្អួច​ឯកជន​ថ្មី -Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ -Name[ko]=새 사생활 보호 모드 -Name[kok]=नवो खाजगी विंडो -Name[ks]=نْو پرایوٹ وینڈو& -Name[lij]=Neuvo barcon privou -Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່ -Name[lt]=Naujas privataus naršymo langas -Name[ltg]=Jauns privatais lūgs -Name[lv]=Jauns privātais logs -Name[mai]=नया निज विंडो (W) -Name[mk]=Нов приватен прозорец -Name[ml]=പുതിയ സ്വകാര്യ ജാലകം -Name[mr]=नवीन वैयक्तिक पटल -Name[ms]=Tetingkap Persendirian Baharu -Name[my]=New Private Window -Name[nb_NO]=Nytt privat vindu -Name[ne_NP]=नयाँ निजी सञ्झ्याल -Name[nl]=Nieuw privévenster -Name[nn_NO]=Nytt privat vindauge -Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ -Name[pl]=Nowe okno prywatne -Name[pt_BR]=Nova janela privativa -Name[pt_PT]=Nova janela privada -Name[rm]=Nova fanestra privata -Name[ro]=Fereastră privată nouă -Name[ru]=Новое приватное окно -Name[sat]=नावा निजेराक् विंडो (W ) -Name[si]=නව පුද්ගලික කවුළුව (W) -Name[sk]=Nové okno v režime Súkromné prehliadanie -Name[sl]=Novo zasebno okno -Name[son]=Sutura zanfun taaga -Name[sq]=Dritare e Re Private -Name[sr]=Нови приватан прозор -Name[sv_SE]=Nytt privat fönster -Name[ta]=புதிய தனிப்பட்ட சாளரம் -Name[te]=కొత్త ఆంతరంగిక విండో -Name[th]=หน้าต่างส่วนตัวใหม่ -Name[tr]=Yeni gizli pencere -Name[tsz]=Juchiiti eraatarakua jimpani -Name[uk]=Приватне вікно -Name[ur]=نیا نجی دریچہ -Name[uz]=Yangi maxfiy oyna -Name[vi]=Cửa sổ riêng tư mới -Name[wo]=Panlanteeru biir bu bees -Name[xh]=Ifestile yangasese entsha -Name[zh_CN]=新建隐私浏览窗口 -Name[zh_TW]=新增隱私視窗 -Exec=waterfox --private-window - -[Desktop Action ProfileManagerWindow] -Name=Open the Profile Manager -Name[cs]=Správa profilů -Name[en_GB]=Profile Manager -Name[en_US]=Profile Manager -Name[pl]=Menedżer Profili -Exec=waterfox --ProfileManager diff --git a/srcpkgs/waterfox-g4-bin/template b/srcpkgs/waterfox-g4-bin/template deleted file mode 100644 index 75035a0..0000000 --- a/srcpkgs/waterfox-g4-bin/template +++ /dev/null @@ -1,59 +0,0 @@ -# Template file for 'waterfox-g4-bin' -pkgname=waterfox-g4-bin -version=4.1.5 -revision=2 -archs="x86_64" -repository="cereus-extra" -build_style=fetch -hostmakedepends="bsdtar" -depends="dbus-glib ffmpeg gtk+ gtk+3 hicolor-icon-theme startup-notification libnotify fontconfig libXt " -short_desc="Fourth generation of customizable privacy-conscious web browser - binary-based package" -maintainer="Kevin Figueroa " -license="MPL-2.0" -homepage="https://github.com/WaterfoxCo/Waterfox" -changelog="https://www.waterfox.net/docs/releases/G${version}" -distfiles="${homepage}/releases/download/G${version}/waterfox-G${version}.en-US.linux-x86_64.tar.bz2" -checksum=13f3c584a90c50ad0fe9006d1fe0906edfdaa02ced99f0f027090d226ed0f942 -conflicts="waterfox-g5-bin watefox-g6-bin" - -do_install() { - vmkdir opt - bsdtar -xf waterfox-G${version}.en-US.linux-x86_64.tar.bz2 \ - -C ${DESTDIR}/opt/ - vmkdir usr/bin - ln -rfs ${DESTDIR}/opt/waterfox/waterfox ${DESTDIR}/usr/bin - - # Copy launcher - vmkdir usr/share/applications - vcopy ${FILESDIR}/waterfox.desktop usr/share/applications - - # Install the icons - for res in 16 32 48 64 128; do - vmkdir usr/share/icons/hicolor/${res}x${res}/apps - vcopy ${DESTDIR}/opt/waterfox/browser/chrome/icons/default/default${res}.png \ - usr/share/icons/hicolor/${res}x${res}/apps/waterfox.png - done - - # Add additional useful settings - install -Dm644 /dev/stdin "${DESTDIR}/opt/waterfox/browser/defaults/preferences/vendor.js" <