From 402abb10c0afedd703be729d191c42d49dd0e508 Mon Sep 17 00:00:00 2001 From: sulincix Date: Sun, 26 May 2024 18:56:52 +0000 Subject: [PATCH] updates --- app/editor/nano/ympbuild | 27 ++++++++++-------- app/emulation/qemu/ympbuild | 35 +++++++++++++++++++----- app/misc/tmux/ympbuild | 6 ++-- dev/libs/wayland-protocols/ympbuild | 6 ++-- x11/base/xorg-xwayland/ympbuild | 6 ++-- x11/misc/lightdm-pardus-greeter/ympbuild | 8 +++--- x11/misc/sddm/ympbuild | 14 +++++----- 7 files changed, 64 insertions(+), 38 deletions(-) diff --git a/app/editor/nano/ympbuild b/app/editor/nano/ympbuild index 711a552b..c84bd8af 100644 --- a/app/editor/nano/ympbuild +++ b/app/editor/nano/ympbuild @@ -1,24 +1,26 @@ #!/usr/bin/env bash name='nano' -release='2' -version='7.2' +release='3' +version='8.0' url='https://www.nano-editor.org/download.php' description='Pico editor clone with enhancements' email='parduscix@yandex.ru' maintainer='sulincix' license=('GPLv3') -source=("https://www.nano-editor.org/dist/v7/nano-$version.tar.xz" - "https://github.com/scopatz/nanorc/archive/refs/tags/2020.10.10.tar.gz" +_commit="ff189e2baa8d89f44b5f58ea7da7aac04ee4ad8b" +source=("https://www.nano-editor.org/dist/v8/nano-$version.tar.xz" + "https://github.com/galenguyer/nano-syntax-highlighting/archive/${_commit}.zip" "nanorc" "nano.desktop" "icon.svg") depends=(file zlib ncurses bzip2) makedepends=() -md5sums=('13742c686c6ddb0b7b294634f0c13cec' - 'fef2d5f43ac31ea0cad2cd7aed0d8255' - 'SKIP' - 'SKIP' - 'SKIP') +sha256sums=('c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4' + '9e836760f61473a7a6ae28ac5e10b8d5b26f0415d1bd0c85d56d9b09e27a9fe1' + 'SKIP' + 'SKIP' + 'SKIP' +) uses=(nanorc) arch=('x86_64') group=(app.editor) @@ -43,9 +45,12 @@ package(){ mkdir -p ${DESTDIR}/etc install ../nanorc ${DESTDIR}/etc/nanorc # install extra nanorc files - cd ../nanorc-2020.10.10 + cd ../nano-syntax-highlighting-${_commit} for file in ./*.nanorc ; do if [[ ! -f ${DESTDIR}/usr/share/nano/$file ]] ; then + # black color is buggy with dark themes so replace with green + sed -i "s/color black/ color green/g" $file + sed -i "s/color brightblack/ color brightgreen/g" $file install $file ${DESTDIR}/usr/share/nano/ fi done @@ -54,6 +59,6 @@ package(){ mkdir -p ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/ install ../nano.desktop ${DESTDIR}/usr/share/applications install ../icon.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/nano.svg - + } diff --git a/app/emulation/qemu/ympbuild b/app/emulation/qemu/ympbuild index 18dacc9f..dcfb9e0b 100644 --- a/app/emulation/qemu/ympbuild +++ b/app/emulation/qemu/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='qemu' -release='1' -version='8.1.2' +release='2' +version='9.0.0' url='https://qemu.org' description='Quick Emulator' email='aliriza.keskin@pardus.org.tr' @@ -14,7 +14,7 @@ depends=(alsa-lib bzip2 curl cyrus-sasl eudev fuse glib pipewire ) makedepends=() -md5sums=('f7e3443d5b62afa0c10771ad42c5e17a') +sha256sums=('32708ac66c30d8c892633ea968c771c1c76d597d70ddead21a0d22ccf386da69') group=(app.emulation) uses=(gtk vnc) arch=('x86_64') @@ -24,21 +24,42 @@ gtk_depends=(gtk3 vte3) cd $name-$version +prepare(){ + cd .. + cp -prf $name-$version $name-$version.static +} + setup () { - ./configure --prefix=/usr \ + + opts=( --libdir=/usr/lib64/ \ - --enable-slirp \ - --target-list=x86_64-softmmu,aarch64-linux-user,aarch64-softmmu \ --disable-zstd \ + ) + # configure system + ./configure --prefix=/usr \ + --disable-linux-user \ + --target-list=x86_64-softmmu,aarch64-softmmu \ + --enable-slirp \ $(use_opt gtk --enable-gtk --disable-gtk) \ - $(use_opt vnc --enable-vnc --disable-vnc) + $(use_opt vnc --enable-vnc --disable-vnc) \ + ${opts[@]} + # configure user static + cd ../$name-$version.static + ./configure --prefix=/usr \ + --disable-system \ + --enable-linux-user \ + --static \ + --target-list=aarch64-linux-user,x86_64-linux-user \ + ${opts[@]} } build () { + make -C ../$name-$version.static $jobs make $jobs } package () { + make -C ../$name-$version.static install $jobs make install $jobs } diff --git a/app/misc/tmux/ympbuild b/app/misc/tmux/ympbuild index 48e6e347..060a8add 100644 --- a/app/misc/tmux/ympbuild +++ b/app/misc/tmux/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='tmux' -release='1' -version='3.3a' +release='2' +version='3.4' url='https://github.com/tmux/tmux' description='Teminal multiplexer' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://github.com/tmux/tmux/releases/download/$version/tmux-$version.tar.gz") depends=(ncurses libevent) makedepends=() -md5sums=('8eee5883b9f6550fa4efaad0c9ec38f3') +sha256sums=('551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa') group=(app.misc) uses=() arch=('x86_64') diff --git a/dev/libs/wayland-protocols/ympbuild b/dev/libs/wayland-protocols/ympbuild index 22a33fbb..44cc843e 100644 --- a/dev/libs/wayland-protocols/ympbuild +++ b/dev/libs/wayland-protocols/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='wayland-protocols' -release='3' -version='1.33' +release='4' +version='1.36' url='https://gitlab.freedesktop.org/wayland/wayland-protocols' description='Wayland protocol files' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$version/downloads/wayland-protocols-$version.tar.xz") depends=(wayland) makedepends=() -md5sums=('6af4d3a18fbfc7d8aa3f9ccf5b4743f3') +sha256sums=('71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92') group=(dev.libs) uses=() arch=('x86_64') diff --git a/x11/base/xorg-xwayland/ympbuild b/x11/base/xorg-xwayland/ympbuild index a7949b41..fea12597 100644 --- a/x11/base/xorg-xwayland/ympbuild +++ b/x11/base/xorg-xwayland/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='xorg-xwayland' -release='1' -version='23.2.1' +release='2' +version='24.1.0' url='https://xorg.freedesktop.org/archive/individual/xserver/' description='Standalone X server running under Wayland' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://xorg.freedesktop.org/archive/individual/xserver/xwayland-$version.tar.xz") depends=(wayland libdrm libepoxy libglvnd libXau libxcvt mesa nettle pixman libxkbfile libXfont2 libfontenc) makedepends=() -md5sums=('e46e0454a9aa8a6a732bdaf7875ea86e') +sha256sums=('bef21c4f18807a4ed571c4e2df60ab63b5466bbd502ecceb2485b892ab76dcc2') group=(x11.base) uses=() arch=('x86_64') diff --git a/x11/misc/lightdm-pardus-greeter/ympbuild b/x11/misc/lightdm-pardus-greeter/ympbuild index bfae72a7..f2e06f7d 100644 --- a/x11/misc/lightdm-pardus-greeter/ympbuild +++ b/x11/misc/lightdm-pardus-greeter/ympbuild @@ -1,16 +1,16 @@ #!/usr/bin/env bash name='lightdm-pardus-greeter' -release='1' -version='0.0.5' +release='2' +version='0.0.8' url='https://github.com/pardus/pardus-lightdm-greeter' description='Lightdm greeter for Pardus' email='aliriza.keskin@pardus.org.tr' maintainer='aliriza' license=('GPLv3') -source=('https://github.com/pardus/pardus-lightdm-greeter/archive/refs/tags/debian/0.0.5.tar.gz') +source=("https://github.com/pardus/pardus-lightdm-greeter/archive/refs/tags/debian/$version.tar.gz") depends=(lightdm py3-pygobject py3-cairo) makedepends=() -md5sums=('ad5d9abdd370c66e389a7bf37e086935') +sha256sums=('f87f6fcdea323f0f0c3c3fea22240531553f1ef1bd0d2303f93d6e0fe4d25281') group=(x11.misc) uses=() arch=('x86_64') diff --git a/x11/misc/sddm/ympbuild b/x11/misc/sddm/ympbuild index 169ee79b..b0bfb360 100644 --- a/x11/misc/sddm/ympbuild +++ b/x11/misc/sddm/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='sddm' -release='1' -version='0.20.0' +release='2' +version='0.21.0' url='https://github.com/sddm/sddm' description='Simple Desktop Display Manager' email='akarsu@protonmail.com' @@ -11,9 +11,9 @@ source=("https://github.com/sddm/sddm/archive/v${version}/sddm-v${version}.tar.g "sddm.initd" "sddm.confd" "sddm.pam") -depends=(qt5-declarative xauth xorg-server) -makedepends=(extra-cmake-modules py3-docutils qt5-tools) -md5sums=('7af67d5fb767639861d35c80eb4e1191' 'SKIP' 'SKIP' 'SKIP') +depends=(qt6-base qt6-declarative xauth xorg-server elogind libXau libxcb) +makedepends=(extra-cmake-modules py3-docutils qt6-tools) +sha256sums=('f895de2683627e969e4849dbfbbb2b500787481ca5ba0de6d6dfdae5f1549abf' 'SKIP' 'SKIP' 'SKIP') group=(x11.misc) uses=() arch=('x86_64') @@ -25,9 +25,9 @@ export CXXFLAGS="$CXXFLAGS -flto=auto" setup () { cmake -B build -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_LIBDIR=lib64 \ -DBUILD_MAN_PAGES=ON \ - -DBUILD_WITH_QT6=OFF \ + -DBUILD_WITH_QT6=ON \ -DENABLE_JOURNALD=OFF \ -DNO_SYSTEMD=ON \ -DUSE_ELOGIND=ON \