reinstate xscreensaver desktop files and resolve conflict with mate-screensaver

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

reinstate xscreensaver desktop files and resolve conflict with mate-screensaver

Landry Breuil-5
Hi,

xfce4-screensaver (as a fork of mate-screensaver) can make use of
xscreensavers if available, but only if the desktop files are provided
by xscreensaver.

They were removed from xscreensaver in
https://github.com/openbsd/ports/commit/aca4d39d8b5fcecb58e12320be0ac983d0134ae5#diff-23f2811b8a1d1d05717bfc412b99bc66
because gnome-screensaver had been removed, but i think they can be
reinstated as they can be used/listed as available by mate-screensaver &
xfce4-screensaver. No need to add a RDEP on xscreensaver though.
I looked and most linux distros ship those .desktop files too.

While here install popsquares.desktop from mate as
mate-popsquares.desktop so that it doesnt conflict with the one from
xscreensaver - no need to rename the binary as its installed in a
distinct dir. xfce4-screensaver installs xfce4-popsquares.desktop.
On this point for example, debian's xscreensaver doesnt ship popsquares
since
https://salsa.debian.org/debian/xscreensaver/commit/3418b1b065fa32b02a0ee58308a6dea920af0220

ok ?

mate-screensaver-unconflict.diff (1K) Download Attachment
xscreensaver-desktop-files.diff (14K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: reinstate xscreensaver desktop files and resolve conflict with mate-screensaver

Robert Nagy
ok for me

On 08/12/18 16:35 +0100, Landry Breuil wrote:

> Hi,
>
> xfce4-screensaver (as a fork of mate-screensaver) can make use of
> xscreensavers if available, but only if the desktop files are provided
> by xscreensaver.
>
> They were removed from xscreensaver in
> https://github.com/openbsd/ports/commit/aca4d39d8b5fcecb58e12320be0ac983d0134ae5#diff-23f2811b8a1d1d05717bfc412b99bc66
> because gnome-screensaver had been removed, but i think they can be
> reinstated as they can be used/listed as available by mate-screensaver &
> xfce4-screensaver. No need to add a RDEP on xscreensaver though.
> I looked and most linux distros ship those .desktop files too.
>
> While here install popsquares.desktop from mate as
> mate-popsquares.desktop so that it doesnt conflict with the one from
> xscreensaver - no need to rename the binary as its installed in a
> distinct dir. xfce4-screensaver installs xfce4-popsquares.desktop.
> On this point for example, debian's xscreensaver doesnt ship popsquares
> since
> https://salsa.debian.org/debian/xscreensaver/commit/3418b1b065fa32b02a0ee58308a6dea920af0220
>
> ok ?

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/mate/screensaver/Makefile,v
> retrieving revision 1.10
> diff -u -r1.10 Makefile
> --- Makefile 22 Sep 2018 06:08:03 -0000 1.10
> +++ Makefile 8 Dec 2018 12:10:08 -0000
> @@ -5,7 +5,7 @@
>  MATE_PROJECT= mate-screensaver
>  MATE_VERSION= 1.20.2
>  
> -REVISION= 0
> +REVISION= 1
>  
>  # LGPLv2
>  PERMIT_PACKAGE_CDROM= Yes
> @@ -46,5 +46,6 @@
>  post-install:
>   @mv ${WRKINST}/etc/xdg/autostart \
>   ${PREFIX}/share/examples/mate-screensaver/xdg/autostart
> + @mv ${PREFIX}/share/applications/screensavers/{,mate-}popsquares.desktop
>  
>  .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/mate/screensaver/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -r1.4 PLIST
> --- pkg/PLIST 20 Sep 2018 11:16:44 -0000 1.4
> +++ pkg/PLIST 8 Dec 2018 12:10:08 -0000
> @@ -19,8 +19,8 @@
>  share/applications/screensavers/cosmos-slideshow.desktop
>  share/applications/screensavers/footlogo-floaters.desktop
>  share/applications/screensavers/gnomelogo-floaters.desktop
> +share/applications/screensavers/mate-popsquares.desktop
>  share/applications/screensavers/personal-slideshow.desktop
> -share/applications/screensavers/popsquares.desktop
>  share/backgrounds/
>  share/backgrounds/cosmos/
>  share/backgrounds/cosmos/background-1.xml

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/xscreensaver/Makefile,v
> retrieving revision 1.98
> diff -u -r1.98 Makefile
> --- Makefile 13 Aug 2018 18:53:50 -0000 1.98
> +++ Makefile 8 Dec 2018 12:10:39 -0000
> @@ -4,6 +4,7 @@
>  
>  # XXX x11/kde4/artwork plist may need regen if an update adds a new hack.
>  DISTNAME= xscreensaver-5.40
> +REVISION= 0
>  
>  CATEGORIES= x11
>  
> @@ -57,5 +58,16 @@
>  .for i in deco circuit
>   mv ${PREFIX}/man/man6/$i.6 ${PREFIX}/man/man6/xscreensaver-$i.6
>  .endfor
> +# create dot.desktop files from xscreensaver xml files for use
> +# by freedesktop compliant screensavers
> + cp ${FILESDIR}/migrate-xscreensaver-config.sh ${WRKSRC}/hacks/config
> + cp ${FILESDIR}/xscreensaver-config.xsl ${WRKSRC}/hacks/config
> + cd ${WRKSRC}/hacks/config && \
> + for i in ${WRKSRC}/hacks/config/*.xml; do \
> + /bin/sh migrate-xscreensaver-config.sh $${i} ; done
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/screensavers/
> + ${INSTALL_DATA} ${WRKSRC}/hacks/config/*.desktop \
> + ${PREFIX}/share/applications/screensavers/
> +
>  
>  .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/xscreensaver/pkg/PLIST,v
> retrieving revision 1.45
> diff -u -r1.45 PLIST
> --- pkg/PLIST 13 Aug 2018 18:53:50 -0000 1.45
> +++ pkg/PLIST 8 Dec 2018 12:10:39 -0000
> @@ -489,6 +489,263 @@
>  @man man/man6/xscreensaver-gl-helper.6
>  @man man/man6/xspirograph.6
>  @man man/man6/zoom.6
> +share/applications/screensavers/
> +share/applications/screensavers/abstractile.desktop
> +share/applications/screensavers/anemone.desktop
> +share/applications/screensavers/anemotaxis.desktop
> +share/applications/screensavers/ant.desktop
> +share/applications/screensavers/antinspect.desktop
> +share/applications/screensavers/antmaze.desktop
> +share/applications/screensavers/antspotlight.desktop
> +share/applications/screensavers/apollonian.desktop
> +share/applications/screensavers/apple2.desktop
> +share/applications/screensavers/atlantis.desktop
> +share/applications/screensavers/attraction.desktop
> +share/applications/screensavers/atunnel.desktop
> +share/applications/screensavers/barcode.desktop
> +share/applications/screensavers/binaryring.desktop
> +share/applications/screensavers/blaster.desktop
> +share/applications/screensavers/blinkbox.desktop
> +share/applications/screensavers/blitspin.desktop
> +share/applications/screensavers/blocktube.desktop
> +share/applications/screensavers/boing.desktop
> +share/applications/screensavers/bouboule.desktop
> +share/applications/screensavers/bouncingcow.desktop
> +share/applications/screensavers/boxed.desktop
> +share/applications/screensavers/boxfit.desktop
> +share/applications/screensavers/braid.desktop
> +share/applications/screensavers/bsod.desktop
> +share/applications/screensavers/bubble3d.desktop
> +share/applications/screensavers/bubbles.desktop
> +share/applications/screensavers/bumps.desktop
> +share/applications/screensavers/cage.desktop
> +share/applications/screensavers/carousel.desktop
> +share/applications/screensavers/ccurve.desktop
> +share/applications/screensavers/celtic.desktop
> +share/applications/screensavers/circuit.desktop
> +share/applications/screensavers/cityflow.desktop
> +share/applications/screensavers/cloudlife.desktop
> +share/applications/screensavers/companioncube.desktop
> +share/applications/screensavers/compass.desktop
> +share/applications/screensavers/coral.desktop
> +share/applications/screensavers/crackberg.desktop
> +share/applications/screensavers/critical.desktop
> +share/applications/screensavers/crumbler.desktop
> +share/applications/screensavers/crystal.desktop
> +share/applications/screensavers/cube21.desktop
> +share/applications/screensavers/cubenetic.desktop
> +share/applications/screensavers/cubestack.desktop
> +share/applications/screensavers/cubestorm.desktop
> +share/applications/screensavers/cubetwist.desktop
> +share/applications/screensavers/cubicgrid.desktop
> +share/applications/screensavers/cwaves.desktop
> +share/applications/screensavers/cynosure.desktop
> +share/applications/screensavers/dangerball.desktop
> +share/applications/screensavers/decayscreen.desktop
> +share/applications/screensavers/deco.desktop
> +share/applications/screensavers/deluxe.desktop
> +share/applications/screensavers/demon.desktop
> +share/applications/screensavers/discoball.desktop
> +share/applications/screensavers/discrete.desktop
> +share/applications/screensavers/distort.desktop
> +share/applications/screensavers/dnalogo.desktop
> +share/applications/screensavers/drift.desktop
> +share/applications/screensavers/dymaxionmap.desktop
> +share/applications/screensavers/endgame.desktop
> +share/applications/screensavers/energystream.desktop
> +share/applications/screensavers/engine.desktop
> +share/applications/screensavers/epicycle.desktop
> +share/applications/screensavers/eruption.desktop
> +share/applications/screensavers/esper.desktop
> +share/applications/screensavers/euler2d.desktop
> +share/applications/screensavers/extrusion.desktop
> +share/applications/screensavers/fadeplot.desktop
> +share/applications/screensavers/fiberlamp.desktop
> +share/applications/screensavers/filmleader.desktop
> +share/applications/screensavers/fireworkx.desktop
> +share/applications/screensavers/flag.desktop
> +share/applications/screensavers/flame.desktop
> +share/applications/screensavers/flipflop.desktop
> +share/applications/screensavers/flipscreen3d.desktop
> +share/applications/screensavers/fliptext.desktop
> +share/applications/screensavers/flow.desktop
> +share/applications/screensavers/fluidballs.desktop
> +share/applications/screensavers/flurry.desktop
> +share/applications/screensavers/flyingtoasters.desktop
> +share/applications/screensavers/fontglide.desktop
> +share/applications/screensavers/forest.desktop
> +share/applications/screensavers/fuzzyflakes.desktop
> +share/applications/screensavers/galaxy.desktop
> +share/applications/screensavers/gears.desktop
> +share/applications/screensavers/geodesic.desktop
> +share/applications/screensavers/geodesicgears.desktop
> +share/applications/screensavers/gflux.desktop
> +share/applications/screensavers/glblur.desktop
> +share/applications/screensavers/glcells.desktop
> +share/applications/screensavers/gleidescope.desktop
> +share/applications/screensavers/glforestfire.desktop
> +share/applications/screensavers/glhanoi.desktop
> +share/applications/screensavers/glitchpeg.desktop
> +share/applications/screensavers/glknots.desktop
> +share/applications/screensavers/glmatrix.desktop
> +share/applications/screensavers/glplanet.desktop
> +share/applications/screensavers/glschool.desktop
> +share/applications/screensavers/glslideshow.desktop
> +share/applications/screensavers/glsnake.desktop
> +share/applications/screensavers/gltext.desktop
> +share/applications/screensavers/goop.desktop
> +share/applications/screensavers/grav.desktop
> +share/applications/screensavers/greynetic.desktop
> +share/applications/screensavers/halftone.desktop
> +share/applications/screensavers/halo.desktop
> +share/applications/screensavers/helix.desktop
> +share/applications/screensavers/hexadrop.desktop
> +share/applications/screensavers/hexstrut.desktop
> +share/applications/screensavers/hilbert.desktop
> +share/applications/screensavers/hopalong.desktop
> +share/applications/screensavers/hydrostat.desktop
> +share/applications/screensavers/hyperball.desktop
> +share/applications/screensavers/hypercube.desktop
> +share/applications/screensavers/hypertorus.desktop
> +share/applications/screensavers/hypnowheel.desktop
> +share/applications/screensavers/ifs.desktop
> +share/applications/screensavers/imsmap.desktop
> +share/applications/screensavers/interaggregate.desktop
> +share/applications/screensavers/interference.desktop
> +share/applications/screensavers/intermomentary.desktop
> +share/applications/screensavers/jigglypuff.desktop
> +share/applications/screensavers/jigsaw.desktop
> +share/applications/screensavers/juggle.desktop
> +share/applications/screensavers/juggler3d.desktop
> +share/applications/screensavers/julia.desktop
> +share/applications/screensavers/kaleidescope.desktop
> +share/applications/screensavers/kaleidocycle.desktop
> +share/applications/screensavers/klein.desktop
> +share/applications/screensavers/kumppa.desktop
> +share/applications/screensavers/lament.desktop
> +share/applications/screensavers/laser.desktop
> +share/applications/screensavers/lavalite.desktop
> +share/applications/screensavers/lcdscrub.desktop
> +share/applications/screensavers/lightning.desktop
> +share/applications/screensavers/lisa.desktop
> +share/applications/screensavers/lissie.desktop
> +share/applications/screensavers/lmorph.desktop
> +share/applications/screensavers/lockward.desktop
> +share/applications/screensavers/loop.desktop
> +share/applications/screensavers/m6502.desktop
> +share/applications/screensavers/maze.desktop
> +share/applications/screensavers/maze3d.desktop
> +share/applications/screensavers/memscroller.desktop
> +share/applications/screensavers/menger.desktop
> +share/applications/screensavers/metaballs.desktop
> +share/applications/screensavers/mirrorblob.desktop
> +share/applications/screensavers/mismunch.desktop
> +share/applications/screensavers/moebius.desktop
> +share/applications/screensavers/moebiusgears.desktop
> +share/applications/screensavers/moire.desktop
> +share/applications/screensavers/moire2.desktop
> +share/applications/screensavers/molecule.desktop
> +share/applications/screensavers/morph3d.desktop
> +share/applications/screensavers/mountain.desktop
> +share/applications/screensavers/munch.desktop
> +share/applications/screensavers/nerverot.desktop
> +share/applications/screensavers/noof.desktop
> +share/applications/screensavers/noseguy.desktop
> +share/applications/screensavers/pacman.desktop
> +share/applications/screensavers/pedal.desktop
> +share/applications/screensavers/peepers.desktop
> +share/applications/screensavers/penetrate.desktop
> +share/applications/screensavers/penrose.desktop
> +share/applications/screensavers/petri.desktop
> +share/applications/screensavers/phosphor.desktop
> +share/applications/screensavers/photopile.desktop
> +share/applications/screensavers/piecewise.desktop
> +share/applications/screensavers/pinion.desktop
> +share/applications/screensavers/pipes.desktop
> +share/applications/screensavers/polyhedra.desktop
> +share/applications/screensavers/polyominoes.desktop
> +share/applications/screensavers/polytopes.desktop
> +share/applications/screensavers/pong.desktop
> +share/applications/screensavers/popsquares.desktop
> +share/applications/screensavers/projectiveplane.desktop
> +share/applications/screensavers/providence.desktop
> +share/applications/screensavers/pulsar.desktop
> +share/applications/screensavers/pyro.desktop
> +share/applications/screensavers/qix.desktop
> +share/applications/screensavers/quasicrystal.desktop
> +share/applications/screensavers/queens.desktop
> +share/applications/screensavers/raverhoop.desktop
> +share/applications/screensavers/razzledazzle.desktop
> +share/applications/screensavers/rd-bomb.desktop
> +share/applications/screensavers/rdbomb.desktop
> +share/applications/screensavers/ripples.desktop
> +share/applications/screensavers/rocks.desktop
> +share/applications/screensavers/romanboy.desktop
> +share/applications/screensavers/rorschach.desktop
> +share/applications/screensavers/rotor.desktop
> +share/applications/screensavers/rotzoomer.desktop
> +share/applications/screensavers/rubik.desktop
> +share/applications/screensavers/rubikblocks.desktop
> +share/applications/screensavers/sballs.desktop
> +share/applications/screensavers/shadebobs.desktop
> +share/applications/screensavers/sierpinski.desktop
> +share/applications/screensavers/sierpinski3d.desktop
> +share/applications/screensavers/skytentacles.desktop
> +share/applications/screensavers/slidescreen.desktop
> +share/applications/screensavers/slip.desktop
> +share/applications/screensavers/sonar.desktop
> +share/applications/screensavers/speedmine.desktop
> +share/applications/screensavers/sphere.desktop
> +share/applications/screensavers/spheremonics.desktop
> +share/applications/screensavers/spiral.desktop
> +share/applications/screensavers/splitflap.desktop
> +share/applications/screensavers/splodesic.desktop
> +share/applications/screensavers/spotlight.desktop
> +share/applications/screensavers/sproingies.desktop
> +share/applications/screensavers/squiral.desktop
> +share/applications/screensavers/stairs.desktop
> +share/applications/screensavers/starfish.desktop
> +share/applications/screensavers/starwars.desktop
> +share/applications/screensavers/stonerview.desktop
> +share/applications/screensavers/strange.desktop
> +share/applications/screensavers/substrate.desktop
> +share/applications/screensavers/superquadrics.desktop
> +share/applications/screensavers/surfaces.desktop
> +share/applications/screensavers/swirl.desktop
> +share/applications/screensavers/t3d.desktop
> +share/applications/screensavers/tangram.desktop
> +share/applications/screensavers/tessellimage.desktop
> +share/applications/screensavers/testx11.desktop
> +share/applications/screensavers/thornbird.desktop
> +share/applications/screensavers/timetunnel.desktop
> +share/applications/screensavers/topblock.desktop
> +share/applications/screensavers/triangle.desktop
> +share/applications/screensavers/tronbit.desktop
> +share/applications/screensavers/truchet.desktop
> +share/applications/screensavers/twang.desktop
> +share/applications/screensavers/unicrud.desktop
> +share/applications/screensavers/unknownpleasures.desktop
> +share/applications/screensavers/vermiculate.desktop
> +share/applications/screensavers/vfeedback.desktop
> +share/applications/screensavers/vidwhacker.desktop
> +share/applications/screensavers/vigilance.desktop
> +share/applications/screensavers/vines.desktop
> +share/applications/screensavers/voronoi.desktop
> +share/applications/screensavers/wander.desktop
> +share/applications/screensavers/webcollage.desktop
> +share/applications/screensavers/whirlwindwarp.desktop
> +share/applications/screensavers/whirlygig.desktop
> +share/applications/screensavers/winduprobot.desktop
> +share/applications/screensavers/worm.desktop
> +share/applications/screensavers/wormhole.desktop
> +share/applications/screensavers/xanalogtv.desktop
> +share/applications/screensavers/xflame.desktop
> +share/applications/screensavers/xjack.desktop
> +share/applications/screensavers/xlyap.desktop
> +share/applications/screensavers/xmatrix.desktop
> +share/applications/screensavers/xrayswarm.desktop
> +share/applications/screensavers/xspirograph.desktop
> +share/applications/screensavers/zoom.desktop
>  share/applications/xscreensaver-properties.desktop
>  share/locale/da/LC_MESSAGES/xscreensaver.mo
>  share/locale/de/LC_MESSAGES/xscreensaver.mo