# HG changeset patch # User Migration Sync # Date 1731188701 0 # Node ID ece4c118e053dedfef32668ffa429f7fc4b1a86d # Parent 184de8203bc6f299f0a76a7995988c7add557a4c [sync] imported eb63403..6e83727 from upstream commit 6e8372740386620a83b33749bb19fc8f40fc948a Author: Daniel Neugebauer Date: Sat Nov 9 22:29:27 2024 +0100 app-misc/qutescoop: bump to 3.0.0-rc3 diff -r 184de8203bc6 -r ece4c118e053 app-misc/qutescoop/Manifest --- a/app-misc/qutescoop/Manifest Thu Apr 18 20:15:02 2024 +0000 +++ b/app-misc/qutescoop/Manifest Sat Nov 09 21:45:01 2024 +0000 @@ -1,4 +1,6 @@ AUX QuteScoop.desktop 234 BLAKE2B f9115f9648c4b19328e71e1b397b36bdf7d32d024a1f8ce9fc0f9eccf3d9be928b8112b843cd3b0e1a990e5a315b0fe7d12bb4d78f923c31a2959850eb4d4daa SHA512 fedb7ff5d394d54bfd35754b7398b7b701e5db8cff481a27e01ea1a2a300769a8b2b9946ecba098bfe43b59de406bb901b3425a9f3b18dd946796af6f576f351 AUX execution-wrapper.sh 857 BLAKE2B f0341813221333fc93ec1b6721430fb4495f90cc6424bd7481388bdc4498f840efecebdbc7567c68865c356dd6447704021f6bd814ef1ec0c70ec4700a3a6c5f SHA512 9aeb4401882941dbb7897cee654d079b7c4ae354854144ff8a99cc40a518ba7807c6e74c24f6756944698f3d20cbab27984ea1c8b9564dc0d78647dded15f056 +AUX userdir.patch 967 BLAKE2B 88cdc52b94afe161dad00254b5d4a3d627b42a4b9f3316f9846829a258f9538a4fa07bdccf72770fdb46b3fe1f434f0fda56e42dd302425f8622ea0324d21782 SHA512 cfbfa27ffb328e409e5dfb34893c7c38ceb9d0ded75703bb6ee11a59573a4a59ae590d4967f0bfb62e164f39c8c999d455a9c565e9e9e8fb0ce03b84d1a725df EBUILD qutescoop-2.2_pre20201118.ebuild 3119 BLAKE2B 75953e0e9ac4d4d626bb952a578e21a7a8d9bd2e95c55039154e9c9e956033294ba6fa434987f6041b87a37adbfd88ec25f39ea1d7e0d0a5ce7d83a6ef84d635 SHA512 056b300cbc56f7bf69732b587d790d5a6fd87a6114a882c1d913c6220062d97df36665e4c8bf21ef839b182b07207be54a1b57cb769323bebdf10439d08a8a70 +EBUILD qutescoop-3.0.0_rc3.ebuild 2774 BLAKE2B f845be93874fa143c71a905c865c66beb29279e6d3cc45226036d58c875e8851ada8ed0cda1ced0f9f6e41225baefdceaeec5a7c534f30ba3732316080bfbec6 SHA512 40373b0abba33a2e08734e56ec8672d74f3e9f7d6dedbdf09174db4659ded6a400634e0131e368b36325f264bef93645f70e2f14d1eac6eef31ec76f9d462a6d EBUILD qutescoop-9999.ebuild 2772 BLAKE2B 81bd737e446a63641a13b5c1752c3d46e968ad9eebcf812981effca9dd270004994b6735cc3764ab43a70a8b1f79893b92b3d73c7446de4930a25dd014fac377 SHA512 a0c663f6a7b6df3495e7af083b14ab7c9fb541e76129c632827e5dfd2fb818f6c4ffd8b0e772d39d5bdcb395def85616adc72b05935b53c77e8431ef70e3e0c7 diff -r 184de8203bc6 -r ece4c118e053 app-misc/qutescoop/files/userdir.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-misc/qutescoop/files/userdir.patch Sat Nov 09 21:45:01 2024 +0000 @@ -0,0 +1,27 @@ +diff --git a/src/Settings.cpp b/src/Settings.cpp +index 040fa65..4f21092 100644 +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -1,5 +1,7 @@ + #include "Settings.h" + ++#include ++ + #include "GuiMessage.h" + #include "Whazzup.h" + #include "dialogs/AirportDetails.h" +@@ -198,6 +200,14 @@ void Settings::importFromFile(QString fileName) { + * @returns fully qualified path to the 'application data directory'. + **/ + QString Settings::dataDirectory(const QString &composeFilePath) { ++ // try local data directory first, use if it exists ++ QString appLocalDataPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); ++ QDir appLocalDataDir(appLocalDataPath); ++ if (appLocalDataDir.exists()) { ++ return QString("%1/%2").arg(appLocalDataPath, composeFilePath); ++ } ++ ++ // fall back to installation directory + return QString("%1/%2") + .arg(QCoreApplication::applicationDirPath(), composeFilePath); + } diff -r 184de8203bc6 -r ece4c118e053 app-misc/qutescoop/qutescoop-3.0.0_rc3.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-misc/qutescoop/qutescoop-3.0.0_rc3.ebuild Sat Nov 09 21:45:01 2024 +0000 @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=8 + +inherit git-r3 +inherit qmake-utils + +# Note: GitHub page only states VATSIM as of January 2021 although other networks +# may still be supported. +DESCRIPTION="A status monitor for VATSIM and other online flight simulation networks." +HOMEPAGE="https://qutescoop.github.io/qutescoop/" + +EGIT_REPO_URI="https://github.com/qutescoop/qutescoop.git" +EGIT_COMMIT="df1b4b39420911c2329699936369060732b3fe27" + +LICENSE="GPL-3" +SLOT="0" + +# only 64 bits because at least paths ("unix64") would need to be changed +KEYWORDS="~amd64" + +# bash is needed for our wrapper script +DEPEND=" + app-shells/bash + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/libglvnd + sys-libs/glibc + virtual/glu +" + +RDEPEND="${DEPEND}" + +PATCHES="${FILESDIR}/userdir.patch" + +src_prepare() { + default + eqmake5 QuteScoop.pro +} + +src_compile() { + emake +} + +src_install() { + # instead of using QuteScoop directly install a wrapper script + # this is needed because QuteScoop needs write permissions to a data directory + # for every user and does not create the necessary directories which need to + # contain specific data + # TODO: script should somehow handle updates + cp -a ${FILESDIR}/execution-wrapper.sh QuteScoop + dobin QuteScoop + + dodoc COPYING + dodoc README.md + + into /usr/share/QuteScoop + dobin DIST-unix64/QuteScoop + + insinto /usr/share/applications + doins ${FILESDIR}/QuteScoop.desktop + + insinto /usr/share/icons/hicolor/32x32/apps + doins src/qutescoop.png + + insinto /usr/share/QuteScoop/data-template + doins -r data + doins -r downloaded + #doins -r screenshots + doins -r textures + + # all directories may currently have a "notes" file but in case those should + # ever get removed, better add our own "keep" file to the otherwise empty directories + keepdir /usr/share/QuteScoop/data-template/downloaded + #keepdir /usr/share/QuteScoop/data-template/screenshots + #keepdir /usr/share/QuteScoop/data-template/textures/clouds +} + +pkg_postinst() { + # 12345678901234567890123456789012345678901234567890123456789012345678901234567890 + einfo "QuteScoop expects a fully prepared user-writable directory. Such a directory" + einfo "cannot be provisioned by this ebuild directly. Instead a wrapper script is used" + einfo "in place of the original binary which creates a template in the user's home" + einfo "directory on first run. Future updates to this package may require the user" + einfo "to delete that directory manually in order to have it re-created:" + einfo "" + einfo " ~/.local/share/QuteScoop" + einfo "" + einfo "Please report any issues with the wrapper script to the ebuild author, not" + einfo "QuteScoop." +}