From 8a17f1acd2e7533f3ae965d1de4f12d17feb717e Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Fri, 12 May 2023 01:09:57 +0500 Subject: [PATCH] Update --- core/calamares/PKGBUILD | 14 +++++++++----- core/calamares_local/PKGBUILD | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/core/calamares/PKGBUILD b/core/calamares/PKGBUILD index c1154ec..74c8121 100644 --- a/core/calamares/PKGBUILD +++ b/core/calamares/PKGBUILD @@ -2,15 +2,19 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=3.3.0.1 +pkgver=3.3.0.2 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("i686" "x86_64") url="https://github.com/Melawy/$_gitname" license=("AGPL") -depends=("boost" "boost-libs" "ckbcomp" "cryptsetup" "dmidecode" "doxygen" "efibootmgr" "extra-cmake-modules" "gptfdisk" "gtk-update-icon-cache" "hwinfo" "icu" "kconfig" "kcoreaddons" "ki18n" "kiconthemes" "kio" "kparts" "kpmcore" "kservice" "kwidgetsaddons" "libpwquality" "mkinitcpio-openswap" "networkmanager" "plasma-framework" "polkit-qt5" "python" "qt5-quickcontrols2" "qt5-svg" "qt5-tools" "qt5-translations" "qt5-webengine" "qt5-xmlpatterns" "rsync" "solid" "squashfs-tools" "upower" "yaml-cpp") + +depends=('appstream-qt' 'boost' 'boost-libs' 'ckbcomp' 'cmake' 'cryptsetup' 'dmidecode' 'doxygen' 'efibootmgr' 'extra-cmake-modules' 'git' 'gptfdisk' 'gtk-update-icon-cache' 'hwinfo' 'icu' 'kconfig' 'kcoreaddons' 'kdbusaddons' 'ki18n' 'kiconthemes' 'kio' 'kparts' 'kpmcore' 'kservice' 'kwidgetsaddons' 'libpwquality' 'mkinitcpio-openswap' 'networkmanager' 'plasma-framework' 'polkit-qt5' 'python' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webengine' 'qt5-xmlpatterns' 'rsync' 'solid' 'squashfs-tools' 'upower' 'yaml-cpp') + +makedepends=('appstream-qt' 'boost' 'boost-libs' 'ckbcomp' 'cmake' 'cryptsetup' 'dmidecode' 'doxygen' 'efibootmgr' 'extra-cmake-modules' 'git' 'gptfdisk' 'gtk-update-icon-cache' 'hwinfo' 'icu' 'kconfig' 'kcoreaddons' 'kdbusaddons' 'ki18n' 'kiconthemes' 'kio' 'kparts' 'kpmcore' 'kservice' 'kwidgetsaddons' 'libpwquality' 'mkinitcpio-openswap' 'networkmanager' 'plasma-framework' 'polkit-qt5' 'python' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webengine' 'qt5-xmlpatterns' 'rsync' 'solid' 'squashfs-tools' 'upower' 'yaml-cpp') + optdepends=() -makedepends=("git" "cmake" "python-jsonschema" "python-pyaml" "python-unidecode" "boost" "boost-libs" "ckbcomp" "cryptsetup" "dmidecode" "doxygen" "efibootmgr" "extra-cmake-modules" "gptfdisk" "gtk-update-icon-cache" "hwinfo" "icu" "kconfig" "kcoreaddons" "ki18n" "kiconthemes" "kio" "kparts" "kpmcore" "kservice" "kwidgetsaddons" "libpwquality" "mkinitcpio-openswap" "networkmanager" "plasma-framework" "polkit-qt5" "python" "qt5-quickcontrols2" "qt5-svg" "qt5-tools" "qt5-translations" "qt5-webengine" "qt5-xmlpatterns" "rsync" "solid" "squashfs-tools" "upower" "yaml-cpp") + backup=() provides=("${pkgname}") conflicts=("calamares" "${pkgname}") @@ -66,7 +70,7 @@ package() { install -Dm644 "${srcdir}/${_gitname}/calamares/melawy-linux.desktop" "${pkgdir}/usr/share/applications/melawy-linux.desktop" install -Dm644 "${srcdir}/${_gitname}/calamares/melawy-linux-debugging.desktop" "${pkgdir}/usr/share/applications/melawy-linux-debugging.desktop" install -Dm755 "${srcdir}/${_gitname}/calamares/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" - rm "${pkgdir}/usr/share/applications/calamares.desktop" + #rm "${pkgdir}/usr/share/applications/calamares.desktop" install -dm 755 "${pkgdir}/etc" - cp -rp "${srcdir}/${_gitname}/calamares/configs/melawy" "${pkgdir}/etc/calamares" + cp -rp "${srcdir}/${_gitname}/calamares/configs/melawy-linux" "${pkgdir}/etc/calamares" } diff --git a/core/calamares_local/PKGBUILD b/core/calamares_local/PKGBUILD index 68d7a6e..1fea08b 100644 --- a/core/calamares_local/PKGBUILD +++ b/core/calamares_local/PKGBUILD @@ -8,9 +8,13 @@ pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('i686' 'x86_64') url="https://github.com/Melawy/$_gitname" license=('AGPL') -depends=("boost" "boost-libs" "ckbcomp" "cryptsetup" "dmidecode" "doxygen" "efibootmgr" "extra-cmake-modules" "gptfdisk" "gtk-update-icon-cache" "hwinfo" "icu" "kconfig" "kcoreaddons" "ki18n" "kiconthemes" "kio" "kparts" "kpmcore" "kservice" "kwidgetsaddons" "libpwquality" "mkinitcpio-openswap" "networkmanager" "plasma-framework" "polkit-qt5" "python" "qt5-quickcontrols2" "qt5-svg" "qt5-tools" "qt5-translations" "qt5-webengine" "qt5-xmlpatterns" "rsync" "solid" "squashfs-tools" "upower" "yaml-cpp") + +depends=('appstream-qt' 'boost' 'boost-libs' 'ckbcomp' 'cmake' 'cryptsetup' 'dmidecode' 'doxygen' 'efibootmgr' 'extra-cmake-modules' 'git' 'gptfdisk' 'gtk-update-icon-cache' 'hwinfo' 'icu' 'kconfig' 'kcoreaddons' 'kdbusaddons' 'ki18n' 'kiconthemes' 'kio' 'kparts' 'kpmcore' 'kservice' 'kwidgetsaddons' 'libpwquality' 'mkinitcpio-openswap' 'networkmanager' 'plasma-framework' 'polkit-qt5' 'python' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webengine' 'qt5-xmlpatterns' 'rsync' 'solid' 'squashfs-tools' 'upower' 'yaml-cpp') + +makedepends=('appstream-qt' 'boost' 'boost-libs' 'ckbcomp' 'cmake' 'cryptsetup' 'dmidecode' 'doxygen' 'efibootmgr' 'extra-cmake-modules' 'git' 'gptfdisk' 'gtk-update-icon-cache' 'hwinfo' 'icu' 'kconfig' 'kcoreaddons' 'kdbusaddons' 'ki18n' 'kiconthemes' 'kio' 'kparts' 'kpmcore' 'kservice' 'kwidgetsaddons' 'libpwquality' 'mkinitcpio-openswap' 'networkmanager' 'plasma-framework' 'polkit-qt5' 'python' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webengine' 'qt5-xmlpatterns' 'rsync' 'solid' 'squashfs-tools' 'upower' 'yaml-cpp') + optdepends=() -makedepends=('git') + backup=() provides=("${pkgname}") conflicts=("calamares" "${pkgname}")