[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxmu: Changes to 'upstream-unstable'

 .gitignore         |    8 ++++++++
 Makefile.am        |   10 +++-------
 README             |   29 ++++++++++++++++++++++++++++-
 configure.ac       |   20 ++++++--------------
 include/.gitignore |    2 --
 src/.gitignore     |    7 -------
 src/EditresCom.c   |    8 ++++----
 src/GetHost.c      |    3 ++-
 src/Makefile.am    |    2 +-
 src/RdBitF.c       |    3 +++
 src/StrToWidg.c    |    2 +-
 11 files changed, 56 insertions(+), 38 deletions(-)

New commits:
commit c2c76abe51878f55e22c44c747f1243e56a4344b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Sep 23 17:53:41 2009 -0700

    libXmu 1.0.5
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/configure.ac b/configure.ac
index 78c292b..f521572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 AC_PREREQ(2.57)
 
 AC_INIT([libXmu],
-        1.0.4,
+        1.0.5,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libXmu)
 

commit 5b31bee92b56147e2c17d19e46e09145d765fdb4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Sep 23 17:49:27 2009 -0700

    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/configure.ac b/configure.ac
index 48e2829..78c292b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,20 +15,19 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER([config.h])
 
 
 # Checks for programs.
 AC_PROG_LIBTOOL
 AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
-XMU_CFLAGS="$CWARNFLAGS $XMU_CFLAGS"
 AC_SUBST(XMU_CFLAGS)
 AC_SUBST(XMU_LIBS)
 
@@ -63,9 +62,6 @@ XORG_LINT_LIBRARY([Xmu])
 LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
 AC_SUBST(LINTLIBUU)
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
            include/Makefile
 	   src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f19c5e..ad5b55d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 	-I${top_srcdir}/include/X11/Xmu \
 	$(BITMAP_DEFINES) -D_BSD_SOURCE
 
-AM_CFLAGS = $(XMU_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
 
 libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
 libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined

commit fef063d82e332b96bcb12ce41abefce868821577
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Sep 23 17:47:16 2009 -0700

    Add pointer to API docs in xorg-docs to README
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/README b/README
index a77cc62..c7f4dcc 100644
--- a/README
+++ b/README
@@ -7,6 +7,9 @@ may choose not to distribute this library if they wish.  Therefore,
 applications developers who depend on this library should be prepared to
 treat it as part of their software base when porting.
 
+API documentation for this library is provided in the xorg-docs module,
+in the file specs/Xmu/Xmu.ms.
+
 All questions regarding this software should be directed at the
 Xorg mailing list:
 

commit 88bd2d387fbb068339b65506331136085082def6
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Mar 31 00:01:48 2009 +0200

    libXmu: check for LONG64, not LONG_64
    
    The latter isn't defined anywhere, so editres hasn't been able to read a
    pointer on 64bit since about 10 years.
    Admittedly, this should be using stdint types, but...
    
    Debian bug#521887 <http://bugs.debian.org/521887>
    
    Reported-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/src/EditresCom.c b/src/EditresCom.c
index 28e1be3..51ac248 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -2123,7 +2123,7 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs)
   /* try to get the value in the proper size */
   switch (res->resource_size)
     {
-#ifdef LONG_64
+#ifdef LONG64
       long v8;
 #endif
       int v4;
@@ -2145,7 +2145,7 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs)
       XtGetValues(w, args, 1);
       value = (int)v4;
       break;
-#ifdef LONG_64
+#ifdef LONG64
     case 8:
       XtSetArg(args[0], res->resource_name, &v8);
       XtGetValues(w, args, 1);
@@ -2197,7 +2197,7 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs)
 	    case sizeof(int):
 	      XmuSnprintf(buffer, sizeof(buffer), "0x%08x", (int)value);
 	      break;
-#ifdef LONG_64
+#ifdef LONG64
 	    case sizeof(long):
 	      XmuSnprintf(buffer, sizeof(buffer), "0x%016lx", value);
 	      break;

commit f1ccbcffc9171868256b5813aa558f6756aca508
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Feb 2 20:34:34 2009 -0800

    Add README with pointers to mailing list, bugzilla & git repos
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/README b/README
index d618e2a..a77cc62 100644
--- a/README
+++ b/README
@@ -2,7 +2,31 @@ This library contains miscellaneous utilities and is not part of the Xlib
 standard.  It contains routines which only use public interfaces so that it
 may be layered on top of any proprietary implementation of Xlib or Xt.
 
-It is intended to support clients in the MIT distribution; vendors
+It is intended to support clients in the X.Org distribution; vendors
 may choose not to distribute this library if they wish.  Therefore,
 applications developers who depend on this library should be prepared to
 treat it as part of their software base when porting.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/lib/libXmu
+
+        http://cgit.freedesktop.org/xorg/lib/libXmu
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+

commit 049534f4eb409bea62b590b436bef78e5eef5b8e
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Thu Jan 29 20:02:33 2009 -0200

    Janitor: make distcheck, compiler warnings, .gitignore.

diff --git a/.gitignore b/.gitignore
index 134f731..41c861b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 config.guess
@@ -19,3 +21,9 @@ stamp-h1
 xmu.pc
 xmuu.pc
 *~
