Skip to content
Snippets Groups Projects
Verified Commit fb6ac250 authored by Katharina Drexel's avatar Katharina Drexel
Browse files

Adding patch for newer version of php-voku-portable-ascii (package won't install otherwise).

parent 0168b00c
No related branches found
No related tags found
1 merge request!2New upstream version 8.83.18.
Pipeline #407393 failed
......@@ -11,6 +11,8 @@ php-laravel-framework (8.83.18-1) unstable; urgency=medium
* Fixing email-validator version.
* Cosmetics in control file.
* Cleaning .pc/ otherwise phpunit fails.
* Adding patch for newer version of php-voku-portable-ascii
(package won't install otherwise).
-- Katharina Drexel <katharina.drexel@bfh.ch> Tue, 12 Jul 2022 16:12:17 +0200
......
From: Katharina Drexel <katharina.drexel@bfh.ch>
Date: Thu, 04 Aug 2022 10:28:36 +0200
Subject: voku-portable-ascii should also be allowed in later version
diff --git a/composer.json b/composer.json
index ea014010f..f21dcbcc6 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"symfony/var-dumper": "^5.4",
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
"vlucas/phpdotenv": "^5.4.1",
- "voku/portable-ascii": "^1.6.1"
+ "voku/portable-ascii": "^1.6.1|^2.0.1"
},
"replace": {
"illuminate/auth": "self.version",
diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
index 527bdcbb8..6a74f2a9f 100644
--- a/src/Illuminate/Support/composer.json
+++ b/src/Illuminate/Support/composer.json
@@ -22,7 +22,7 @@
"illuminate/contracts": "^8.0",
"illuminate/macroable": "^8.0",
"nesbot/carbon": "^2.53.1",
- "voku/portable-ascii": "^1.6.1"
+ "voku/portable-ascii": "^1.6.1|^2.0.1"
},
"conflict": {
"tightenco/collect": "<5.5.33"
0001-Fix-email-validator-too-new.patch
0002-Fix-voku-portable-ascii-too-new.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment