diff --git a/timetable-bin/.SRCINFO b/timetable-bin/.SRCINFO index e1ccc4c..805e0cf 100644 --- a/timetable-bin/.SRCINFO +++ b/timetable-bin/.SRCINFO @@ -1,15 +1,18 @@ pkgbase = timetable-bin - pkgdesc = GTK4 + LibAdwaita client for WebUntis (prebuilt, bundles python-webuntis) + pkgdesc = GTK4 + LibAdwaita client for WebUntis (prebuilt) pkgver = 4.0 - pkgrel = 1 + pkgrel = 2 url = https://codeberg.org/ostfriese4/untis arch = any license = GPL-3.0-or-later depends = gtk4 depends = libadwaita + depends = webkitgtk-6.0 + depends = libsecret depends = python depends = python-gobject depends = python-requests + depends = python-pyotp depends = glib2 depends = hicolor-icon-theme provides = untis diff --git a/timetable-bin/PKGBUILD b/timetable-bin/PKGBUILD index 1336163..91fe402 100644 --- a/timetable-bin/PKGBUILD +++ b/timetable-bin/PKGBUILD @@ -4,12 +4,13 @@ pkgname=timetable-bin pkgver=4.0 -pkgrel=1 -pkgdesc="GTK4 + LibAdwaita client for WebUntis (prebuilt, bundles python-webuntis)" +pkgrel=2 +pkgdesc="GTK4 + LibAdwaita client for WebUntis (prebuilt)" arch=('any') url="https://codeberg.org/ostfriese4/untis" license=('GPL-3.0-or-later') -depends=('gtk4' 'libadwaita' 'python' 'python-gobject' 'python-requests' 'glib2' 'hicolor-icon-theme') +depends=('gtk4' 'libadwaita' 'webkitgtk-6.0' 'libsecret' 'python' 'python-gobject' + 'python-requests' 'python-pyotp' 'glib2' 'hicolor-icon-theme') provides=('untis' 'timetable') conflicts=('untis' 'timetable') source=("https://github.com/Felitendo/PKGBUILDS/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.zst") diff --git a/timetable-bin/pkg.sh b/timetable-bin/pkg.sh index 80f588a..783c5f1 100644 --- a/timetable-bin/pkg.sh +++ b/timetable-bin/pkg.sh @@ -8,7 +8,7 @@ UPSTREAM_REPO="ostfriese4/untis" # Installed in CI (pacman) before build_artifact runs. -BUILD_DEPS=(meson ninja glib2 glib2-devel gtk4 libadwaita python python-gobject python-pip gettext) +BUILD_DEPS=(meson ninja glib2 glib2-devel gtk4 libadwaita python python-gobject gettext) latest_version() { curl -sf "https://codeberg.org/api/v1/repos/$UPSTREAM_REPO/releases/latest" \ @@ -31,11 +31,6 @@ build_artifact() { meson setup "$workdir/build" "$workdir/untis" --prefix=/usr --buildtype=release meson install -C "$workdir/build" --destdir "$destdir" - # Bundle the pure-python webuntis library: it is packaged neither in the - # Arch repos nor on the AUR. /usr/share/untis is on the launcher's sys.path. - pip download --no-deps --only-binary :all: --dest "$workdir/wheels" webuntis - python -m zipfile -e "$workdir"/wheels/webuntis-*.whl "$destdir/usr/share/untis/" - # These caches are generated by pacman hooks; shipping them would cause # file conflicts on install. rm -f "$destdir/usr/share/glib-2.0/schemas/gschemas.compiled" \