Hello community,
here is the log from the commit of package openmotif
checked in at Mon Nov 17 17:36:22 CET 2008.
--------
--- openmotif/openmotif.changes 2008-10-09 22:06:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/openmotif/openmotif.changes 2008-11-10 17:44:32.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 10 17:44:13 CET 2008 - schwab@suse.de
+
+- Remove obsolete changes.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
openmotif-2.3.1-1.tar.gz
New:
----
openmotif-2.3.1-1.tar.lzma
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openmotif.spec ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:55.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:55.000000000 +0100
@@ -24,9 +24,9 @@
%define _mandir %_prefix/man
%define _datadir %_prefix/lib
%endif
-BuildRequires: bison flex freetype2-devel libjpeg-devel libpng-devel pkgconfig update-desktop-files xorg-x11-devel
+BuildRequires: bison flex freetype2-devel libjpeg-devel libpng-devel lzma pkgconfig update-desktop-files xorg-x11-devel
Version: 2.3.1
-Release: 1
+Release: 2
License: MOTIF LICENSE (http://www.opengroup.org/openmotif/license)
Group: System/Libraries
AutoReqProv: on
@@ -35,7 +35,7 @@
Summary: Open Motif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.motifzone.net/
-Source: openmotif-%{version}-1.tar.gz
+Source: openmotif-%{version}-1.tar.lzma
Source1: mwm.desktop
Patch: openmotif-%{version}.diff
Patch1: warn.patch
@@ -90,15 +90,15 @@
%prep
%setup -q
-%patch -p1
-%patch1 -p1
+%patch
+%patch1
%patch2
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch3
+%patch4
+%patch5
+%patch6
+%patch7
+%patch8
%patch9 -p1
%build
@@ -196,7 +196,9 @@
%{_mandir}/man5/*.gz
%changelog
-* Fri Oct 10 2008 bwalle@suse.de
+* Mon Nov 10 2008 schwab@suse.de
+- Remove obsolete changes.
+* Thu Oct 09 2008 bwalle@suse.de
- Update to openMotif 2.3.1.
* Bug fixes, see ftp://ftp.ics.com/openmotif/2.3/2.3.1/RELEASE.
- Drop openmotif-etched-in-menus: Included in release.
@@ -249,7 +251,7 @@
- Set mandir.
* Wed Apr 12 2006 schwab@suse.de
- Fix build race.
-* Tue Apr 11 2006 schwab@suse.de
+* Mon Apr 10 2006 schwab@suse.de
- Update to openmotif 2.3.0 beta2.
* Fri Mar 31 2006 schwab@suse.de
- Fix fencepost error.
@@ -317,14 +319,14 @@
- Fix permission of site.def after modifying.
* Thu Apr 04 2002 schwab@suse.de
- Remove dependency on libXmu to allow static linking.
-* Thu Apr 04 2002 schwab@suse.de
+* Wed Apr 03 2002 schwab@suse.de
- Update to openMotif 2.2.2.
- New subpackage openmotif-demo.
* Fri Jan 04 2002 adrian@suse.de
- fix build for mips
* Thu Nov 15 2001 schwab@suse.de
- Integrate JDK bug fix.
-* Tue May 08 2001 mfabian@suse.de
+* Mon May 07 2001 mfabian@suse.de
- bzip2 sources
* Thu Feb 22 2001 schwab@suse.de
- Trigger on xdevel, not xf86.
++++++ mwm.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,9 +1,5 @@
----
- clients/mwm/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/clients/mwm/Makefile.am
-+++ b/clients/mwm/Makefile.am
+--- clients/mwm/Makefile.am
++++ clients/mwm/Makefile.am
@@ -14,7 +14,7 @@ mwm_LDADD = ./WmWsmLib/libWsm.a ../../li
INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART \
-DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\" \
++++++ openmotif-2.3.1.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,19 +1,7 @@
----
- Makefile.am | 6 +--
- ac_find_xft.m4 | 2 +
- clients/uil/Makefile.am | 4 +-
- config/cf/Imake.cf | 33 +++++++++++++++++++
- config/cf/Imake.tmpl | 8 +++-
- config/cf/linux.cf | 80 +++++++++++++++++++++++++++++++++++++++++++++--
- config/imake/imakemdep.h | 24 ++++++++++++++
- configure.ac | 4 +-
- lib/Mrm/Makefile.am | 2 -
- lib/Xm/EditresCom.c | 14 ++++----
- lib/Xm/Makefile.am | 2 -
- 11 files changed, 158 insertions(+), 21 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
+Index: Makefile.am
+================================================================================
+--- Makefile.am
++++ Makefile.am
@@ -29,7 +29,7 @@ SUBDIRS = bindings bitmaps \
include \
tools \
@@ -25,26 +13,8 @@
+AUTOMAKE_OPTIONS = 1.4 foreign
+ACLOCAL_AMFLAGS = -I .
ACLOCAL_AMFLAGS = -I .
---- a/ac_find_xft.m4
-+++ b/ac_find_xft.m4
-@@ -77,6 +77,7 @@ saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
- AC_CHECK_HEADERS(freetype/freetype.h)
-
-+m4_pattern_allow([^FINDXFT_HAVE_FREETYPE$])dnl
- FINDXFT_HAVE_FREETYPE="no"
- case "$ac_cv_header_freetype_freetype_h" in
- no)
-@@ -131,6 +132,7 @@ AC_SUBST(CONFDIR)
- #
- # Check X configuration
- #
-+m4_pattern_allow([^FINDXFT_HAVE_XRENDER$])dnl
- FINDXFT_HAVE_XRENDER="no"
- case "$have_x" in
- yes)
---- a/clients/uil/Makefile.am
-+++ b/clients/uil/Makefile.am
+--- clients/uil/Makefile.am
++++ clients/uil/Makefile.am
@@ -13,7 +13,7 @@ UilParser.lo: UilParser.c
libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la
@@ -63,8 +33,8 @@
HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \
UilDef.h XmAppl.uil
---- a/config/cf/Imake.cf
-+++ b/config/cf/Imake.cf
+--- config/cf/Imake.cf
++++ config/cf/Imake.cf
@@ -570,6 +570,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# ifdef i386
# define i386Architecture
@@ -119,8 +89,8 @@
#endif /* linux */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
---- a/config/cf/Imake.tmpl
-+++ b/config/cf/Imake.tmpl
+--- config/cf/Imake.tmpl
++++ config/cf/Imake.tmpl
@@ -502,14 +502,18 @@ JPTCLIBDIR = JpTclLibDir
#define DefaultUsrBin /usr/bin
#endif
@@ -142,8 +112,8 @@
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
---- a/config/cf/linux.cf
-+++ b/config/cf/linux.cf
+--- config/cf/linux.cf
++++ config/cf/linux.cf
@@ -41,8 +41,9 @@ XCOMM platform: $XFree86: xc/config/cf/
/* Set some defaults for the Default* values in case imake doesn't find them */
#ifndef DefaultLinuxCLibMajorVersion
@@ -273,8 +243,8 @@
+
#include
#include
---- a/config/imake/imakemdep.h
-+++ b/config/imake/imakemdep.h
+--- config/imake/imakemdep.h
++++ config/imake/imakemdep.h
@@ -333,6 +333,18 @@ char *cpp_argv[ARGUMENTS] = {
# ifdef __i386__
"-D__i386__",
@@ -313,8 +283,8 @@
#ifdef __DECC
{"__DECC", "1"},
#endif
---- a/configure.ac
-+++ b/configure.ac
+--- configure.ac
++++ configure.ac
@@ -167,13 +167,13 @@ AC_SUBST(CDE_INSTALLATION_TOP)
CDE_CONFIGURATION_TOP="\${prefix}/etc/dt"
AC_SUBST(CDE_CONFIGURATION_TOP)
@@ -331,8 +301,8 @@
AC_SUBST(XMBINDDIR_FALLBACK)
AC_ARG_ENABLE(motif22-compatibility, [ --disable-motif22-compatibility
---- a/lib/Mrm/Makefile.am
-+++ b/lib/Mrm/Makefile.am
+--- lib/Mrm/Makefile.am
++++ lib/Mrm/Makefile.am
@@ -8,7 +8,7 @@ mrmdir = $(includedir)/Mrm
libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}
@@ -342,8 +312,8 @@
lib_LTLIBRARIES = libMrm.la
---- a/lib/Xm/EditresCom.c
-+++ b/lib/Xm/EditresCom.c
+--- lib/Xm/EditresCom.c
++++ lib/Xm/EditresCom.c
@@ -1771,7 +1771,7 @@ Widget w;
XtFree((char *)widget_list);
}
@@ -407,8 +377,8 @@
_XEditResGetWidgetInfo(stream, info)
ProtocolStream * stream;
WidgetInfo * info;
---- a/lib/Xm/Makefile.am
-+++ b/lib/Xm/Makefile.am
+--- lib/Xm/Makefile.am
++++ lib/Xm/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I.. -I$(srcdir)/.. -DXMBINDD
${X_CFLAGS}
xmdir = $(includedir)/Xm
++++++ openmotif-editres.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,10 +1,6 @@
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
--- a/configure.ac
+++ b/configure.ac
-@@ -74,7 +74,9 @@ AC_DEFINE(HAVE_LIBXMU, 1, This System ha
+@@ -70,7 +70,9 @@ AC_DEFINE(HAVE_LIBXMU, 1, This System ha
, X_XMU="", -lXt -lX11)
AC_CHECK_LIB(Xmu,XmuNCopyISOLatin1Lowered ,
AC_DEFINE(HAVE_XMU_N_COPY_ISO,1,Have XmuNCopyISOLatin1Lowered)
++++++ openmotif-uil.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,13 +1,5 @@
----
- clients/uil/UilDiags.c | 26 ++++++++++++++------------
- clients/uil/UilIODef.h | 2 +-
- clients/uil/UilSrcSrc.c | 18 +++++++++++-------
- tools/wml/Makefile.am | 6 ++++--
- tools/wml/Uil.y | 2 +-
- 5 files changed, 31 insertions(+), 23 deletions(-)
-
---- a/clients/uil/UilDiags.c
-+++ b/clients/uil/UilDiags.c
+--- clients/uil/UilDiags.c
++++ clients/uil/UilDiags.c
@@ -207,9 +207,9 @@ void diag_issue_diagnostic
va_list ap; /* ptr to variable length parameter */
int severity; /* severity of message */
@@ -111,9 +103,9 @@
}
/*
---- a/clients/uil/UilIODef.h
-+++ b/clients/uil/UilIODef.h
-@@ -75,7 +75,7 @@ typedef struct
+--- clients/uil/UilIODef.h
++++ clients/uil/UilIODef.h
+@@ -75,7 +75,7 @@ typedef struct
char *c_buffer;
boolean v_position_before_get;
z_key last_key;
@@ -122,8 +114,8 @@
} uil_fcb_type;
#endif /* UilIODef_h */
---- a/clients/uil/UilSrcSrc.c
-+++ b/clients/uil/UilSrcSrc.c
+--- clients/uil/UilSrcSrc.c
++++ clients/uil/UilSrcSrc.c
@@ -271,6 +271,7 @@ Uil_src_cleanup_source(void)
diag_k_no_source, diag_k_no_column,
src_az_source_file_table[i]->expanded_name);
@@ -132,7 +124,7 @@
_free_memory ((char*)src_az_source_file_table [i]);
src_az_source_file_table[i] = NULL;
}
-@@ -626,13 +627,13 @@ open_source_file( XmConst char
+@@ -626,13 +627,13 @@ open_source_file( XmConst char
static unsigned short main_dir_len = 0;
boolean main_file;
int i; /* loop index through include files */
@@ -149,7 +141,7 @@
/* Determine if this is the main file or an include file. */
-@@ -674,11 +675,10 @@ open_source_file( XmConst char
+@@ -674,11 +675,10 @@ open_source_file( XmConst char
}
if (!specific_directory) {
@@ -162,7 +154,7 @@
}
/* Open the include file. */
-@@ -701,6 +701,7 @@ open_source_file( XmConst char
+@@ -701,6 +701,7 @@ open_source_file( XmConst char
if (inc_dir_len == 0) {
search_user_include = False;
}
@@ -170,7 +162,7 @@
_move (buffer, Uil_cmd_z_command.ac_include_dir[i], inc_dir_len);
/* Add '/' if not specified at end of directory */
-@@ -724,6 +725,7 @@ open_source_file( XmConst char
+@@ -724,6 +725,7 @@ open_source_file( XmConst char
/* Look in the default include directory. */
if (search_user_include) {
@@ -197,9 +189,9 @@
return src_k_open_normal;
}
---- a/tools/wml/Makefile.am
-+++ b/tools/wml/Makefile.am
-@@ -43,10 +43,12 @@ wmllex.c: wmllex.l
+--- tools/wml/Makefile.am
++++ tools/wml/Makefile.am
+@@ -42,10 +42,12 @@ wmllex.c: wmllex.l
$(srcdir)/wmldbcreate.c: $(WMLTARGETS) UilLexPars.h
@@ -214,8 +206,8 @@
$(LN_S) Uil.c UilLexPars.c
$(WMLTARGETS): wmluiltok wml UilLexPars.c $(TABLE)
---- a/tools/wml/Uil.y
-+++ b/tools/wml/Uil.y
+--- tools/wml/Uil.y
++++ tools/wml/Uil.y
@@ -559,7 +559,7 @@ control_object_definition
object_specification
++++++ openmotif-unaligned.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,10 +1,6 @@
----
- lib/Xm/TextF.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/lib/Xm/TextF.c
-+++ b/lib/Xm/TextF.c
-@@ -3919,7 +3919,7 @@ InsertChar(Widget w,
+--- lib/Xm/TextF.c
++++ lib/Xm/TextF.c
+@@ -3906,7 +3906,7 @@
nextPos, insert_string,
insert_length, True);
} else {
@@ -13,7 +9,7 @@
insert_string[insert_length] = '\0'; /* NULL terminate for mbstowcs */
wc_insert_string = (wchar_t*)XmStackAlloc((Cardinal)(insert_length+1) *
sizeof(wchar_t), stack_cache);
-@@ -6981,7 +6981,7 @@ ValidateString(XmTextFieldWidget tf,
+@@ -6964,7 +6964,7 @@
int str_len = 0;
int i, j;
++++++ openmotif-xpm.diff ++++++
++++ 920 lines (skipped)
++++ between openmotif/openmotif-xpm.diff
++++ and /mounts/work_src_done/STABLE/openmotif/openmotif-xpm.diff
++++++ sentinel.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,14 +1,5 @@
----
- clients/mwm/WmFunction.c | 8 ++++----
- demos/lib/Xmd/onHelp.c | 2 +-
- demos/programs/Exm/simple_app/simpleDemo.c | 2 +-
- demos/programs/filemanager/actions.c | 2 +-
- demos/programs/fileview/text.c | 2 +-
- demos/programs/popups/autopopups.c | 2 +-
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/clients/mwm/WmFunction.c
-+++ b/clients/mwm/WmFunction.c
+--- clients/mwm/WmFunction.c
++++ clients/mwm/WmFunction.c
@@ -1126,12 +1126,12 @@ Boolean F_Exec (String args, ClientData
directory, then we must call execlp and not execl
*/
@@ -36,8 +27,8 @@
#endif
---- a/demos/lib/Xmd/onHelp.c
-+++ b/demos/lib/Xmd/onHelp.c
+--- demos/lib/Xmd/onHelp.c
++++ demos/lib/Xmd/onHelp.c
@@ -66,7 +66,7 @@ int main(int argc, String argv[])
Widget dismiss;
@@ -47,8 +38,8 @@
n = 0;
XtSetArg(args[n], XmdNhelpFile, "helpOn"); n++;
help = XmdCreateHelp(toplevel, "help", args, n);
---- a/demos/programs/Exm/simple_app/simpleDemo.c
-+++ b/demos/programs/Exm/simple_app/simpleDemo.c
+--- demos/programs/Exm/simple_app/simpleDemo.c
++++ demos/programs/Exm/simple_app/simpleDemo.c
@@ -162,7 +162,7 @@ main (int argc, char **argv)
menu = XmCreatePulldownMenu(menuBar, "FileMenu", NULL, 0);
@@ -58,8 +49,8 @@
str = XmStringCreateLocalized("Quit");
menuitem = XtVaCreateManagedWidget("item", xmPushButtonWidgetClass,
---- a/demos/programs/filemanager/actions.c
-+++ b/demos/programs/filemanager/actions.c
+--- demos/programs/filemanager/actions.c
++++ demos/programs/filemanager/actions.c
@@ -91,7 +91,7 @@ viewCB(Widget widget, char *type, XtPo
XtVaSetValues(fileviewer,
XmNlayoutType, spatial,
@@ -69,8 +60,8 @@
fixViewerSize(XtParent(fileviewer), NULL, NULL);
---- a/demos/programs/fileview/text.c
-+++ b/demos/programs/fileview/text.c
+--- demos/programs/fileview/text.c
++++ demos/programs/fileview/text.c
@@ -160,7 +160,7 @@ void NewPaneCallback(Widget widget, View
XtSetValues(XtParent(new->text), args, n);
XmTextSetTopCharacter(new->text,
@@ -80,8 +71,8 @@
}
printf("source text set\n");
XtManageChild(new->text);
---- a/demos/programs/popups/autopopups.c
-+++ b/demos/programs/popups/autopopups.c
+--- demos/programs/popups/autopopups.c
++++ demos/programs/popups/autopopups.c
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
XmString str, tmp1, tmp2;
++++++ strcmp.diff ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,10 +1,6 @@
----
- lib/Xm/Xpms_popen.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/Xm/Xpms_popen.c
-+++ b/lib/Xm/Xpms_popen.c
-@@ -56,7 +56,7 @@ FILE *Xpms_popen(char *cmd, const char *
+--- lib/Xm/Xpms_popen.c
++++ lib/Xm/Xpms_popen.c
+@@ -56,7 +56,7 @@
char *cmdcpy;
++++++ warn.patch ++++++
--- /var/tmp/diff_new_pack.N19000/_old 2008-11-17 17:35:56.000000000 +0100
+++ /var/tmp/diff_new_pack.N19000/_new 2008-11-17 17:35:56.000000000 +0100
@@ -1,16 +1,6 @@
----
- demos/programs/ColorSel/util-c.c | 4 ++++
- demos/programs/Ext18List/util-c.c | 4 ++++
- demos/programs/FontSel/fontsel.c | 1 +
- demos/programs/IconB/misc.c | 4 ++++
- demos/programs/Tree/bxutil-c.c | 2 ++
- lib/Xm/XmString.c | 6 ++----
- tools/wml/wmlresolve.c | 1 +
- 7 files changed, 18 insertions(+), 4 deletions(-)
-
---- a/demos/programs/ColorSel/util-c.c
-+++ b/demos/programs/ColorSel/util-c.c
-@@ -3468,6 +3468,8 @@ GRA(xpmData *, mdata)
+--- demos/programs/ColorSel/util-c.c
++++ demos/programs/ColorSel/util-c.c
+@@ -3468,6 +3468,8 @@
c = xpmGetC(mdata);
}
return (c);
@@ -19,7 +9,7 @@
}
}
-@@ -3489,6 +3491,8 @@ GRA(xpmData *, mdata)
+@@ -3489,6 +3491,8 @@
/* if not natural XPM2 */
mdata->InsideString = !mdata->InsideString;
return (ungetc(c, mdata->stream.file));
@@ -28,9 +18,9 @@
}
}
---- a/demos/programs/Ext18List/util-c.c
-+++ b/demos/programs/Ext18List/util-c.c
-@@ -3468,6 +3468,8 @@ GRA(xpmData *, mdata)
+--- demos/programs/Ext18List/util-c.c
++++ demos/programs/Ext18List/util-c.c
+@@ -3468,6 +3468,8 @@
c = xpmGetC(mdata);
}
return (c);
@@ -39,7 +29,7 @@
}
}
-@@ -3489,6 +3491,8 @@ GRA(xpmData *, mdata)
+@@ -3489,6 +3491,8 @@
/* if not natural XPM2 */
mdata->InsideString = !mdata->InsideString;
return (ungetc(c, mdata->stream.file));
@@ -48,18 +38,18 @@
}
}
---- a/demos/programs/FontSel/fontsel.c
-+++ b/demos/programs/FontSel/fontsel.c
-@@ -121,5 +121,6 @@ char **argv;
+--- demos/programs/FontSel/fontsel.c
++++ demos/programs/FontSel/fontsel.c
+@@ -122,5 +122,6 @@
XtRealizeWidget(top);
XtAppMainLoop(app);
+ return 0;
}
---- a/demos/programs/IconB/misc.c
-+++ b/demos/programs/IconB/misc.c
-@@ -3440,6 +3440,8 @@ GRA(xpmData *, mdata)
+--- demos/programs/IconB/misc.c
++++ demos/programs/IconB/misc.c
+@@ -3440,6 +3440,8 @@
c = xpmGetC(mdata);
}
return (c);
@@ -68,7 +58,7 @@
}
}
-@@ -3461,6 +3463,8 @@ GRA(xpmData *, mdata)
+@@ -3461,6 +3463,8 @@
/* if not natural XPM2 */
mdata->InsideString = !mdata->InsideString;
return (ungetc(c, mdata->stream.file));
@@ -77,9 +67,9 @@
}
}
---- a/demos/programs/Tree/bxutil-c.c
-+++ b/demos/programs/Tree/bxutil-c.c
-@@ -3469,6 +3469,7 @@ GRA(xpmData *, mdata)
+--- demos/programs/Tree/bxutil-c.c
++++ demos/programs/Tree/bxutil-c.c
+@@ -3469,6 +3469,7 @@
}
return (c);
}
@@ -87,7 +77,7 @@
}
-@@ -3490,6 +3491,7 @@ GRA(xpmData *, mdata)
+@@ -3490,6 +3491,7 @@
mdata->InsideString = !mdata->InsideString;
return (ungetc(c, mdata->stream.file));
}
@@ -95,9 +85,9 @@
}
/*
---- a/lib/Xm/XmString.c
-+++ b/lib/Xm/XmString.c
-@@ -7969,8 +7969,7 @@ XmStringParseText(XtPointer text,
+--- lib/Xm/XmString.c
++++ lib/Xm/XmString.c
+@@ -7962,8 +7962,7 @@
case XmMULTIBYTE_TEXT:
/* Non-NULL values (except _MOTIF_DEFAULT_LOCALE)
are not accepted in Motif 2.0. */
@@ -107,7 +97,7 @@
{
_XmProcessUnlock();
return NULL;
-@@ -8583,8 +8582,7 @@ XmStringComponentCreate(XmStringComponen
+@@ -8572,8 +8571,7 @@
_XmProcessUnlock();
return NULL;
}
@@ -117,9 +107,9 @@
_XmProcessUnlock();
return NULL;
}
---- a/tools/wml/wmlresolve.c
-+++ b/tools/wml/wmlresolve.c
-@@ -69,6 +69,7 @@ static char rcsid[] = "$XConsortium: wml
+--- tools/wml/wmlresolve.c
++++ tools/wml/wmlresolve.c
+@@ -69,6 +69,7 @@
#if defined(__STDC__)
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org