diff options
Diffstat (limited to 'freebsd/applications/office/basket')
3 files changed, 4 insertions, 63 deletions
diff --git a/freebsd/applications/office/basket/distinfo b/freebsd/applications/office/basket/distinfo index 7971b5fb7..201b9c8c2 100644 --- a/freebsd/applications/office/basket/distinfo +++ b/freebsd/applications/office/basket/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635215761 -SHA256 (TDE/applications/office/basket-trinity_14.0.11.orig.tar.xz) = 0a23465b5b9c452fb7cb67f04015f846047b9b7add56a9508ba4b86f37ed9caf -SIZE (TDE/applications/office/basket-trinity_14.0.11.orig.tar.xz) = 3614936 +TIMESTAMP = 1651013263 +SHA256 (TDE/applications/office/basket-trinity_14.0.12.orig.tar.xz) = b60ac5dc89438f8dfadc95a99b6fe8a3ae8f9b6b7a16008430a8083d4149b852 +SIZE (TDE/applications/office/basket-trinity_14.0.12.orig.tar.xz) = 3617300 diff --git a/freebsd/applications/office/basket/files/patch-bp000-fix-crash-on-export-basket-archive.diff b/freebsd/applications/office/basket/files/patch-bp000-fix-crash-on-export-basket-archive.diff deleted file mode 100644 index 172333cf3..000000000 --- a/freebsd/applications/office/basket/files/patch-bp000-fix-crash-on-export-basket-archive.diff +++ /dev/null @@ -1,60 +0,0 @@ -commit 6ccb5528ecff0cf0db5fe2f81b26a79959e87902 -Author: Slávek Banko <[email protected]> -Date: Fri Oct 29 03:47:53 2021 +0200 - - Prevent null pointer deference in methods for selection. - This resolves the crash when exporting the Basket archive. - - Signed-off-by: Slávek Banko <[email protected]> - (cherry picked from commit a08c6ac9e3c8ac162ce08b730fd6108e2f71213c) - -diff --git a/src/archive.cpp b/src/archive.cpp -index 3f3377c..aec789f 100644 ---- a/src/archive.cpp -+++ b/src/archive.cpp -@@ -228,7 +228,8 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS - - // Recursively save child baskets: - BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); -- if (recursive && item->firstChild()) { -+ if (recursive && item && item->firstChild()) -+ { - for (BasketListViewItem *child = (BasketListViewItem*) item->firstChild(); child; child = (BasketListViewItem*) child->nextSibling()) { - saveBasketToArchive(child->basket(), recursive, tar, backgrounds, tempFolder, progress); - } -diff --git a/src/basket.cpp b/src/basket.cpp -index a4edb31..67107d2 100644 ---- a/src/basket.cpp -+++ b/src/basket.cpp -@@ -4469,12 +4469,20 @@ void Basket::noteUngroup() - - void Basket::unplugSelection(NoteSelection *selection) - { -+ if (!selection) -+ { -+ return; -+ } - for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) - unplugNote(toUnplug->note); - } - - void Basket::insertSelection(NoteSelection *selection, Note *after) - { -+ if (!selection) -+ { -+ return; -+ } - for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { - if (toUnplug->note->isGroup()) { - Note *group = new Note(this); -@@ -4496,6 +4504,10 @@ void Basket::insertSelection(NoteSelection *selection, Note *after) - - void Basket::selectSelection(NoteSelection *selection) - { -+ if (!selection) -+ { -+ return; -+ } - for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { - if (toUnplug->note->isGroup()) - selectSelection(toUnplug); diff --git a/freebsd/applications/office/basket/pkg-plist b/freebsd/applications/office/basket/pkg-plist index 4586f04d9..c1833598b 100644 --- a/freebsd/applications/office/basket/pkg-plist +++ b/freebsd/applications/office/basket/pkg-plist @@ -98,6 +98,7 @@ share/icons/crystalsvg/scalable/apps/basket.svg share/locale/cs/LC_MESSAGES/basket.mo share/locale/da/LC_MESSAGES/basket.mo share/locale/de/LC_MESSAGES/basket.mo +share/locale/el/LC_MESSAGES/basket.mo share/locale/es/LC_MESSAGES/basket.mo share/locale/fr/LC_MESSAGES/basket.mo share/locale/it/LC_MESSAGES/basket.mo |