From 9783f8f5a2bd3bd5ed479b3826428e93ae5d5211 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 1 Jul 2021 22:19:09 -0400 Subject: updpkg: libre/xscreensaver 6.00-2.parabola1 Signed-off-by: David P --- libre/xscreensaver/PKGBUILD | 27 +++++++++++++++------------ libre/xscreensaver/Remove_bsod.patch | 25 +++++++++++++++---------- 2 files changed, 30 insertions(+), 22 deletions(-) (limited to 'libre') diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD index ed1baba03..e091c9b33 100644 --- a/libre/xscreensaver/PKGBUILD +++ b/libre/xscreensaver/PKGBUILD @@ -8,8 +8,8 @@ # removed nonfree asm files pkgname=xscreensaver -pkgver=5.44 -pkgrel=1 +pkgver=6.00 +pkgrel=2 pkgrel+=.parabola1 pkgdesc='Screen saver and locker for the X Window System' pkgdesc+=", without nonfree asm files" @@ -17,29 +17,32 @@ url='https://www.jwz.org/xscreensaver/' arch=('x86_64') arch+=('i686' 'armv7h') license=('BSD') -depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww' 'libsystemd.so') +depends=( + 'gtk2' 'glu' 'xorg-appres' 'libglvnd' 'libjpeg-turbo' 'libjpeg.so' + 'libsystemd.so' 'libx11' 'libxcrypt' 'libcrypt.so' 'libxext' 'libxft' 'libxi' + 'libxinerama' 'libxmu' 'libxrandr' 'libxt' 'libxxf86vm' 'perl-libwww' 'pam' + 'libpam.so' 'glibc' 'glib2' 'gdk-pixbuf2' 'gdk-pixbuf-xlib' +) makedepends=('bc' 'intltool' 'libxpm' 'gdm' 'systemd' 'systemd-libs') optdepends=('gdm: for login manager support') backup=('etc/pam.d/xscreensaver') source=(https://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz LICENSE Remove_bsod.patch) -sha512sums=('9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae' +sha512sums=('7292bacf633137b5c0eb2de9a99dc238b2012a113e62c86d4be19fc2fd4fea7133bd950253ca2d3a4ab27af4b4dc9a40a857e8d3dc714946ccfa7efcd043ded6' '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e' - '376370c40c959e4db022cc07382962b2e2f80925b4f9d3c29fbef1dd0788bfe3ab2741b85da52430566398be7430f9f5468fcf0471f79b72de96f451d51b2f90') -b2sums=('102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3' + '1b63c91ae8ef74b9fe34ddf098620299fcf791140468240eeebbdc00a1d34f176d3a67ba90b942bfece0c76c2239eea02d86b5405e5397c7cff6e021c5bf72e3') +b2sums=('228f176915f0f62bc782d43b19c767bd58f72820665ed1c0602fc5f7de4b58898de2c087905fab6bca886452a996985c361e844854dfb864066699db9c4e7235' 'cacb6ba39d6ecb8703ef5f5a7dc74de0ca805cce73b43a8b9b6b4c255c909aa9b5e692de76c2fbd4da26ce6efb5f2a46138c43b1b37f53cee6d20fd6ed41f4a9' - '8b2b1986e06d3f07605b4c3fe325aede1b3473fbd22281ff7348584f80d00da8ef415d2730e2d93d565e28fd4a6b9824f290dfa36ea64ba67e95ae8d5df9ae00') + '1152d9141f994bb1494a4583460529ff607d3cb1ab5b53e8f2fa65d1bf9c9552c4d8e246dc5ce28c6e63735b46234baad6768d89c85c159f0ff089da66cc319a') prepare() { cd ${pkgname}-${pkgver} # Deleting dmsc.asm file due which don't have source code supplied rm -v hacks/images/m6502/dmsc.asm - # Remove BSOD for referneces to non-free (Issue #2391) + # Remove BSOD for references to non-free (Issue #2391) patch -Nup1 hacks/Makefile.in ../Remove_bsod.patch rm -v hacks/bsod* - sed 's|-std=c89||' -i configure.in - autoreconf -fiv } build() { @@ -50,6 +53,8 @@ build() { --localstatedir=/var \ --libexecdir=/usr/lib \ --with-x-app-defaults=/usr/share/X11/app-defaults \ + --without-setuid-hacks \ + --without-setcap-hacks \ --with-pam \ --with-login-manager \ --with-gtk \ @@ -65,7 +70,5 @@ package() { install -d "${pkgdir}/etc/pam.d" make install_prefix="${pkgdir}" install install -Dm 644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" - # remove sticky bit - chmod 755 "${pkgdir}/usr/bin/xscreensaver" echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" } diff --git a/libre/xscreensaver/Remove_bsod.patch b/libre/xscreensaver/Remove_bsod.patch index b682749b4..55a228d8c 100644 --- a/libre/xscreensaver/Remove_bsod.patch +++ b/libre/xscreensaver/Remove_bsod.patch @@ -1,24 +1,26 @@ ---- a/hacks/Makefile.in 2018-12-28 20:21:49.000000000 -0400 -+++ b/hacks/Makefile.in 2019-07-20 07:28:35.915050337 -0300 -@@ -104,7 +104,7 @@ +diff --git a/hacks/Makefile.in b/hacks/Makefile.in +index ef6ee5c..6f4ee46 100644 +--- a/hacks/Makefile.in ++++ b/hacks/Makefile.in +@@ -104,7 +104,7 @@ SRCS = xscreensaver-getimage.c \ rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \ - rotor.c ant.c xjack.c xlyap.c xscreensaver-sgigl.c \ + rotor.c ant.c xjack.c xlyap.c \ cynosure.c moire2.c flow.c epicycle.c interference.c \ - truchet.c bsod.c crystal.c discrete.c distort.c kumppa.c \ + truchet.c crystal.c discrete.c distort.c kumppa.c \ demon.c loop.c t3d.c penetrate.c deluxe.c compass.c \ squiral.c xflame.c wander.c spotlight.c critical.c \ phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c ccurve.c \ -@@ -145,7 +145,7 @@ +@@ -142,7 +142,7 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \ - rotor.o ant.o xjack.o xlyap.o xscreensaver-sgigl.o \ + rotor.o ant.o xjack.o xlyap.o xscreensaver-getimage.o \ cynosure.o moire2.o flow.o epicycle.o interference.o \ - truchet.o bsod.o crystal.o discrete.o distort.o kumppa.o \ + truchet.o crystal.o discrete.o distort.o kumppa.o \ demon.o loop.o t3d.o penetrate.o deluxe.o compass.o \ squiral.o xflame.o wander.o spotlight.o critical.o \ phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o ccurve.o \ -@@ -174,7 +174,7 @@ +@@ -171,7 +171,7 @@ EXES = attraction blitspin bouboule braid decayscreen deco \ slip strange swirl goop starfish munch \ fadeplot rd-bomb coral mountain triangle \ xjack xlyap cynosure moire2 flow epicycle \ @@ -27,7 +29,7 @@ demon loop penetrate deluxe compass squiral xflame \ wander spotlight phosphor xmatrix petri shadebobs \ ccurve blaster bumps ripples xspirograph \ -@@ -214,7 +214,7 @@ +@@ -210,7 +210,7 @@ HDRS = screenhack.h screenhackI.h fps.h fpsI.h xlockmore.h \ apple2.h analogtv.h pacman.h pacman_ai.h pacman_level.h \ asm6502.h delaunay.h recanim.h MEN = anemone.man apollonian.man attraction.man \ @@ -36,7 +38,7 @@ bumps.man ccurve.man compass.man coral.man \ crystal.man cynosure.man decayscreen.man \ deco.man deluxe.man demon.man discrete.man distort.man \ -@@ -688,9 +688,6 @@ +@@ -661,9 +661,6 @@ interference: interference.o $(HACK_OBJS) $(COL) $(SHM) $(THRO) $(DBE) truchet: truchet.o $(HACK_OBJS) $(COL) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) @@ -46,7 +48,7 @@ apple2: apple2.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) $(CC_HACK) -o $@ $@.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) $(PNG_LIBS) $(TEXT_LIBS) $(THRL) -@@ -1293,38 +1290,6 @@ +@@ -1294,41 +1291,6 @@ braid.o: $(UTILS_SRC)/xft.h braid.o: $(UTILS_SRC)/yarandom.h braid.o: $(srcdir)/xlockmoreI.h braid.o: $(srcdir)/xlockmore.h @@ -60,6 +62,8 @@ -bsod.o: images/gen/atari_png.h -bsod.o: images/gen/atm_png.h -bsod.o: images/gen/dvd_png.h +-bsod.o: images/gen/gnome1_png.h +-bsod.o: images/gen/gnome2_png.h -bsod.o: images/gen/hmac_png.h -bsod.o: images/gen/macbomb_png.h -bsod.o: images/gen/mac_png.h @@ -79,6 +83,7 @@ -bsod.o: $(UTILS_SRC)/thread_util.h -bsod.o: $(UTILS_SRC)/usleep.h -bsod.o: $(UTILS_SRC)/visual.h +-bsod.o: $(UTILS_SRC)/xft.h -bsod.o: $(UTILS_SRC)/xshm.h -bsod.o: $(UTILS_SRC)/yarandom.h -bsod.o: $(srcdir)/ximage-loader.h -- cgit v1.2.3