Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 692716 - x11-misc/xscreensaver-5.43 - xscreensaver-5.43.tar.gz reissue
Summary: x11-misc/xscreensaver-5.43 - xscreensaver-5.43.tar.gz reissue
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Desktop Misc. Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-08-22 09:36 UTC by Fabio Coatti
Modified: 2019-08-22 10:34 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Fabio Coatti 2019-08-22 09:36:27 UTC
Looking at xscreensaver-demo I noticed that deepstars hack was missing. Digging on this issue I noticed that the tar.gz file downloaded by ebuild file is different from what is provided by upstream (jwz):
3e0cf3e658a08efc5ef2afb79e690e86  xscreensaver-5.43.tar.gz
aa856bce076e58b021bfc0295fdc45e1  xscreensaver-5.43.tar.gz_jwz

Diffing the content you can see quite a lot of differences, like this one (juist an excerpt):

diff -urN xscreensaver-5.43_jwz/hacks/glx/Makefile.in xscreensaver-5.43/hacks/glx/Makefile.in
--- xscreensaver-5.43_jwz/hacks/glx/Makefile.in 2019-07-10 05:31:26.000000000 +0200
+++ xscreensaver-5.43/hacks/glx/Makefile.in     2019-07-01 23:17:52.000000000 +0200
@@ -137,7 +137,7 @@
                  raverhoop.c hydrostat.c discoball.c cubetwist.c cubestack.c \
                  splodesic.c hexstrut.c vigilance.c seccam.c esper.c \
                  razzledazzle.c ships.c peepers.c crumbler.c quickhull.c \
-                 maze3d.c handsy.c handsy_model.c gravitywell.c deepstars.c
+                 maze3d.c handsy.c handsy_model.c gravitywell.c
 
 OBJS           = xscreensaver-gl-helper.o normals.o erase-gl.o fps-gl.o \
                  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \


I don't know the reason for this issue (maybe upstream changed tar file?) but it could be worth update the ebuild to use the current one.


Reproducible: Always
Comment 1 Jeroen Roovers (RETIRED) gentoo-dev 2019-08-22 10:12:16 UTC
-# Auto-generated: Mon Jul  1 14:17:56 PDT 2019
+# Auto-generated: Tue Jul  9 20:31:29 PDT 2019
Comment 2 Larry the Git Cow gentoo-dev 2019-08-22 10:30:03 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9db15838fbc91ccf890d85207eb8b9a94b1a24

commit ab9db15838fbc91ccf890d85207eb8b9a94b1a24
Author:     Jeroen Roovers <jer@gentoo.org>
AuthorDate: 2019-08-22 10:25:25 +0000
Commit:     Jeroen Roovers <jer@gentoo.org>
CommitDate: 2019-08-22 10:29:59 +0000

    x11-misc/xscreensaver: Add deepstars hack
    
    Package-Manager: Portage-2.3.72, Repoman-2.3.17
    Fixes: https://bugs.gentoo.org/692716
    Signed-off-by: Jeroen Roovers <jer@gentoo.org>

 x11-misc/xscreensaver/Manifest                                          | 2 +-
 .../{xscreensaver-5.43.ebuild => xscreensaver-5.43-r1.ebuild}           | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
Comment 3 Larry the Git Cow gentoo-dev 2019-08-22 10:34:28 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fc4932484b22e8fc3a7ecc177d4787eb889b61

commit d9fc4932484b22e8fc3a7ecc177d4787eb889b61
Author:     Jeroen Roovers <jer@gentoo.org>
AuthorDate: 2019-08-22 10:33:47 +0000
Commit:     Jeroen Roovers <jer@gentoo.org>
CommitDate: 2019-08-22 10:34:24 +0000

    x11-misc/xscreensaver: Rename ${A}
    
    Package-Manager: Portage-2.3.72, Repoman-2.3.17
    Bug: https://bugs.gentoo.org/692716
    Signed-off-by: Jeroen Roovers <jer@gentoo.org>

 x11-misc/xscreensaver/Manifest                    | 2 +-
 x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)