Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/nextcloud/, www-apps/nextcloud/files/
Date: Fri, 08 Dec 2017 13:14:16
Message-Id: 1512731578.8053f54194a24886b9d8a16cbdbc37e3154c2bf1.voyageur@gentoo
1 commit: 8053f54194a24886b9d8a16cbdbc37e3154c2bf1
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 8 11:04:03 2017 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 8 11:12:58 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8053f541
7
8 www-apps/nextcloud: 11.0.6/12.0.4 bumps
9
10 Also backport bugfix on authentication required
11
12 Closes: https://bugs.gentoo.org/639994
13 Package-Manager: Portage-2.3.16, Repoman-2.3.6
14
15 www-apps/nextcloud/Manifest | 8 +++--
16 ...extcloud-12.0.4-destroy_modal_when_closed.patch | 26 ++++++++++++++
17 www-apps/nextcloud/nextcloud-11.0.6.ebuild | 40 +++++++++++++++++++++
18 www-apps/nextcloud/nextcloud-12.0.4.ebuild | 42 ++++++++++++++++++++++
19 4 files changed, 113 insertions(+), 3 deletions(-)
20
21 diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
22 index 7f33eb7ada4..2c0100c88a5 100644
23 --- a/www-apps/nextcloud/Manifest
24 +++ b/www-apps/nextcloud/Manifest
25 @@ -1,4 +1,6 @@
26 -DIST nextcloud-11.0.4.tar.bz2 42164294 SHA256 68b89f1d0068728f76d89519c7d0a57396f2d216d048cc970346d436ec61999e SHA512 3e521921dfd218100cd114da02f5b9316883d72c000e44ecee606ecfc300c9847de9af3c291d8cbe936a43d29ac37b2d76c03d32a633b7a8f73dc6ff51e9c520 WHIRLPOOL 2453f49e0e7e8f0ed6bc69dbfbd5e7c9b88d9a2f4279fca046f47f7cf393c5d89a96c73956b685a40a9ddd7fb4ec155af5bc0d85828302cf6bda1654c0403246
27 -DIST nextcloud-11.0.5.tar.bz2 42515140 SHA256 47261211384e63b1d4816be60817b0315029d018b5568ac3aeb3181be5fb98a4 SHA512 4e25fefb34c68d2244fe9bbfba33a140b6d0833a485f4bffdd24b5f774f1053b80a9a8eb161a673b1fcbe278a929f8ae80b5f9da0163b668f6f41bacaaac478a WHIRLPOOL f9cd8473c839f2edf9e06b120e9efbd1b480310415d9973561f00a312c4d39fddceaf3682c373c857a1a436adbe6c2321b0a786c7604c0a355554251c29eebc8
28 +DIST nextcloud-11.0.4.tar.bz2 42164294 BLAKE2B 9cb46b3b189ab68da885d4db176ff12767ab5fd6dedb68fe4dddaba6dd8dea77ca6d0cc7a6454cf94c9707302f790b09abc9cefb2bc0ed0eb19a98d8c4dc652c SHA512 3e521921dfd218100cd114da02f5b9316883d72c000e44ecee606ecfc300c9847de9af3c291d8cbe936a43d29ac37b2d76c03d32a633b7a8f73dc6ff51e9c520
29 +DIST nextcloud-11.0.5.tar.bz2 42515140 BLAKE2B 865546232ec0dae8bb8385f3bfe90fef65c48167c38e1d441860466d06370000e773f5bbdfe1668901f43126935ec0c7fd5ae7154700d9ff740cdf169a82cfba SHA512 4e25fefb34c68d2244fe9bbfba33a140b6d0833a485f4bffdd24b5f774f1053b80a9a8eb161a673b1fcbe278a929f8ae80b5f9da0163b668f6f41bacaaac478a
30 +DIST nextcloud-11.0.6.tar.bz2 43226496 BLAKE2B 08b1f088cb05d1b2916d84d29c4a9b99ff88c8e1852f7337701030a8e56bb4fc484aa4b945dc634b095ff3046479a3e004c6483b039036b4ab9597e5a6c5b20f SHA512 66ff8e69cbf895c751665f590ff3dfab1629d79424c008455ef0145fd7a637f1f545d2ea106109624c0bdd33e505732a04ab98bcde1da2b4df1c0ac84d301e0f
31 DIST nextcloud-12.0.2.tar.bz2 42756355 SHA256 eb34d6cb9f55ee84bf2ad847b4b08cdb925321848ffa2264a9b1566e7b21a17c SHA512 5451c2dd2fa0a9f64e66723e075642d3e37b43f9611dc1a954183babea137c241c4e6c6428dbac99b3a99bff1ce6c6e4db6f3b42babb37caf445bfbd1674faa2 WHIRLPOOL d1d1baa6c0852d5abf9863bcc0ba67fea29b8c14eb5015191f5f547fd9c6d1247e863eecf2f8966314cccecdb19ec16e5d66454ed21995b6c99076eac8f3205a
32 -DIST nextcloud-12.0.3.tar.bz2 42935218 SHA256 88bcaccba886d0e5a145b15fe216d652ab68a0a4c089a102f1fa1e78e6ddfb71 SHA512 4aae61cb201f3c8b7ba7fa6c2789fb72930b1190ff40ef96494bc2763f268f321b2c2d1ec70c9add8cd45307818ddee39749a5d0a7d0667997980e4b5087c308 WHIRLPOOL 3445559e0efe59c78098b6ea53660403664a70999c18b24759c945757450b3de0a7241c85caffdfc165a275caa7a87931af854853ff3330aeb382f0855d936e0
33 +DIST nextcloud-12.0.3.tar.bz2 42935218 BLAKE2B 98927af76c326c1869094fb61ddffd0c32a7bbc51becb193b65c46d5593d588f92e79fcac31869416985fd55629afbec406063dc45af93d8604c7c7a5932e6f3 SHA512 4aae61cb201f3c8b7ba7fa6c2789fb72930b1190ff40ef96494bc2763f268f321b2c2d1ec70c9add8cd45307818ddee39749a5d0a7d0667997980e4b5087c308
34 +DIST nextcloud-12.0.4.tar.bz2 43583313 BLAKE2B a1f495d9afca67c55f4c9b5721baa9b6be79d4d21f23daea786382b7f21f9e9cae6c8166a18bc8d40dc84a153faf759bb57739cbb8716550f68888483bcf3902 SHA512 30426e6998ccc38026ab584fbec2e8e64419dc500a62066fefa8efd29eae94c7d11104e1ecfa6307ac754dbb82d4eaa499c2b38459af6353845ea741b304a4bf
35
36 diff --git a/www-apps/nextcloud/files/nextcloud-12.0.4-destroy_modal_when_closed.patch b/www-apps/nextcloud/files/nextcloud-12.0.4-destroy_modal_when_closed.patch
37 new file mode 100644
38 index 00000000000..ca63cb6db40
39 --- /dev/null
40 +++ b/www-apps/nextcloud/files/nextcloud-12.0.4-destroy_modal_when_closed.patch
41 @@ -0,0 +1,26 @@
42 +From 75bc40f7a08e11fc115e4986bb45fc314d49632a Mon Sep 17 00:00:00 2001
43 +From: Thomas Bille <thomas.bille625@×××××.com>
44 +Date: Mon, 10 Jul 2017 14:33:41 +0200
45 +Subject: [PATCH] Destroy modal when closed
46 +
47 +Signed-off-by: Thomas Bille <contact@××××××.fr>
48 +---
49 + core/js/jquery.ocdialog.js | 4 +++-
50 + 1 file changed, 3 insertions(+), 1 deletion(-)
51 +
52 +diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
53 +index 555b35e59ff..f3a54119e78 100644
54 +--- a/core/js/jquery.ocdialog.js
55 ++++ b/core/js/jquery.ocdialog.js
56 +@@ -212,8 +212,10 @@
57 + // Ugly hack to catch remaining keyup events.
58 + setTimeout(function() {
59 + self._trigger('close', self);
60 +- self.$dialog.hide();
61 + }, 200);
62 ++
63 ++ self.$dialog.remove();
64 ++ this.destroy();
65 + },
66 + destroy: function() {
67 + if(this.$title) {
68
69 diff --git a/www-apps/nextcloud/nextcloud-11.0.6.ebuild b/www-apps/nextcloud/nextcloud-11.0.6.ebuild
70 new file mode 100644
71 index 00000000000..d70e7708a17
72 --- /dev/null
73 +++ b/www-apps/nextcloud/nextcloud-11.0.6.ebuild
74 @@ -0,0 +1,40 @@
75 +# Copyright 1999-2017 Gentoo Foundation
76 +# Distributed under the terms of the GNU General Public License v2
77 +
78 +EAPI=6
79 +
80 +inherit eutils webapp
81 +
82 +DESCRIPTION="Personal cloud that runs on your own server"
83 +HOMEPAGE="http://nextcloud.com"
84 +SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
85 +LICENSE="AGPL-3"
86 +
87 +KEYWORDS="~amd64 ~arm ~x86"
88 +IUSE="+curl mysql postgres +sqlite"
89 +REQUIRED_USE="|| ( mysql postgres sqlite )"
90 +
91 +DEPEND=""
92 +RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
93 + virtual/httpd-php"
94 +
95 +S=${WORKDIR}/${PN}
96 +
97 +pkg_setup() {
98 + webapp_pkg_setup
99 +}
100 +
101 +src_install() {
102 + webapp_src_preinst
103 +
104 + insinto "${MY_HTDOCSDIR}"
105 + doins -r .
106 + dodir "${MY_HTDOCSDIR}"/data
107 +
108 + webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
109 + webapp_serverowned -R "${MY_HTDOCSDIR}"/data
110 + webapp_serverowned -R "${MY_HTDOCSDIR}"/config
111 + webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
112 +
113 + webapp_src_install
114 +}
115
116 diff --git a/www-apps/nextcloud/nextcloud-12.0.4.ebuild b/www-apps/nextcloud/nextcloud-12.0.4.ebuild
117 new file mode 100644
118 index 00000000000..94a35930f42
119 --- /dev/null
120 +++ b/www-apps/nextcloud/nextcloud-12.0.4.ebuild
121 @@ -0,0 +1,42 @@
122 +# Copyright 1999-2017 Gentoo Foundation
123 +# Distributed under the terms of the GNU General Public License v2
124 +
125 +EAPI=6
126 +
127 +inherit eutils webapp
128 +
129 +DESCRIPTION="Personal cloud that runs on your own server"
130 +HOMEPAGE="http://nextcloud.com"
131 +SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
132 +LICENSE="AGPL-3"
133 +
134 +KEYWORDS="~amd64 ~arm ~x86"
135 +IUSE="+curl mysql postgres +sqlite"
136 +REQUIRED_USE="|| ( mysql postgres sqlite )"
137 +
138 +DEPEND=""
139 +RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
140 + virtual/httpd-php"
141 +
142 +PATCHES=( "${FILESDIR}"/${P}-destroy_modal_when_closed.patch )
143 +
144 +S=${WORKDIR}/${PN}
145 +
146 +pkg_setup() {
147 + webapp_pkg_setup
148 +}
149 +
150 +src_install() {
151 + webapp_src_preinst
152 +
153 + insinto "${MY_HTDOCSDIR}"
154 + doins -r .
155 + dodir "${MY_HTDOCSDIR}"/data
156 +
157 + webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
158 + webapp_serverowned -R "${MY_HTDOCSDIR}"/data
159 + webapp_serverowned -R "${MY_HTDOCSDIR}"/config
160 + webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
161 +
162 + webapp_src_install
163 +}
Report Message
Find on MARC Find on Google Groups