pool/xlockmore
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 56151 from X11:Utilities

Browse Source 
Accepted submit request 56151 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/56151
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=14
This commit is contained in:
Marcus Rückert
2010-12-20 14:44:37 +00:00
committed by Git OBS Bridge
parent b6d047eea4
commit 64127bc645
15 changed files with 36 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xlockmore-5.28.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9483efc940705f5fff8555eeeba6f3514ffee40a1b4222bdb7d8329759fd3fd7
size 1901583

3
xlockmore-5.32.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0e67fd292579b0da2ded37bf05c31615020d0f7d638ff7a7eb2dc5cdc900870
size 1987212

8
xlockmore-bitmaps.patch
View File

@@ -1,6 +1,8 @@
--- xlock/XLock.ad
+++ xlock/XLock.ad
@@ -74,8 +74,8 @@
Index: xlock/XLock.ad
===================================================================
--- xlock/XLock.ad.orig 2009-08-27 22:42:04.000000000 +0200
+++ xlock/XLock.ad 2010-12-14 12:19:00.772719051 +0100
@@ -76,8 +76,8 @@ XLock.program: fortune -s
!XLock.messagefont: -*-times-*-*-*-*-18-*-*-*-*-*-*-*
! For modes with images

13
xlockmore-bitmaps_xorg6.patch
View File

@@ -1,13 +0,0 @@
--- xlock/XLock.ad
+++ xlock/XLock.ad
@@ -75,8 +75,8 @@
!XLock.messagefont: -*-times-*-*-*-*-18-*-*-*-*-*-*-*
! For modes with images
-!XLock.*.bitmap: bitmaps/m-xlock.xbm
-!XLock.*.bitmap: pixmaps/m-xlock.xpm
+XLock.*.bitmap: /usr/X11R6/include/X11/bitmaps/m-xlock.xbm
+XLock.*.bitmap: /usr/X11R6/include/X11/pixmaps/m-xlock.xpm
!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps
! For mailbox check application

28
xlockmore-gltt+ftgl.patch
View File

@@ -1,28 +0,0 @@
--- modes/Makefile.in
+++ modes/Makefile.in
@@ -99,8 +99,9 @@
@CCC@@GL@$(DOG)i_twojet$(OG)i_twojetvec$(O)
@CCC@@GL@XLOCKDEPCPPGLOBJS = $(INVERTOBJS)
@CCC@@GL@XLOCKMULTCPPGLOBJS = $(DOG)invert$(O)
-@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O)
-@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS = $(DOG)text3d2$(OG)rotator$(O)
+XLOCKTEXTGLOBJS =
+@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS += $(DOG)text3d$(O)
+@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS += $(DOG)text3d2$(OG)rotator$(O)
@GL@SPROINGIESOBJS = $(DOG)buildlwo$(OG)sproingiewrap$(OG)s1_b$(O)$(S)\
@GL@$(DOG)s1_1$(OG)s1_2$(OG)s1_3$(OG)s1_4$(OG)s1_5$(OG)s1_6$(O)
@GL@ATLANTISOBJS = $(DOG)dolphin$(OG)shark$(OG)swim$(OG)whale$(O)
--- modes/glx/Makefile.in
+++ modes/glx/Makefile.in
@@ -53,8 +53,9 @@
@CCC@@GL@$(DOG)i_twojet$(OG)i_twojetvec$(O)
@CCC@@GL@XLOCKDEPCPPGLOBJS = $(INVERTOBJS)
@CCC@@GL@XLOCKMULTCPPGLOBJS = $(DOG)invert$(O)
-@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O)
-@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS = $(DOG)text3d2$(OG)rotator$(O)
+XLOCKTEXTGLOBJS =
+@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS += $(DOG)text3d$(O)
+@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS += $(DOG)text3d2$(OG)rotator$(O)
@GL@SPROINGIESOBJS = $(DOG)buildlwo$(OG)sproingiewrap$(OG)s1_b$(O)$(S)\
@GL@$(DOG)s1_1$(OG)s1_2$(OG)s1_3$(OG)s1_4$(OG)s1_5$(OG)s1_6$(O)
@GL@ATLANTISOBJS = $(DOG)dolphin$(OG)shark$(OG)swim$(OG)whale$(O)

20
xlockmore-gltt-libttf.patch
View File

@@ -1,20 +0,0 @@
--- configure.in
+++ configure.in
@@ -1279,7 +1279,7 @@
# See if we find them without any special options.
# Do not add to $LIBS permanently.
ac_save_LIBS="$LIBS"
-LIBS="-l$gltt_direct_test_library $LIBS"
+LIBS="-l$gltt_direct_test_library -lttf $LIBS"
# First see if replacing the include by lib works.
for ac_dir in `echo "$ac_gltt_includes" | sed s%/X11$%% | sed s/include/lib/` \
\
@@ -1451,7 +1451,7 @@
\
/usr/local/include \
/usr/remote/include \
- /usr/include/X11 \
+ /usr/include \
/usr/unsupported/include \
/usr/athena/include \
/usr/local/x11r5/include \

