diff --git a/aur-repo/serial-studio/PKGBUILD b/aur-repo/serial-studio/PKGBUILD index a605e334..057c010d 100644 --- a/aur-repo/serial-studio/PKGBUILD +++ b/aur-repo/serial-studio/PKGBUILD @@ -12,65 +12,114 @@ url="https://github.com/Serial-Studio/Serial-Studio" license=('MIT') groups=() _qt=qt6 -depends=(gcc-libs +depends=( + avahi + brotli + bzip2 + curl + e2fsprogs + expat + dbus + duktape + gcc-libs + glib2 glibc - $_qt-5compat + gmp + graphite + gnutls + harfbuzz + freetype2 + icu + llvm-libs + libcap + libcups + libdrm + libedit + libelf + libevdev + libffi + libglvnd + libgudev + libjpeg-turbo + libice + libp11-kit + libpciaccess + libpng + libpsl + libidn2 + libnghttp2 + libnghttp3 + libssh2 + libtasn1 + libunistring + libwacom + libx11 + libxau + libxcb + libxdmcp + libxml2 + libxkbcommon + libxshmfence + lm_sensors + keyutils + krb5 + systemd-libs + mesa + mtdev + ncurses + nettle $_qt-base - $_qt-connectivity $_qt-declarative - $_qt-serialport) -makedepends=(git - $_qt-charts + $_qt-connectivity $_qt-location + $_qt-graphs + $_qt-quick3d + $_qt-positioning + $_qt-serialport + $_qt-svg + openssl + pcre2 + util-linux-libs + wayland + xcb-util + xcb-util-image + xcb-util-renderutil + xz + zlib + zstd +) +makedepends=( + cmake + ninja + $_qt-5compat + $_qt-charts # $_qt-quickcontrols2 $_qt-quickeffectmaker - $_qt-svg - $_qt-tools) -provides=(${_pkgname} ${pkgname} ${pkgname}-git) -conflicts=(${_pkgname} ${pkgname} ${pkgname}-git) + $_qt-tools +) +provides=(${_pkgname} ${pkgname}) +conflicts=(${_pkgname} ${pkgname}) replaces=() backup=() options=() install= -source=("${pkgname}::git+${url}.git" - "git+https://github.com/alex-spataru/QSimpleUpdater.git" - "git+https://github.com/iamantony/qtcsv.git" - "git+https://github.com/jothepro/doxygen-awesome-css.git" - "git+https://github.com/alex-spataru/qmqtt.git") -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') +source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz") +sha256sums=('3141605fae37869f4375349bbfa0242ae66b3914ead31ea11866ab3fac2f20e4') noextract=() -pkgver() { - cd "${srcdir}/${pkgname}" - ( - set -o pipefail - git describe --long --tag --abbrev=7 2>/dev/null | sed 's/^v//g;s/\([^-]*-g\)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)" - ) -} +build() { + cd "$srcdir/${_pkgname}-${pkgver}" -prepare() { - git -C "${srcdir}/${pkgname}" clean -dfx - cd "$srcdir/${pkgname}" - git submodule init - git config submodule.libs/QSimpleUpdater.url "$srcdir/QSimpleUpdater" - git config submodule.libs/qtcsv.url "$srcdir/qtcsv" - git config submodule.doc/doxygen/doxygen-awesome-css.url "$srcdir/doxygen-awesome-css" - git config submodule.libs/qmqtt.url "$srcdir/qmqtt" - git -c protocol.file.allow=always submodule update -} + cmake -DCMAKE_BUILD_TYPE=Release \ + -DPRODUCTION_OPTIMIZATION=ON \ + -DCMAKE_INSTALL_PREFIX=/usr/share/serial-studio \ + -DCMAKE_INSTALL_BINDIR=/usr/bin \ + -B build \ + -G Ninja -build() { - cd "$srcdir/${pkgname}" - qmake6 ${_pkgname}.pro CONFIG+=[release] - make -j$(nproc) + ninja -C build } package() { - cd "$srcdir/${pkgname}" - make INSTALL_ROOT="$pkgdir/" install + DESTDIR="${pkgdir}" ninja -C "${srcdir}"/${_pkgname}-${pkgver}/build install } diff --git a/aur-repo/serial-studio/lilac.yaml b/aur-repo/serial-studio/lilac.yaml index e63adebd..f3bd970e 100644 --- a/aur-repo/serial-studio/lilac.yaml +++ b/aur-repo/serial-studio/lilac.yaml @@ -1,14 +1,12 @@ maintainers: - github: taotieren - build_prefix: extra-x86_64 - pre_build: vcs_update - post_build_script: | git_pkgbuild_commit() update_aur_repo() - update_on: - source: github github: Serial-Studio/Serial-Studio + use_max_tag: true + prefix: v