[arch-commits] Commit in xscreensaver/trunk (2 files)

2018-04-14 Thread Antonio Rojas via arch-commits 
Date: Saturday, April 14, 2018 @ 20:31:35
  Author: arojas
Revision: 321807

Update to 5.39

Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/xscreensaver-add-electricsheep.diff

-+
 PKGBUILD|   11 ++-
 xscreensaver-add-electricsheep.diff |   10 --
 2 files changed, 2 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-14 19:13:35 UTC (rev 321806)
+++ PKGBUILD2018-04-14 20:31:35 UTC (rev 321807)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=xscreensaver
-pkgver=5.38
+pkgver=5.39
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('x86_64')
@@ -13,17 +13,10 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-xscreensaver-add-electricsheep.diff
LICENSE)
-sha1sums=('b4e6b6799e8e244c894db277d6ff2bf5ee48290c'
-  'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+sha1sums=('7166c9f4a860785e0829df046f0328f5be74c0d7'
   '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \

Deleted: xscreensaver-add-electricsheep.diff
===
--- xscreensaver-add-electricsheep.diff 2018-04-14 19:13:35 UTC (rev 321806)
+++ xscreensaver-add-electricsheep.diff 2018-04-14 20:31:35 UTC (rev 321807)
@@ -1,10 +0,0 @@
 driver/XScreenSaver.ad.in-orig 2013-07-16 16:47:10.183068023 -0400
-+++ driver/XScreenSaver.ad.in  2013-07-16 16:48:23.293473297 -0400
-@@ -157,6 +157,7 @@
- !
- *programs:  \
-   maze -root  \n\
-+  electricsheep --root 1  \n\
- @GL_KLUDGE@ GL:   superquadrics -root 
\n\
-   attraction -root\n\
-   blitspin -root  \n\

[arch-commits] Commit in xscreensaver/trunk (2 files)

2015-10-26 Thread Eric Bélanger 
Date: Tuesday, October 27, 2015 @ 03:51:07
  Author: eric
Revision: 249781

upgpkg: xscreensaver 5.34-1

Upstream update

Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/xscreensaver-missingescape.patch

--+
 PKGBUILD |9 +++--
 xscreensaver-missingescape.patch |   12 
 2 files changed, 3 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-27 00:50:18 UTC (rev 249780)
+++ PKGBUILD2015-10-27 02:51:07 UTC (rev 249781)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=xscreensaver
-pkgver=5.33
-pkgrel=2
+pkgver=5.34
+pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/;
@@ -14,17 +14,14 @@
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
 xscreensaver-add-electricsheep.diff
-   xscreensaver-missingescape.patch
LICENSE)
-sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
+sha1sums=('a6d9a391981730cedcd51e75c35ffb4101928cc2'
   'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-  'ab2962f497e0b50a2ffe135baefdc155b0be1413'
   '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
-  patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
 }
 
 build() {

Deleted: xscreensaver-missingescape.patch
===
--- xscreensaver-missingescape.patch2015-10-27 00:50:18 UTC (rev 249780)
+++ xscreensaver-missingescape.patch2015-10-27 02:51:07 UTC (rev 249781)
@@ -1,12 +0,0 @@
-diff -Naur xscreensaver-5.33-orig/driver/xscreensaver-text 
xscreensaver-5.33/driver/xscreensaver-text
 xscreensaver-5.33-orig/driver/xscreensaver-text2015-07-21 
21:12:53.283286533 -0400
-+++ xscreensaver-5.33/driver/xscreensaver-text 2015-07-21 21:16:48.589580345 
-0400
-@@ -473,7 +473,7 @@
- 
- # Try to omit all tables, since they're impossible to read as text.
- #
--1 while (s/{{[^{}]*}}/ /gs); # {{ ... }}
-+1 while (s/{\{[^{}]*}}/ /gs);# {{ ... }}
- 1 while (s/{\|.*?\|}/\n\n/gs);   # {| ... |}
- 1 while (s/\|-.*?\|/ /gs);   # |- ... |  (table 
cell)
-

[arch-commits] Commit in xscreensaver/trunk (2 files)

2015-07-21 Thread Eric Bélanger 
Date: Wednesday, July 22, 2015 @ 03:56:20
  Author: eric
Revision: 242411

upgpkg: xscreensaver 5.33-2