11
xlockmore-null-fontset.patch
View File

@@ -1,11 +0,0 @@
--- xlock/xlock.c
+++ xlock/xlock.c
@@ -3367,6 +3367,8 @@
#ifdef USE_MB
fontset = createFontSet(dsp, fontsetname);
+ if (fontset == NULL)
+ exit(1);
XmbTextExtents(fontset, "Aj", 1, NULL, &mbRect);
planfontset = createFontSet(dsp, planfontsetname);
XmbTextExtents(planfontset, "Aj", 1, NULL, &planmbRect);

11
xlockmore-null.patch
View File

@@ -1,11 +0,0 @@
--- xglock/xglock.c
+++ xglock/xglock.c
@@ -666,7 +666,7 @@
else if ( numberprocess == 0 ) {
(void) execlp(XLOCK, XLOCK, "-parent", numberwidget,
MODE_STRING, LockProcs[mode].cmdline_arg, "-geometry", WINDOW_GEOMETRY, "-delay", "100000",
- "-nolock", "-inwindow", "+install", 0);
+ "-nolock", "-inwindow", "+install", NULL);
}
}

19
xlockmore-strict-aliasing.patch
View File

@@ -1,17 +1,8 @@
--- xlock/iostuff.c
+++ xlock/iostuff.c
@@ -567,7 +567,7 @@
if (!blogo.data) {
if (BitmapSuccess == XbmReadFileToImage(bitmap_local,
&blogo.width, &blogo.height,
- (unsigned char **) &blogo.data)) {
+ &blogo.data)) {
blogo.bytes_per_line = (blogo.width + 7) / 8;
*graphics_format = IS_XBMFILE;
*logo = &blogo;
--- xlock/vroot.h
+++ xlock/vroot.h
@@ -108,7 +108,7 @@
Index: xlock/vroot.h
===================================================================
--- xlock/vroot.h.orig 2007-10-28 02:49:36.000000000 +0100
+++ xlock/vroot.h 2010-12-14 12:19:00.878842537 +0100
@@ -108,7 +108,7 @@ VirtualRootWindowOfScreen(Screen * s)
__SWM_VROOT, 0, 1, False, XA_WINDOW,
&actual_type, &actual_format,
&nitems, &bytesafter,

10
xlockmore-ttf_dir.patch
View File

@@ -1,6 +1,8 @@
--- configure.in
+++ configure.in
@@ -1574,9 +1574,9 @@
Index: configure.in
===================================================================
--- configure.in.orig 2010-01-28 00:30:40.000000000 +0100
+++ configure.in 2010-12-14 12:19:00.863842724 +0100
@@ -1585,9 +1585,9 @@ else
ttf=yes
AC_DEFINE(HAVE_TTF)
if test "x$prefix" = "xNONE"; then
@@ -12,7 +14,7 @@
fi
XLOCKLIBS="${XLOCKLIBS} -lttf"
test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes
@@ -1970,9 +1970,9 @@
@@ -1985,9 +1985,9 @@ else
freetype=yes
AC_DEFINE(HAVE_FREETYPE)
if test "x$prefix" = "xNONE"; then

26
xlockmore-ttf_dir_xorg6.patch
View File

@@ -1,26 +0,0 @@
--- configure.in
+++ configure.in
@@ -1574,9 +1574,9 @@
ttf=yes
AC_DEFINE(HAVE_TTF)
if test "x$prefix" = "xNONE"; then
- AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/xlock/fonts/")
+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/fonts/truetype/")
else
- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/")
+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/fonts/truetype/")
fi
XLOCKLIBS="${XLOCKLIBS} -lttf"
test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes
@@ -1970,9 +1970,9 @@
freetype=yes
AC_DEFINE(HAVE_FREETYPE)
if test "x$prefix" = "xNONE"; then
- AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/xlock/fonts/")
+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/fonts/truetype/")
else
- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/")
+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "$/usr/lib/X11/fonts/truetype/")
fi
XLOCKLIBS="${XLOCKLIBS} -lfreetype"
test "x$freetype_includes" = xNONE && freetype_includes=$ac_freetype_includes

27
xlockmore-undefined-code.patch
View File

