diff options
| -rw-r--r-- | .SRCINFO | 66 | ||||
| -rw-r--r-- | PKGBUILD | 60 | ||||
| -rw-r--r-- | kf6-patch.patch | 13 |
3 files changed, 83 insertions, 56 deletions
@@ -1,65 +1,65 @@ pkgbase = thedesk pkgdesc = Desktop Environment built on Qt - pkgver = rc1 - pkgrel = 1 - url = https://github.com/vicr123/thedesk + pkgver = 1.0 + pkgrel = 0 + url = https://github.com/theCheeseboard/thedesk arch = x86_64 + arch = aarch64 license = GPL3 - makedepends = polkit-qt5 - makedepends = qt5-tools - makedepends = the-libs + makedepends = git + makedepends = qt6-tools + makedepends = qt6-positioning + makedepends = cmake + makedepends = clang + makedepends = polkit-qt6-git makedepends = libtdesktopenvironment - makedepends = pulseaudio-qt - makedepends = libx11 - makedepends = libxi - makedepends = xf86-input-libinput - makedepends = networkmanager-qt - makedepends = modemmanager-qt - makedepends = qt5-location - makedepends = libtwebservices - makedepends = bluez-qt + makedepends = pulseaudio-qt6-git + makedepends = networkmanager-qt6 + makedepends = modemmanager-qt6 + makedepends = bluez-qt6 makedepends = qrencode - makedepends = thefile - source = thedesk-rc1::https://github.com/vicr123/thedesk/archive/rc1.tar.gz - sha256sums = e0a8320d4d6aacb5281698edb29f07563620773d371da565f30b7722f93d4681 + makedepends = libthefile + makedepends = contemporary-icons + makedepends = contemporary-widgets + makedepends = ttf-contemporary + source = thedesk-1.0::https://github.com/theCheeseboard/thedesk/archive/refs/tags/v1.0.tar.gz + source = kf6-patch.patch + sha256sums = d9594530e6efce439d98888f9e0ea4e4ec23e9eee1f6c7591c3f3e31ee92546c + sha256sums = SKIP pkgname = thedesk - depends = the-libs depends = kwin depends = libtdesktopenvironment depends = td-polkitagent depends = libthedesk depends = thedesk-platform - depends = pulseaudio-qt + depends = pulseaudio-qt6-git depends = libx11 depends = libxi depends = xf86-input-libinput - depends = networkmanager-qt - depends = modemmanager-qt + depends = networkmanager-qt6 + depends = modemmanager-qt6 depends = accountsservice - depends = qt5-location depends = libtwebservices - depends = bluez-qt + depends = bluez-qt6 depends = qrencode depends = thedesk-xdg-utils depends = xdg-desktop-portal-td + depends = qt6-positioning pkgname = td-polkitagent - depends = the-libs - depends = polkit-qt5 + depends = polkit-qt6-git depends = libtdesktopenvironment pkgname = xdg-desktop-portal-td - depends = the-libs - depends = thefile + depends = libthefile pkgname = thedesk-platform - depends = the-libs + depends = libcontemporary depends = libx11 - optdepends = contemporary-widgets: Default Widget Theme - optdepends = contemporary-icons: Default Icon Theme - optdepends = ttf-contemporary: Default Font + depends = contemporary-widgets + depends = contemporary-icons + depends = ttf-contemporary pkgname = libthedesk - depends = the-libs depends = libtdesktopenvironment @@ -1,60 +1,74 @@ # Maintainer: Victor Tran <vicr12345 at gmail dot com> +_pkg_networkmanager='networkmanager-qt6' +_pkg_modemmanager='modemmanager-qt6' +_pkg_bluez='bluez-qt6' +_pkg_pulseaudio='pulseaudio-qt6-git' +_pkg_polkit='polkit-qt6-git' + pkgname=('thedesk' 'td-polkitagent' 'xdg-desktop-portal-td' 'thedesk-platform' 'libthedesk') -pkgver=rc1 -pkgrel=1 +pkgver=1.0 +pkgrel=0 pkgdesc="Desktop Environment built on Qt" -arch=("x86_64") -url="https://github.com/vicr123/thedesk" +arch=("x86_64" "aarch64") +url="https://github.com/theCheeseboard/thedesk" license=('GPL3') -makedepends=('polkit-qt5' 'qt5-tools' 'the-libs' 'libtdesktopenvironment' 'pulseaudio-qt' 'libx11' 'libxi' 'xf86-input-libinput' 'networkmanager-qt' 'modemmanager-qt' 'qt5-location' 'libtwebservices' 'bluez-qt' 'qrencode' 'thefile') -source=("thedesk-$pkgver"::'https://github.com/vicr123/thedesk/archive/rc1.tar.gz') -sha256sums=('e0a8320d4d6aacb5281698edb29f07563620773d371da565f30b7722f93d4681') +makedepends=('git' 'qt6-tools' 'qt6-positioning' 'cmake' 'clang' $_pkg_polkit 'libtdesktopenvironment' $_pkg_pulseaudio $_pkg_networkmanager $_pkg_modemmanager $_pkg_bluez 'qrencode' 'libthefile' 'contemporary-icons' 'contemporary-widgets' 'ttf-contemporary') +source=("thedesk-$pkgver"::"https://github.com/theCheeseboard/thedesk/archive/refs/tags/v$pkgver.tar.gz" + "kf6-patch.patch") +sha256sums=("d9594530e6efce439d98888f9e0ea4e4ec23e9eee1f6c7591c3f3e31ee92546c" + "SKIP") doInstallModule() { - pushd "$pkgbase-$pkgver/build/$1" - make install INSTALL_ROOT=$pkgdir - popd + DESTDIR="$pkgdir" cmake --install "build/$1" +} + +prepare() { + cd "$pkgname-$pkgver" + patch --forward --strip=1 --input="${srcdir}/kf6-patch.patch" } build() { - cd "$pkgname-$pkgver" - mkdir -p build - cd build - qmake .. - make + cmake -B build -S "$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_PREFIX_PATH='/opt/KF5-qt6/lib/pkgconfig;/opt/KF5-qt6/lib/cmake' \ + -DKF5BluezQt_DIR=/opt/KF5-qt6/lib/cmake/KF5BluezQt \ + -DKF5ModemManagerQt_DIR=/opt/KF5-qt6/lib/cmake/KF5ModemManagerQt \ + -DKF5NetworkManagerQt_DIR=/opt/KF5-qt6/lib/cmake/KF5NetworkManagerQt \ + -DKF5PulseAudioQt_DIR=/opt/KF5-qt6/lib/cmake/KF5PulseAudioQt \ + -DKF_VERSION_MAJOR=5 \ + -DFORCE_STABLE=ON + cmake --build build } package_libthedesk() { - depends=('the-libs' 'libtdesktopenvironment') + depends=('libtdesktopenvironment') doInstallModule 'libthedesk'; } package_thedesk-platform() { - depends=('the-libs' 'libx11') - optdepends=('contemporary-widgets: Default Widget Theme' - 'contemporary-icons: Default Icon Theme' - 'ttf-contemporary: Default Font') + depends=('libcontemporary' 'libx11' 'contemporary-widgets' 'contemporary-icons' 'ttf-contemporary') doInstallModule 'platform' } package_td-polkitagent() { - depends=('the-libs' 'polkit-qt5' 'libtdesktopenvironment') + depends=($_pkg_polkit 'libtdesktopenvironment') doInstallModule 'polkitagent'; } package_xdg-desktop-portal-td() { - depends=('the-libs' 'thefile') + depends=('libthefile') doInstallModule 'desktop-portal' } package_thedesk() { - depends=('the-libs' 'kwin' 'libtdesktopenvironment' 'td-polkitagent' 'libthedesk' 'thedesk-platform' 'pulseaudio-qt' 'libx11' 'libxi' 'xf86-input-libinput' 'networkmanager-qt' 'modemmanager-qt' 'accountsservice' 'qt5-location' 'libtwebservices' 'bluez-qt' 'qrencode' 'thedesk-xdg-utils' 'xdg-desktop-portal-td') + depends=('kwin' 'libtdesktopenvironment' 'td-polkitagent' 'libthedesk' 'thedesk-platform' $_pkg_pulseaudio 'libx11' 'libxi' 'xf86-input-libinput' $_pkg_networkmanager $_pkg_modemmanager 'accountsservice' 'libtwebservices' $_pkg_bluez 'qrencode' 'thedesk-xdg-utils' 'xdg-desktop-portal-td' 'qt6-positioning') doInstallModule 'desktop'; doInstallModule 'plugins'; doInstallModule 'startdesk'; + doInstallModule 'locker'; } diff --git a/kf6-patch.patch b/kf6-patch.patch new file mode 100644 index 000000000000..20acbf78052c --- /dev/null +++ b/kf6-patch.patch @@ -0,0 +1,13 @@ +diff --git a/startdesk/thedesk.desktop.in b/startdesk/thedesk.desktop.in +index f2d3fa5..faf295f 100644 +--- a/startdesk/thedesk.desktop.in ++++ b/startdesk/thedesk.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=${CMAKE_INSTALL_FULL_BINDIR}/startdesk ++Exec=env LD_LIBRARY_PATH=/opt/KF5-qt6/lib/ ${CMAKE_INSTALL_FULL_BINDIR}/startdesk + TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startdesk + DesktopNames=theDesk + Name=theDesk |