[arch-commits] Commit in nextcloud/trunk (2 files)
David Runge
dvzrv at gemini.archlinux.org
Sat Jan 22 13:02:14 UTC 2022
Date: Saturday, January 22, 2022 @ 13:02:13
Author: dvzrv
Revision: 1113433
upgpkg: nextcloud 23.0.0-4: Rebuild to fix pimple 3rdparty submodule.
Add php 8.1 support for pimple 3rdparty submodule.
https://bugs.archlinux.org/task/73452
https://github.com/nextcloud/3rdparty/pull/905
Added:
nextcloud/trunk/nextcloud-23.0.0-pimple_php8.1.patch
Modified:
nextcloud/trunk/PKGBUILD
--------------------------------------+
PKGBUILD | 19 +++-
nextcloud-23.0.0-pimple_php8.1.patch | 130 +++++++++++++++++++++++++++++++++
2 files changed, 145 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-01-22 12:16:17 UTC (rev 1113432)
+++ PKGBUILD 2022-01-22 13:02:13 UTC (rev 1113433)
@@ -4,7 +4,7 @@
pkgname=nextcloud
# NOTE: do not package x.0.0 versions as they are considered beta
pkgver=23.0.0
-pkgrel=3
+pkgrel=4
pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
arch=(any)
url="https://nextcloud.com"
@@ -53,6 +53,7 @@
"${pkgname}-cron.service"
"${pkgname}-cron.timer"
"${pkgname}-23.0.0-php8.1.patch"
+ "${pkgname}-23.0.0-pimple_php8.1.patch"
)
sha512sums=('fba9f03c37a4d3f5e44472218fc50a49157872ae7c1aaaa3bc0c1c0301a97394690f75cf03cd11b3f9b0f282fef29eea189fa52ee5019f40a0d6f671ddda6706'
'SKIP'
@@ -65,7 +66,8 @@
'8bc7e76ba986cadf8d3bf35d6fbd8e7e236a61d1372e023c07e60427bacce925737c996d9fbaaeb51ed1066c1d0c8d83a86d7d640ed991b531744ed06629a670'
'c585af280c2503a5a969fffd53d192a045a1dedd6d3a32901dfa0e226f9ddb4b5d1b1760553e962b061172c0077fcc57b095d8b7c70cafaa8ca84dbfce2eaa24'
'eb69785a5b0df0e2a11f53f9c2e2dbf75681d7c698e88cbcc5ceed713a558d528511cc576813cc083cbaa28a2c83d543a39436ad4805670348ef22634305b1c8'
- '13062af253ceaafa4a65cdbd808318c643acc654f60454b31674e4f03bf49d1b20c5d0b3907f1d520871819eccb141968470defb7e48c1c7fba450af12361b9b')
+ '13062af253ceaafa4a65cdbd808318c643acc654f60454b31674e4f03bf49d1b20c5d0b3907f1d520871819eccb141968470defb7e48c1c7fba450af12361b9b'
+ 'd5552d111f6632878173976987464723de222c45aeb529ad922590613a21586d54b8b5d55c056934a2c8998c08ea2e66c4c4d2fdda265f5372b5e87719770ceb')
b2sums=('2dc00a1b522b51baa368a19628e354a674af1428e062595ccf75cb8541f497c1b2f8ed4f301cc0b5136382526e0e0c6ea1405f2d08a748b8fa2caf95d70c3d89'
'SKIP'
'7d40d120c28291f1a7537f3e1b5049fa83c9c0af949371345ea9ccdf3de4a0f3a3a06edbc52d9254dba483e4d11acf562cf679b9e379c5dfc2f61dfbfc2e4cef'
@@ -77,13 +79,22 @@
'937ae5b89d968d784c7b68e1ca81e7aec11e295b95244fc4bcfec55b3d5f37ef70d5f593086eeb14101c8940a241565730cb6edcdf88165094c4ad27a89bd980'
'9857f3dd219b624869255e0d6c262b60de813b87ac4fd3fccad0a330392f55709e8c2d4b9dfb5ad19df7cc0fc13cc83cead06c9a1d893ee4e4972c4937df0c2b'
'e6214351ca16bfe97683e838e727d6b5eaa62194878272204034c62aac4a632c9b33cd31aa0570c2eb936d7e9e7ff60190ac05a3a8cc2e27eda423a7d89b6d39'
- 'd29c475db8a8fd083bf3981914a298d105484ee71e3dcbc9c726ea675b6f2dc56cf135850c22ac5231becdf1bcc6994ff645b179f7d14e0ace692e460ba2052b')
+ 'd29c475db8a8fd083bf3981914a298d105484ee71e3dcbc9c726ea675b6f2dc56cf135850c22ac5231becdf1bcc6994ff645b179f7d14e0ace692e460ba2052b'
+ '3050c5c5f5befd044c892f67f1a194d42cb6ed9cd0b54d0a69258b26605da7f21bc781780e963846c26ece5fcf9f3987e832b4b1bbd8db91feea97fe4502c6d1')
validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <security at nextcloud.com>
prepare() {
cd "${pkgname}"
- # add backported patch for php 8.1 support: https://github.com/nextcloud/server/pull/29862
+ # add backported patch for php 8.1 support:
+ # https://github.com/nextcloud/server/pull/29432
+ # https://github.com/nextcloud/server/pull/29862
patch -Np1 -i ../"${pkgname}-23.0.0-php8.1.patch"
+ # add backported patch for php 8.1 support in pimple 3rdparty submodule:
+ # https://github.com/nextcloud/3rdparty/pull/905
+ (
+ cd 3rdparty
+ patch -Np1 -i ../../"${pkgname}-23.0.0-pimple_php8.1.patch"
+ )
}
package() {
Added: nextcloud-23.0.0-pimple_php8.1.patch
===================================================================
--- nextcloud-23.0.0-pimple_php8.1.patch (rev 0)
+++ nextcloud-23.0.0-pimple_php8.1.patch 2022-01-22 13:02:13 UTC (rev 1113433)
@@ -0,0 +1,130 @@
+diff --git a/pimple/pimple/src/Pimple/Container.php b/pimple/pimple/src/Pimple/Container.php
+index 715de10e..586a0b77 100644
+--- a/pimple/pimple/src/Pimple/Container.php
++++ b/pimple/pimple/src/Pimple/Container.php
+@@ -74,8 +74,11 @@ public function __construct(array $values = [])
+ * @param string $id The unique identifier for the parameter or object
+ * @param mixed $value The value of the parameter or a closure to define an object
+ *
++ * @return void
++ *
+ * @throws FrozenServiceException Prevent override of a frozen service
+ */
++ #[\ReturnTypeWillChange]
+ public function offsetSet($id, $value)
+ {
+ if (isset($this->frozen[$id])) {
+@@ -95,6 +98,7 @@ public function offsetSet($id, $value)
+ *
+ * @throws UnknownIdentifierException If the identifier is not defined
+ */
++ #[\ReturnTypeWillChange]
+ public function offsetGet($id)
+ {
+ if (!isset($this->keys[$id])) {
+@@ -130,6 +134,7 @@ public function offsetGet($id)
+ *
+ * @return bool
+ */
++ #[\ReturnTypeWillChange]
+ public function offsetExists($id)
+ {
+ return isset($this->keys[$id]);
+@@ -139,7 +144,10 @@ public function offsetExists($id)
+ * Unsets a parameter or an object.
+ *
+ * @param string $id The unique identifier for the parameter or object
++ *
++ * @return void
+ */
++ #[\ReturnTypeWillChange]
+ public function offsetUnset($id)
+ {
+ if (isset($this->keys[$id])) {
+@@ -280,8 +288,7 @@ public function keys()
+ /**
+ * Registers a service provider.
+ *
+- * @param ServiceProviderInterface $provider A ServiceProviderInterface instance
+- * @param array $values An array of values that customizes the provider
++ * @param array $values An array of values that customizes the provider
+ *
+ * @return static
+ */
+diff --git a/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php b/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
+index c173d7c0..714b8826 100644
+--- a/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
++++ b/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
+@@ -68,7 +68,7 @@ public function get(string $id)
+ /**
+ * {@inheritdoc}
+ */
+- public function has(string $id)
++ public function has(string $id): bool
+ {
+ return isset($this->aliases[$id]) && isset($this->container[$this->aliases[$id]]);
+ }
+diff --git a/pimple/pimple/src/Pimple/ServiceIterator.php b/pimple/pimple/src/Pimple/ServiceIterator.php
+index 5cde5188..ebafac16 100644
+--- a/pimple/pimple/src/Pimple/ServiceIterator.php
++++ b/pimple/pimple/src/Pimple/ServiceIterator.php
+@@ -42,26 +42,46 @@ public function __construct(Container $container, array $ids)
+ $this->ids = $ids;
+ }
+
++ /**
++ * @return void
++ */
++ #[\ReturnTypeWillChange]
+ public function rewind()
+ {
+ \reset($this->ids);
+ }
+
++ /**
++ * @return mixed
++ */
++ #[\ReturnTypeWillChange]
+ public function current()
+ {
+ return $this->container[\current($this->ids)];
+ }
+
++ /**
++ * @return mixed
++ */
++ #[\ReturnTypeWillChange]
+ public function key()
+ {
+ return \current($this->ids);
+ }
+
++ /**
++ * @return void
++ */
++ #[\ReturnTypeWillChange]
+ public function next()
+ {
+ \next($this->ids);
+ }
+
++ /**
++ * @return bool
++ */
++ #[\ReturnTypeWillChange]
+ public function valid()
+ {
+ return null !== \key($this->ids);
+diff --git a/pimple/pimple/src/Pimple/ServiceProviderInterface.php b/pimple/pimple/src/Pimple/ServiceProviderInterface.php
+index c004594b..abf90d82 100644
+--- a/pimple/pimple/src/Pimple/ServiceProviderInterface.php
++++ b/pimple/pimple/src/Pimple/ServiceProviderInterface.php
+@@ -39,8 +39,6 @@ interface ServiceProviderInterface
+ *
+ * This method should only be used to configure services and parameters.
+ * It should not get services.
+- *
+- * @param Container $pimple A container instance
+ */
+ public function register(Container $pimple);
+ }
More information about the arch-commits
mailing list