From 75fdc11bf19e9c5a0812ca7a70abca38864421d8 Mon Sep 17 00:00:00 2001
From: Alexander Miroshnichenko <alex@millerson.name>
Date: Sun, 18 Aug 2024 14:56:27 +0300
Subject: [PATCH] app-office/jal: update 2024.1.3 version

---
 app-office/jal/Manifest                            |  3 ++-
 app-office/jal/files/jal-2024.1.3-dbfilepath.patch | 14 ++++++++++++++
 app-office/jal/jal-2024.1.3.ebuild                 |  4 ++--
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 app-office/jal/files/jal-2024.1.3-dbfilepath.patch

diff --git a/app-office/jal/Manifest b/app-office/jal/Manifest
index 2de54cb..66204d5 100644
--- a/app-office/jal/Manifest
+++ b/app-office/jal/Manifest
@@ -1,5 +1,6 @@
+AUX jal-2024.1.3-dbfilepath.patch 785 BLAKE2B 2f7611dfef93163c002291d1a586fb62743e8713e354df10c171289ca30aff954dd2d089bdeffdce98fd303bb3fd9dbc07303a80b7cf0714084f8ca3b897a518 SHA512 5d7e1c8145a617a4d793d290ff6e6974da76dee94313d3eb330730835205b3ed47fb2339722db289c24a4c138805588c2c72e090ecb9c78b481d16a28b8bee86
 AUX jal-dbfilepath.patch 779 BLAKE2B 57be678fc71555953f9585ba1de523e0d4c91115ce870837933ba7f8794456e4733b9228b55cbd686120338eabfc87cca7840f9434f198690df87be7bcea186b SHA512 62f51e70877a800c4dea9ad831973b9106424bb18ff4fc09547a1a305085d4eb36b7c9e335e74204953c5a604799404efeef588bae568e4c14b2d43d458fbcd6
 DIST jal-2024.1.3.tar.gz 356183 BLAKE2B fd089436770209f208454827d3c822b0ea6f6cd2ad2218109ee55090d4b6329e81531059aa4ce7050d19aa435e27e8f2b853b2fbcbb1bc059b96517dcfd3936b SHA512 83c9f59c6709314bb61e504e34750c583f51f3de3deefd9adf1dc2e8cff6f8005d93df9b813c4b632db2fd9e968f6e77f0d9450deaa7a86fb8bb0833cd68caec
 DIST jal-2024.7.1.tar.gz 413975 BLAKE2B 4b9f7dad2e1872a6991d7188b88bc7db291ac774b3e24f014439b5d5a8a62a2c6626de84500bb4ce06aae64f2d1373d185f5d39004adf94d534ed84c65ddc0fc SHA512 4bbb9dda706bf8f45da1cd0d4b23f507c1e2b303b0b7726acc20d2f2da1cb8c17fa94949bf1835e9a52e8f8652b42d80de42034334831a8eca32129f8c243e39
-EBUILD jal-2024.1.3.ebuild 1579 BLAKE2B 3d9b0f9ea914780b653fa7f1a59d7229d3a3ea204667459429db476f63561fc5b554c10d2876c2208137561a9f7cf8fabbe5c12593eae47d4983bedb374082bb SHA512 98babfe4e100f24568acf6bec140184c59e1f1148c81cdcc9c751f9738327157a99ee8e474b985b4fc6a6797a88730f32b4672da8533f409412e57f16c0f2dee
+EBUILD jal-2024.1.3.ebuild 1575 BLAKE2B 97435ffe6d4e21d522bb7dbbbc7f694d151e1c4745502efe01ffbcc956b011c335673c3bb030c8a81b34a59674e8c92773699f93cb18311d676e2b98191e4ece SHA512 3b802c98efe1088c48ccc8f40012b38c43dcbfb99c438e303a304f32bc84835207cf978b883777f1fdb4101e3e7e27bbba177e7c651a26c57498b329be81bd6f
 EBUILD jal-2024.7.1.ebuild 1579 BLAKE2B 3d9b0f9ea914780b653fa7f1a59d7229d3a3ea204667459429db476f63561fc5b554c10d2876c2208137561a9f7cf8fabbe5c12593eae47d4983bedb374082bb SHA512 98babfe4e100f24568acf6bec140184c59e1f1148c81cdcc9c751f9738327157a99ee8e474b985b4fc6a6797a88730f32b4672da8533f409412e57f16c0f2dee
diff --git a/app-office/jal/files/jal-2024.1.3-dbfilepath.patch b/app-office/jal/files/jal-2024.1.3-dbfilepath.patch
new file mode 100644
index 0000000..14f0b60
--- /dev/null
+++ b/app-office/jal/files/jal-2024.1.3-dbfilepath.patch
@@ -0,0 +1,14 @@
+diff -ur jal-2024.1.3.old/jal/db/helpers.py jal-2024.1.3.new/jal/db/helpers.py
+--- jal-2024.1.3.old/jal/db/helpers.py	2024-01-19 15:34:59.000000000 +0300
++++ jal-2024.1.3.new/jal/db/helpers.py	2024-08-18 14:50:56.957916611 +0300
+@@ -79,7 +79,9 @@
+ 
+ # -------------------------------------------------------------------------------------------------------------------
+ def get_dbfilename(app_path):
+-    return app_path + Setup.DB_PATH
++    DBfilepath = os.path.expanduser('~') + '/.jal/' + Setup.DB_PATH
++    os.makedirs(os.path.dirname(DBfilepath), exist_ok=True)
++    return DBfilepath
+ 
+ # -------------------------------------------------------------------------------------------------------------------
+ # Return a row from the model in form of {"field_name": value} dictionary
diff --git a/app-office/jal/jal-2024.1.3.ebuild b/app-office/jal/jal-2024.1.3.ebuild
index edbcffd..83cd8af 100644
--- a/app-office/jal/jal-2024.1.3.ebuild
+++ b/app-office/jal/jal-2024.1.3.ebuild
@@ -33,7 +33,7 @@ BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]"
 
 PATCHES=(
-        "${FILESDIR}/${PN}-dbfilepath.patch"
+        "${FILESDIR}/${P}-dbfilepath.patch"
 )
 
 distutils_enable_tests pytest
@@ -42,7 +42,7 @@ src_install() {
         distutils-r1_src_install
         
         # Prepare the icons
-        newicon "${PN}"/img/ui_jal.png "${PN}.png"
+        newicon "${PN}"/img/jal.png "${PN}.png"
 
         # Create a desktop entry
         make_desktop_entry "${PN}" "JAL (Just Another Ledger)" "${PN}" "" "Comment[ru]=Контроль и учёт личных финансов;"