Accepting request 1281438 from Education

OBS-URL: https://build.opensuse.org/request/show/1281438 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rasmol?expand=0&rev=27
- added patches
2025-05-31 17:16:38 +00:00 · 2025-05-30 14:07:21 +00:00
3 changed files with 70 additions and 0 deletions
--- a/rasmol-gcc15.patch
+++ b/rasmol-gcc15.patch
@@ -0,0 +1,61 @@
+--- src/cif_fract.c	2025-05-20 09:10:32.902245777 +0000
+++ src/cif_fract.c	2025-05-20 10:39:28.903481837 +0000
+@@ -348,8 +348,6 @@ int invxfrm(double __far mato2f[3][3], d
+ {
+     static int ii, jj;
+     register double newvol, xdet;
+-    
+-    extern double det();
+ 
+ 
+ 
+--- src/x11win.c	2025-05-20 09:10:32.903264813 +0000
+++ src/x11win.c	2025-05-20 10:52:30.481374700 +0000
+@@ -2820,7 +2820,7 @@ int CreateImage( void )
+     register int format;
+     register Pixel *ptr;
+ #ifdef MITSHM
+-    register int (*handler)();
+    register XErrorHandler handler;
+ #endif
+ 
+     if( !Interactive )
+@@ -3080,7 +3080,7 @@ static void HandleIPCCommand( void )
+ 
+     register size_t rlen;
+     register int result;
+-    register int (*handler)();
+    register XErrorHandler handler;
+     register char *cmnd;
+     register char *ptr;
+ 
+@@ -3168,22 +3168,22 @@ static void HandleIPCCommand( void )
+ }
+ 
+ 
+-void SetMouseUpdateStatus( int bool )
+void SetMouseUpdateStatus( int boolean )
+ {
+-    if( MouseUpdateStatus != bool )
+    if( MouseUpdateStatus != boolean )
+     {   /* Enable/Disable Pointer Motion Events! */
+         attr.event_mask = ExposureMask | ButtonPressMask | ButtonMotionMask 
+                         | ButtonReleaseMask;
+-        if( bool ) attr.event_mask |= PointerMotionMask;
+        if( boolean ) attr.event_mask |= PointerMotionMask;
+         XChangeWindowAttributes( dpy, CanvWin, CWEventMask, &attr );
+     }
+-    MouseUpdateStatus = bool;
+    MouseUpdateStatus = boolean;
+ }
+ 
+ 
+-void SetMouseCaptureStatus( int bool )
+void SetMouseCaptureStatus( int boolean )
+ {
+-    MouseCaptureStatus = bool;
+    MouseCaptureStatus = boolean;
+ }
+                          
+ 
+
--- a/rasmol.changes
+++ b/rasmol.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 20 10:57:51 UTC 2025 - pgajdos@suse.com
+
+- added patches
+  build with gcc15
+  + rasmol-gcc15.patch
+
 -------------------------------------------------------------------
 Fri Feb 23 11:46:16 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/rasmol.spec
+++ b/rasmol.spec
@@ -33,6 +33,8 @@ Patch2:         RasMol_%{version}-decrement_var.patch
 # this patch ommit downloading CBFlib tarball which is copied from source2
 Patch3:         RasMol_%{version}-no_wget_CBFlib.patch
 Patch4:         RasMol_%{version}-CBFlib_rpmoptflags.patch
+# build with gcc15
+Patch5:         rasmol-gcc15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       RasMol
 BuildRequires:  imake