From 75ace1ebafb2e1adfa3f2318b6fc4980d992ff91 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Tue, 9 May 2023 23:35:37 +0500 Subject: [PATCH] Update --- core/calamares/.gitignore | 8 +++ core/calamares/PKGBUILD | 72 +++++++++++++++++++ core/calamares/README.md | 11 +++ core/calamares_local/.gitignore | 10 +++ core/calamares_local/PKGBUILD | 40 +++++++++++ core/calamares_local/README.md | 11 +++ core/linux-keyring/PKGBUILD | 1 + core/linux-mirrorlist/PKGBUILD | 1 + core/paru-bin/PKGBUILD | 1 + core/paru-git/PKGBUILD | 1 + core/paru/PKGBUILD | 1 + design/Fenek/plymouth-theme-fenek/PKGBUILD | 2 +- .../plymouth-theme-lera-sugar/PKGBUILD | 2 +- .../plasma-plasmoid-archupdate/PKGBUILD | 2 +- 14 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 core/calamares/.gitignore create mode 100644 core/calamares/PKGBUILD create mode 100644 core/calamares/README.md create mode 100644 core/calamares_local/.gitignore create mode 100644 core/calamares_local/PKGBUILD create mode 100644 core/calamares_local/README.md diff --git a/core/calamares/.gitignore b/core/calamares/.gitignore new file mode 100644 index 0000000..274fcb4 --- /dev/null +++ b/core/calamares/.gitignore @@ -0,0 +1,8 @@ +*.pkg.tar +*.pkg.tar.* +*.zst +*.zst.* +pkg/ +src/ +.idea/ +/calamares diff --git a/core/calamares/PKGBUILD b/core/calamares/PKGBUILD new file mode 100644 index 0000000..c1154ec --- /dev/null +++ b/core/calamares/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("melawy-$_gitname") +pkgver=3.3.0.1 +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") +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}") +options=(!strip !emptydirs) +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=("95F48000540A4DB146583A47C49B5E77FD80302D") + +# pkgver() { +# cd "$srcdir/$_gitname" +# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +# } + +pkgver() { + cd "${srcdir}/${_gitname}" + printf "3.3.0.%s" "$(git rev-list --count HEAD)" +} + +prepare() { +# cp -rv ../modules/* ${srcdir}/$_pkgname-${pkgver}/src/modules/ + + sed -i -e 's/"Install configuration files" OFF/"Install configuration files" ON/' "${srcdir}/${_gitname}/calamares_eos/CMakeLists.txt" + sed -i -e 's/# DEBUG_FILESYSTEMS/DEBUG_FILESYSTEMS/' "${srcdir}/${_gitname}/calamares_eos/CMakeLists.txt" + sed -i -e "s/desired_size = 512 \* 1024 \* 1024 \# 512MiB/desired_size = 512 \* 1024 \* 1024 \* 4 \# 2048MiB/" "${srcdir}/${_gitname}/calamares_eos/src/modules/fstab/main.py" + sed -i -e "s|CALAMARES_VERSION 3.3.0-alpha3|CALAMARES_VERSION $pkgver|g" "${srcdir}/${_gitname}/calamares_eos/CMakeLists.txt" +} + +build() { + mkdir -p "${_gitname}/calamares/build" + + cmake -B "${_gitname}/calamares/build" -S "${_gitname}/calamares_eos" \ + -DWEBVIEW_FORCE_WEBKIT=OFF \ + -DWITH_PYTHONQT=ON \ + -DWITH_KF5DBus=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DSKIP_MODULES="dummyprocess dummypython dummycpp dummypythonqt \ + dracut dracutlukscfg initramfs initramfscfg initcpio \ + webview tracking services-openrc \ + keyboardq localeq welcomeq finishedq \ + license notesqml oemid \ + openrcdmcryptcfg plymouthcfg plasmalnf \ + summaryq usersq" + + export DESTDIR="${_gitname}/calamares/build" + make -j $(nproc) -C "${_gitname}/calamares/build" +} + +package() { + make -C "${srcdir}/${_gitname}/calamares/build" DESTDIR="${pkgdir}" install + 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" + install -dm 755 "${pkgdir}/etc" + cp -rp "${srcdir}/${_gitname}/calamares/configs/melawy" "${pkgdir}/etc/calamares" +} diff --git a/core/calamares/README.md b/core/calamares/README.md new file mode 100644 index 0000000..2a9cf33 --- /dev/null +++ b/core/calamares/README.md @@ -0,0 +1,11 @@ +# calamares +Installer for Melawy Linux + +### Donate +[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) + +[YooMoney](https://yoomoney.ru/to/4100115921160758) + +[Qiwi](https://qiwi.com/n/VALERIAFADEEVA) + +Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f diff --git a/core/calamares_local/.gitignore b/core/calamares_local/.gitignore new file mode 100644 index 0000000..02e0e4b --- /dev/null +++ b/core/calamares_local/.gitignore @@ -0,0 +1,10 @@ +*.pkg.tar +*.pkg.tar.* +*.zst +*.zst.* +*.tar +*.tar.gz +pkg/ +src/ +.idea/ +calamares_local diff --git a/core/calamares_local/PKGBUILD b/core/calamares_local/PKGBUILD new file mode 100644 index 0000000..68d7a6e --- /dev/null +++ b/core/calamares_local/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("melawy-$_gitname") +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") +optdepends=() +makedepends=('git') +backup=() +provides=("${pkgname}") +conflicts=("calamares" "${pkgname}") +options=(!strip !emptydirs) +source=("file:///disk/github/active/Melawy/Melawy-Dev/CORE/calamares_local/calamares.tar.gz") +sha256sums=("SKIP") +validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') + +# pkgver() { +# cd "${srcdir}/$_gitname" +# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +# } + +# pkgver() { +# cd "${srcdir}/$_gitname" +# printf "3.3.0.%s" "$(git rev-list --count HEAD)" +# } + +package() { + make -C ${srcdir}/calamares/build DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/calamares/melawy-linux.desktop" "${pkgdir}/usr/share/applications/melawy-linux.desktop" + install -Dm644 "${srcdir}/calamares/melawy-linux-debugging.desktop" "${pkgdir}/usr/share/applications/melawy-linux-debugging.desktop" + install -Dm755 "${srcdir}/calamares/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" + rm "${pkgdir}/usr/share/applications/calamares.desktop" + install -dm 755 "${pkgdir}/etc" + cp -rp "${srcdir}/calamares/configs/melawy" "${pkgdir}/etc/calamares" +} diff --git a/core/calamares_local/README.md b/core/calamares_local/README.md new file mode 100644 index 0000000..2a9cf33 --- /dev/null +++ b/core/calamares_local/README.md @@ -0,0 +1,11 @@ +# calamares +Installer for Melawy Linux + +### Donate +[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) + +[YooMoney](https://yoomoney.ru/to/4100115921160758) + +[Qiwi](https://qiwi.com/n/VALERIAFADEEVA) + +Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f diff --git a/core/linux-keyring/PKGBUILD b/core/linux-keyring/PKGBUILD index cd23141..4ff9fad 100644 --- a/core/linux-keyring/PKGBUILD +++ b/core/linux-keyring/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Valeria Fadeeva + _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") pkgver=1.1 diff --git a/core/linux-mirrorlist/PKGBUILD b/core/linux-mirrorlist/PKGBUILD index 75bfa05..5f3a4c9 100644 --- a/core/linux-mirrorlist/PKGBUILD +++ b/core/linux-mirrorlist/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Valeria Fadeeva + _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") pkgver=1.1 diff --git a/core/paru-bin/PKGBUILD b/core/paru-bin/PKGBUILD index b135a3b..de018f9 100644 --- a/core/paru-bin/PKGBUILD +++ b/core/paru-bin/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Morgan + pkgname=paru-bin pkgver=1.11.2 pkgrel=1 diff --git a/core/paru-git/PKGBUILD b/core/paru-git/PKGBUILD index 46eff0c..fc1e356 100644 --- a/core/paru-git/PKGBUILD +++ b/core/paru-git/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Morgan + pkgname=paru-git _pkgname=paru pkgver=1.11.2.r167.g257e011 diff --git a/core/paru/PKGBUILD b/core/paru/PKGBUILD index e2a82da..37f85c6 100644 --- a/core/paru/PKGBUILD +++ b/core/paru/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Morgan + pkgname=paru pkgver=1.11.1 pkgrel=1 diff --git a/design/Fenek/plymouth-theme-fenek/PKGBUILD b/design/Fenek/plymouth-theme-fenek/PKGBUILD index 7a67980..7292304 100644 --- a/design/Fenek/plymouth-theme-fenek/PKGBUILD +++ b/design/Fenek/plymouth-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://github.com/Melawy/$_gitname" diff --git a/design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD b/design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD index cf6de7c..de598c9 100644 --- a/design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD +++ b/design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://github.com/Melawy/$_gitname" diff --git a/design/Melawy/plasma-plasmoid-archupdate/PKGBUILD b/design/Melawy/plasma-plasmoid-archupdate/PKGBUILD index 8de2f85..580f1cf 100644 --- a/design/Melawy/plasma-plasmoid-archupdate/PKGBUILD +++ b/design/Melawy/plasma-plasmoid-archupdate/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://github.com/Melawy/$_gitname"