Fix missing escape in xscreensaver-text (close FS#45524)

Added:
  xscreensaver/trunk/xscreensaver-missingescape.patch
Modified:
  xscreensaver/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 xscreensaver-missingescape.patch |   12 
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-21 20:26:07 UTC (rev 242410)
+++ PKGBUILD2015-07-22 01:56:20 UTC (rev 242411)
@@ -3,7 +3,7 @@
 
 pkgname=xscreensaver
 pkgver=5.33
-pkgrel=1
+pkgrel=2
 pkgdesc=Screen saver and locker for the X Window System
 arch=('i686' 'x86_64')
 url=http://www.jwz.org/xscreensaver/;
@@ -13,14 +13,18 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-xscreensaver-add-electricsheep.diff LICENSE)
+xscreensaver-add-electricsheep.diff
+   xscreensaver-missingescape.patch
+   LICENSE)
 sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
   'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+  'ab2962f497e0b50a2ffe135baefdc155b0be1413'
   '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p0 -i ${srcdir}/xscreensaver-add-electricsheep.diff
+  patch -p1 -i ${srcdir}/xscreensaver-missingescape.patch
 }
 
 build() {

Added: xscreensaver-missingescape.patch
===
--- xscreensaver-missingescape.patch(rev 0)
+++ xscreensaver-missingescape.patch2015-07-22 01:56:20 UTC (rev 242411)
@@ -0,0 +1,12 @@
+diff -Naur xscreensaver-5.33-orig/driver/xscreensaver-text 
xscreensaver-5.33/driver/xscreensaver-text
+--- xscreensaver-5.33-orig/driver/xscreensaver-text2015-07-21 
21:12:53.283286533 -0400
 xscreensaver-5.33/driver/xscreensaver-text 2015-07-21 21:16:48.589580345 
-0400
+@@ -473,7 +473,7 @@
+ 
+ # Try to omit all tables, since they're impossible to read as text.
+ #
+-1 while (s/{{[^{}]*}}/ /gs); # {{ ... }}
++1 while (s/{\{[^{}]*}}/ /gs);# {{ ... }}
+ 1 while (s/{\|.*?\|}/\n\n/gs);   # {| ... |}
+ 1 while (s/\|-.*?\|/ /gs);   # |- ... |  (table 
cell)
+

[arch-commits] Commit in xscreensaver/trunk (2 files)

2014-11-24 Thread Eric Bélanger 
Date: Monday, November 24, 2014 @ 22:35:07
  Author: eric
Revision: 227068

upgpkg: xscreensaver 5.32-1

Upstream update, Remove old patch

Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch

--+
 PKGBUILD |   11 +--
 xscreensaver-5.31-1001-binaryring.c-include-stdint.patch |   36 -
 2 files changed, 4 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-24 20:45:48 UTC (rev 227067)
+++ PKGBUILD2014-11-24 21:35:07 UTC (rev 227068)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=xscreensaver
-pkgver=5.31
+pkgver=5.32
 pkgrel=1
 pkgdesc=Screen saver and locker for the X Window System
 arch=('i686' 'x86_64')
@@ -13,17 +13,14 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-xscreensaver-add-electricsheep.diff LICENSE
-   xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
-sha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6'
+xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('3131d45295b9a18a2901737c9b95f1c5434f53a6'
   'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-  '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
-  '5a91e707f6482a3349609e8016b7668e3cd53161')
+  '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p0 -i ${srcdir}/xscreensaver-add-electricsheep.diff
-  patch -p1 -i 
${srcdir}/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
 }
 
 build() {

Deleted: xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
===
--- xscreensaver-5.31-1001-binaryring.c-include-stdint.patch2014-11-24 
20:45:48 UTC (rev 227067)
+++ xscreensaver-5.31-1001-binaryring.c-include-stdint.patch2014-11-24 
21:35:07 UTC (rev 227068)
@@ -1,36 +0,0 @@
-From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA mtas...@fedoraproject.org
-Date: Sun, 16 Nov 2014 16:55:48 +0900
-Subject: [PATCH] binaryring.c: include stdint
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On Fedora 21, binaryring.c fails to compile as:
-
-../../hacks/binaryring.c:40:9: error: unknown type name ‘uint32_t’
- typedef uint32_t pixel_t;
- ^
-Makefile:542: recipe for target 'binaryring.o' failed
-
-Just include stdint.h for this type.

- hacks/binaryring.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hacks/binaryring.c b/hacks/binaryring.c
-index 2432073..e3a58d9 100644
 a/hacks/binaryring.c
-+++ b/hacks/binaryring.c
-@@ -27,6 +27,8 @@
- #include colors.h
- #include hsv.h
- 
-+#include stdint.h
-+
- #define ANTIALIAS   1
- #define BLACK   0
- #define WHITE   1
--- 
-2.1.0
-

[arch-commits] Commit in xscreensaver/trunk (2 files)

2014-11-18 Thread Eric Bélanger 
Date: Tuesday, November 18, 2014 @ 19:55:57
  Author: eric
Revision: 226367

upgpkg: xscreensaver 5.31-1

Upstream update

Added:
  xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
Modified:
  xscreensaver/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 xscreensaver-5.31-1001-binaryring.c-include-stdint.patch |   36 +
 2 files changed, 43 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-18 18:27:58 UTC (rev 226366)
+++ PKGBUILD2014-11-18 18:55:57 UTC (rev 226367)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=xscreensaver
-pkgver=5.30
+pkgver=5.31
 pkgrel=1
 pkgdesc=Screen saver and locker for the X Window System
 arch=('i686' 'x86_64')
@@ -13,14 +13,17 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-xscreensaver-add-electricsheep.diff LICENSE)
-sha1sums=('734e0861145ec67cb848348fc25ea29393dc4d95'
+xscreensaver-add-electricsheep.diff LICENSE
+   xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
+sha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6'
   'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-  '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
+  '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
+  '5a91e707f6482a3349609e8016b7668e3cd53161')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p0 -i ${srcdir}/xscreensaver-add-electricsheep.diff
+  patch -p1 -i 
${srcdir}/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
 }
 
 build() {

Added: xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
===
--- xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
(rev 0)
+++ xscreensaver-5.31-1001-binaryring.c-include-stdint.patch2014-11-18 
18:55:57 UTC (rev 226367)
@@ -0,0 +1,36 @@
+From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA mtas...@fedoraproject.org
+Date: Sun, 16 Nov 2014 16:55:48 +0900
+Subject: [PATCH] binaryring.c: include stdint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On Fedora 21, binaryring.c fails to compile as:
+
+../../hacks/binaryring.c:40:9: error: unknown type name ‘uint32_t’
+ typedef uint32_t pixel_t;
+ ^
+Makefile:542: recipe for target 'binaryring.o' failed
+
+Just include stdint.h for this type.
+---
+ hacks/binaryring.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hacks/binaryring.c b/hacks/binaryring.c
+index 2432073..e3a58d9 100644
+--- a/hacks/binaryring.c
 b/hacks/binaryring.c
+@@ -27,6 +27,8 @@
+ #include colors.h
+ #include hsv.h
+ 
++#include stdint.h
++
+ #define ANTIALIAS   1
+ #define BLACK   0
+ #define WHITE   1
+-- 
+2.1.0
+

[arch-commits] Commit in xscreensaver/trunk (2 files)

2012-07-30 Thread Eric Bélanger 
Date: Monday, July 30, 2012 @ 17:28:19
  Author: eric
Revision: 164331

upgpkg: xscreensaver 5.19-1

Upstream update, Clean up depends, Remove old patch

Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/xscreensaver-5.18-sonar-compile.patch

---+
 PKGBUILD  |   13 +
 xscreensaver-5.18-sonar-compile.patch |   12 
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-30 15:42:06 UTC (rev 164330)
+++ PKGBUILD2012-07-30 21:28:19 UTC (rev 164331)
@@ -2,30 +2,27 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=xscreensaver
-pkgver=5.18
+pkgver=5.19
 pkgrel=1
 pkgdesc=Screen saver and locker for the X Window System
 arch=('i686' 'x86_64')
 url=http://www.jwz.org/xscreensaver/;
 license=('BSD')
-depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
+depends=('libxxf86vm' 'libglade' 'mesa' 'xorg-appres' 'libxmu' \
  'perl-libwww' 'perl-http-message')
 makedepends=('bc' 'libxpm' 'gdm')
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-add-electricsheep.diff xscreensaver.pam LICENSE
-xscreensaver-5.18-sonar-compile.patch)
-sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
+add-electricsheep.diff xscreensaver.pam LICENSE)
+sha1sums=('16437d45f568ded8721a917e082f9b4d948954ec'
   '677496218b81a42d90bee400026e94dd87fb8ffb'
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-  '4209ea586b204fd1d81c382a0522c654f9fd9134'
-  '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
+  '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p0 -i ${srcdir}/add-electricsheep.diff
-  patch -p1 -i ${srcdir}/xscreensaver-5.18-sonar-compile.patch
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
 --with-pam --with-login-manager --with-gtk --with-gl \

Deleted: xscreensaver-5.18-sonar-compile.patch
===
--- xscreensaver-5.18-sonar-compile.patch   2012-07-30 15:42:06 UTC (rev 
164330)
+++ xscreensaver-5.18-sonar-compile.patch   2012-07-30 21:28:19 UTC (rev 
164331)
@@ -1,12 +0,0 @@
 xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile   2012-07-03 
04:18:53.0 +0900
-+++ xscreensaver-5.18/hacks/glx/sonar-icmp.c   2012-07-04 09:17:12.580996448 
+0900
-@@ -591,7 +591,9 @@
- fprintf (stderr, %s: if: %4s: %s\n, progname,
-  ifa-ifa_name,
-  (ifa-ifa_addr-sa_family == AF_UNIX  ? local :
-+#ifdef AF_LINK
-   ifa-ifa_addr-sa_family == AF_LINK  ? link  :
-+#endif
-   ifa-ifa_addr-sa_family == AF_INET6 ? ipv6  :
-   other));
-   continue;

[arch-commits] Commit in xscreensaver/trunk (2 files)

2012-07-15 Thread Eric Bélanger 
Date: Sunday, July 15, 2012 @ 21:29:06
  Author: eric
Revision: 163562

upgpkg: xscreensaver 5.18-1

Upstream update, Add build patch

Added:
  xscreensaver/trunk/xscreensaver-5.18-sonar-compile.patch
Modified:
  xscreensaver/trunk/PKGBUILD

---+
 PKGBUILD  |   14 --
 xscreensaver-5.18-sonar-compile.patch |   12 
 2 files changed, 20 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-15 23:10:42 UTC (rev 163561)
+++ PKGBUILD2012-07-16 01:29:06 UTC (rev 163562)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=xscreensaver
-pkgver=5.17
-pkgrel=2
+pkgver=5.18
+pkgrel=1
 pkgdesc=Screen saver and locker for the X Window System
 arch=('i686' 'x86_64')
 url=http://www.jwz.org/xscreensaver/;
@@ -14,16 +14,18 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('8cbe8d03642a7c3216030d01286b95568319d54c'
+add-electricsheep.diff xscreensaver.pam LICENSE
+xscreensaver-5.18-sonar-compile.patch)
+sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
   '677496218b81a42d90bee400026e94dd87fb8ffb'
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-  '4209ea586b204fd1d81c382a0522c654f9fd9134')
+  '4209ea586b204fd1d81c382a0522c654f9fd9134'
+  '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p0 -i ${srcdir}/add-electricsheep.diff
-  sed -i 's/lament.xpm/lament512.xpm/' hacks/glx/Makefile.in
+  patch -p1 -i ${srcdir}/xscreensaver-5.18-sonar-compile.patch
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
 --with-pam --with-login-manager --with-gtk --with-gl \

Added: xscreensaver-5.18-sonar-compile.patch
===
--- xscreensaver-5.18-sonar-compile.patch   (rev 0)
+++ xscreensaver-5.18-sonar-compile.patch   2012-07-16 01:29:06 UTC (rev 
163562)
@@ -0,0 +1,12 @@
+--- xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile   2012-07-03 
04:18:53.0 +0900
 xscreensaver-5.18/hacks/glx/sonar-icmp.c   2012-07-04 09:17:12.580996448 
+0900
+@@ -591,7 +591,9 @@
+ fprintf (stderr, %s: if: %4s: %s\n, progname,
+  ifa-ifa_name,
+  (ifa-ifa_addr-sa_family == AF_UNIX  ? local :
++#ifdef AF_LINK
+   ifa-ifa_addr-sa_family == AF_LINK  ? link  :
++#endif
+   ifa-ifa_addr-sa_family == AF_INET6 ? ipv6  :
+   other));
+   continue;