From 3a5d0f3c5c3076c98566ff81981e6f7103265877 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sat, 24 Jun 2023 23:27:40 +0200 Subject: [PATCH] x11-misc/gpaste: fix history items vanish --- x11-misc/gpaste/Manifest | 3 +- ...gpaste-44.0-fix-vanish-history-items.patch | 32 +++++++++++++++++++ ...aste-44.0.ebuild => gpaste-44.0-r1.ebuild} | 4 +++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 x11-misc/gpaste/files/gpaste-44.0-fix-vanish-history-items.patch rename x11-misc/gpaste/{gpaste-44.0.ebuild => gpaste-44.0-r1.ebuild} (96%) diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest index d523215..07dad30 100644 --- a/x11-misc/gpaste/Manifest +++ b/x11-misc/gpaste/Manifest @@ -1,3 +1,4 @@ +AUX gpaste-44.0-fix-vanish-history-items.patch 1044 BLAKE2B fdddbc30cb12a986dc08f384e00904e96ef6b2e9d595d7ddc0ef27a2d161a048aad7f5a2016954dd18d32ee96be8dbe5461c4b9710a46a00f6264f018473ac81 SHA512 2b3ad944e49861ddaa4fcae139f91ad87b66caa34d9dedeeb229b32022eec3defbe201713a262974197fbd8b1b718cf8139d60210d611bbd78d939dcd362f110 DIST gpaste-44.0.tar.gz 337661 BLAKE2B a8102c7b49ef77495eada8384cd2f7d933ea0c5680c80dd47079724a6fc3f2156d4d7e88fc5d71eb91413326cfab93cec226b3cfa04c831b5318a3cf2b5a3c4f SHA512 7cf2ce1d1de421b8b4e1301c244292443e1ce2b3c587f0dbe9427045283c822c844a76387978919006e7aa8d29b28f261b2ae118ec486307fd3f3ab1ac848077 -EBUILD gpaste-44.0.ebuild 1662 BLAKE2B c8dd6aa461721213f7a431048620d9e0aaaded759f22dceffda4dbc47401976e5b595fc77966ea92cebc0e6fa1152a1dc40d7f37e4a929aca19b4d183e4ca3a0 SHA512 7375457ff5148935756392ff0088bbdf431248ae9adf8b77f975322d269843dd2a5a81cf399e4c370d9cd2ec8b1272dadc31c71f7f47d9c43afd920c9f45865f +EBUILD gpaste-44.0-r1.ebuild 1726 BLAKE2B 96622608d5985d37c7b472eb6455061d3f54397e8a8ddb440f228f38df2d0f12b5b870a064b8523f51e215f1acdd3df48df77c7afee98a96391b839af4855bee SHA512 8f90e469c00f684cf398f3c0de7fe3b1ce72dc7da844582561b3bc699a68a1eb3be3688343b5c24f68c84df5f652690a0fbcfe5d6a42f42915a9cbb822d2dda9 MISC metadata.xml 677 BLAKE2B 79d617528e62670788eda4ba64b9698d04b3255f10f8baf2fdce7c7a3708a247b1b839bdf419053b61bc4a6a6200d79033c799c30b6aa29786e6d4b19ebf0954 SHA512 46348240699731847dbb0c55e89386c6ecd5ee9ccc32114eb41a1007cb21e9eaa25930b92a0e470083d64f854b8c5aff055af90f52e4f55dbb36299f6c8b32d2 diff --git a/x11-misc/gpaste/files/gpaste-44.0-fix-vanish-history-items.patch b/x11-misc/gpaste/files/gpaste-44.0-fix-vanish-history-items.patch new file mode 100644 index 0000000..bccf0d9 --- /dev/null +++ b/x11-misc/gpaste/files/gpaste-44.0-fix-vanish-history-items.patch @@ -0,0 +1,32 @@ +From 3a85c23ec96797d558e958fab209f417e6eac255 Mon Sep 17 00:00:00 2001 +From: bobi32 +Date: Wed, 10 May 2023 14:44:03 +0200 +Subject: [PATCH] #365 fix (#421) + +--- + src/daemon/tmp/gpaste-file-backend.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/daemon/tmp/gpaste-file-backend.c b/src/daemon/tmp/gpaste-file-backend.c +index 6ce30914..9923ee17 100644 +--- a/src/daemon/tmp/gpaste-file-backend.c ++++ b/src/daemon/tmp/gpaste-file-backend.c +@@ -339,7 +339,6 @@ add_item (Data *data) + data->uuid = g_uuid_string_random (); + + g_paste_item_set_uuid (item, data->uuid); +- data->mem_size += g_paste_item_get_size (item); + data->history = g_list_append (data->history, item); + ++data->current_size;; + } +@@ -354,6 +353,10 @@ add_item (Data *data) + g_free (v->data); + g_free (v); + } ++ ++ if (item) ++ data->mem_size += g_paste_item_get_size (item); ++ + g_clear_pointer(&data->special_values, g_slist_free); + } + diff --git a/x11-misc/gpaste/gpaste-44.0.ebuild b/x11-misc/gpaste/gpaste-44.0-r1.ebuild similarity index 96% rename from x11-misc/gpaste/gpaste-44.0.ebuild rename to x11-misc/gpaste/gpaste-44.0-r1.ebuild index eb38c18..7590628 100644 --- a/x11-misc/gpaste/gpaste-44.0.ebuild +++ b/x11-misc/gpaste/gpaste-44.0-r1.ebuild @@ -61,6 +61,10 @@ RDEPEND="${DEPEND} S="${WORKDIR}/GPaste-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-fix-vanish-history-items.patch +) + src_prepare() { use vala && vala_src_prepare default