From 66ec07523c83679288fabd9d18cadc3efb1e7c7b Mon Sep 17 00:00:00 2001 From: AsukaMinato Date: Thu, 26 Oct 2023 07:28:47 +0900 Subject: [PATCH 1/2] fix-some-errors --- .SRCINFO | 61 ++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 128 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4f2fd46..cb6c91c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,6 +5,67 @@ pkgbase = activitywatch-bin url = https://github.com/ActivityWatch/activitywatch arch = x86_64 license = MPL2 + depends = freetype2 + depends = libgcrypt + depends = at-spi2-core + depends = glibc + depends = fontconfig + depends = libxdamage + depends = libbsd + depends = pcre2 + depends = pango + depends = libxrender + depends = xcb-util + depends = libxfixes + depends = qt6-base + depends = harfbuzz + depends = libxinerama + depends = libglvnd + depends = xz + depends = qt6-webengine + depends = libxcursor + depends = glib2 + depends = libdatrie + depends = wayland + depends = gcc-libs + depends = pixman + depends = libx11 + depends = bash + depends = zlib + depends = lz4 + depends = systemd-libs + depends = libxi + depends = bzip2 + depends = cairo + depends = libxcomposite + depends = openssl-1.1 + depends = sqlite + depends = xcb-util-cursor + depends = keyutils + depends = libepoxy + depends = util-linux-libs + depends = qt6-svg + depends = readline + depends = dbus + depends = libgpg-error + depends = libxcb + depends = gdk-pixbuf2 + depends = libxkbcommon + depends = krb5 + depends = libxkbcommon-x11 + depends = qt6-wayland + depends = libxrandr + depends = gtk3 + depends = xcb-util-image + depends = xcb-util-renderutil + depends = xcb-util-wm + depends = libxext + depends = e2fsprogs + depends = libpng + depends = libdrm + depends = xcb-util-keysyms + depends = fribidi + depends = libthai provides = activitywatch conflicts = activitywatch source = https://github.com/ActivityWatch/activitywatch/releases/download/v0.12.3b12/activitywatch-v0.12.3b12-linux-x86_64.zip diff --git a/PKGBUILD b/PKGBUILD index f4f0875..a366a26 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,21 +14,83 @@ license=('MPL2') provides=("activitywatch") conflicts=("activitywatch") depends=( - #'qt5-base' - #'qt5-svg' + #'qt6-base' + #'qt6-svg' #'gtk3' #'openssl-1.0' +freetype2 +libgcrypt +at-spi2-core +glibc +fontconfig +libxdamage +libbsd +pcre2 +pango +libxrender +xcb-util +libxfixes +qt6-base +harfbuzz +libxinerama +libglvnd +xz +qt6-webengine +libxcursor +glib2 +libdatrie +wayland +gcc-libs +pixman +libx11 +bash +zlib +lz4 +systemd-libs +libxi +bzip2 +cairo +libxcomposite +openssl-1.1 +sqlite +xcb-util-cursor +keyutils +libepoxy +util-linux-libs +qt6-svg +readline +dbus +libgpg-error +libxcb +gdk-pixbuf2 +libxkbcommon +krb5 +libxkbcommon-x11 +qt6-wayland +libxrandr +gtk3 +xcb-util-image +xcb-util-renderutil +xcb-util-wm +libxext +e2fsprogs +libpng +libdrm +xcb-util-keysyms +fribidi +libthai + ) source=("https://github.com/ActivityWatch/activitywatch/releases/download/v${pkgver}/activitywatch-v${pkgver}-linux-x86_64.zip") md5sums=('74f605bf34f9f352261ca9a53cc32082') package() { # Install into /opt/activitywatch - mkdir -p $pkgdir/opt + install -d $pkgdir/opt cp -r activitywatch $pkgdir/opt # Symlink executables to /usr/bin - mkdir -p $pkgdir/usr/bin + install -d $pkgdir/usr/bin execnames=("aw-qt") for name in "${execnames[@]}"; do ln -s /opt/activitywatch/$name $pkgdir/usr/bin/$name @@ -40,8 +102,7 @@ package() { done # Add .desktop file for autostart - mkdir -p $pkgdir/etc/xdg/autostart - cp activitywatch/aw-qt.desktop $pkgdir/etc/xdg/autostart + install -Dm644 activitywatch/aw-qt.desktop -t $pkgdir/etc/xdg/autostart # See: https://aur.archlinux.org/packages/activitywatch-bin/#comment-834170 #rm $pkgdir/opt/activitywatch/libharfbuzz.so* From bebb3b2bb56bb3df9d6e8fc957bdd0d155ece279 Mon Sep 17 00:00:00 2001 From: AsukaMinato Date: Thu, 26 Oct 2023 07:32:12 +0900 Subject: [PATCH 2/2] bump pkgrel --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cb6c91c..59416bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = activitywatch-bin pkgdesc = Log what you do on your computer. Simple, extensible, no third parties. pkgver = 0.12.3b12 - pkgrel = 2 + pkgrel = 3 url = https://github.com/ActivityWatch/activitywatch arch = x86_64 license = MPL2 diff --git a/PKGBUILD b/PKGBUILD index a366a26..7adba57 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=activitywatch-bin pkgver='0.12.3b12' -pkgrel=2 +pkgrel=3 epoch= pkgdesc="Log what you do on your computer. Simple, extensible, no third parties." arch=('x86_64')