Accepting request 1201241 from X11:Utilities

OBS-URL: https://build.opensuse.org/request/show/1201241
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=52

xlockmore-5.78.tar.xz

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

xlockmore-5.78.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCZk/mlwAKCRDPFZcHN3kZ
-roy0AJ9Gdu0hYL/odwZhcaPqIVGbDqiDNACfZrdE6kj9vMZ0Eib0GWc28p1RsXY=
-=GuM4
------END PGP SIGNATURE-----

xlockmore-5.79.tar.xz

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

xlockmore-5.79.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCZuJZWgAKCRDPFZcHN3kZ
+ro2YAJ0dZsqfyZHvizawGVmRx9k8qyEYBACeOhKl5dllsDQj85ZZkC0oasIe+Cs=
+=3j7V
+-----END PGP SIGNATURE-----

xlockmore-cast-function-pointers.patch

@@ -0,0 +1,22 @@
+Index: b/xlock/vtlock_proc.c
+===================================================================
+--- a/xlock/vtlock_proc.c
++++ b/xlock/vtlock_proc.c
+@@ -188,7 +188,7 @@ find_x_proc(int disp_nr, dev_t lxdev, in
+     lencmd = strlen(xcmd_ref);
+     if ( stat( PROCDIR, &stbuf ) == -1 ) return( (pid_t)-1 );
+     namelist = (struct dirent **) malloc(sizeof (struct dirent *));
+-    if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, alphasort)) == -1 )
++    if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, (int (*)(const void *, const void *)) alphasort)) == -1 )
+     {
+       free(namelist);
+       return( (pid_t)-1 );
+@@ -301,7 +301,7 @@ scan_x_fds( struct inode_ref *inotab, in
+ 
+     (void) sprintf(xfddir, PROCDIR "/%d/fd", proc);
+     namelist = (struct dirent **) malloc(sizeof (struct dirent *));
+-    if (scan_dir(xfddir, &namelist, NULL, alphasort) == -1) {
++    if (scan_dir(xfddir, &namelist, NULL, (int (*)(const void *, const void *)) alphasort) == -1) {
+         free(namelist);
+         return 0;
+     }

xlockmore-strict-aliasing.patch

@@ -1,13 +0,0 @@
-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,
--							(unsigned char **) &newRoot) == Success && newRoot) {
-+							&newRoot) == Success && newRoot) {
- 						root = *newRoot;
- 						break;
- 					}

xlockmore.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Sep 15 13:53:22 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 5.79:
+  * pyraminx and oct mode extended to size 6 also some hardcoding of size
+    removed and fixed some drawing errors.
+- Fix builds
+  * Remove xlockmore-strict-aliasing.patch
+  * Add xlockmore-cast-function-pointers.patch
+
 -------------------------------------------------------------------
 Tue Jun 11 18:37:11 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
 

xlockmore.spec

@@ -17,7 +17,7 @@
 
 
 Name:           xlockmore
-Version:        5.78
+Version:        5.79
 Release:        0
 Summary:        Screen Saver and Locker for the X Window System
 License:        MIT
@@ -34,11 +34,11 @@ Patch1:         %{name}-bitmaps.patch
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch3:         xlockmore-ttf_dir.patch
 # end of X.org related patches
-Patch7:         xlockmore-strict-aliasing.patch
 # PATCH-FIX-UPSTREAM xlockmore-extend-freetype-include-search.patch -- search only for freetype.h, not the half path. Also,
 # extended list of directories where could freetype be found
 Patch9:         xlockmore-extend-freetype-include-search.patch
 Patch10:        xlockmore-nose_mode_crash.patch
+Patch11:        xlockmore-cast-function-pointers.patch
 BuildRequires:  ImageMagick-devel
 BuildRequires:  automake
 BuildRequires:  bc
@@ -76,9 +76,9 @@ saver until a password is entered.
 chmod -x README docs/Revisions
 %patch -P 1
 %patch -P 3
-%patch -P 7
 %patch -P 9 -p1
 %patch -P 10 -p1
+%patch -P 11 -p1
 
 %build
 aclocal