From 864e7326fe5051ddef608a5dda8af367ac86d8e7 Mon Sep 17 00:00:00 2001 From: Lorem Date: Thu, 3 Dec 2020 12:18:13 +0530 Subject: [PATCH] minigalaxy: update to 1.0.0. --- ...1-paths-support-merged-usr-directory.patch | 65 ------------------- srcpkgs/minigalaxy/template | 6 +- 2 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/minigalaxy/patches/0001-paths-support-merged-usr-directory.patch diff --git a/srcpkgs/minigalaxy/patches/0001-paths-support-merged-usr-directory.patch b/srcpkgs/minigalaxy/patches/0001-paths-support-merged-usr-directory.patch deleted file mode 100644 index a7632b6fa94..00000000000 --- a/srcpkgs/minigalaxy/patches/0001-paths-support-merged-usr-directory.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 332f3e06f457ea63cddf5e266dfd1c220a6ecb88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Sat, 2 May 2020 18:40:10 +0700 -Subject: [PATCH] paths: support merged /usr directory -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In the Linux world, some distribution started to merge: -- /bin into /usr/bin -- /sbin into /usr/sbin -- /lib into /usr/lib -- /lib64 into /usr/lib64 - -Some distro go with more extreme approach, merge `/bin`, `/sbin`, -`/usr/sbin` into `/usr/bin`. - -See: https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/ - -If minigalaxy was invoked as: - - /bin/galaxy - -We'll see this error: - -> Traceback (most recent call last): -> File "/bin/minigalaxy", line 66, in -> main() -> File "/bin/minigalaxy", line 57, in main -> from minigalaxy.ui import Window -> File "/usr/lib/python3.8/site-packages/minigalaxy/ui/__init__.py", line 2, in -> from minigalaxy.ui.window import Window -> File "/usr/lib/python3.8/site-packages/minigalaxy/ui/window.py", line 5, in -> from minigalaxy.ui.login import Login -> File "/usr/lib/python3.8/site-packages/minigalaxy/ui/login.py", line 13, in -> class Login(Gtk.Dialog): -> File "/usr/lib/python3.8/site-packages/gi/_gtktemplate.py", line 226, in __call__ -> bytes_ = GLib.Bytes.new(file_.load_contents()[1]) -> gi.repository.GLib.Error: g-io-error-quark: Error opening file /share/minigalaxy/ui/login.ui: No such file or directory - -Fix this problem by explicit checking if LAUNCH_DIR is `/bin` or -`/sbin`. - -Signed-off-by: Đoàn Trần Công Danh ---- - minigalaxy/paths.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git minigalaxy/paths.py minigalaxy/paths.py -index 16dd48d..525fa7a 100644 ---- minigalaxy/paths.py -+++ minigalaxy/paths.py -@@ -2,6 +2,8 @@ import os - import sys - - LAUNCH_DIR = os.path.abspath(os.path.dirname(sys.argv[0])) -+if LAUNCH_DIR == "/bin" or LAUNCH_DIR == "/sbin": -+ LAUNCH_DIR = "/usr" + LAUNCH_DIR - - CONFIG_DIR = os.path.join(os.getenv('XDG_CONFIG_HOME', os.path.expanduser('~/.config')), "minigalaxy") - CONFIG_FILE_PATH = os.path.join(CONFIG_DIR, "config.json") --- -2.26.2.526.g744177e7f7 - diff --git a/srcpkgs/minigalaxy/template b/srcpkgs/minigalaxy/template index b18f74c31f6..87af28e6414 100644 --- a/srcpkgs/minigalaxy/template +++ b/srcpkgs/minigalaxy/template @@ -1,7 +1,7 @@ # Template file for 'minigalaxy' pkgname=minigalaxy -version=0.9.4 -revision=3 +version=1.0.0 +revision=1 build_style=python3-module hostmakedepends="gettext python3-setuptools" depends="hicolor-icon-theme webkit2gtk python3-gobject python3-requests" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later, CC-BY-3.0" homepage="https://sharkwouter.github.io/minigalaxy/" changelog="https://github.com/sharkwouter/minigalaxy/blob/master/CHANGELOG.md" distfiles="https://github.com/sharkwouter/minigalaxy/archive/${version}.tar.gz" -checksum=ec6ae3b3dc73fec93060af4d9ab5d8558f668a3775db202be3702908323a88d7 +checksum=00c99cdff167a762d6e78891216d6a3ba889c970f198618472e15f398ed2c9b3 post_install() { vlicense THIRD-PARTY-LICENSES.md LICENSE