Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xlockmore for openSUSE:Factory
checked in at 2024-12-02 16:59:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xlockmore (Old)
and /work/SRC/openSUSE:Factory/.xlockmore.new.28523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xlockmore"
Mon Dec 2 16:59:14 2024 rev:54 rq:1227685 version:5.81
Changes:
--------
--- /work/SRC/openSUSE:Factory/xlockmore/xlockmore.changes 2024-10-02
21:34:46.105833674 +0200
+++ /work/SRC/openSUSE:Factory/.xlockmore.new.28523/xlockmore.changes
2024-12-02 16:59:37.938454734 +0100
@@ -1,0 +2,9 @@
+Sun Dec 1 16:46:04 UTC 2024 - Antonio Teixeira <antonio.teixe...@suse.com>
+
+- Update to 5.81:
+ * Fixed life3d mode when running by itself as it would not pick up
+ allGliders rules on refresh.
+ * Fixed building for CDE for Linux. In general, for Linux, the build
+ now uses -R for linking like BSD.
+
+-------------------------------------------------------------------
Old:
----
xlockmore-5.80.tar.xz
xlockmore-5.80.tar.xz.asc
New:
----
xlockmore-5.81.tar.xz
xlockmore-5.81.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xlockmore.spec ++++++
--- /var/tmp/diff_new_pack.HqNVV4/_old 2024-12-02 16:59:38.578481587 +0100
+++ /var/tmp/diff_new_pack.HqNVV4/_new 2024-12-02 16:59:38.582481755 +0100
@@ -17,7 +17,7 @@
Name: xlockmore
-Version: 5.80
+Version: 5.81
Release: 0
Summary: Screen Saver and Locker for the X Window System
License: MIT
++++++ xlockmore-5.80.tar.xz -> xlockmore-5.81.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/README new/xlockmore-5.81/README
--- old/xlockmore-5.80/README 2024-09-24 19:08:44.000000000 +0200
+++ new/xlockmore-5.81/README 2024-11-25 15:12:21.000000000 +0100
@@ -1,4 +1,4 @@
-xlockmore-5.80: the maintained version of xlock
+xlockmore-5.81: the maintained version of xlock
see docs/Revisions for more version stuff
see docs/TODO for stuff to do :)
Help is always appreciated too ;) .
@@ -161,7 +161,7 @@
cp etc/dtprofile $HOME/.dtprofile
This uses a ksh syntax. If your shell is csh or other change it
accordingly.
- cp etc/dtscreen.dt $HOME/.dt/types
+ cp etc/dtscreen.dt $HOME/.dt/types/dtscreen.dt
The actions points to /usr/remote so you may want to change this.
After this you need to completely logout from your CDE session and log
back in so it will read the .dtprofile. (If you just modify the actions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/configure new/xlockmore-5.81/configure
--- old/xlockmore-5.80/configure 2023-07-06 04:10:36.000000000 +0200
+++ new/xlockmore-5.81/configure 2024-11-22 18:26:24.000000000 +0100
@@ -4891,7 +4891,7 @@
#define PACKAGE "$PACKAGE"
_ACEOF
-VERSION=5.72
+VERSION=5.80
cat >>confdefs.h <<_ACEOF
@@ -10025,7 +10025,10 @@
eval "$ac_cv_path_dtsaver"
fi # with_dtsaver != no
-if test "$no_motif" = no; then
+if test "$no_motif" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ignored - needs Motif" >&5
+$as_echo "ignored - needs Motif" >&6; }
+else
if test "$no_dtsaver" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -10033,25 +10036,22 @@
$as_echo "#define USE_DTSAVER 1" >>confdefs.h
- XLOCKLIBS="${XLOCKLIBS} -lDtSvc"
+ XLOCKLIBS="${XLOCKLIBS} -lDtSvc -lDtXinerama -ltt -lXm"
test "x$dtsaver_includes" = xNONE && dtsaver_includes=$ac_dtsaver_includes
test "x$dtsaver_libraries" = xNONE &&
dtsaver_libraries=$ac_dtsaver_libraries
ac_cv_path_dtsaver="no_dtsaver= ac_dtsaver_includes=$dtsaver_includes
ac_dtsaver_libraries=$dtsaver_libraries"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries
$dtsaver_libraries, headers $dtsaver_includes" >&5
$as_echo "libraries $dtsaver_libraries, headers $dtsaver_includes" >&6; }
fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ignored - needs Motif" >&5
-$as_echo "ignored - needs Motif" >&6; }
fi
if test "x$dtsaver_libraries" != x && test "x$dtsaver_libraries" != xNONE ;
then
- XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dtsaver_libraries"
- XLOCKLIBPATHS="${XLOCKLIBPATHS} -L$dtsaver_libraries"
+ XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dtsaver_libraries:$motif_libraries"
+ XLOCKLIBPATHS="${XLOCKLIBPATHS} -L$dtsaver_libraries -L$motif_libraries"
fi
if test "x$dtsaver_includes" != x && test "x$dtsaver_includes" != xNONE ; then
- XLOCKINC="${XLOCKINC} -I$dtsaver_includes"
+ XLOCKINC="${XLOCKINC} -I$dtsaver_includes -I$motif_includes"
fi
@@ -11781,6 +11781,8 @@
INSTPGMFLAGS="-s $INSTPGMFLAGS"
BITMAPTYPE="linux"
PIXMAPTYPE="linux"
+ XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
+ XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
;;
*-*-cygwin* )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/configure.ac
new/xlockmore-5.81/configure.ac
--- old/xlockmore-5.80/configure.ac 2023-07-06 04:10:20.000000000 +0200
+++ new/xlockmore-5.81/configure.ac 2024-11-22 18:26:17.000000000 +0100
@@ -3829,30 +3829,30 @@
eval "$ac_cv_path_dtsaver"
fi # with_dtsaver != no
-if test "$no_motif" = no; then
+if test "$no_motif" = yes; then
+ AC_MSG_RESULT(ignored - needs Motif)
+else
if test "$no_dtsaver" = yes; then
AC_MSG_RESULT(no)
else
AC_DEFINE([USE_DTSAVER], [1], [Desktop Saver])
- XLOCKLIBS="${XLOCKLIBS} -lDtSvc"
+ XLOCKLIBS="${XLOCKLIBS} -lDtSvc -lDtXinerama -ltt -lXm"
test "x$dtsaver_includes" = xNONE && dtsaver_includes=$ac_dtsaver_includes
test "x$dtsaver_libraries" = xNONE &&
dtsaver_libraries=$ac_dtsaver_libraries
ac_cv_path_dtsaver="no_dtsaver= ac_dtsaver_includes=$dtsaver_includes
ac_dtsaver_libraries=$dtsaver_libraries"
AC_MSG_RESULT([libraries $dtsaver_libraries, headers $dtsaver_includes])
fi
-else
- AC_MSG_RESULT(ignored - needs Motif)
fi
])
AC_PATH_DTSAVER
if test "x$dtsaver_libraries" != x && test "x$dtsaver_libraries" != xNONE ;
then
- XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dtsaver_libraries"
- XLOCKLIBPATHS="${XLOCKLIBPATHS} -L$dtsaver_libraries"
+ XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dtsaver_libraries:$motif_libraries"
+ XLOCKLIBPATHS="${XLOCKLIBPATHS} -L$dtsaver_libraries -L$motif_libraries"
fi
if test "x$dtsaver_includes" != x && test "x$dtsaver_includes" != xNONE ; then
- XLOCKINC="${XLOCKINC} -I$dtsaver_includes"
+ XLOCKINC="${XLOCKINC} -I$dtsaver_includes -I$motif_includes"
fi
dnl Xext
@@ -5110,6 +5110,8 @@
PIXMAPTYPE="linux"
dnl if Shadow and not elf
dnl XLOCKLIBS="${XLOCKLIBS} -lgdbm"
+ XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
+ XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
;;
*-*-cygwin* )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/docs/Revisions
new/xlockmore-5.81/docs/Revisions
--- old/xlockmore-5.80/docs/Revisions 2024-09-26 01:47:33.000000000 +0200
+++ new/xlockmore-5.81/docs/Revisions 2024-11-26 18:52:26.000000000 +0100
@@ -1,4 +1,4 @@
-xlockmore-5.80 as of 25 September 2024, the maintained version of xlock
+xlockmore-5.81 as of 26 Nov 2024, the maintained version of xlock
Primary site: https://www.sillycycle.com/xlock
Alternate site: http://ibiblio.org/pub/Linux/X11/screensavers
@@ -12,6 +12,12 @@
Adapted from Patrick J. Naughton's original xlock, with lots of help
from others.
+5.81
+ Fixed life3d mode when running by itself as it would not pick up
+ allGliders rules on refresh.
+ Fixed building for CDE for Linux. In general, for Linux, the build
+ now uses -R for linking like BSD.
+
5.80
pyraminx and oct mode extended now to any size > 1, also some hard
coding of size removed and fixed some drawing errors.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/etc/dtprofile
new/xlockmore-5.81/etc/dtprofile
--- old/xlockmore-5.80/etc/dtprofile 2024-05-21 14:20:30.000000000 +0200
+++ new/xlockmore-5.81/etc/dtprofile 2024-11-22 16:46:35.000000000 +0100
@@ -141,8 +141,8 @@
#StartDtscreenHop \
#StartDtscreenImage \
#StartDtscreenLife \
-#StartDtscreenRotor \
#StartDtscreenPyro \
+#StartDtscreenRotor \
#StartDtscreenWorm \
#StartDtscreenBlank"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/modes/ant3d.c
new/xlockmore-5.81/modes/ant3d.c
--- old/xlockmore-5.80/modes/ant3d.c 2019-09-08 19:35:12.000000000 +0200
+++ new/xlockmore-5.81/modes/ant3d.c 2024-11-26 04:51:32.000000000 +0100
@@ -56,7 +56,7 @@
#define FONT_WIDTH 15
/*-
- * neighbors of 0 randomizes it for 6, 8, 12, 14, 18, 20, 26
+ * neighbors of 0 randomizes it for 6, 12
*/
#define DEF_NEIGHBORS "0" /* choose random value */
#define DEF_RULE "A" /* All rules */
@@ -73,8 +73,7 @@
{(char *) "+label", (char *) ".ant3d.label", XrmoptionNoArg, (caddr_t)
"off"},
{(char *) "-neighbors", (char *) ".ant3d.neighbors", XrmoptionSepArg,
(caddr_t) NULL},
{(char *) "-rule", (char *) ".ant3d.rule", XrmoptionSepArg, (caddr_t)
NULL},
- {(char *) "-eyes", (char *) ".ant3d.eyes", XrmoptionNoArg, (caddr_t)
"on"}
-,
+ {(char *) "-eyes", (char *) ".ant3d.eyes", XrmoptionNoArg, (caddr_t)
"on"},
{(char *) "+eyes", (char *) ".ant3d.eyes", XrmoptionNoArg, (caddr_t)
"off"}
};
static argtype vars[] =
@@ -87,7 +86,7 @@
static OptionStruct desc[] =
{
{(char *) "-/+label", (char *) "turn on/off rule labeling"},
- {(char *) "-neighbors num", (char *) "cubes 6, 8, 14, 18, 20, 26, or
rhombic dodecahedron 12"},
+ {(char *) "-neighbors num", (char *) "cubes 6 or rhombic dodecahedron
12"},
{(char *) "-rule string", (char *) "base 4 string for Turk's Ant"},
{(char *) "-/+eyes", (char *) "turn on/off eyes"}
};
@@ -196,7 +195,7 @@
} antfarm3dstruct;
static char plots[] =
-{12, 26};
+{6, 12};
#define NEIGHBORKINDS ((long) (sizeof plots / sizeof *plots))
/* Coordinate ant moves */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/modes/glx/oct.c
new/xlockmore-5.81/modes/glx/oct.c
--- old/xlockmore-5.80/modes/glx/oct.c 2024-09-24 22:10:46.000000000 +0200
+++ new/xlockmore-5.81/modes/glx/oct.c 2024-10-03 17:47:45.000000000 +0200
@@ -3593,9 +3593,9 @@
drawFacet(mi, -1, -1, -1, -1, -1, -1, -1, pos, tetra);
glPopMatrix();
}
- }
- }
- }
+ }
+ }
+ }
}
typedef struct _CornerDepth {
@@ -5767,9 +5767,9 @@
drawFacet(mi, -1, -1, -1, -1, -1, -1, -1, pos, tetra);
glPopMatrix();
}
- }
- }
- }
+ }
+ }
+ }
}
/*-
* This rotates whole octahedron.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/modes/life.h
new/xlockmore-5.81/modes/life.h
--- old/xlockmore-5.80/modes/life.h 2022-03-30 20:40:10.000000000 +0200
+++ new/xlockmore-5.81/modes/life.h 2024-11-22 14:48:31.000000000 +0100
@@ -794,6 +794,22 @@
127
},
#ifdef LIFE_NAMES
+ {"chakar (p18)"},
+#endif
+ {
+ -2, -6,
+ -5, -5, -4, -5, -2, -5, -1, -5, 0, -5,
+ -3, -4,
+ -4, -3, 1, -3,
+ -5, -2, 3, -2,
+ -4, -1, 2, -1, 3, -1,
+ -4, 0, -3, 0,
+ -1, 1, 3, 1,
+ -1, 2, 1, 2, 3, 2, 4, 2,
+ 0, 3, 3, 3,
+ 127
+ },
+#ifdef LIFE_NAMES
{"triangle with stabilizers (p18)"},
#endif
{
@@ -10574,6 +10590,18 @@
127
},
#ifdef LIFE_NAMES
+ {"23443_3 (p10)"},
+#endif
+ {
+ -6, -3, -5, -3, 5, -3, 6, -3,
+ -4, -2, 4, -2,
+ -1, -1, 1, -1,
+ -1, 0, 1, 0,
+ -4, 1, 4, 1,
+ -6, 2, -5, 2, 5, 2, 6, 2,
+ 127
+ },
+#ifdef LIFE_NAMES
{"Penrose Triangle (p10)"},
#endif
{
@@ -10728,6 +10756,30 @@
127
},
#ifdef LIFE_NAMES
+ {"23443_2 (p10)"},
+#endif
+ {
+ -6, -3, 6, -3,
+ -6, -2, -5, -2, 5, -2, 6, -2,
+ -1, -1, 1, -1,
+ -1, 0, 1, 0,
+ -6, 1, -5, 1, 5, 1, 6, 1,
+ -6, 2, 6, 2,
+ 127
+ },
+#ifdef LIFE_NAMES
+ {"23443_3 (p10)"},
+#endif
+ {
+ -6, -3, -5, -3, 5, -3, 6, -3,
+ -4, -2, 4, -2,
+ -1, -1, 1, -1,
+ -1, 0, 1, 0,
+ -4, 1, 4, 1,
+ -6, 2, -5, 2, 5, 2, 6, 2,
+ 127
+ },
+#ifdef LIFE_NAMES
{"hexagon with bows (p11)"},
#endif
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/modes/life3d.c
new/xlockmore-5.81/modes/life3d.c
--- old/xlockmore-5.80/modes/life3d.c 2020-10-09 04:24:34.000000000 +0200
+++ new/xlockmore-5.81/modes/life3d.c 2024-11-23 03:54:00.000000000 +0100
@@ -276,6 +276,7 @@
int allPatterns, allGliders;
paramstruct input_param;
int labelOffsetX, labelOffsetY;
+ Bool foundBirth, foundSurvival;
char ruleString[80], nameString[80];
} life3dstruct;
@@ -416,6 +417,7 @@
int i = 1, l;
string[0] = 'B';
+
if (verbose)
(void) fprintf(stdout,
"rule (Birth/Survival %d neighborhood): ",
@@ -858,25 +860,23 @@
life3dstruct *lp = &life3ds[MI_SCREEN(mi)];
int n, l = 0;
char serving = 0;
- static Bool foundBirth = False;
- static Bool foundSurvival = False;
- if (foundBirth && foundSurvival)
+ if (lp->foundBirth && lp->foundSurvival)
return;
- foundBirth = foundSurvival = False;
+ lp->foundBirth = lp->foundSurvival = False;
lp->input_param.birth = lp->input_param.survival = 0;
if (rule) {
n = 0;
while (rule[n]) {
if (rule[n] == 'P' || rule[n] == 'p') {
lp->allPatterns = True;
- foundBirth = foundSurvival = True;
+ lp->foundBirth = lp->foundSurvival = True;
if (MI_IS_VERBOSE(mi))
(void) fprintf(stdout, "rule: All rules
with known patterns\n");
return;
} else if (rule[n] == 'G' || rule[n] == 'g') {
lp->allGliders = True;
- foundBirth = foundSurvival = True;
+ lp->foundBirth = lp->foundSurvival = True;
if (MI_IS_VERBOSE(mi))
(void) fprintf(stdout, "rule: All rules
with known gliders\n");
return;
@@ -890,10 +890,10 @@
l = rule[n] - '0';
if (l >= 0 && l <= 9 && l <=
ABS(lp->neighbors)) { /* no 10..26 */
if (serving == 'B' || rule[n] == 'b') {
- foundBirth = True;
+ lp->foundBirth = True;
lp->input_param.birth |= (1 <<
l);
} else if (serving == 'S' || rule[n] ==
's') {
- foundSurvival = True;
+ lp->foundSurvival = True;
lp->input_param.survival |= (1
<< l);
}
}
@@ -901,11 +901,11 @@
n++;
}
}
- if (!foundBirth || !foundSurvival ||
+ if (!lp->foundBirth || !lp->foundSurvival ||
!(lp->input_param.birth || lp->input_param.survival)) {
/* Default to Bays' rules if rule does not make sense */
lp->allGliders = True;
- foundBirth = foundSurvival = True;
+ lp->foundBirth = lp->foundSurvival = !MI_IS_FULLRANDOM(mi);
if (MI_IS_VERBOSE(mi))
(void) fprintf(stdout,
"rule: Defaulting to all rules with known
gliders\n");
@@ -3655,6 +3655,7 @@
}
}
lp->generation = 0;
+ lp->foundBirth = lp->foundSurvival = 0;
if (MI_IS_FULLRANDOM(mi)) {
int r12n1 = patterns_12rules[0];
int r12n2 = r12n1 + patterns_12rules[1];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/xlock/version.h
new/xlockmore-5.81/xlock/version.h
--- old/xlockmore-5.80/xlock/version.h 2024-09-24 19:09:15.000000000 +0200
+++ new/xlockmore-5.81/xlock/version.h 2024-11-26 18:48:56.000000000 +0100
@@ -1,6 +1,6 @@
#ifndef _version_h
#define _version_h
-#define VERSION "5.80"
+#define VERSION "5.81"
#endif /* _version_h */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xlockmore-5.80/xlockmore.spec
new/xlockmore-5.81/xlockmore.spec
--- old/xlockmore-5.80/xlockmore.spec 2024-09-24 19:09:36.000000000 +0200
+++ new/xlockmore-5.81/xlockmore.spec 2024-11-26 18:46:54.000000000 +0100
@@ -19,7 +19,7 @@
# https://www.sillycycle.com/xlockmore.html
%define name xlockmore
-%define stableversion 5.80
+%define stableversion 5.81
%define release 1
%define serial 1
# Comment quality for stable release
