From 0f2e2e1be37c546fe0c526cf4c96ba9ab2d42ecd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 5 Jan 2025 18:50:49 -0500 Subject: [PATCH] ilot/freescout: upgrade to 1.8.160 --- ilot/freescout/APKBUILD | 10 ++++++---- ilot/freescout/fix-laravel-log-viewer.patch | 13 +++++++++++++ ilot/freescout/rename-client-to-membre-fr-en.patch | 6 +++--- 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 ilot/freescout/fix-laravel-log-viewer.patch diff --git a/ilot/freescout/APKBUILD b/ilot/freescout/APKBUILD index bac7fcc..0093ab0 100644 --- a/ilot/freescout/APKBUILD +++ b/ilot/freescout/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) pkgname=freescout -pkgver=1.8.152 +pkgver=1.8.160 pkgrel=0 pkgdesc="Free self-hosted help desk & shared mailbox" arch="noarch" @@ -9,7 +9,7 @@ url="freescout.net" license="AGPL-3.0" _php=php83 _php_mods="-fpm -mbstring -xml -imap -zip -gd -curl -intl -tokenizer -pdo_pgsql -openssl -session -iconv -fileinfo -dom -pcntl" -depends="$_php ${_php_mods//-/$_php-} nginx postgresql pwgen" +depends="$_php ${_php_mods//-/$_php-} nginx postgresql pwgen bash" makedepends="composer pcre" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-install" source=" @@ -17,6 +17,7 @@ source=" freescout.nginx freescout-manage.sh rename-client-to-membre-fr-en.patch + fix-laravel-log-viewer.patch " pkgusers="freescout" pkggroups="freescout" @@ -75,8 +76,9 @@ package() { install -m755 -D "$srcdir"/freescout-manage.sh "$pkgdir"/usr/bin/freescout-manage } sha512sums=" -0e4d6d4a1aaeba2d39db8678e436f3c46c1a1fd79ea2b37c9ac95cbb319306b818991981987f6ac7dc8100a084d4189fa12f7639b24e2744705fa409ac349864 freescout-1.8.152.tar.gz +8441385a36d9ee5b542936f34e7700e86e1595d9a16b07afeac42bf48409ba0ecd1c542bc82b48afb0bb9201c7219bd146fe9455491ba40116dc66953b994488 freescout-1.8.160.tar.gz e4af6c85dc12f694bef2a02e4664e31ed50b2c109914d7ffad5001c2bbd764ef25b17ecaa59ff55ef41bccf17169bf910d1a08888364bdedd0ecc54d310e661f freescout.nginx 7ce9b3ee3a979db44f5e6d7daa69431e04a5281f364ae7be23e5a0a0547f96abc858d2a8010346be2fb99bd2355fb529e7030ed20d54f310249e61ed5db4d0ba freescout-manage.sh -3416da98d71aea5a7093913ea34e783e21ff05dca90bdc5ff3d00c548db5889f6d0ec98441cd65ab9f590be5cd59fdd0d7f1c98b5deef7bb3adbc8db435ec9bf rename-client-to-membre-fr-en.patch +0cba00b7d945ce84f72a2812d40028a073a5278856f610e46dbfe0ac78deff6bf5eba7643635fa4bc64d070c4d49eb47d24ea0a05ba1e6ea76690bfd77906366 rename-client-to-membre-fr-en.patch +2c651db6adac6d53597ba36965d0c65e005293f9b030e6be167853e4089384920524737aa947c5066877ee8caefb46741ccba797f653e7c2678556063540d261 fix-laravel-log-viewer.patch " diff --git a/ilot/freescout/fix-laravel-log-viewer.patch b/ilot/freescout/fix-laravel-log-viewer.patch new file mode 100644 index 0000000..8f29a36 --- /dev/null +++ b/ilot/freescout/fix-laravel-log-viewer.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/composer/installed.json.orig b/vendor/composer/installed.json +index 0b826f5..9d14ec8 100644 +--- a/vendor/composer/installed.json.orig ++++ b/vendor/composer/installed.json +@@ -4494,7 +4494,7 @@ + "installation-source": "dist", + "autoload": { + "classmap": [ +- "src/controllers" ++ "src/" + ], + "psr-0": { + "Rap2hpoutre\\LaravelLogViewer\\": "src/" diff --git a/ilot/freescout/rename-client-to-membre-fr-en.patch b/ilot/freescout/rename-client-to-membre-fr-en.patch index 097e503..90e75b8 100644 --- a/ilot/freescout/rename-client-to-membre-fr-en.patch +++ b/ilot/freescout/rename-client-to-membre-fr-en.patch @@ -38,7 +38,7 @@ index 00000000..82d26052 +} \ No newline at end of file diff --git a/resources/lang/fr.json.orig b/resources/lang/fr.json -index ff8d9d4..98d158f 100644 +index 6264973..8a7037e 100644 --- a/resources/lang/fr.json.orig +++ b/resources/lang/fr.json @@ -26,8 +26,8 @@ @@ -201,8 +201,8 @@ index ff8d9d4..98d158f 100644 - "This number is not visible to customers. It is only used to track conversations within :app_name": "Ce numéro n'est pas visible pour les clients. Il est uniquement utilisé pour suivre les conversations dans :app_name", + "This number is not visible to customers. It is only used to track conversations within :app_name": "Ce numéro n'est pas visible pour les membres. Il est uniquement utilisé pour suivre les conversations dans :app_name", "This password is incorrect.": "Ce mot de passe est incorrect.", -- "This reply will go to the customer. :%switch_start%Switch to a note:switch_end if you are replying to :user_name.": "Cette réponse ira au client. :%switch_start%Passez à une note:switch_end si vous répondez à :user_name.", -+ "This reply will go to the customer. :%switch_start%Switch to a note:switch_end if you are replying to :user_name.": "Cette réponse ira au membre. :%switch_start%Passez à une note:switch_end si vous répondez à :user_name.", +- "This reply will go to the customer. :%switch_start%Switch to a note:%switch_end% if you are replying to :user_name.": "Cette réponse ira au client. :%switch_start%Passez à une note:%switch_end% si vous répondez à :user_name.", ++ "This reply will go to the customer. :%switch_start%Switch to a note:%switch_end% if you are replying to :user_name.": "Cette réponse ira au membre. :%switch_start%Passez à une note:%switch_end% si vous répondez à :user_name.", "This setting gives you control over what page loads after you perform an action (send a reply, add a note, change conversation status or assignee).": "Ce paramètre vous permet de contrôler la page qui se charge après avoir effectué une action (envoyer une réponse, ajouter une note, etc.).", - "This text will be added to the beginning of each email reply sent to a customer.": "Ce texte sera ajouté au début de chaque réponse par e-mail envoyée à un client.", + "This text will be added to the beginning of each email reply sent to a customer.": "Ce texte sera ajouté au début de chaque réponse par e-mail envoyée à un membre.",