Hello community,
here is the log from the commit of package openmotif22-libs
checked in at Tue Apr 10 10:15:48 CEST 2007.
--------
New Changes file:
--- /dev/null 2006-06-16 15:54:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/openmotif22-libs/openmotif22-libs.changes 2007-03-30 01:39:44.000000000 +0200
@@ -0,0 +1,25 @@
+-------------------------------------------------------------------
+Fri Mar 30 01:29:11 CEST 2007 - ro@suse.de
+
+- added flex,bison to buildreq
+
+-------------------------------------------------------------------
+Fri Oct 13 14:00:47 CEST 2006 - schwab@suse.de
+
+- Fix XPM plausibility checks.
+
+-------------------------------------------------------------------
+Thu Aug 3 18:33:33 CEST 2006 - schwab@suse.de
+
+- Don't build demos.
+
+-------------------------------------------------------------------
+Fri Jul 28 15:52:07 CEST 2006 - schwab@suse.de
+
+- Fix building with Xorg7.
+
+-------------------------------------------------------------------
+Mon Jul 3 15:42:07 CEST 2006 - schwab@suse.de
+
+- OpenMotif 2.2.4 libraries.
+
New:
----
datadir.patch
openmotif-2.2.4.diff
openmotif-2.2.4.tar.bz2
openmotif22-libs.changes
openmotif22-libs.spec
openmotif-uil.diff
openmotif-xpm.diff
PrintableString.diff
sentinel.diff
warn.patch
XmResizeHashTable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openmotif22-libs.spec ++++++
#
# spec file for package openmotif22-libs (Version 2.2.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: openmotif22-libs
%{expand:%%global _prefix %(pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_prefix" == "/usr/X11R6"
%define _mandir %_prefix/man
%define _datadir %_prefix/lib
%endif
BuildRequires: bison flex pkgconfig xorg-x11 xorg-x11-devel
Version: 2.2.4
Release: 46
License: Other License(s), see package
Group: System/Libraries
Autoreqprov: on
Summary: Open Motif 2.2.4 Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://www.motifzone.net/
Source: openmotif-%{version}.tar.bz2
Patch: openmotif-%{version}.diff
Patch1: warn.patch
Patch2: datadir.patch
Patch3: XmResizeHashTable.patch
Patch4: openmotif-xpm.diff
Patch5: sentinel.diff
Patch6: openmotif-uil.diff
Patch7: PrintableString.diff
%description
This is the old version 2.2.4 Open Motif runtime environment. It
includes the Motif version 2.2.4 shared libraries.
Open Motif is a freely available version of the well-known Motif user
interface toolkit for open source operating systems. This package was
built with the Metro Link sources.
%prep
%setup -q -n openmotif-%{version}
%patch
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6
%patch7
%build
rm -f depcomp
%{suse_update_config -f}
autoreconf --force --install
%ifarch %arm
# miscompilation?
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1"
%endif
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--prefix=%{_prefix} --libdir=%{_libdir} \
--datadir=%{_datadir} --mandir=%{_mandir}
# Not parallel safe
make
%install
make install DESTDIR="$RPM_BUILD_ROOT"
# remove everything not packaged
rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -f $RPM_BUILD_ROOT%_libdir/lib*.a
rm -f $RPM_BUILD_ROOT%_libdir/lib*.la
rm -f $RPM_BUILD_ROOT%_libdir/lib*.so
rm -rf $RPM_BUILD_ROOT%{_datadir}/X11
rm -rf $RPM_BUILD_ROOT%{_datadir}/Xm
rm -rf $RPM_BUILD_ROOT%{_prefix}/include
rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%{_libdir}/*.so.*
%changelog
* Fri Mar 30 2007 - ro@suse.de
- added flex,bison to buildreq
* Fri Oct 13 2006 - schwab@suse.de
- Fix XPM plausibility checks.
* Thu Aug 03 2006 - schwab@suse.de
- Don't build demos.
* Fri Jul 28 2006 - schwab@suse.de
- Fix building with Xorg7.
* Mon Jul 03 2006 - schwab@suse.de
- OpenMotif 2.2.4 libraries.
++++++ datadir.patch ++++++
--- demos/programs/ButtonBox/Makefile.am
+++ demos/programs/ButtonBox/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/ButtonBox
+pkgdatadir = $(datadir)/Xm/ButtonBox
bin_PROGRAMS = bboxdemo
EXTRA_DIST = Imakefile
bboxdemo_SOURCES = bboxdemo.c
-data_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(bboxdemo_SOURCES)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
--- demos/programs/ColorSel/Makefile.am
+++ demos/programs/ColorSel/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Color
+pkgdatadir = $(datadir)/Xm/Color
bin_PROGRAMS = colordemo
colordemo_SOURCES = bxutil-c.c colordemo.c
EXTRA_DIST = Imakefile
-data_DATA = $(colordemo_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(colordemo_SOURCES) $(EXTRA_DIST)
LDADD = $(TOPDIR)/lib/Xm/libXm.la
TOPDIR = ../../..
INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
--- demos/programs/Column/Makefile.am
+++ demos/programs/Column/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Column
+pkgdatadir = $(datadir)/Xm/Column
bin_PROGRAMS = column
column_SOURCES = column.c
EXTRA_DIST = Imakefile Column.ad
-data_DATA = $(EXTRA_DIST) $(column_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(column_SOURCES)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
--- demos/programs/DropDown/Makefile.am
+++ demos/programs/DropDown/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/DropDown
+pkgdatadir = $(datadir)/Xm/DropDown
bin_PROGRAMS = dropdown
EXTRA_DIST = DropDown.ad Imakefile
dropdown_SOURCES = dropdown.c
-data_DATA = $(EXTRA_DIST) $(dropdown_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(dropdown_SOURCES)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
--- demos/programs/Exm/app_in_c/Makefile.am
+++ demos/programs/Exm/app_in_c/Makefile.am
@@ -1,10 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
-bindir = ${prefix}/share/Xm/Exm/app_in_c
-datadir = ${prefix}/share/Xm/Exm/app_in_c
+pkgdatadir = $(datadir)/Xm/Exm/app_in_c
man_MANS = exm_in_c.man
-bin_PROGRAMS = exm_in_c
+pkgdata_PROGRAMS = exm_in_c
exm_in_c_SOURCES = exm_in_c.c
EXTRA_DIST = exm_in_c.man Imakefile
--- demos/programs/Exm/simple_app/Makefile.am
+++ demos/programs/Exm/simple_app/Makefile.am
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
-bindir = ${prefix}/share/Xm/Exm/simple_app
-datadir = ${prefix}/share/Xm/Exm/simple_app
+bindir = @datadir@/Xm/Exm/simple_app
+datadir = @datadir@/Xm/Exm/simple_app
data_DATA = README
man_MANS = simpleDemo.man
--- demos/programs/FontSel/Makefile.am
+++ demos/programs/FontSel/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/fontsel
+pkgdatadir = $(datadir)/Xm/fontsel
bin_PROGRAMS = fontsel
fontsel_SOURCES = callbacks-c.c creation-c.c fontsel.c fontsel.h
EXTRA_DIST = Imakefile
-data_DATA = $(EXTRA_DIST) $(fontsel_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(fontsel_SOURCES)
LDADD = $(TOPDIR)/lib/Xm/libXm.la
TOPDIR = ../../..
INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
--- demos/programs/IconB/Makefile.am
+++ demos/programs/IconB/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Icon
+pkgdatadir= $(datadir)/Xm/Icon
EXTRA_DIST = Imakefile small.bm
bin_PROGRAMS = iconbuttondemo
iconbuttondemo_SOURCES = misc.c iconbuttondemo.c
-data_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(iconbuttondemo_SOURCES) $(EXTRA_DIST)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
--- demos/programs/MultiList/Makefile.am
+++ demos/programs/MultiList/Makefile.am
@@ -1,13 +1,13 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/MultiList
+pkgdatadir = $(datadir)/Xm/MultiList
bin_PROGRAMS = multilist
SUBDIRS = pixmaps
multilist_SOURCES = bxutil-c.c callbacks-c.c creation.c multilist.c \
extlist.h
EXTRA_DIST = Imakefile
-data_DATA = $(EXTRA_DIST) $(multilist_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(multilist_SOURCES)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
--- demos/programs/MultiList/pixmaps/Makefile.am
+++ demos/programs/MultiList/pixmaps/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/MultiList/pixmaps
+pkgdatadir = $(datadir)/Xm/MultiList/pixmaps
EXTRA_DIST = clown.xbm crab.xpm eye.xpm porsche.xpm stopsign.xpm
-data_DATA = $(EXTRA_DIST)
+pkgdata_DATA = $(EXTRA_DIST)
--- demos/programs/Outline/Makefile.am
+++ demos/programs/Outline/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Outline
+pkgdatadir = $(datadir)/Xm/Outline
EXTRA_DIST = Imakefile
bin_PROGRAMS = outline
outline_SOURCES = outline.c
-data_DATA = $(outline_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(outline_SOURCES) $(EXTRA_DIST)
LDADD = $(TOPDIR)/lib/Xm/libXm.la
TOPDIR = ../../..
INCLUDES = -I$(TOPDIR)/lib -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS}
--- demos/programs/Paned/Makefile.am
+++ demos/programs/Paned/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Paned2
+pkgdatadir = $(datadir)/Xm/Paned2
EXTRA_DIST = Imakefile
bin_PROGRAMS = paned
paned_SOURCES = creation-c.c paned.c
-data_DATA = $(EXTRA_DIST) $(paned_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(paned_SOURCES)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
--- demos/programs/TabStack/Makefile.am
+++ demos/programs/TabStack/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Tabstack
+pkgdatadir = $(datadir)/Xm/Tabstack
bin_PROGRAMS = tabstack
tabstack_SOURCES = bxutils.c callbacks.c creation.c main.c creation.h
EXTRA_DIST = Imakefile
-data_DATA = $(tabstack_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(tabstack_SOURCES) $(EXTRA_DIST)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
--- demos/programs/Tree/Makefile.am
+++ demos/programs/Tree/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/Tree
+pkgdatadir = $(datadir)/Xm/Tree
EXTRA_DIST = Imakefile
bin_PROGRAMS = tree
tree_SOURCES = bxutil-c.c tree.c
-data_DATA = $(EXTRA_DIST) $(tree_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(tree_SOURCES)
TOPDIR = ../../..
LDADD = $(TOPDIR)/lib/Xm/libXm.la
--- demos/programs/airport/Makefile.am
+++ demos/programs/airport/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/airport
+pkgdatadir = $(datadir)/Xm/airport
bin_PROGRAMS = airport
airport_SOURCES = main.c dragsource.c dropsite.c airport.h \
dragsource.h dropsite.h main.h
EXTRA_DIST = Imakefile XmdAirport.ad README
-data_DATA = $(airport_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(airport_SOURCES) $(EXTRA_DIST)
LDADD = ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/animate/Makefile.am
+++ demos/programs/animate/Makefile.am
@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/animate
+pkgdatadir = $(datadir)/Xm/animate
+uiddir = $(datadir)/X11/uid
EXTRA_DIST = dog.uil plane.uil superman.uil xmanimate.uil \
superman1.xbm superman2.xbm superman3.xbm superman4.xbm \
@@ -11,8 +12,8 @@
CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid
-data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \
- $(EXTRA_DIST)
+pkgdata_DATA = $(xmanimate_SOURCES) $(EXTRA_DIST)
+uid_DATA = dog.uid plane.uid superman.uid xmanimate.uid
bin_PROGRAMS = xmanimate
--- demos/programs/draw/Makefile.am
+++ demos/programs/draw/Makefile.am
@@ -1,10 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/draw
+pkgdatadir = $(datadir)/Xm/draw
bin_PROGRAMS = draw
draw_SOURCES = draw.c
EXTRA_DIST = Imakefile XmdDraw.ad README draw.help draw.man
-data_DATA = $(EXTRA_DIST) $(draw_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(draw_SOURCES)
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/earth/Makefile.am
+++ demos/programs/earth/Makefile.am
@@ -1,10 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/earth
+pkgdatadir = $(datadir)/Xm/earth
bin_PROGRAMS = earth
earth_SOURCES = earth.c
EXTRA_DIST = terre.xbm earth.man Imakefile README
-data_DATA = $(EXTRA_DIST) $(earth_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(earth_SOURCES)
LDADD = ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/filemanager/Makefile.am
+++ demos/programs/filemanager/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/filemanager
+pkgdatadir = $(datadir)/Xm/filemanager
bin_PROGRAMS = filemanager
filemanager_SOURCES = filemanager.c actions.c readdir.c convert.c \
@@ -9,7 +9,7 @@
Imakefile code.xpm dir.xpm exec.xpm file.xpm none.xpm \
obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \
s_none.xpm s_pix.xpm
-data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(filemanager_SOURCES)
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/fileview/Makefile.am
+++ demos/programs/fileview/Makefile.am
@@ -1,12 +1,14 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/fileview
+pkgdatadir = $(datadir)/Xm/fileview
+uiddir = $(datadir)/X11/uid
bin_PROGRAMS = fileview
fileview_SOURCES = main.c text.c file.c file.h fileE.h fileview.h main.h \
mainE.h text.h textE.h
EXTRA_DIST = $(UILS) English.df French.df German.df README Fileview.ad
-data_DATA = French.uid German.uid English.uid $(fileview_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(fileview_SOURCES) $(EXTRA_DIST)
+uid_DATA = French.uid German.uid English.uid
UILS= French.uil German.uil English.uil
--- demos/programs/getsubres/Makefile.am
+++ demos/programs/getsubres/Makefile.am
@@ -1,10 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/getsubres
+pkgdatadir = $(datadir)/Xm/getsubres
bin_PROGRAMS = getsubres
EXTRA_DIST = getsubres.help getsubres.man README Imakefile
getsubres_SOURCES = getsubres.c
-data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(getsubres_SOURCES)
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/hellomotif/Makefile.am
+++ demos/programs/hellomotif/Makefile.am
@@ -1,11 +1,13 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/hellomotif
+pkgdatadir = $(datadir)/Xm/hellomotif
+uiddir = $(datadir)/X11/uid
bin_PROGRAMS = hellomotif
EXTRA_DIST = hellomotif.uil Imakefile README
hellomotif_SOURCES = hellomotif.c
-data_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES) hellomotif.uid
+pkgdata_DATA = $(EXTRA_DIST) $(hellomotif_SOURCES)
+uid_DATA = hellomotif.uid
LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/hellomotifi18n/Makefile.am
+++ demos/programs/hellomotifi18n/Makefile.am
@@ -1,13 +1,15 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/helloint
+pkgdatadir = $(datadir)/Xm/helloint
+uiddir = $(datadir)/X11/uid
SUBDIRS = C english french hebrew japan japanese swedish
EXTRA_DIST = README helloint.uil Imakefile helloint.man
CLEANFILES = helloint.uid
helloint_SOURCES = helloint.c
bin_PROGRAMS = helloint
-data_DATA = $(EXTRA_DIST) $(helloint_SOURCES) helloint.uid
+pkgdata_DATA = $(EXTRA_DIST) $(helloint_SOURCES)
+uid_DATA = helloint.uid
helloint_DEPENDENCIES = helloint.uid C/uid/l_strings.uid english/uid/l_strings.uid french/uid/l_strings.uid hebrew/uid/l_strings.uid japan/uid/l_strings.uid japanese/uid/l_strings.uid swedish/uid/l_strings.uid
INCLUDES = -I$(top_srcdir)/lib ${X_CFLAGS}
--- demos/programs/i18ninput/Makefile.am
+++ demos/programs/i18ninput/Makefile.am
@@ -1,12 +1,12 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/i18ninput
+pkgdatadir = $(datadir)/Xm/i18ninput
bin_PROGRAMS = i18ninput
i18ninput_SOURCES = i18ninput.c input.c
EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help \
Imakefile
-data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES)
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/panner/Makefile.am
+++ demos/programs/panner/Makefile.am
@@ -1,10 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/panner
+pkgdatadir = $(datadir)/Xm/panner
bin_PROGRAMS = panner
panner_SOURCES = panner.c
EXTRA_DIST = README panner.man Imakefile
-data_DATA = $(EXTRA_DIST) $(panner_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(panner_SOURCES)
LDADD = ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/periodic/Makefile.am
+++ demos/programs/periodic/Makefile.am
@@ -1,11 +1,13 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/periodic
+pkgdatadir = $(datadir)/Xm/periodic
+uiddir = $(datadir)/X11/uid
bin_PROGRAMS = periodic
EXTRA_DIST = periodic.uil periodic_l.uil XmdPeriodic.ad Imakefile README
periodic_SOURCES = periodic.c
-data_DATA = $(EXTRA_DIST) $(periodic_SOURCES) periodic.uid
+pkgdata_DATA = $(EXTRA_DIST) $(periodic_SOURCES)
+uid_DATA = periodic.uid
LDADD = ../../../lib/Xm/libXm.la ../../../lib/Mrm/libMrm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/piano/Makefile.am
+++ demos/programs/piano/Makefile.am
@@ -1,12 +1,12 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/piano
+pkgdatadir = $(datadir)/Xm/piano
bin_PROGRAMS = piano
piano_SOURCES = piano.c
EXTRA_DIST = piano.images README Inv8_part1.piano Inv8_part2.piano \
piano.man Imakefile
-data_DATA = $(EXTRA_DIST) $(piano_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(piano_SOURCES)
LDADD = ../../../lib/Xm/libXm.la -lm
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/pixmaps/Makefile.am
+++ demos/programs/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/pixmaps
+pkgdatadir = $(datadir)/Xm/pixmaps
EXTRA_DIST = crab.xpm eye.xpm porsche.xpm stopsign.xpm clown.xbm
-data_DATA = $(EXTRA_DIST)
+pkgdata_DATA = $(EXTRA_DIST)
--- demos/programs/popups/Makefile.am
+++ demos/programs/popups/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/autopopups
+pkgdatadir = $(datadir)/Xm/autopopups
bin_PROGRAMS = autopopups
autopopups_SOURCES = autopopups.c
EXTRA_DIST = README autopopups.man Imakefile
-data_DATA = $(EXTRA_DIST) $(autopopups_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(autopopups_SOURCES)
LDADD = ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/sampler2_0/Makefile.am
+++ demos/programs/sampler2_0/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/sampler2_0
+pkgdatadir = $(datadir)/Xm/sampler2_0
EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \
labir.xpm main.xpm pile.xpm prev.xpm spir.xpm stack.xpm \
@@ -8,7 +8,7 @@
XmdSampler2_0.ad
bin_PROGRAMS = sampler2_0
sampler2_0_SOURCES = sampler2_0.c
-data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST)
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/setdate/Makefile.am
+++ demos/programs/setdate/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/setDate
+pkgdatadir = $(datadir)/Xm/setDate
bin_PROGRAMS = setDate
EXTRA_DIST = XmdSetDate.ad README setDate.man Imakefile
setDate_SOURCES = setDate.c
-data_DATA = $(EXTRA_DIST) $(setDate_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(setDate_SOURCES)
LDADD = ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/todo/Makefile.am
+++ demos/programs/todo/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/todo
+pkgdatadir = $(datadir)/Xm/todo
EXTRA_DIST = README XmdTodo.ad example.todo todo.man todo.help Imakefile
bin_PROGRAMS = todo
todo_SOURCES = todo.c io.c actions.c page.h
-data_DATA = $(EXTRA_DIST) $(todo_SOURCES)
+pkgdata_DATA = $(EXTRA_DIST) $(todo_SOURCES)
INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS}
LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la
--- demos/programs/tooltips/Makefile.am
+++ demos/programs/tooltips/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/tooltips
+pkgdatadir = $(datadir)/Xm/tooltips
EXTRA_DIST = Imakefile
bin_PROGRAMS = tooltips
tooltips_SOURCES = tooltips.c
-data_DATA = $(tooltips_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(tooltips_SOURCES) $(EXTRA_DIST)
LDADD = ../../../lib/Xm/libXm.la
INCLUDES = -I$(srcdir)/../../../lib ${X_CFLAGS}
--- demos/programs/workspace/Makefile.am
+++ demos/programs/workspace/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-datadir = ${prefix}/share/Xm/wsm
+pkgdatadir = $(datadir)/Xm/wsm
EXTRA_DIST = Imakefile README wsm.man
bin_PROGRAMS = wsm
@@ -8,6 +8,6 @@
wsmSend.c wsmStruct.c wsm_cb.c wsm_create.c xrmLib.c \
command_ui.h wsm_cb.h wsm_create.h wsmData.h wsmDebug.h \
wsm.h wsmSend.h wsmStruct.h wsm_ui.h xrmLib.h
-data_DATA = $(wsm_SOURCES) $(EXTRA_DIST)
+pkgdata_DATA = $(wsm_SOURCES) $(EXTRA_DIST)
INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib ${X_CFLAGS}
LDADD = ../../../lib/Xm/libXm.la -L../../lib/Wsm -lWsm
++++++ openmotif-2.2.4.diff ++++++
++++ 611 lines (skipped)
++++++ openmotif-uil.diff ++++++
--- clients/uil/UilDiags.c
+++ clients/uil/UilDiags.c
@@ -207,9 +207,9 @@
va_list ap; /* ptr to variable length parameter */
int severity; /* severity of message */
int message_number; /* message number */
- char msg_buffer[132]; /* buffer to construct message */
+ char *msg_buffer = 0; /* buffer to construct message */
char ptr_buffer[buf_size]; /* buffer to construct pointer */
- char loc_buffer[132]; /* buffer to construct location */
+ char *loc_buffer = 0; /* buffer to construct location */
char src_buffer[buf_size]; /* buffer to hold source line */
/*
@@ -293,19 +293,18 @@
va_start(ap, l_start_column);
#ifndef NO_MESSAGE_CATALOG
- vsprintf( msg_buffer,
+ vasprintf(&msg_buffer,
catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ],
diag_rz_msg_table[ message_number ].ac_text),
ap );
#else
- vsprintf( msg_buffer,
+ vasprintf(&msg_buffer,
diag_rz_msg_table[ message_number ].ac_text,
ap );
#endif
va_end(ap);
src_buffer[ 0 ] = 0;
- loc_buffer[ 0 ] = 0;
ptr_buffer[ 0 ] = 0;
if (az_src_rec != diag_k_no_source)
@@ -317,13 +316,13 @@
*/
#ifndef NO_MESSAGE_CATALOG
- sprintf( loc_buffer,
+ asprintf(&loc_buffer,
catgets(uil_catd, UIL_SET_MISC,
UIL_MISC_0, "\t\t line: %d file: %s"),
az_src_rec->w_line_number,
src_get_file_name( az_src_rec ) );
#else
- sprintf( loc_buffer,
+ asprintf(&loc_buffer,
"\t\t line: %d file: %s",
az_src_rec->w_line_number,
src_get_file_name( az_src_rec ) );
@@ -371,7 +370,7 @@
if (l_start_column != diag_k_no_column)
#ifndef NO_MESSAGE_CATALOG
- sprintf(loc_buffer,
+ asprintf(&loc_buffer,
catgets(uil_catd, UIL_SET_MISC,
UIL_MISC_1,
"\t\t line: %d position: %d file: %s"),
@@ -379,7 +378,7 @@
l_start_column + 1,
src_get_file_name( az_src_rec ) );
#else
- sprintf(loc_buffer,
+ asprintf(&loc_buffer,
"\t\t line: %d position: %d file: %s",
az_src_rec->w_line_number,
l_start_column + 1,
@@ -387,13 +386,13 @@
#endif
else
#ifndef NO_MESSAGE_CATALOG
- sprintf( loc_buffer, catgets(uil_catd, UIL_SET_MISC,
+ asprintf(&loc_buffer, catgets(uil_catd, UIL_SET_MISC,
UIL_MISC_0,
"\t\t line: %d file: %s"),
az_src_rec->w_line_number,
src_get_file_name( az_src_rec ) );
#else
- sprintf( loc_buffer,
+ asprintf(&loc_buffer,
"\t\t line: %d file: %s",
az_src_rec->w_line_number,
src_get_file_name( az_src_rec ) );
@@ -406,7 +405,8 @@
*/
write_msg_to_standard_error
- ( message_number, src_buffer, ptr_buffer, msg_buffer, loc_buffer );
+ ( message_number, src_buffer, ptr_buffer, msg_buffer,
+ loc_buffer ? loc_buffer : "");
/*
** if we have a listing, place message in the source structure
@@ -428,6 +428,8 @@
uil_exit( uil_k_severe_status );
}
+ free (loc_buffer);
+ free (msg_buffer);
}
/*
--- clients/uil/UilIODef.h
+++ clients/uil/UilIODef.h
@@ -75,7 +75,7 @@
char *c_buffer;
boolean v_position_before_get;
z_key last_key;
- char expanded_name[ 256 ];
+ char *expanded_name;
} uil_fcb_type;
#endif /* UilIODef_h */
--- clients/uil/UilSrcSrc.c
+++ clients/uil/UilSrcSrc.c
@@ -271,6 +271,7 @@
diag_k_no_source, diag_k_no_column,
src_az_source_file_table[i]->expanded_name);
}
+ _free_memory (src_az_source_file_table[i]->expanded_name);
_free_memory ((char*)src_az_source_file_table [i]);
src_az_source_file_table[i] = NULL;
}
@@ -626,12 +627,13 @@
static unsigned short main_dir_len = 0;
boolean main_file;
int i; /* loop index through include files */
- char buffer[256];
+ char *buffer;
/* place the file name in the expanded_name buffer */
- strcpy(buffer, c_file_name);
+ buffer = _get_memory (strlen (c_file_name) + 1);
+ strcpy (buffer, c_file_name);
/* Determine if this is the main file or an include file. */
@@ -673,11 +675,10 @@
}
if (!specific_directory) {
+ buffer = XtRealloc (buffer, main_dir_len + strlen (c_file_name) + 1);
_move (buffer, main_fcb -> expanded_name, main_dir_len);
_move (& buffer [main_dir_len],
c_file_name, strlen (c_file_name) + 1); /* + NULL */
- } else {
- strcpy (buffer, c_file_name);
}
/* Open the include file. */
@@ -700,6 +701,7 @@
if (inc_dir_len == 0) {
search_user_include = False;
}
+ buffer = XtRealloc (buffer, inc_dir_len + strlen (c_file_name) + 1);
_move (buffer, Uil_cmd_z_command.ac_include_dir[i], inc_dir_len);
/* Add '/' if not specified at end of directory */
@@ -723,6 +725,7 @@
/* Look in the default include directory. */
if (search_user_include) {
+ buffer = XtRealloc (buffer, sizeof c_include_dir - 1 + strlen (c_file_name) + 1);
_move(buffer, c_include_dir, sizeof c_include_dir - 1); /* no NULL */
_move(&buffer[sizeof c_include_dir - 1],
c_file_name, strlen (c_file_name) + 1); /* + NULL */
@@ -736,14 +739,16 @@
/* check the open status. */
- if (az_fcb->az_file_ptr == NULL)
+ if (az_fcb->az_file_ptr == NULL) {
+ _free_memory (buffer);
return src_k_open_error;
+ }
/* open succeeded - place buffer address in fcb */
az_fcb->c_buffer = az_source_buffer->c_text;
az_fcb->c_buffer[ src_k_max_source_line_length ] = 0;
- strcpy(az_fcb->expanded_name, buffer);
+ az_fcb->expanded_name = buffer;
return src_k_open_normal;
}
--- tools/wml/Uil.y
+++ tools/wml/Uil.y
@@ -559,7 +559,7 @@
object_specification
: CLASS_NAME
- { sar_set_object_class (&$1); }
+ { sar_set_object_class (&$1); $$ = gz_yynullval;}
opt_create_proc_ref
opt_variant
object_spec
++++++ openmotif-xpm.diff ++++++
++++ 808 lines (skipped)
++++++ PrintableString.diff ++++++
--- lib/Xm/TextF.c
+++ lib/Xm/TextF.c
@@ -3723,15 +3723,15 @@
cache_ptr = tmp = XmStackAlloc(buf_size, cache);
tmp_str = (wchar_t *)str;
- ret_val = wctomb(tmp, *tmp_str);
+ ret_val = 0;
count = 0;
- while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) )
+ while (count < n && buf_size >= MB_CUR_MAX &&
+ (ret_val = wctomb(tmp, *tmp_str)) > 0)
{
count += 1;
tmp += ret_val;
buf_size -= ret_val;
tmp_str++;
- ret_val = wctomb(tmp, *tmp_str);
}
if (ret_val == -1) /* bad character */
++++++ sentinel.diff ++++++
--- clients/mwm/WmFunction.c
+++ clients/mwm/WmFunction.c
@@ -1124,12 +1124,12 @@
directory, then we must call execlp and not execl
*/
shellname = shell;
- execlp (shell, shellname, "-c", args, 0);
+ execlp (shell, shellname, "-c", args, (char *) 0);
}
else
{
shellname++;
- execl (shell, shellname, "-c", args, 0);
+ execl (shell, shellname, "-c", args, (char *) 0);
}
}
@@ -1138,9 +1138,9 @@
* Try /bin/sh .
*/
#ifdef SVR4
- execl ("/usr/bin/sh", "sh", "-c", args, 0);
+ execl ("/usr/bin/sh", "sh", "-c", args, (char *) 0);
#else
- execl ("/bin/sh", "sh", "-c", args, 0);
+ execl ("/bin/sh", "sh", "-c", args, (char *) 0);
#endif
--- demos/lib/Xmd/onHelp.c
+++ demos/lib/Xmd/onHelp.c
@@ -66,7 +66,7 @@
Widget dismiss;
toplevel = XtVaAppInitialize(&app_context, "HelpOnHelp", NULL, 0,
- &argc, argv, NULL, 0);
+ &argc, argv, NULL, NULL);
n = 0;
XtSetArg(args[n], XmdNhelpFile, "helpOn"); n++;
help = XmdCreateHelp(toplevel, "help", args, n);
--- demos/programs/Exm/simple_app/simpleDemo.c
+++ demos/programs/Exm/simple_app/simpleDemo.c
@@ -162,7 +162,7 @@
menu = XmCreatePulldownMenu(menuBar, "FileMenu", NULL, 0);
- XtVaSetValues(cascade, XmNsubMenuId, menu, 0);
+ XtVaSetValues(cascade, XmNsubMenuId, menu, NULL);
str = XmStringCreateLocalized("Quit");
menuitem = XtVaCreateManagedWidget("item", xmPushButtonWidgetClass,
--- demos/programs/filemanager/actions.c
+++ demos/programs/filemanager/actions.c
@@ -91,7 +91,7 @@
XtVaSetValues(fileviewer,
XmNlayoutType, spatial,
XmNentryViewType, size,
- 0, 0);
+ NULL);
fixViewerSize(XtParent(fileviewer), NULL, NULL);
--- demos/programs/filemanager/filemanager.c
+++ demos/programs/filemanager/filemanager.c
@@ -118,7 +118,7 @@
XtSetArg(args[n], XmNallowShellResize, True); n++;
toplevel = XtVaAppInitialize(&app_context, APP_CLASS, NULL, 0, &argc, argv,
- fallback_resources, 0);
+ fallback_resources, NULL);
app_class_quark = XrmStringToQuark(APP_CLASS);
app_quark = XrmStringToQuark(argv[0]);
--- demos/programs/fileview/text.c
+++ demos/programs/fileview/text.c
@@ -160,7 +160,7 @@
XtSetValues(XtParent(new->text), args, n);
XmTextSetTopCharacter(new->text,
XmTextGetTopCharacter(this->current_pane->text));
- XtVaSetValues(target, XmNheight, (Dimension) height/2);
+ XtVaSetValues(target, XmNheight, (Dimension) height/2, NULL);
}
printf("source text set\n");
XtManageChild(new->text);
--- demos/programs/popups/autopopups.c
+++ demos/programs/popups/autopopups.c
@@ -83,7 +83,7 @@
XmString str, tmp1, tmp2;
shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv,
- NULL, 0);
+ NULL, NULL);
frame1 = XmCreateFrame(shell, "outerframe", NULL, 0);
XtManageChild(frame1);
--- demos/programs/setdate/setDate.c
+++ demos/programs/setdate/setDate.c
@@ -95,7 +95,7 @@
char *str;
shell = XtVaAppInitialize(&context, APP_CLASS, NULL, 0, &argc, argv,
- fallback_resources, 0);
+ fallback_resources, NULL);
time(&timer);
thetime = localtime(&timer);
--- demos/programs/todo/todo.c
+++ demos/programs/todo/todo.c
@@ -150,7 +150,7 @@
shell = XtVaAppInitialize(&context, APP_CLASS,
optionDesc, XtNumber(optionDesc),
&argc, argv,
- fallback_resources, 0);
+ fallback_resources, NULL);
XtGetApplicationResources(shell, (XtPointer) &options,
resources, XtNumber(resources), (Arg *) NULL, 0);
--- lib/Xm/Label.c
+++ lib/Xm/Label.c
@@ -2595,7 +2595,7 @@
{
XmString value;
- XtVaGetValues(w, XmNlabelString, &value, 0);
+ XtVaGetValues(w, XmNlabelString, &value, NULL);
if (type == XmFORMAT_XmSTRING)
{
++++++ warn.patch ++++++
--- demos/programs/ButtonBox/bboxdemo.c
+++ demos/programs/ButtonBox/bboxdemo.c
@@ -668,4 +668,5 @@
XtRealizeWidget(top);
XtAppMainLoop(app);
+ return 0;
}
--- demos/programs/ColorSel/bxutil-c.c
+++ demos/programs/ColorSel/bxutil-c.c
@@ -3471,6 +3471,7 @@
default:
return -1;
}
+ abort();
}
@@ -3494,6 +3495,7 @@
default:
return -1;
}
+ abort();
}
/*
--- demos/programs/FontSel/fontsel.c
+++ demos/programs/FontSel/fontsel.c
@@ -68,6 +68,7 @@
* Returns: nothing
*
*/
+void
InitializeDemoForm(Widget form)
{
Widget w;
@@ -119,5 +120,6 @@
XtRealizeWidget(top);
XtAppMainLoop(app);
+ return 0;
}
--- demos/programs/MultiList/bxutil-c.c
+++ demos/programs/MultiList/bxutil-c.c
@@ -3469,6 +3469,7 @@
}
return (c);
}
+ abort();
}
@@ -3490,6 +3491,7 @@
mdata->InsideString = !mdata->InsideString;
return (ungetc(c, mdata->stream.file));
}
+ abort();
}
/*
--- demos/programs/Tree/bxutil-c.c
+++ demos/programs/Tree/bxutil-c.c
@@ -3471,6 +3471,7 @@
default:
return -1;
}
+ abort();
}
@@ -3494,6 +3495,7 @@
default:
return -1;
}
+ abort();
}
/*
--- tools/wml/wmlresolve.c
+++ tools/wml/wmlresolve.c
@@ -69,6 +69,7 @@
#if defined(__STDC__)
#include