@@ -1,27 +0,0 @@
--- modes/fadeplot.c
+++ modes/fadeplot.c
@@ -207,11 +207,11 @@
if ((fp->temps % (fp->angles / 2)) == 0) {
fp->temps = fp->temps % fp->angles * 5;
if ((fp->temps % (fp->angles)) == 0)
- fp->speed.y = (fp->speed.y++) % 30 + 1;
+ fp->speed.y = (fp->speed.y + 1) % 30 + 1;
if ((fp->temps % (fp->angles * 2)) == 0)
fp->speed.x = (fp->speed.x) % 20;
if ((fp->temps % (fp->angles * 3)) == 0)
- fp->step.y = (fp->step.y++) % 2 + 1;
+ fp->step.y = (fp->step.y + 1) % 2 + 1;
MI_CLEARWINDOWCOLORMAPFAST(mi, MI_GC(mi), MI_BLACK_PIXEL(mi));
}
}
--- modes/swarm.c
+++ modes/swarm.c
@@ -339,7 +339,7 @@
sp->yv[NRAND(sp->beecount)] += balance_rand(3);
}
/* <=- Bees -=> */
- sp->tick = ++(sp->tick) % (sp->taillen);
+ sp->tick = (sp->tick + 1) % (sp->taillen);
prev = (sp->tick) ? sp->tick - 1 : sp->taillen - 1;
if (sp->tick == sp->taillen - 1)
sp->rolloverflag = 1;

11
xlockmore-void-return.patch
View File

@@ -1,11 +0,0 @@
--- modes/life3d.c
+++ modes/life3d.c
@@ -2271,7 +2271,7 @@
return False;
}
-static Bool populateGlider(life3dstruct * lp, char *glider, int offsetSwitch,
+static void populateGlider(life3dstruct * lp, char *glider, int offsetSwitch,
int hsp, int vsp, int asp, int hoff, int voff, int aoff) {
int x, y, z, temp;

15
xlockmore.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Dec 14 11:25:05 UTC 2010 - coolo@novell.com
- update to 5.32
* life3d update for -neighbors 14, new truncated octahedral life form.
* ant & demon updates for -neighbors 5 or 7
* -xinerama option added off by default.
* skewb mode now scrambles, taken out of unstable category.
* juggler3d mode stolen from xscreensaver with help from Tim Auckland.
* petri: crashed due to shift of int, fix from Dr Nigel Warr
* penrose should be working again. Other small fixes for life, etc.
* image: image set right away and added option -icononly to only display
image when in password window
- remove support for outdated libraries and versions
-------------------------------------------------------------------
Tue Jul 28 18:20:46 CEST 2009 - sbrabec@suse.cz

44
xlockmore.spec
View File

@@ -19,13 +19,13 @@
Name: xlockmore
BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ gltt-devel libdrm-devel pkg-config
BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ libdrm-devel pkg-config
License: GPL v2 or later ; MIT License (or similar)
Group: System/X11/Utilities
Provides: xlock
Obsoletes: xlock
AutoReqProv: on
Version: 5.28
Version: 5.32
Release: 2
Summary: Screen Saver and Locker for the X Window System
Url: http://www.tux.org/~bagleyd/xlockmore.html
@@ -33,33 +33,17 @@ Source: %{name}-%{version}.tar.bz2
Source1: xlock.pamd
Source2: xlock-wrapper
Source3: xlock-wrapper_xorg6
Patch: %{name}-null.patch
# apply even patches when X.org < 7.0 else apply odd patches
Patch1: %{name}-bitmaps.patch
Patch2: %{name}-bitmaps_xorg6.patch
Patch3: xlockmore-ttf_dir.patch
Patch4: xlockmore-ttf_dir_xorg6.patch
# end of X.org related patches
Patch5: xlockmore-gltt-libttf.patch
Patch6: xlockmore-gltt+ftgl.patch
Patch7: xlockmore-strict-aliasing.patch
Patch8: xlockmore-null-fontset.patch
Patch9: xlockmore-void-return.patch
Patch10: xlockmore-undefined-code.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The xlock utility locks your X Window System session and runs a screen
saver until a password is entered.
Authors:
--------
David Albert Bagley <bagleyd@tux.org>
Patrick J. Naughton <naughton@eng.sun.com>
%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
%define _xorg7libs %_lib
%define _xorg7libs32 lib
%define _xorg7bin bin
@@ -71,37 +55,13 @@ Authors:
%define _xorg7_serverincl /usr/include/xorg
%define _xorg7_fonts /usr/share/fonts
%define _xorg7_prefix /usr
%else
%define _xorg7libs X11R6/%_lib
%define _xorg7libs32 X11R6/lib
%define _xorg7bin X11R6/bin
%define _xorg7_mandir /usr/X11R6/man
%define _xorg7pixmaps X11R6/include
%define _xorg7libshare X11R6/lib/
%define _xorg7_xkb /etc/X11/xkb
%define _xorg7_termcap /usr/X11R6/lib/X11/etc
%define _xorg7_serverincl /usr/X11R6/lib/Server/include
%define _xorg7_fonts /usr/X11R6/lib/X11/fonts
%define _xorg7_prefix /usr/X11R6
%endif
%prep
%setup -q
chmod -x README docs/Revisions
%patch
%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
%patch1
%patch3
%else
%patch2
%patch4
%endif
%patch5
%patch6
%patch7
%patch8
%patch9
%patch10
%build
%{?suse_update_config:%{suse_update_config -f}}