diff --git a/dev-util/gertty/gertty-1.6.0.recipe b/dev-util/gertty/gertty-1.6.0.recipe index b1edbff9a..7b61670f4 100644 --- a/dev-util/gertty/gertty-1.6.0.recipe +++ b/dev-util/gertty/gertty-1.6.0.recipe @@ -19,7 +19,7 @@ changes." HOMEPAGE="https://pypi.org/project/gertty/" COPYRIGHT="2022 The TTY Group" LICENSE="Apache v2" -REVISION="1" +REVISION="2" pypiVersion="13/fa/67165ece7a08f7142bcfda2e5cee145dbda78e003c11924098bfc6efaf0e" SOURCE_URI="https://files.pythonhosted.org/packages/$pypiVersion/gertty-$portVersion.tar.gz" CHECKSUM_SHA256="1c3593d2e6ce53bd84b27d6ac92df4a86d8923afd18b4f4f8e2c979f8a6277df" diff --git a/dev-util/gertty/patches/gertty-1.6.0.patchset b/dev-util/gertty/patches/gertty-1.6.0.patchset index ab99aabd4..10234306e 100644 --- a/dev-util/gertty/patches/gertty-1.6.0.patchset +++ b/dev-util/gertty/patches/gertty-1.6.0.patchset @@ -1,4 +1,4 @@ -From 06c271ef071ef7a91cfb600de1683f83de485dfb Mon Sep 17 00:00:00 2001 +From 8b4b0c4e16c93b3d055a3fa074db03b14edce7b2 Mon Sep 17 00:00:00 2001 From: begasus Date: Tue, 5 Jul 2022 13:30:07 +0200 Subject: Put documentation at the right place. @@ -674,7 +674,7 @@ index 0879e81..25952d5 100644 2.36.1 -From 7067333ec2e70a91ddf83d1bb3a5adc9fa0cd3e6 Mon Sep 17 00:00:00 2001 +From 91b5a31f554268173fdcf8cf52aed5d7c62b890e Mon Sep 17 00:00:00 2001 From: begasus Date: Tue, 5 Jul 2022 13:47:02 +0200 Subject: Fix config file location. @@ -845,3 +845,51 @@ index 25952d5..634ce27 100644 -- 2.36.1 + +From 7c802c6430cf015da4e22f44c8dec0c2cc3e26dd Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Fri, 15 Jul 2022 18:07:53 +0200 +Subject: Actually fix the configuation file path + +The previous patch changed everything (messages, documentation) except +the actual place where the config file location is defined. + +diff --git a/gertty/config.py b/gertty/config.py +index 21348f0..b3ce7ba 100644 +--- a/gertty/config.py ++++ b/gertty/config.py +@@ -36,7 +36,7 @@ try: + except AttributeError: + OrderedDict = ordereddict.OrderedDict + +-DEFAULT_CONFIG_PATH = '~/.config/gertty/gertty.yaml' ++DEFAULT_CONFIG_PATH = '~/config/settings/gertty.yaml' + FALLBACK_CONFIG_PATH = '~/.gertty.yaml' + + class ConfigSchema(object): +-- +2.36.1 + + +From 4c9c92797c5b306e4cffb88e551e16ecf3ea8bb8 Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Fri, 15 Jul 2022 18:08:45 +0200 +Subject: Backport fix for alembic >= 1.7 from upstream + +Without this, gertty crashes on start. + +diff --git a/gertty/db.py b/gertty/db.py +index 3bb7ddd..7f4388a 100644 +--- a/gertty/db.py ++++ b/gertty/db.py +@@ -20,6 +20,7 @@ import threading + + import alembic + import alembic.config ++import alembic.migration + import six + import sqlalchemy + from sqlalchemy import create_engine, MetaData, Table, Column, Integer, String, Boolean, DateTime, Text, UniqueConstraint +-- +2.36.1 +