[packages/motif] - updated to 2.3.8 - updated bison patch (mostly obsolete, just configure part is left) - removed ou
qboosh
qboosh at pld-linux.org
Sat May 12 21:06:07 CEST 2018
commit 9ac1fae8540727117e06a8e96caa056f2ed7bef9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 12 21:06:50 2018 +0200
- updated to 2.3.8
- updated bison patch (mostly obsolete, just configure part is left)
- removed outdated makedepend patch
- replaced custom system-mwmrc file with upstream patched (enhanced mwmrc patch)
motif-bison.patch | 307 ------------------------------------------------------
motif-mwmrc.patch | 47 ++++++++-
motif.spec | 47 ++++-----
3 files changed, 69 insertions(+), 332 deletions(-)
---
diff --git a/motif.spec b/motif.spec
index bdc9068..3b82506 100644
--- a/motif.spec
+++ b/motif.spec
@@ -7,21 +7,19 @@
Summary: Motif toolkit
Summary(pl.UTF-8): Toolkit Motif
Name: motif
-Version: 2.3.4
-Release: 6
+Version: 2.3.8
+Release: 1
License: LGPL v2.1
Group: X11/Libraries
-Source0: http://downloads.sourceforge.net/motif/%{name}-%{version}-src.tgz
-# Source0-md5: 612bb8127d0d31da6e5474edf8a5c247
-Source2: mwmrc
-Source5: mwm-xsession.desktop
-Source6: ac_find_%{name}.m4
-Patch0: %{name}-makedepend.patch
-Patch1: %{name}-mwmrc.patch
-Patch2: %{name}-bison.patch
-Patch3: %{name}-freetype.patch
-Patch4: %{name}-parbuild.patch
-Patch5: format-security.patch
+Source0: http://downloads.sourceforge.net/motif/%{name}-%{version}.tar.gz
+# Source0-md5: 7572140bb52ba21ec2f0c85b2605e2b1
+Source1: mwm-xsession.desktop
+Source2: ac_find_%{name}.m4
+Patch0: %{name}-mwmrc.patch
+Patch1: %{name}-bison.patch
+Patch2: %{name}-freetype.patch
+Patch3: %{name}-parbuild.patch
+Patch4: format-security.patch
URL: http://motif.ics.com/
BuildRequires: autoconf >= 2.59-9
BuildRequires: automake
@@ -181,7 +179,6 @@ stare programy mogą z nimi działać).
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
%{__libtoolize}
@@ -192,12 +189,12 @@ stare programy mogą z nimi działać).
%{__autoconf}
%configure \
+ --enable-jpeg \
+ --enable-png \
--enable-shared \
--enable-static \
--enable-themes \
--enable-xft \
- --enable-jpeg \
- --enable-png \
--with-fontconfig-config="pkg-config fontconfig"
%{__make} clean
@@ -214,19 +211,20 @@ install -d $RPM_BUILD_ROOT{%{_examplesdir}/motif,%{_datadir}/xsessions} \
bindir=%{_bindir} \
binddir=%{xlibdir}/bindings
+# improperly installed man pagages for some demos
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/manm/{exm_in_c,simpleDemo}.man
+
cd demos
# breaks -bi --short-circuit !
%{__make} clean
cp -a * $RPM_BUILD_ROOT%{_examplesdir}/motif
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/Xm
cd ..
-mv -f $RPM_BUILD_ROOT%{_bindir}/{,motif-}column
-mv -f $RPM_BUILD_ROOT%{_bindir}/{,motif-}tree
-
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/mwm/system.mwmrc
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,motif-}column
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,motif-}tree
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/mwm.desktop
-install %{SOURCE6} $RPM_BUILD_ROOT%{_aclocaldir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/mwm.desktop
+install %{SOURCE2} $RPM_BUILD_ROOT%{_aclocaldir}
cd $RPM_BUILD_ROOT%{_libdir}
ln -sf libXm.so.*.*.* libXm.so.3
@@ -236,8 +234,8 @@ ln -sf libXm.so.*.*.* libXm.so.1
%clean
rm -rf $RPM_BUILD_ROOT
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
@@ -312,6 +310,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/combo
%attr(755,root,root) %{_bindir}/draw
%attr(755,root,root) %{_bindir}/earth
+%attr(755,root,root) %{_bindir}/exm_in_c
%attr(755,root,root) %{_bindir}/ext18list
%attr(755,root,root) %{_bindir}/filemanager
%attr(755,root,root) %{_bindir}/fileview
diff --git a/motif-bison.patch b/motif-bison.patch
index f0a767f..1044fb8 100644
--- a/motif-bison.patch
+++ b/motif-bison.patch
@@ -12,310 +12,3 @@
AM_PROG_LEX
AC_PROG_INSTALL
---- openMotif-2.2.3/tools/wml/Uil.y.orig 2003-08-15 17:48:15.000000000 +0000
-+++ openMotif-2.2.3/tools/wml/Uil.y 2004-07-24 23:53:59.386710858 +0000
-@@ -59,6 +59,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
- #include "UilDefI.h"
- #include "UilCompGl.h"
-
---- openMotif-2.2.3/tools/wml/wmldbcreate.c.orig 2003-10-08 21:07:48.000000000 +0000
-+++ openMotif-2.2.3/tools/wml/wmldbcreate.c 2004-07-24 23:55:39.212881510 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilCmd.c.orig 2002-02-05 16:48:25.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilCmd.c 2004-07-25 00:18:12.352513372 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilDiags.c.orig 2002-01-10 20:55:42.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilDiags.c 2004-07-25 00:19:25.954074970 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilKeyTab.c.orig 2002-01-10 20:55:42.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilKeyTab.c 2004-07-25 00:20:10.053683805 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilLexAna.c.orig 2002-01-10 20:55:43.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilLexAna.c 2004-07-25 00:20:43.037081838 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilLstLst.c.orig 2002-01-10 20:55:43.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilLstLst.c 2004-07-25 00:21:53.031221606 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilP2Out.c.orig 2002-01-10 20:55:44.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilP2Out.c 2004-07-25 00:22:44.679658473 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilP2Reslv.c.orig 2002-01-10 20:55:44.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilP2Reslv.c 2004-07-25 00:23:23.496064248 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSarComp.c.orig 2003-08-15 17:15:05.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarComp.c 2004-07-25 00:25:42.036101613 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilSarExp.c.orig 2002-01-10 20:55:45.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarExp.c 2004-07-25 00:26:10.260710642 +0000
-@@ -45,7 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
--
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
---- openMotif-2.2.3/clients/uil/UilSarInc.c.orig 2002-01-10 20:55:45.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarInc.c 2004-07-25 00:26:30.274382272 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSarMod.c.orig 2002-01-10 20:55:45.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarMod.c 2004-07-25 00:26:52.194303878 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSarObj.c.orig 2002-01-10 20:55:45.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarObj.c 2004-07-25 00:27:12.709928627 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSarProc.c.orig 2002-01-10 20:55:46.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarProc.c 2004-07-25 00:27:35.916959593 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSarVal.c.orig 2002-01-10 20:55:46.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSarVal.c 2004-07-25 00:27:54.599576551 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSrcSrc.c.orig 2002-01-10 20:55:47.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSrcSrc.c 2004-07-25 00:28:15.732388793 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSymNam.c.orig 2002-01-10 20:55:47.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSymNam.c 2004-07-25 00:28:35.569302612 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSymStor.c.orig 2002-01-10 20:55:48.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSymStor.c 2004-07-25 00:29:03.620083518 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilData.c.orig 2003-08-15 16:54:48.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilData.c 2004-07-25 00:29:30.066372257 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilLstMac.c.orig 2002-01-10 20:55:43.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilLstMac.c 2004-07-25 00:29:54.008754776 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSemVal.c.orig 2002-01-10 20:55:47.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSemVal.c 2004-07-25 00:30:21.896449747 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilSemCSet.c.orig 2002-01-10 20:55:47.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilSemCSet.c 2004-07-25 00:30:42.346644809 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilDB.c.orig 2003-08-15 17:15:05.000000000 +0000
-+++ openMotif-2.2.3/clients/uil/UilDB.c 2004-07-25 00:31:02.083949255 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
-
- /*
---- openMotif-2.2.3/clients/uil/UilMain.c.orig 2004-07-25 00:52:41.887644270 +0000
-+++ openMotif-2.2.3/clients/uil/UilMain.c 2004-07-25 00:51:30.036082650 +0000
-@@ -45,6 +45,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifdef VERSION
-+#undef VERSION
-+#endif
-
- /*
- * (c) Copyright 1989, 1990, DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS. */
diff --git a/motif-mwmrc.patch b/motif-mwmrc.patch
index e42b55c..0d6c97d 100644
--- a/motif-mwmrc.patch
+++ b/motif-mwmrc.patch
@@ -41,7 +41,7 @@
.PP
.nf
-\f(CW/usr/X11R6/bin/X11/mwm -xrm "mwm*configFile: mymwmrc"\fR
-+\f(CW/usr/X11R6/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR
++\f(CW/usr/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR
.fi
.PP
.SS "Resource Types"
@@ -77,3 +77,48 @@
}";
char builtinRootMenu[] = BUILTINROOTMENU
#else /* MCCABE */
+--- motif-2.3.8/clients/mwm/system.mwmrc.orig 2018-05-12 13:34:25.881753933 +0200
++++ motif-2.3.8/clients/mwm/system.mwmrc 2018-05-12 13:34:28.888420566 +0200
+@@ -42,12 +42,14 @@
+ Menu DefaultRootMenu
+ {
+ "Root Menu" f.title
+- "New Window" f.exec "xterm &"
++ "New Shell" f.exec "xterm &"
+ "Shuffle Up" f.circle_up
+ "Shuffle Down" f.circle_down
+ "Refresh" f.refresh
+ "Pack Icons" f.pack_icons
+-! "Toggle Behavior..." f.set_behavior
++ "Toggle Behavior..." f.set_behavior
++ no-label f.separator
++ "Programs" f.menu Programs
+ no-label f.separator
+ "Restart..." f.restart
+ "Quit..." f.quit_mwm
+@@ -57,12 +59,12 @@
+ Menu RootMenu_1.1
+ {
+ "Root Menu" f.title
+- "New Window" f.exec "xterm &"
++ "New Shell" f.exec "xterm &"
+ "Shuffle Up" f.circle_up
+ "Shuffle Down" f.circle_down
+ "Refresh" f.refresh
+ ! "Pack Icons" f.pack_icons
+-! "Toggle Behavior" f.set_behavior
++ "Toggle Behavior" f.set_behavior
+ no-label f.separator
+ "Restart..." f.restart
+ }
+--- motif-2.3.8/configure.ac.orig 2018-05-12 08:51:02.568614749 +0200
++++ motif-2.3.8/configure.ac 2018-05-12 20:30:26.611468928 +0200
+@@ -175,7 +175,7 @@
+ LIBDIR="${libdir}/X11"
+ AC_SUBST(LIBDIR)
+
+-MWMRCDIR="${libdir}/X11"
++MWMRCDIR="/etc/X11/mwm"
+ AC_SUBST(MWMRCDIR)
+
+ INCDIR="${includedir}/X11"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/motif.git/commitdiff/9ac1fae8540727117e06a8e96caa056f2ed7bef9
More information about the pld-cvs-commit
mailing list