+*.o
+*.la
+*.lo
+libXmu-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 8eb6410..955bcb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,14 @@ pkgconfig_DATA = xmu.pc xmuu.pc
 EXTRA_DIST = \
 	xmu.pc.in \
 	xmuu.pc.in \
-	autogen.sh \
-	include/X11/Xmu/WhitePoint.h
-
-EXTRA_DIST += ChangeLog
+	include/X11/Xmu/WhitePoint.h \
+	ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 901ffd3..48e2829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,19 +15,20 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 AM_CONFIG_HEADER([config.h])
 
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
-
 
 # Checks for programs.
 AC_PROG_LIBTOOL
 AC_PROG_CC
+XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
+XMU_CFLAGS="$CWARNFLAGS $XMU_CFLAGS"
 AC_SUBST(XMU_CFLAGS)
 AC_SUBST(XMU_LIBS)
 
@@ -62,13 +63,8 @@ XORG_LINT_LIBRARY([Xmu])
 LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
 AC_SUBST(LINTLIBUU)
 
-if test "x$GCC" = "xyes"; then
-        GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-        -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
-        XMU_CFLAGS="$GCC_WARNINGS $XMU_CFLAGS"
-fi
-
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            include/Makefile
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index b47b240..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXmu.la
-libXmuu.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/EditresCom.c b/src/EditresCom.c
index 66da52c..28e1be3 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -1611,7 +1611,7 @@ InsertWidget(ProtocolStream *stream, Widget w)
   unsigned long *widget_list;
     register int i, num_widgets;
 
-  for (temp = w, i = 0; temp != 0; temp = XtParent(temp), i++)
+  for (temp = w, i = 0; temp != NULL; temp = XtParent(temp), i++)
     ;
 
     num_widgets = i;

commit fc2096538ff7424bfeb171b1a36e860070594627
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Aug 4 19:42:22 2008 -0700

    Add libX11 to libXmu dependencies

diff --git a/configure.ac b/configure.ac
index a604592..901ffd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PROG_LIBTOOL
 AC_PROG_CC
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XMU, xt xext xextproto)
+PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
 AC_SUBST(XMU_CFLAGS)
 AC_SUBST(XMU_LIBS)
 

commit 85f77401635dfa57d40de89aa2c9f39a344a8d3b
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date:   Tue Apr 29 13:13:06 2008 +0100

    Fix build problems on WIN32 platforms

diff --git a/src/GetHost.c b/src/GetHost.c
old mode 100644
new mode 100755
index ca7bed5..19793fd
--- a/src/GetHost.c
+++ b/src/GetHost.c
@@ -41,6 +41,7 @@ in this Software without prior written authorization from The Open Group.
 #include <unistd.h>
 
 #ifdef WIN32
+#include <X11/Xlibint.h>
 #include <X11/Xwinsock.h>
 #endif
 
diff --git a/src/RdBitF.c b/src/RdBitF.c
old mode 100644
new mode 100755
index eb5fe59..073e3df
--- a/src/RdBitF.c
+++ b/src/RdBitF.c
@@ -57,6 +57,9 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #include <ctype.h>
 #include <X11/Xmu/Drawing.h>
+#ifdef WIN32
+#include <X11/Xwindows.h>
+#endif
 
 #define MAX_SIZE 255
 

commit aa6e9793fbb8621ce1f1ed580298621e29638619
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date:   Sat Apr 26 08:51:54 2008 +0100

    Switch to winsock2

diff --git a/src/GetHost.c b/src/GetHost.c
index 91673b8..ca7bed5 100644
--- a/src/GetHost.c
+++ b/src/GetHost.c
@@ -61,7 +61,7 @@ XmuGetHostname(char *buf, int maxlen)
 #ifdef WIN32
     static WSADATA wsadata;
 
-    if (!wsadata.wVersion && WSAStartup(MAKEWORD(1,1), &wsadata))
+    if (!wsadata.wVersion && WSAStartup(MAKEWORD(2,2), &wsadata))
 	return -1;
 #endif
 

commit cbfab9d91e17239084ab24b99751bdd1610fcc1b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Mar 9 08:32:59 2008 +0100

    nuke RCS Ids

diff --git a/Makefile.am b/Makefile.am
index 8482dc5..8eb6410 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 SUBDIRS = include src
 
 pkgconfigdir = $(libdir)/pkgconfig

commit 3fe753215b6186e588246220a473417810f82b05
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Thu Feb 28 18:55:23 2008 -0300

    Compile warning fix by using Cardinal instead of int.
    
    This also matches the function prototype.

diff --git a/src/StrToWidg.c b/src/StrToWidg.c
index b9fb8a9..190e91f 100644
--- a/src/StrToWidg.c
+++ b/src/StrToWidg.c
@@ -60,7 +60,7 @@ XmuCvtStringToWidget(XrmValuePtr args, Cardinal *num_args,
 {
     static Widget widget, *widgetP, parent;
     XrmName name = XrmStringToName(fromVal->addr);
-    int i;
+    Cardinal i;
 
     if (*num_args != 1)
     {
Reply to: