Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package motif for openSUSE:Factory checked 
in at 2022-04-25 23:35:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/motif (Old)
 and      /work/SRC/openSUSE:Factory/.motif.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "motif"

Mon Apr 25 23:35:07 2022 rev:9 rq:972467 version:2.3.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/motif/motif.changes      2016-02-17 
12:15:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.motif.new.1538/motif.changes    2022-04-25 
23:35:11.702388524 +0200
@@ -1,0 +2,42 @@
+Sat Apr 23 23:55:13 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 2.3.8
+  * Fixed bug: TextField leaves a residual cursor shadow on focus lose
+  * Fixed bug: Many cases of typos in horizontal/vertical conditions in the 
code
+  * Fixed bug: motif does crash on OpenSuse Leap 42.2
+  * Fixed bug: TabStack with tabSelectColor and Right causes BadMatch Error
+  * Fixed bug: Open Motif build fails due to weak aliases on Darwin with cl
+  * Fixed bug: Motif 2.3.6 and 2.3.4 do not work with XQuartz 2.7.9 and later
+  * Fixed bug: Add support for more Cyrillic locales
+  * Fixed bug: Memory leak in DataF.c
+  * Fixed bug: Closing open menus with mouse click disables keyboard shortcut
+- Update to version 2.3.7
+  * Fixed segmentation faults associated with option menus or other popup 
windows
+- Update to version 2.3.6
+  * Fixed Rendering issues seen while scrolling window
+  * Fixed parallel building error
+- Update to version 2.3.5
+  * Reimplemented bugfix: The active window changes to inactive
+    when the drop down list is clicked
+  * Fixed XmList segfault when left-shift left-button click on
+    list item
+  * Fixed Label size computed wrong within a Form
+  * Fixed Using deprecated X functions
+  * Fixed Buffer overrun in FontS.c
+  * Fixed many compile-time bugs
+- Drop outdated patches:
+  * openmotif-2.3.3.diff, warn.patch, strcmp.diff,
+    openmotif-xpm.diff, sentinel.diff, openmotif-uil.diff,
+    openmotif-unaligned.diff, mwm.diff, openmotif-editres.diff,
+    openmotif-editres-prototype.patch, motif-avoid-empty-include.diff,
+    motif-sequence-points.diff, openmotif-2.3.1-suse-stipple.patch,
+    and motif-2.3.4-implicit-fortify-decl.patch
+- Added patches from upstream and alpine:
+  * fix-format-security.patch
+  * no-demos.patch
+  * fix_underlinking.patch
+  * fix_hardcoded_x11rgb_path.patch
+  * fix-undefined-use-of-sprintf.patch
+  * 18-option-main.patch
+
+-------------------------------------------------------------------

Old:
----
  motif-2.3.4-implicit-fortify-decl.patch
  motif-2.3.4-src.tgz
  motif-avoid-empty-include.diff
  motif-sequence-points.diff
  mwm.diff
  openmotif-2.3.1-suse-stipple.patch
  openmotif-2.3.3.diff
  openmotif-editres-prototype.patch
  openmotif-editres.diff
  openmotif-uil.diff
  openmotif-unaligned.diff
  openmotif-xpm.diff
  sentinel.diff
  strcmp.diff
  warn.patch

New:
----
  18-option-main.patch
  fix-format-security.patch
  fix-undefined-use-of-sprintf.patch
  fix_hardcoded_x11rgb_path.patch
  fix_underlinking.patch
  motif-2.3.8.tar.gz
  no-demos.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ motif.spec ++++++
--- /var/tmp/diff_new_pack.QgS156/_old  2022-04-25 23:35:12.462389589 +0200
+++ /var/tmp/diff_new_pack.QgS156/_new  2022-04-25 23:35:12.466389594 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package motif
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,35 +12,33 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           motif
-Version:        2.3.4
+Version:        2.3.8
 Release:        0
 Summary:        Motif Runtime Programs
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Libraries
-Url:            http://motif.ics.com/
-Source0:        
http://sourceforge.net/projects/motif/files/Motif%20%{version}%20Source%20Code/%{name}-%{version}-src.tgz
+URL:            https://motif.ics.com/
+Source0:        
https://sourceforge.net/projects/motif/files/Motif%%20%{version}%%20Source%%20Code/motif-%{version}.tar.gz
 Source1:        mwm.desktop
 Source2:        baselibs.conf
-Patch0:         openmotif-2.3.3.diff
-Patch1:         warn.patch
-Patch2:         strcmp.diff
-Patch3:         openmotif-xpm.diff
-Patch4:         sentinel.diff
-Patch5:         openmotif-uil.diff
-Patch6:         openmotif-unaligned.diff
-Patch7:         mwm.diff
-Patch8:         openmotif-editres.diff
-Patch9:         openmotif-editres-prototype.patch
-Patch10:        motif-avoid-empty-include.diff
-Patch11:        motif-sequence-points.diff
-Patch12:        openmotif-2.3.1-suse-stipple.patch
-# PATCH-FIX-UPSTREAM fix implicit-fortify-decl errors
-Patch13:        motif-2.3.4-implicit-fortify-decl.patch
+# PATCH-FIX-UPSTREAM 02-fix-format-security.patch -- 
http://bugs.motifzone.net/show_bug.cgi?id=1574
+Patch0:         fix-format-security.patch
+# PATCH-FEATURE-UPSTREAM 03-no-demos.patch -- Disable demos if not needed
+Patch1:         no-demos.patch
+# PATCH-FIX-UPSTREAM fix_underlinking.patch -- 
http://bugs.motifzone.net/show_bug.cgi?id=1583
+Patch2:         fix_underlinking.patch
+# PATCH-FIX-UPSTEAM 13-fix_hardcoded_x11rgb_path.patch -- 
http://bugs.motifzone.net/show_bug.cgi?id=1585
+Patch3:         fix_hardcoded_x11rgb_path.patch
+# PATCH-FIX-UPSTREM 16-fix-undefined-use-of-sprintf.patch -- 
http://bugs.motifzone.net/show_bug.cgi?id=1628
+Patch4:         fix-undefined-use-of-sprintf.patch
+Patch5:         
https://git.alpinelinux.org/aports/plain/community/motif/18-option-main.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libjpeg-devel
@@ -117,46 +115,23 @@
 Motif applications.
 
 %prep
-%setup -q
-# remove all files that have strange licenses
-rm lib/Xm/regexp.c
-rm lib/Xm/regexpI.h
-rm localized/util/mkcatdefs.c
-rm tests/doc/Output/draft/ps/title.ps
-rm tests/doc/title.sm
-sed -e '/regexpI.h/d' -i lib/Xm/Makefile.am
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch -P 10 -P 11 -p1
-%patch12 -p1
-%patch13 -p1
-
+%autosetup -p1
+sed -i 's|{libdir}/X11|{datadir}/X11|' configure.ac
 %build
-./autogen.sh
-%ifarch %arm
-# miscompilation?
-RPM_OPT_FLAGS="%{optflags} -O1"
-%endif
+autoreconf -fi
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %configure \
     --disable-static \
+    --disable-demos \
+    --with-x11rgbdir="%{_datadir}/X11" \
     --enable-xft \
     --enable-jpeg \
     --enable-png \
     --with-pic
-# parallel make is broken
-make --jobs 1 MWMRCDIR=%{_sysconfdir}/X11
+%make_build MWMRCDIR=%{_sysconfdir}/X11 
XMBINDDIR_FALLBACK=%{_datadir}/X11/bindings
 
 %install
-make install DESTDIR=%{buildroot} MWMRCDIR=%{_sysconfdir}/X11
+%make_install MWMRCDIR=%{_sysconfdir}/X11 XMBINDDIR_FALLBACK=%{_datadir}/X11
 
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/mwm.desktop
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/mwm.desktop

++++++ 18-option-main.patch ++++++
diff -urN motif-2.3.8.orig/tools/wml/wmluiltok.l 
motif-2.3.8/tools/wml/wmluiltok.l
--- motif-2.3.8.orig/tools/wml/wmluiltok.l      2021-05-25 13:51:53.464073407 
-0600
+++ motif-2.3.8/tools/wml/wmluiltok.l   2021-05-25 13:52:25.354192799 -0600
@@ -1,3 +1,5 @@
+%option main
+
 %{
 /*
  * Motif

++++++ fix-format-security.patch ++++++
++++ 610 lines (skipped)

++++++ fix-undefined-use-of-sprintf.patch ++++++
diff -Nur motif-2.3.8/lib/Xm/XmRenderT.c new/lib/Xm/XmRenderT.c
--- motif-2.3.8/lib/Xm/XmRenderT.c      2017-03-28 00:24:31.000000000 +0200
+++ new/lib/Xm/XmRenderT.c      2022-04-24 02:39:14.163728778 +0200
@@ -2703,7 +2703,7 @@
       number = tlist -> count;
       tab = (_XmTab) tlist -> start;
       while(number > 0) {
-       sprintf(temp, "%s %f %d %d %d, ", temp, tab -> value, 
+       sprintf(temp + strlen(temp), " %f %d %d %d, ", tab -> value,
                tab -> units, tab -> alignment, tab -> offsetModel);
        tab = (_XmTab) tab -> next;
        number--;


++++++ fix_hardcoded_x11rgb_path.patch ++++++
diff -Nur motif-2.3.8/configure.ac new/configure.ac
--- motif-2.3.8/configure.ac    2022-04-24 02:44:54.935728737 +0200
+++ new/configure.ac    2022-04-24 03:03:56.819728602 +0200
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT
+AC_INIT([motif], [2.3.8])
 AC_CONFIG_SRCDIR([lib/Xm/Form.c])
 AC_PREREQ(2.52)
 AC_CONFIG_AUX_DIR(.)
@@ -22,7 +22,7 @@
 AC_SUBST(AGE)
 
 dnl This is really dumb but it seems to be bug
-AM_INIT_AUTOMAKE(motif,2.3.8,no-define)
+AM_INIT_AUTOMAKE([no-define foreign])
 
 LIBTOOL_VERSION=$CURRENT:$REVISION:$AGE
 

++++++ fix_underlinking.patch ++++++
++++ 612 lines (skipped)

++++++ no-demos.patch ++++++
diff -Nur motif-2.3.8/configure.ac new/configure.ac
--- motif-2.3.8/configure.ac    2017-12-05 13:43:54.000000000 +0100
+++ new/configure.ac    2022-04-24 02:36:04.663728800 +0200
@@ -305,7 +305,20 @@
 doc/man/man5/Makefile \
 tools/Makefile \
 tools/wml/Makefile \
-demos/Makefile \
+lib/Xm/xmstring.list \
+])
+
+AC_ARG_ENABLE(demos, [  --disable-demos
+                       Disable building demos])
+
+if test x$enable_demos = x
+then
+    enable_demos="yes"
+fi
+
+if test "$enable_demos" = "yes"
+then
+  AC_CONFIG_FILES([demos/Makefile
 demos/lib/Makefile \
 demos/lib/Xmd/Makefile \
 demos/lib/Wsm/Makefile \
@@ -389,6 +402,11 @@
 demos/doc/programGuide/ch17/Makefile \
 demos/doc/programGuide/ch17/simple_drop/Makefile \
 demos/doc/programGuide/ch17/simple_drag/Makefile \
-lib/Xm/xmstring.list \
-])
+  ])
+  MAYBE_DEMOS=demos
+else
+  MAYBE_DEMOS=
+fi
+AC_SUBST(MAYBE_DEMOS)
+
 AC_OUTPUT
diff -Nur motif-2.3.8/Makefile.am new/Makefile.am
--- motif-2.3.8/Makefile.am     2017-08-17 02:38:43.000000000 +0200
+++ new/Makefile.am     2022-04-24 02:36:04.663728800 +0200
@@ -28,6 +28,7 @@
              tools \
              clients \
              doc \
-             demos
+             $(MAYBE_DEMOS)
+
 AUTOMAKE_OPTIONS = 1.4
 ACLOCAL_AMFLAGS = -I .

Reply via email to