libxaw: Changes to 'debian-unstable'
.gitignore | 6 ++
ChangeLog | 46 ++++++++++++++++++
Makefile.am | 16 ++++--
README | 25 +++++++++-
configure.ac | 25 +++++++---
debian/README.source | 73 +++++++++++++++++++++++++++++
debian/changelog | 8 +++
debian/control | 4 -
debian/xsfbs/repack.sh | 32 ++++++++++++
debian/xsfbs/xsfbs.sh | 78 -------------------------------
include/X11/Xaw/TextP.h | 2
src/AllWidgets.c | 1
src/AsciiSrc.c | 4 -
src/Command.c | 4 -
src/Dialog.c | 2
src/DisplayList.c | 2
src/Makefile.am | 18 +++++--
src/Paned.c | 6 +-
src/Pixmap.c | 2
src/Text.c | 2
src/TextAction.c | 119 ++++++++++++++++++------------------------------
src/TextTr.c | 2
src/Tip.c | 2
src/Tree.c | 4 -
src/Vendor.c | 2
xaw6.pc.in | 2
26 files changed, 301 insertions(+), 186 deletions(-)
New commits:
commit e29270d4fce7b0e681dfa9856b71a5a46d379459
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 27 18:13:33 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index d02c572..b45400e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxaw (2:1.0.6-1) UNRELEASED; urgency=low
+libxaw (2:1.0.6-1) unstable; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* New upstream release.
* Move -dbg package to section debug.
- -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:36:04 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:37:25 +0200
libxaw (2:1.0.5-2) unstable; urgency=low
commit 61d8de05c48215b2a8d0a006d231ddfeb7f17256
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 27 17:37:23 2009 +0200
Move the -dbg package to section debug
diff --git a/debian/changelog b/debian/changelog
index 440dee5..d02c572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libxaw (2:1.0.6-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* New upstream release.
+ * Move -dbg package to section debug.
- -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:34:00 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:36:04 +0200
libxaw (2:1.0.5-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ccc8cc7..f6759a8 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Description: X11 Athena Widget library
git://anongit.freedesktop.org/git/xorg/lib/libXaw
Package: libxaw7-dbg
-Section: libdevel
+Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxaw7 (= ${binary:Version})
commit 7ce24608c9dc1d27de4179bcb736686b5abed1cb
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 27 17:35:31 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 2ac7053..8a8167f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+commit 2ef9c2d730200246405cfdfc882a66fbd6728a92
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 13:37:13 2009 -0400
+
+ libXaw 1.0.6
+
+commit 9d9facf604d2355842a3834664a1ddc233d4d1e1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:32 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 654fd414b7ebe3a0fccd6712bf52666d42d2a711
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Fri Jan 9 20:24:10 2009 -0200
+
+ Changed AsciiSrc widget to use only binary selection transfers.
+
+ Conversion from multi byte to single byte text format, and
+ vice versa, frequently doesn't do what the user want, so,
+ operate only on literal/binary selection transfers.
+
+commit 0b9de9e69e95872dd3eddbe5c1602e42c27c53e1
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Fri Jan 9 19:18:36 2009 -0200
+
+ Compile warning fixes.
+
+ This uses XORG_CHANGELOG macro to properly work with the "git-log"
+ to "git log" change (required to pass "make distcheck"), uses the
+ XORG_CWARNFLAGS macro. Most gcc 4.3 and sparse warnings corrected.
+
+commit 420efdba52593bf13d97c7e001b64caccd04cd5d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sat Nov 8 16:04:23 2008 -0800
+
+ Fixed compile/install on darwin
+
+commit a48021b05693c74bd03b51b82abec4ce3ba24dc5
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date: Sat Nov 8 15:44:22 2008 +0100
+
+ xaw6 doesn't depend on xpm
+
commit 6dab13545cd26efd46dbb58a18ae651c56c7d76d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 7 15:45:32 2008 -0200
diff --git a/debian/changelog b/debian/changelog
index 342a7b1..440dee5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libxaw (2:1.0.5-3) UNRELEASED; urgency=low
+libxaw (2:1.0.6-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
+ * New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:33:02 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:34:00 +0200
libxaw (2:1.0.5-2) unstable; urgency=low
commit d40507dd1182a38aef2d6b01b7acd8658ec0d8f6
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 27 17:33:40 2009 +0200
Bump Standards-Version to 3.8.2 now that we have README.source
diff --git a/debian/changelog b/debian/changelog
index d6e47ce..342a7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxaw (2:1.0.5-3) UNRELEASED; urgency=low
+
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 27 Jul 2009 17:33:02 +0200
+
libxaw (2:1.0.5-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index b94d0f3..ccc8cc7 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxaw
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxaw.git
commit 2ef9c2d730200246405cfdfc882a66fbd6728a92
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 13:37:13 2009 -0400
libXaw 1.0.6
diff --git a/configure.ac b/configure.ac
index 3927025..044227f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([libXaw],
- 1.0.5,
+ 1.0.6,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXaw)
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 9d9facf604d2355842a3834664a1ddc233d4d1e1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:32 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 011e3fb..14aa939 100644
--- a/README
+++ b/README
@@ -1,3 +1,26 @@
Xaw is the X Athena Widget Set.
-
Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
+
+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/libXaw
+
+ http://cgit.freedesktop.org/xorg/lib/libXaw
+
+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 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit 654fd414b7ebe3a0fccd6712bf52666d42d2a711
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 9 20:24:10 2009 -0200
Changed AsciiSrc widget to use only binary selection transfers.
Conversion from multi byte to single byte text format, and
vice versa, frequently doesn't do what the user want, so,
operate only on literal/binary selection transfers.
diff --git a/src/TextAction.c b/src/TextAction.c
index 2da0a9f..062956c 100644
--- a/src/TextAction.c
+++ b/src/TextAction.c
@@ -434,39 +434,6 @@ _SelectionReceived(Widget w, XtPointer client_data, Atom *selection,
*length = wcslen(wlist[0]);
XtFree((XtPointer)wlist);
text.format = XawFmtWide;
- } else {
- XTextProperty textprop;
- char **list;
- int count;
-
- textprop.encoding = *type;
- textprop.value = (unsigned char *)value;
- textprop.nitems = strlen(value);
- textprop.format = 8;
-
- if (XmbTextPropertyToTextList(d, &textprop, &list, &count)
- != Success
- || count < 1) {
- XFreeStringList(list);
-
- /* Notify the user on strerr and in the insertion :) */
- fprintf(stderr, "Xaw Text Widget: An attempt was made to insert "
- "an illegal selection.\n");
-
- textprop.value = (unsigned char *)" >> ILLEGAL SELECTION << ";
- textprop.nitems = strlen((char *) textprop.value);
- if (XmbTextPropertyToTextList(d, &textprop, &list, &count)
- != Success
- || count < 1)
- return;
- }
-
- XFree(value);
- value = (XPointer)list[0];
-
- *length = strlen(list[0]);
- XtFree((XtPointer)list);
- text.format = XawFmt8Bit;
}
text.ptr = (char*)value;
text.firstPos = 0;
@@ -489,6 +456,8 @@ _SelectionReceived(Widget w, XtPointer client_data, Atom *selection,
static void
GetSelection(Widget w, Time timev, String *params, Cardinal num_params)
{
+ Display *d = XtDisplay(w);
+ TextWidget ctx = (TextWidget)w;
Atom selection;
int buffer;
@@ -529,7 +498,8 @@ GetSelection(Widget w, Time timev, String *params, Cardinal num_params)
}
else
list = NULL;
- XtGetSelectionValue(w, selection, XA_UTF8_STRING(XtDisplay(w)),
+ XtGetSelectionValue(w, selection, XawTextFormat(ctx, XawFmtWide) ?
+ XA_UTF8_STRING(d) : XA_TEXT(d),
_SelectionReceived, (XtPointer)list, timev);
}
}
@@ -1069,49 +1039,52 @@ ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type,
*length = salt->length;
}
/* Got *value,*length, now in COMPOUND_TEXT format. */
- if (XawTextFormat(ctx, XawFmtWide) && *type == XA_STRING) {
- XTextProperty textprop;
- wchar_t **wlist;
- int count;
-
- textprop.encoding = XA_COMPOUND_TEXT(d);
- textprop.value = (unsigned char *)*value;
- textprop.nitems = strlen(*value);
- textprop.format = 8;
- if (XwcTextPropertyToTextList(d, &textprop, &wlist, &count)
- < Success
- || count < 1) {
+ if (XawTextFormat(ctx, XawFmtWide)) {
+ if (*type == XA_STRING) {
+ XTextProperty textprop;
+ wchar_t **wlist;
+ int count;
+
+ textprop.encoding = XA_COMPOUND_TEXT(d);
+ textprop.value = (unsigned char *)*value;
+ textprop.nitems = strlen(*value);
+ textprop.format = 8;
+ if (XwcTextPropertyToTextList(d, &textprop, &wlist, &count)
+ < Success
+ || count < 1) {
+ XtFree(*value);
+ return (False);
+ }
XtFree(*value);
- return (False);
- }
- XtFree(*value);
- if (XwcTextListToTextProperty(d, wlist, 1, XStringStyle, &textprop)
- < Success) {
- XwcFreeStringList((wchar_t**)wlist);
- return (False);
+ if (XwcTextListToTextProperty(d, wlist, 1, XStringStyle, &textprop)
+ < Success) {
+ XwcFreeStringList((wchar_t**)wlist);
+ return (False);
+ }
+ *value = (XtPointer)textprop.value;
+ *length = textprop.nitems;
+ XwcFreeStringList((wchar_t**) wlist);
}
- *value = (XtPointer)textprop.value;
- *length = textprop.nitems;
- XwcFreeStringList((wchar_t**) wlist);
- } else if (*type == XA_UTF8_STRING(d)) {
- XTextProperty textprop;
- char **list;
- int count;
-
- textprop.encoding = XA_COMPOUND_TEXT(d);
- textprop.value = (unsigned char *)*value;
- textprop.nitems = strlen(*value);
- textprop.format = 8;
- if (Xutf8TextPropertyToTextList(d, &textprop, &list, &count)
- < Success
- || count < 1) {
+ else if (*type == XA_UTF8_STRING(d)) {
+ XTextProperty textprop;
+ char **list;
+ int count;
+
+ textprop.encoding = XA_COMPOUND_TEXT(d);
+ textprop.value = (unsigned char *)*value;
+ textprop.nitems = strlen(*value);
+ textprop.format = 8;
+ if (Xutf8TextPropertyToTextList(d, &textprop, &list, &count)
+ < Success
+ || count < 1) {
+ XtFree(*value);
+ return (False);
+ }
XtFree(*value);
- return (False);
+ *value = *list;
+ *length = strlen(*list);
+ XFree(list);
}
- XtFree(*value);
- *value = *list;
- *length = strlen(*list);
- XFree(list);
}
*format = 8;
return (True);
commit 0b9de9e69e95872dd3eddbe5c1602e42c27c53e1
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 9 19:18:36 2009 -0200
Compile warning fixes.
This uses XORG_CHANGELOG macro to properly work with the "git-log"
to "git log" change (required to pass "make distcheck"), uses the
XORG_CWARNFLAGS macro. Most gcc 4.3 and sparse warnings corrected.
diff --git a/.gitignore b/.gitignore
index da3cc60..a7993ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,9 @@ mkinstalldirs
stamp-h1
xaw6.pc
xaw7.pc
-xaw8.pc
*~
+ChangeLog
+*.o
+libXaw-*.tar.*
+*.patch
+tags
diff --git a/Makefile.am b/Makefile.am
index 265ccfc..2e3f9c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,6 @@ 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 9ba2414..3927025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,10 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2.1)
+
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -19,6 +23,8 @@ AC_PROG_LIBTOOL
# is in an if statement, and later calls would break if it's skipped.
PKG_PROG_PKG_CONFIG
+XORG_CWARNFLAGS
+
#
# fix libtool to set SONAME to libXaw.so.$major
#
@@ -60,7 +66,7 @@ AC_ARG_ENABLE(xaw6, AC_HELP_STRING([--disable-xaw6],
if test "x$build_v6" = xyes; then
PKG_CHECK_MODULES(XAW6, xproto x11 xext xextproto xt xmu)
-
+ XAW6_CFLAGS="$CWARNFLAGS $XAW6_CFLAGS"
AC_SUBST(XAW6_CFLAGS)
AC_SUBST(XAW6_LIBS)
fi
@@ -74,7 +80,7 @@ AC_ARG_ENABLE(xaw7, AC_HELP_STRING([--disable-xaw7],
if test "x$build_v7" = xyes; then
PKG_CHECK_MODULES(XAW7, xproto x11 xext xextproto xt xmu xpm)
-
+ XAW7_CFLAGS="$CWARNFLAGS $XAW7_CFLAGS"
AC_SUBST(XAW7_CFLAGS)
AC_SUBST(XAW7_LIBS)
fi
@@ -100,6 +106,7 @@ AC_CHECK_FUNCS([iswalnum])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
include/Makefile
diff --git a/include/X11/Xaw/TextP.h b/include/X11/Xaw/TextP.h
index 0edbdd2..d058e8b 100644
--- a/include/X11/Xaw/TextP.h
+++ b/include/X11/Xaw/TextP.h
@@ -73,6 +73,8 @@ _XFUNCPROTOBEGIN
extern XtActionsRec _XawTextActionsTable[];
extern Cardinal _XawTextActionsTableCount;
+extern char _XawDefaultTextTranslations[];
+
#define XawLF 0x0a
#define XawCR 0x0d
#define XawTAB 0x09
diff --git a/src/AllWidgets.c b/src/AllWidgets.c
index c943630..4d95887 100644
--- a/src/AllWidgets.c
+++ b/src/AllWidgets.c
@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
#endif
#include <X11/IntrinsicP.h>
#include <X11/Xmu/WidgetNode.h>
+#include <X11/Xaw/AllWidgets.h>
extern WidgetClass applicationShellWidgetClass;
extern WidgetClass asciiSinkObjectClass;
diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c
index b23ba4f..eb569fc 100644
--- a/src/AsciiSrc.c
+++ b/src/AsciiSrc.c
@@ -1448,7 +1448,7 @@ InitStringOrFile(AsciiSrcObject src, Bool newString)
if (src->ascii_src.string == NULL)
XtErrorMsg("NoFile", "asciiSourceCreate", "XawError",
"Creating a read only disk widget and no file specified.",
- NULL, 0);
+ NULL, NULL);
open_mode = O_RDONLY;
fdopen_mode = "r";
break;
@@ -1779,7 +1779,7 @@ GetDefaultPieceSize(Widget w, int offset, XrmValue *value)
{
static XPointer pagesize;
- if (pagesize == 0) {
+ if (pagesize == NULL) {
pagesize = (XPointer)((long)_XawGetPageSize());
if (pagesize < (XPointer)BUFSIZ)
pagesize = (XPointer)BUFSIZ;
diff --git a/src/Command.c b/src/Command.c
index fdab1b1..845ffb8 100644
--- a/src/Command.c
+++ b/src/Command.c
@@ -206,11 +206,11 @@ CommandClassRec commandClassRec = {
},
/* label */
{
- 0, /* not used */
+ NULL, /* not used */
},
/* command */
{
- 0, /* not used */
+ NULL, /* not used */
},
};
diff --git a/src/Dialog.c b/src/Dialog.c
index 0c8b82f..62d91b8 100644
--- a/src/Dialog.c
+++ b/src/Dialog.c
@@ -116,7 +116,7 @@ static XtResource resources[] = {
sizeof(Pixmap),
XtOffsetOf(DialogRec, dialog.icon),
XtRImmediate,
- 0
+ NULL
},
};
diff --git a/src/DisplayList.c b/src/DisplayList.c
index e43621b..1704286 100644
--- a/src/DisplayList.c
+++ b/src/DisplayList.c
@@ -2035,7 +2035,7 @@ _Xaw_Xlib_DataInitProc(String class_name,
tmp_win = XCreateWindow(DisplayOfScreen(screen),
RootWindowOfScreen(screen),
0, 0, 1, 1, 1, depth,
- InputOutput, CopyFromParent, 0, NULL);
+ InputOutput, (Visual *)CopyFromParent, 0, NULL);
data->mask = 0;
data->gc = XCreateGC(DisplayOfScreen(screen), tmp_win, 0, &data->values);
XDestroyWindow(DisplayOfScreen(screen), tmp_win);
diff --git a/src/Paned.c b/src/Paned.c
index 4dbdb30..a2408ba 100644
--- a/src/Paned.c
+++ b/src/Paned.c
@@ -242,7 +242,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(cursor),
XtRImmediate,
- None
+ NULL
},
{
XtNgripCursor,
@@ -251,7 +251,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(grip_cursor),
XtRImmediate,
- None
+ NULL
},
{
XtNverticalGripCursor,
@@ -278,7 +278,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(adjust_this_cursor),
XtRString,
- None
+ NULL
},
{
XtNverticalBetweenCursor,
diff --git a/src/Pixmap.c b/src/Pixmap.c
index 06e326a..a6fb5a3 100644
--- a/src/Pixmap.c
+++ b/src/Pixmap.c
@@ -282,7 +282,7 @@ XawLoadPixmap(String name, Screen *screen, Colormap colormap, int depth)
XawParams *xaw_params;
if (!name)
- return (False);
+ return (NULL);
xaw_pixmap = _XawFindPixmap(name, screen, colormap, depth);
diff --git a/src/Text.c b/src/Text.c
index 7d7dd2e..2fd9d3f 100644
--- a/src/Text.c
+++ b/src/Text.c
@@ -270,8 +270,6 @@ void _XawTextSinkDisplayText(Widget, int, int, XawTextPosition, XawTextPosition,
/*
* From TextTr.c
*/
-extern char _XawDefaultTextTranslations[];
-
static XawTextSelectType defaultSelectTypes[] = {
XawselectPosition, XawselectAlphaNumeric, XawselectWord, XawselectLine,
XawselectParagraph, XawselectAll, XawselectNull,
diff --git a/src/TextTr.c b/src/TextTr.c
index c918ee6..059a792 100644
--- a/src/TextTr.c
+++ b/src/TextTr.c
@@ -43,6 +43,8 @@ The Japanese user typically hits their Kanji key when they want to do
input. This merely makes sure the input is connected.
*/
+#include <X11/Xaw/Text.h>
+
char _XawDefaultTextTranslations[] =
"c<Key>A:" "beginning-of-line()\n"
"c<Key>B:" "backward-character()\n"
diff --git a/src/Tip.c b/src/Tip.c
index 3c4b794..f2168a6 100644
--- a/src/Tip.c
+++ b/src/Tip.c
@@ -311,7 +311,7 @@ XawTipRealize(Widget w, Mask *mask, XSetWindowAttributes *attr)
XtBorderWidth(w),
DefaultDepthOfScreen(XtScreen(w)),
InputOutput,
- CopyFromParent,
+ (Visual *)CopyFromParent,
*mask, attr);
}
diff --git a/src/Tree.c b/src/Tree.c
index 88bd51f..c37b215 100644
--- a/src/Tree.c
+++ b/src/Tree.c
@@ -193,7 +193,7 @@ TreeClassRec treeClassRec = {
},
{
/* Tree class fields */
- 0, /* ignore */
+ NULL, /* ignore */
}
};
@@ -314,7 +314,7 @@ delete_node(Widget parent, Widget node)
for (i = pos; i < pc->tree.n_children; i++)
pc->tree.children[i] = pc->tree.children[i+1];
- pc->tree.children[pc->tree.n_children]=0;
+ pc->tree.children[pc->tree.n_children] = NULL;
}
static void
diff --git a/src/Vendor.c b/src/Vendor.c
index a23ea7b..b9ffcf6 100644
--- a/src/Vendor.c
+++ b/src/Vendor.c
@@ -307,7 +307,7 @@ XawCvtCompoundTextToString(Display *dpy, XrmValuePtr args, Cardinal *num_args,
if(XmbTextPropertyToTextList(dpy, &prop, &list, &count) < Success) {
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
"converter", "XmbTextPropertyToTextList", "XawError",
- "conversion from CT to MB failed.", NULL, 0);
Reply to: