From d621f05c9e1f561e253f9c1baa0fd49f2801d0e4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: May 26 2016 15:56:05 +0000 Subject: Update to 5.35 --- diff --git a/.gitignore b/.gitignore index 20ce3f5..3ae1a4f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /xscreensaver-5.32.ja.po.gz /xscreensaver-5.33.tar.gz /xscreensaver-5.34.tar.gz +/xscreensaver-5.35.tar.gz diff --git a/sources b/sources index 048210f..3772c16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b71f7d652ec7c28473d3526b234a3168 xscreensaver-5.34.tar.gz +672e6bb903dd4412226e22ff65df8b84 xscreensaver-5.35.tar.gz diff --git a/xscreensaver-5.26-webcollage-default-nonet.patch b/xscreensaver-5.26-webcollage-default-nonet.patch deleted file mode 100644 index 7f6edfd..0000000 --- a/xscreensaver-5.26-webcollage-default-nonet.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xscreensaver-5.26/hacks/config/webcollage.xml.nonet 2013-12-05 07:04:09.000000000 +0900 -+++ xscreensaver-5.26/hacks/config/webcollage.xml 2013-12-10 13:41:37.303883653 +0900 -@@ -28,8 +28,8 @@ - - - -- - --> -+ - - - -@@ -49,6 +49,11 @@ - - See also http://www.jwz.org/webcollage/ - -+NOTE: -+Webcollage on Fedora does not connect to internet by default -+and uses image files on your local disk. If you want webcollage to -+search for image files on net, use webcollage.original . -+ - Written by Jamie Zawinski; 1999. - - ---- xscreensaver-5.26/hacks/webcollage.man.nonet 2009-10-14 06:12:31.000000000 +0900 -+++ xscreensaver-5.26/hacks/webcollage.man 2013-12-10 13:40:38.139050305 +0900 -@@ -178,6 +178,11 @@ - .TP 8 - .B \-fps - Display the current frame rate and CPU load (MacOS only). -+.SH NOTES FOR FEDORA USER -+Webcollage on Fedora uses '-directory' option by default, so it -+.B does not connect to internet -+and uses image files on your local disk. If you want webcollage to -+search for image files on net, use webcollage.original . - .SH ENVIRONMENT - .PP - .TP 8 diff --git a/xscreensaver-5.34-0001-async_netdb-kill-gcc6-strict-aliasing-warning.patch b/xscreensaver-5.34-0001-async_netdb-kill-gcc6-strict-aliasing-warning.patch deleted file mode 100644 index b513d8e..0000000 --- a/xscreensaver-5.34-0001-async_netdb-kill-gcc6-strict-aliasing-warning.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 6e8efe88a07008a9f7f14de5b7f79dca2ba14602 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sat, 30 Jan 2016 23:29:00 +0900 -Subject: [PATCH] async_netdb: kill gcc6 strict aliasing warning - -POSIX.1-2008 sys/socket.h says "When a pointer to a -sockaddr_storage structure is cast as a pointer to -a protocol-specific address structure, ...", -but now gcc 6 warns about breaking strict aliasing -rules like: - -./../utils/async_netdb.c: In function 'async_name_from_addr_finish': -../../utils/async_netdb.c:239:36: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] - raw_addr = &((const struct sockaddr_in *)&self->addr)->sin_addr; - ^~~~~~~~~~~ -../../utils/async_netdb.c:244:36: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] - raw_addr = &((const struct sockaddr_in6 *)&self->addr)->sin6_addr; ---- - utils/async_netdb.c | 12 ++++++------ - utils/async_netdb.h | 16 ++++++++++++++-- - 2 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/utils/async_netdb.c b/utils/async_netdb.c -index 5c52161..930da40 100644 ---- a/utils/async_netdb.c -+++ b/utils/async_netdb.c -@@ -31,8 +31,8 @@ - - #if ASYNC_NETDB_USE_GAI - --# define _get_addr_family(addr) ((addr)->ss_family) --# define _get_addr_len(addr) ((addr)->ss_len) -+# define _get_addr_family(addr) ((addr)->x_sockaddr_storage.ss_family) -+# define _get_addr_len(addr) ((addr)->x_sockaddr_storage.ss_len) - - static int _has_threads; - -@@ -45,8 +45,8 @@ int _async_netdb_is_done (struct io_thread *io) - - #else /* ASYNC_NETDB_USE_GAI */ - --# define _get_addr_family(addr) ((addr)->sin_family) --# define _get_addr_len(addr) ((addr)->sin_len) -+# define _get_addr_family(addr) ((addr)->x_sockaddr_in.sin_family) -+# define _get_addr_len(addr) ((addr)->x_sockaddr_in.sin_len) - - static const int _has_threads = -1; - -@@ -236,12 +236,12 @@ async_name_from_addr_finish (async_name_from_addr_t self_raw, - switch (_get_addr_family (&self->addr)) - { - case AF_INET: -- raw_addr = &((const struct sockaddr_in *)&self->addr)->sin_addr; -+ raw_addr = &self->addr.x_sockaddr_in.sin_addr; - addrlen = 4; - break; - #if ASYNC_NETDB_USE_GAI - case AF_INET6: -- raw_addr = &((const struct sockaddr_in6 *)&self->addr)->sin6_addr; -+ raw_addr = &self->addr.x_sockaddr_in6.sin6_addr; - addrlen = 16; - break; - #endif /* ASYNC_NETDB_USE_GAI */ -diff --git a/utils/async_netdb.h b/utils/async_netdb.h -index df6c59c..3d3101f 100644 ---- a/utils/async_netdb.h -+++ b/utils/async_netdb.h -@@ -53,13 +53,25 @@ - - #if ASYNC_NETDB_USE_GAI - --typedef struct sockaddr_storage async_netdb_sockaddr_storage_t; -+/* Without using union, gcc-6 warns for -+ breaking strict aliasing rules -+ */ -+typedef union { -+ struct sockaddr_storage x_sockaddr_storage; -+ struct sockaddr_in x_sockaddr_in; -+ struct sockaddr_in6 x_sockaddr_in6; -+} async_netdb_sockaddr_storage_t; - - int _async_netdb_is_done (struct io_thread *io); - - #else - --typedef struct sockaddr_in async_netdb_sockaddr_storage_t; -+/* Because the definition for the above case is now union, -+ the definition for this case must also be union... -+*/ -+typedef union { -+ struct sockaddr_in x_sockaddr_in; -+} async_netdb_sockaddr_storage_t; - - # ifndef EAI_SYSTEM - /* The EAI_* codes are specified specifically as preprocessor macros, so --- -2.7.0 - diff --git a/xscreensaver-5.34-0002-intentation-fix-jwz.patch b/xscreensaver-5.34-0002-intentation-fix-jwz.patch deleted file mode 100644 index 20e83c7..0000000 --- a/xscreensaver-5.34-0002-intentation-fix-jwz.patch +++ /dev/null @@ -1,334 +0,0 @@ -diff --git a/driver/lock.c b/driver/lock.c -index 7c92be6..2ad1e0f 100644 ---- a/driver/lock.c -+++ b/driver/lock.c -@@ -1,5 +1,5 @@ - /* lock.c --- handling the password dialog for locking-mode. -- * xscreensaver, Copyright (c) 1993-2014 Jamie Zawinski -+ * xscreensaver, Copyright (c) 1993-2014, Jamie Zawinski - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that -@@ -534,7 +534,7 @@ make_passwd_window (saver_info *si, - /* Measure the info_label. */ - if (pw->info_label->overall_width > pw->width) - pw->width = pw->info_label->overall_width; -- h2 += pw->info_label->overall_height; -+ h2 += pw->info_label->overall_height; - - /* Measure the user string. */ - XTextExtents (pw->passwd_font, -diff --git a/hacks/barcode.c b/hacks/barcode.c -index d659216..8feea68 100644 ---- a/hacks/barcode.c -+++ b/hacks/barcode.c -@@ -824,7 +824,7 @@ static void drawDigitChar (struct state *st, Bitmap *b, int x, int y, char c) - if ((c < '0') || (c > '9')) - c = '0'; - -- bitmapDrawChar5x8 (b, x, y, c); -+ bitmapDrawChar5x8 (b, x, y, c); - } - - /* draw a upc/ean digit at the given coordinates */ -diff --git a/hacks/glx/engine.c b/hacks/glx/engine.c -index b31cf0d..c7f87a3 100644 ---- a/hacks/glx/engine.c -+++ b/hacks/glx/engine.c -@@ -326,8 +326,10 @@ static int cylinder (Engine *e, GLfloat x, GLfloat y, GLfloat z, - for (a = sangle ; a <= angle || b <= angle ; a+= step) { - y2=outer*(float)e->sin_table[a]+y; - z2=outer*(float)e->cos_table[a]+z; -- if (endcaps) -- y2c[a] = y2; z2c[a] = z2; /* cache for later */ -+ if (endcaps) { -+ y2c[a] = y2; -+ z2c[a] = z2; /* cache for later */ -+ } - if (tube) { - Y2=inner*(float)e->sin_table[a]+y; - Z2=inner*(float)e->cos_table[a]+z; -diff --git a/hacks/glx/glcells.c b/hacks/glx/glcells.c -index c312f0c..f5e486e 100644 ---- a/hacks/glx/glcells.c -+++ b/hacks/glx/glcells.c -@@ -1147,9 +1147,11 @@ static void tick( State *st ) - - /* have a snack */ - x = ((int)st->cell[b].x)/4; -- if (x<0) x=0; if (x>=w4) x = w4-1; -+ if (x<0) x=0; -+ if (x>=w4) x = w4-1; - y = ((int)st->cell[b].y)/4; -- if (y<0) y=0; if (y>=h4) y = h4-1; -+ if (y<0) y=0; -+ if (y>=h4) y = h4-1; - - offset = x+y*w4; - -diff --git a/hacks/glx/glforestfire.c b/hacks/glx/glforestfire.c -index 3697b2e..e880cfa 100644 ---- a/hacks/glx/glforestfire.c -+++ b/hacks/glx/glforestfire.c -@@ -621,13 +621,15 @@ static Bool inittree(ModeInfo * mi) - return False; - } - /* initialise positions */ -- for(i=0;inum_trees;i++) -- do { -- fs->treepos[i].x =vrnd()*TREEOUTR*2.0-TREEOUTR; -- fs->treepos[i].y =0.0; -- fs->treepos[i].z =vrnd()*TREEOUTR*2.0-TREEOUTR; -- dist=sqrt(fs->treepos[i].x *fs->treepos[i].x +fs->treepos[i].z *fs->treepos[i].z ); -- } while((distTREEOUTR)); -+ for(i=0;inum_trees;i++) { -+ do { -+ fs->treepos[i].x =vrnd()*TREEOUTR*2.0-TREEOUTR; -+ fs->treepos[i].y =0.0; -+ fs->treepos[i].z =vrnd()*TREEOUTR*2.0-TREEOUTR; -+ dist = sqrt(fs->treepos[i].x * fs->treepos[i].x + -+ fs->treepos[i].z * fs->treepos[i].z); -+ } while((distTREEOUTR)); -+ } - return True; - } - -diff --git a/hacks/glx/molecule.c b/hacks/glx/molecule.c -index cbc07b1..2423802 100644 ---- a/hacks/glx/molecule.c -+++ b/hacks/glx/molecule.c -@@ -1,4 +1,4 @@ --/* molecule, Copyright (c) 2001-2014 Jamie Zawinski -+/* molecule, Copyright (c) 2001-2016 Jamie Zawinski - * Draws molecules, based on coordinates from PDB (Protein Data Base) files. - * - * Permission to use, copy, modify, distribute, and sell this software and its -@@ -479,9 +479,12 @@ draw_bounding_box (ModeInfo *mi) - - glColor3f (c2[0], c2[1], c2[2]); - glBegin(GL_LINES); -- if (x1 > 0) x1 = 0; if (x2 < 0) x2 = 0; -- if (y1 > 0) y1 = 0; if (y2 < 0) y2 = 0; -- if (z1 > 0) z1 = 0; if (z2 < 0) z2 = 0; -+ if (x1 > 0) x1 = 0; -+ if (x2 < 0) x2 = 0; -+ if (y1 > 0) y1 = 0; -+ if (y2 < 0) y2 = 0; -+ if (z1 > 0) z1 = 0; -+ if (z2 < 0) z2 = 0; - glVertex3f(x1, 0, 0); glVertex3f(x2, 0, 0); - glVertex3f(0 , y1, 0); glVertex3f(0, y2, 0); - glVertex3f(0, 0, z1); glVertex3f(0, 0, z2); -diff --git a/hacks/penetrate.c b/hacks/penetrate.c -index 611cf84..2ce18e0 100644 ---- a/hacks/penetrate.c -+++ b/hacks/penetrate.c -@@ -172,10 +172,11 @@ static void launch (struct state *st, int xlim, int ylim, int src) - m->splits = 0; - if (m->jenis < 50) { - int j = ylim * 0.4; -- if (j) -+ if (j) { - m->splits = random() % j; - if (m->splits < ylim * 0.08) - m->splits = 0; -+ } - } - - /* special if we're from another missile */ -diff --git a/hacks/speedmine.c b/hacks/speedmine.c -index 81c4686..02d9283 100644 ---- a/hacks/speedmine.c -+++ b/hacks/speedmine.c -@@ -478,7 +478,8 @@ generate_terrain (struct state *st, int start, int end, int final) - for (w= diff/2, l=TERRAIN_BREADTH/4; - w >= final || l >= final; w /= 2, l /= 2) { - -- if (w<1) w=1; if (l<1) l=1; -+ if (w<1) w=1; -+ if (l<1) l=1; - - for (i=start+w-1; i < end; i += (w*2)) { - ip = i-w; MODULO(ip, TERRAIN_LENGTH); -diff --git a/hacks/swirl.c b/hacks/swirl.c -index d647b04..49529f6 100644 ---- a/hacks/swirl.c -+++ b/hacks/swirl.c -@@ -1355,78 +1355,78 @@ draw_swirl(ModeInfo * mi) - rotate_colors(mi->xgwa.screen, MI_COLORMAP(mi), - swirl->rgb_values, swirl->colours, 1); - #else /* !STANDALONE */ -- /* rotate the colours */ -- install_map(MI_DISPLAY(mi), swirl, swirl->dshift); -+ /* rotate the colours */ -+ install_map(MI_DISPLAY(mi), swirl, swirl->dshift); - #endif /* !STANDALONE */ - -- /* draw a batch of points */ -- swirl->batch_todo = BATCH_DRAW; -- while ((swirl->batch_todo > 0) && swirl->drawing) { -- /* draw a point */ -- draw_point(mi, swirl); -+ /* draw a batch of points */ -+ swirl->batch_todo = BATCH_DRAW; -+ while ((swirl->batch_todo > 0) && swirl->drawing) { -+ /* draw a point */ -+ draw_point(mi, swirl); - -- /* move to the next point */ -- next_point(swirl); -+ /* move to the next point */ -+ next_point(swirl); - -- /* done a point */ -- swirl->batch_todo--; -- } -+ /* done a point */ -+ swirl->batch_todo--; -+ } - } else { - #ifdef STANDALONE - if (mi->writable_p) - rotate_colors(mi->xgwa.screen, MI_COLORMAP(mi), - swirl->rgb_values, swirl->colours, 1); - #else /* !STANDALONE */ -- /* rotate the colours */ -- install_map(MI_DISPLAY(mi), swirl, swirl->shift); -+ /* rotate the colours */ -+ install_map(MI_DISPLAY(mi), swirl, swirl->shift); - #endif /* !STANDALONE */ - -- /* time for a higher resolution? */ -- if (swirl->resolution > swirl->max_resolution) { -- /* move to higher resolution */ -- swirl->resolution--; -- -- /* calculate the pixel step for this resulution */ -- swirl->r = (1 << (swirl->resolution - 1)); -- -- /* start drawing again */ -- swirl->drawing = True; -- -- /* start in the middle of the screen */ -- swirl->x = (swirl->width - swirl->r) / 2; -- swirl->y = (swirl->height - swirl->r) / 2; -- -- /* initialise spiral drawing parameters */ -- swirl->direction = DRAW_RIGHT; -- swirl->dir_todo = 1; -- swirl->dir_done = 0; -- } else { -- /* all done, decide when to restart */ -- if (swirl->start_again == -1) { -- /* start the counter */ -- swirl->start_again = RESTART; -- } else if (swirl->start_again == 0) { -- /* reset the counter */ -- swirl->start_again = -1; -+ /* time for a higher resolution? */ -+ if (swirl->resolution > swirl->max_resolution) { -+ /* move to higher resolution */ -+ swirl->resolution--; -+ -+ /* calculate the pixel step for this resulution */ -+ swirl->r = (1 << (swirl->resolution - 1)); -+ -+ /* start drawing again */ -+ swirl->drawing = True; -+ -+ /* start in the middle of the screen */ -+ swirl->x = (swirl->width - swirl->r) / 2; -+ swirl->y = (swirl->height - swirl->r) / 2; -+ -+ /* initialise spiral drawing parameters */ -+ swirl->direction = DRAW_RIGHT; -+ swirl->dir_todo = 1; -+ swirl->dir_done = 0; -+ } else { -+ /* all done, decide when to restart */ -+ if (swirl->start_again == -1) { -+ /* start the counter */ -+ swirl->start_again = RESTART; -+ } else if (swirl->start_again == 0) { -+ /* reset the counter */ -+ swirl->start_again = -1; - - #ifdef STANDALONE -- /* Pick a new colormap! */ -- XClearWindow (MI_DISPLAY(mi), MI_WINDOW(mi)); -- free_colors (mi->xgwa.screen, MI_COLORMAP(mi), -- mi->colors, mi->npixels); -- make_smooth_colormap (mi->xgwa.screen, MI_VISUAL(mi), -- MI_COLORMAP(mi), -- mi->colors, &mi->npixels, True, -- &mi->writable_p, True); -- swirl->colours = mi->npixels; -+ /* Pick a new colormap! */ -+ XClearWindow (MI_DISPLAY(mi), MI_WINDOW(mi)); -+ free_colors (mi->xgwa.screen, MI_COLORMAP(mi), -+ mi->colors, mi->npixels); -+ make_smooth_colormap (mi->xgwa.screen, MI_VISUAL(mi), -+ MI_COLORMAP(mi), -+ mi->colors, &mi->npixels, True, -+ &mi->writable_p, True); -+ swirl->colours = mi->npixels; - #endif /* STANDALONE */ - -- /* start again */ -- init_swirl(mi); -- } else -- /* decrement the counter */ -- swirl->start_again--; -- } -+ /* start again */ -+ init_swirl(mi); -+ } else -+ /* decrement the counter */ -+ swirl->start_again--; -+ } - } - } - } -diff --git a/hacks/t3d.c b/hacks/t3d.c -index 08df871..576ad3c 100644 ---- a/hacks/t3d.c -+++ b/hacks/t3d.c -@@ -563,10 +563,15 @@ fill_kugel(struct state *st, int i, Pixmap buf, int setcol) - else if(-ra<40.0) inc=2; - if(setcol) - { -- if (m==27) col=33; -+ if (m==27) -+ col=33; - else - col=(int)(m); -- if (col>33) col=33; col/=3; -+ -+ if (col>33) -+ col=33; -+ -+ col/=3; - setink(st->colors[col].pixel); - } - -diff --git a/hacks/xlyap.c b/hacks/xlyap.c -index 2d36cb9..f3fb85e 100644 ---- a/hacks/xlyap.c -+++ b/hacks/xlyap.c -@@ -827,7 +827,7 @@ Getkey(struct state *st, XKeyEvent *event) - unsigned char key; - int i; - if (XLookupString(event, (char *)&key, sizeof(key), (KeySym *)0, -- (XComposeStatus *) 0) > 0) -+ (XComposeStatus *) 0) > 0) { - - if (st->reset_countdown) - st->reset_countdown = st->linger; -@@ -956,6 +956,7 @@ Getkey(struct state *st, XKeyEvent *event) - case 'H': print_help(st); return True; - default: return False; - } -+ } - - return False; - } diff --git a/xscreensaver-5.35-0001-Fix-implicit-function-declaration-on-subprocs.c.patch b/xscreensaver-5.35-0001-Fix-implicit-function-declaration-on-subprocs.c.patch new file mode 100644 index 0000000..a870ab5 --- /dev/null +++ b/xscreensaver-5.35-0001-Fix-implicit-function-declaration-on-subprocs.c.patch @@ -0,0 +1,29 @@ +From aad8296f1f6b727adfef8f0a7794cf7536080729 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 27 May 2016 00:10:09 +0900 +Subject: [PATCH] Fix implicit function declaration on subprocs.c + +Fix the following warnings + +../../driver/subprocs.c: In function 'make_job': +../../driver/subprocs.c:288:19: warning: implicit declaration of function 'time' [-Wimplicit-function-declaration] + job->launched = time ((time_t *) 0); +--- + driver/subprocs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/driver/subprocs.c b/driver/subprocs.c +index 29ad600..c0a9f62 100644 +--- a/driver/subprocs.c ++++ b/driver/subprocs.c +@@ -44,6 +44,7 @@ + #endif /* VMS */ + + #include /* for the signal names */ ++#include /* for time */ + + #if !defined(SIGCHLD) && defined(SIGCLD) + # define SIGCHLD SIGCLD +-- +2.7.4 + diff --git a/xscreensaver-5.35-webcollage-default-nonet.patch b/xscreensaver-5.35-webcollage-default-nonet.patch new file mode 100644 index 0000000..4c6ab80 --- /dev/null +++ b/xscreensaver-5.35-webcollage-default-nonet.patch @@ -0,0 +1,38 @@ +--- xscreensaver-5.35/hacks/config/webcollage.xml.nonet 2016-04-08 11:15:38.000000000 +0900 ++++ xscreensaver-5.35/hacks/config/webcollage.xml 2016-05-26 23:47:38.000000000 +0900 +@@ -28,8 +28,8 @@ + + + +- + --> ++ + + + +@@ -49,6 +49,11 @@ + + See also https://www.jwz.org/webcollage/ + ++NOTE: ++Webcollage on Fedora does not connect to internet by default ++and uses image files on your local disk. If you want webcollage to ++search for image files on net, use webcollage.original . ++ + Written by Jamie Zawinski; 1999. + + +--- xscreensaver-5.26/hacks/webcollage.man.nonet 2009-10-14 06:12:31.000000000 +0900 ++++ xscreensaver-5.26/hacks/webcollage.man 2013-12-10 13:40:38.139050305 +0900 +@@ -178,6 +178,11 @@ + .TP 8 + .B \-fps + Display the current frame rate and CPU load (MacOS only). ++.SH NOTES FOR FEDORA USER ++Webcollage on Fedora uses '-directory' option by default, so it ++.B does not connect to internet ++and uses image files on your local disk. If you want webcollage to ++search for image files on net, use webcollage.original . + .SH ENVIRONMENT + .PP + .TP 8 diff --git a/xscreensaver.spec b/xscreensaver.spec index b31dd69..e7ed5b0 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,6 +1,6 @@ %define name xscreensaver -%define mainversion 5.34 +%define mainversion 5.35 %define beta_ver %{nil} @@ -10,7 +10,7 @@ %define split_getimage 1 %endif -%define fedora_rel 3 +%define fedora_rel 1 %global use_clang_as_cc 0 %global use_clang_analyze 0 @@ -40,7 +40,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{mainversion} -Release: %{fedora_rel}%{?dist}%{?extrarel}.1 +Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: MIT Group: Amusements/Graphics @@ -66,7 +66,7 @@ Patch1: xscreensaver-5.00b5-sanitize-hacks.patch %global PATCH21_desc \ # Change webcollage not to access to net \ # Also see bug 472061 -Patch21: xscreensaver-5.26-webcollage-default-nonet.patch +Patch21: xscreensaver-5.35-webcollage-default-nonet.patch # %global PATCH51_desc \ # driver/test-passwd tty segfaults @@ -77,13 +77,9 @@ Patch52: xscreensaver-5.12-tests-miscfix.patch # # Enable double buffer on cubestorm Patch3204: xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch -# Kill gcc6 warning for string aliasing rule -Patch3401: xscreensaver-5.34-0001-async_netdb-kill-gcc6-strict-aliasing-warning.patch -# -%global PATCH3402_desc \ -# Fix indentation warnings by gcc6 -Wmisleading-indentation -Patch3402: xscreensaver-5.34-0002-intentation-fix-jwz.patch # +# Fix implicit function declaration on subprocs.c +Patch3501: xscreensaver-5.35-0001-Fix-implicit-function-declaration-on-subprocs.c.patch # # Patches end Requires: xscreensaver-base = %{epoch}:%{version}-%{release} @@ -344,9 +340,7 @@ rm -f driver/XScreenSaver_ad.h %__git commit -m "%PATCH52_desc" -a %__cat %PATCH3204 | %__git am -%__cat %PATCH3401 | %__git am -%patch3402 -p1 - %__git commit -m "%PATCH3402_desc" "--author=Jamie Zawinski " -a +%__cat %PATCH3501 | %__git am change_option(){ set +x @@ -1006,6 +1000,9 @@ exit 0 %endif %changelog +* Thu May 26 2016 Mamoru TASAKA - 1:5.35-1 +- Update to 5.35 + * Fri Feb 05 2016 Fedora Release Engineering - 1:5.34-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild