ChangeLog | 119 ++++++++++++++++++++++++++++++++++++++++ autogen.sh | 4 + configure.ac | 3 - debian/changelog | 9 +++ debian/rules | 10 --- debian/upstream/signing-key.asc | 60 ++++++++++++++++++++ debian/watch | 1 src/AsciiSrc.c | 14 +--- src/Makefile.am | 24 ++++---- src/MultiSrc.c | 14 +--- src/OS.c | 2 src/Text.c | 2 src/TextAction.c | 1 src/TextPop.c | 4 - 14 files changed, 217 insertions(+), 50 deletions(-)
New commits: commit 3f545a5a4cf8794d86911cb03a7ed4d3159c069c Author: Julien Cristau <[email protected]> Date: Sat Aug 1 11:31:19 2015 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 1b67dbb..3ba3e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libxaw (2:1.0.13-1) UNRELEASED; urgency=medium +libxaw (2:1.0.13-1) unstable; urgency=medium * Let uscan verify tarball signatures. * New upstream release. * Drop override_dh_auto_install, I don't think it's necessary with just one Xaw variant. - -- Julien Cristau <[email protected]> Sat, 01 Aug 2015 11:01:53 +0200 + -- Julien Cristau <[email protected]> Sat, 01 Aug 2015 11:31:17 +0200 libxaw (2:1.0.12-2) unstable; urgency=medium commit a4658f5aa7f298acb4f91cd46f488eb47e99ee29 Author: Julien Cristau <[email protected]> Date: Sat Aug 1 11:25:56 2015 +0200 Drop override_dh_auto_install I don't think it's necessary with just one Xaw variant. diff --git a/debian/changelog b/debian/changelog index c1522f5..1b67dbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libxaw (2:1.0.13-1) UNRELEASED; urgency=medium * Let uscan verify tarball signatures. * New upstream release. + * Drop override_dh_auto_install, I don't think it's necessary with just one + Xaw variant. -- Julien Cristau <[email protected]> Sat, 01 Aug 2015 11:01:53 +0200 diff --git a/debian/rules b/debian/rules index 4ce458c..55275a7 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - %: dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel @@ -23,11 +21,6 @@ override_dh_auto_configure-arch override_dh_auto_configure-indep: --disable-silent-rules \ $(docflags) -override_dh_auto_install: - dh_auto_install - rm -f debian/tmp/usr/lib/*/libXaw.so - ln -s libXaw7.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXaw.so - override_dh_install: dh_install --fail-missing --exclude=.la commit 6e704bf33ebbdb60bd819304561937c52388f655 Author: Julien Cristau <[email protected]> Date: Sat Aug 1 11:24:48 2015 +0200 Stop explicitly setting CFLAGS dh does it as of compat level 9 diff --git a/debian/rules b/debian/rules index 77575da..4ce458c 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,7 @@ override_dh_auto_configure-arch override_dh_auto_configure-indep: --disable-xaw6 \ --with-xmlto --without-fop \ --disable-silent-rules \ - $(docflags) \ - $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) + $(docflags) override_dh_auto_install: dh_auto_install commit bc073371700562a077fe4bd0d60aa7b52b45aca6 Author: Julien Cristau <[email protected]> Date: Sat Aug 1 11:02:13 2015 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 2ad60b6..1840195 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,122 @@ +commit 8c82c47a770274c50944f002b97369c4e30872d8 +Author: Alan Coopersmith <[email protected]> +Date: Thu Apr 30 22:06:03 2015 -0700 + + libXaw 1.0.13 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 882da69d577b8f206694691679cef2cc3ca69725 +Author: Jon TURNEY <[email protected]> +Date: Sun Sep 14 16:30:45 2014 +0100 + + Include <unistd.h> + + Required for prototype of usleep() + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 1955d3917b8d24d7a8621ad80b160e4cefde6fc9 +Author: Alan Coopersmith <[email protected]> +Date: Fri Nov 7 22:01:06 2014 -0800 + + Use SEEK_* names instead of raw numbers for fseek whence argument + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3b0de83ef4f2cdb0bfa52aba9092b56a1a1dc6ea +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 5 18:01:17 2014 -0800 + + Just use C89 size_t instead of rolling our own Size_t + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Hans de Goede <[email protected]> + +commit ebaa906159a73eeb001506a7787f5128f17af61a +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 5 17:58:48 2014 -0800 + + Use autoconf HAVE_UNISTD_H instead of imake X_NOT_POSIX to find <unistd.h> + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Hans de Goede <[email protected]> + +commit 1804def12f26b9f64453fb9d641034f8de92ff7d +Author: Thomas Klausner <[email protected]> +Date: Tue Mar 18 22:51:45 2014 +0100 + + Fix abs() usage. + + For long arguments, use labs(). + From Jörg Sonnenberger <[email protected]> + + Reviewed-by: Matt Turner <[email protected]> + Signed-off-by: Thomas Klausner <[email protected]> + +commit 1a1bf8404229b5636892d4be2fe9122304603c25 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 21:39:32 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ad1bb9a727c067a586882a478e36bbce532b0fb0 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 21:38:41 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6234ea0ba30861547e5cf1f7d4259e39f36618d3 +Author: Gaetan Nadon <[email protected]> +Date: Sat Dec 14 13:23:29 2013 -0500 + + Makefile: use $(LN_S) for better code portability + + Autoconf recommends using LN_S to safeguard against actual or future + portability issues. + + Autoconf: + "Symbolic links are not available on old systems; use ‘$(LN_S)’ + as a portable substitute". + + AC_PROG_LN_S is brought in by AC_PROG_LIBTOOL + + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ec7d7c303385a6bdb0833a5aaae96be697cca7ab +Author: Adam Jackson <[email protected]> +Date: Thu Nov 21 11:43:55 2013 -0500 + + Fix build with gcc -Werror=format-security + + DisplayList.c:290:4: error: format not a string literal and no format + arguments [-Werror=format-security] + + Signed-off-by: Adam Jackson <[email protected]> + +commit 0543fa37ebdc48c0432425de80abc63235182085 +Author: Gaetan Nadon <[email protected]> +Date: Sun Sep 22 16:06:00 2013 -0400 + + Makefile: use AM_V_GEN and AM_V_at to implement automake silent rules + + Passing --enable-silent-rules to configure will cause build rules to be less + verbose; the option --disable-silent-rules will cause normal verbose output. + + At make run time, the default chosen at configure time may be overridden: + make V=1 will produce verbose output, make V=0 less verbose output. + + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + commit a2d573ad309b4e717c5aef4635daa51e60a46db7 Author: Alan Coopersmith <[email protected]> Date: Sat Sep 7 20:57:47 2013 -0700 diff --git a/debian/changelog b/debian/changelog index 04ccf36..c1522f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -libxaw (2:1.0.12-3) UNRELEASED; urgency=medium +libxaw (2:1.0.13-1) UNRELEASED; urgency=medium * Let uscan verify tarball signatures. + * New upstream release. - -- Julien Cristau <[email protected]> Sat, 01 Aug 2015 10:59:08 +0200 + -- Julien Cristau <[email protected]> Sat, 01 Aug 2015 11:01:53 +0200 libxaw (2:1.0.12-2) unstable; urgency=medium commit b00eada8b9d8b3544677977d167dc2ff5e147435 Author: Julien Cristau <[email protected]> Date: Sat Aug 1 10:59:18 2015 +0200 Let uscan verify tarball signatures. diff --git a/debian/changelog b/debian/changelog index 860895d..04ccf36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxaw (2:1.0.12-3) UNRELEASED; urgency=medium + + * Let uscan verify tarball signatures. + + -- Julien Cristau <[email protected]> Sat, 01 Aug 2015 10:59:08 +0200 + libxaw (2:1.0.12-2) unstable; urgency=medium * Fix typo in package description (closes: #736829). Thanks, darkestkhan! diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..863981f --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,60 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n +Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g +EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE +a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9 +8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV +Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ +xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG +CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE +TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w +ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD +AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP +cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g +Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb +AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO +6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu +QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr +BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY +eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS +Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0 +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 +=tc6G +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index a79aa6b..b80b1f7 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/lib/libXaw version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ http://xorg.freedesktop.org/releases/individual/lib/ libXaw-(.*)\.tar\.gz commit 8c82c47a770274c50944f002b97369c4e30872d8 Author: Alan Coopersmith <[email protected]> Date: Thu Apr 30 22:06:03 2015 -0700 libXaw 1.0.13 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index a4d4764..05ce684 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXaw], [1.0.12], +AC_INIT([libXaw], [1.0.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) commit 882da69d577b8f206694691679cef2cc3ca69725 Author: Jon TURNEY <[email protected]> Date: Sun Sep 14 16:30:45 2014 +0100 Include <unistd.h> Required for prototype of usleep() Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> diff --git a/src/TextAction.c b/src/TextAction.c index 74446d6..6363259 100644 --- a/src/TextAction.c +++ b/src/TextAction.c @@ -29,6 +29,7 @@ in this Software without prior written authorization from The Open Group. #endif #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include <X11/Xos.h> /* for select() and struct timeval */ #include <ctype.h> #include <X11/IntrinsicP.h> commit 1955d3917b8d24d7a8621ad80b160e4cefde6fc9 Author: Alan Coopersmith <[email protected]> Date: Fri Nov 7 22:01:06 2014 -0800 Use SEEK_* names instead of raw numbers for fseek whence argument Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index 87efdf2..9e5fa5e 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -1514,7 +1514,7 @@ LoadPieces(AsciiSrcObject src, FILE *file, char *string) int len; left = 0; - fseek(file, 0, 0); + fseek(file, 0, SEEK_SET); while (left < src->ascii_src.length) { ptr = XtMalloc((unsigned)src->ascii_src.piece_size); if ((len = fread(ptr, sizeof(unsigned char), diff --git a/src/MultiSrc.c b/src/MultiSrc.c index 701fe2c..15bdaf8 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -1321,7 +1321,7 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string) if (src->multi_src.length != 0) { temp_mb_holder = XtMalloc((src->multi_src.length + 1) * sizeof(unsigned char)); - fseek(file, 0, 0); + fseek(file, 0, SEEK_SET); src->multi_src.length = fread(temp_mb_holder, sizeof(unsigned char), (size_t)src->multi_src.length, file); diff --git a/src/TextPop.c b/src/TextPop.c index 953fa9a..3ff29b9 100644 --- a/src/TextPop.c +++ b/src/TextPop.c @@ -310,14 +310,14 @@ InsertFileNamed(Widget tw, char *str) pos = XawTextGetInsertionPoint(tw); - fseek(file, 0L, 2); + fseek(file, 0L, SEEK_END); text.firstPos = 0; text.length = ftell(file); text.ptr = XtMalloc(text.length + 1); text.format = XawFmt8Bit; - fseek(file, 0L, 0); + fseek(file, 0L, SEEK_SET); if (fread(text.ptr, 1, text.length, file) != text.length) XtErrorMsg("readError", "insertFileNamed", "XawError", "fread returned error", NULL, NULL); commit 3b0de83ef4f2cdb0bfa52aba9092b56a1a1dc6ea Author: Alan Coopersmith <[email protected]> Date: Wed Nov 5 18:01:17 2014 -0800 Just use C89 size_t instead of rolling our own Size_t Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Hans de Goede <[email protected]> diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index a37b6a1..87efdf2 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -59,14 +59,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xaw/AsciiText.h> /* for Widget Classes */ #endif -#ifdef X_NOT_POSIX -#define Off_t long -#define Size_t unsigned int -#else -#define Off_t off_t -#define Size_t size_t -#endif - #define MAGIC_VALUE ((XawTextPosition)-1) #define streq(a, b) (strcmp((a), (b)) == 0) @@ -1525,8 +1517,8 @@ LoadPieces(AsciiSrcObject src, FILE *file, char *string) fseek(file, 0, 0); while (left < src->ascii_src.length) { ptr = XtMalloc((unsigned)src->ascii_src.piece_size); - if ((len = fread(ptr, (Size_t)sizeof(unsigned char), - (Size_t)src->ascii_src.piece_size, file)) < 0) + if ((len = fread(ptr, sizeof(unsigned char), + (size_t)src->ascii_src.piece_size, file)) < 0) XtErrorMsg("readError", "asciiSourceCreate", "XawError", "fread returned error.", NULL, NULL); piece = AllocNewPiece(src, piece); diff --git a/src/MultiSrc.c b/src/MultiSrc.c index efa08b0..701fe2c 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -78,14 +78,6 @@ in this Software without prior written authorization from The Open Group. #define MAGIC_VALUE ((XawTextPosition)-1) #define streq(a, b) (strcmp((a), (b)) == 0) -#ifdef X_NOT_POSIX -#define Off_t long -#define Size_t unsigned int -#else -#define Off_t off_t -#define Size_t size_t -#endif - /* * Class Methods @@ -1331,8 +1323,8 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string) XtMalloc((src->multi_src.length + 1) * sizeof(unsigned char)); fseek(file, 0, 0); src->multi_src.length = fread(temp_mb_holder, - (Size_t)sizeof(unsigned char), - (Size_t)src->multi_src.length, file); + sizeof(unsigned char), + (size_t)src->multi_src.length, file); if (src->multi_src.length <= 0) XtAppErrorMsg(XtWidgetToApplicationContext ((Widget) src), "readError", "multiSource", "XawError", commit ebaa906159a73eeb001506a7787f5128f17af61a Author: Alan Coopersmith <[email protected]> Date: Wed Nov 5 17:58:48 2014 -0800 Use autoconf HAVE_UNISTD_H instead of imake X_NOT_POSIX to find <unistd.h> Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Hans de Goede <[email protected]> diff --git a/src/OS.c b/src/OS.c index 8bc23dd..4c69005 100644 --- a/src/OS.c +++ b/src/OS.c @@ -7,7 +7,7 @@ #include <X11/IntrinsicP.h> #include "Private.h" -#ifndef X_NOT_POSIX +#ifdef HAVE_UNISTD_H #include <unistd.h> /* for sysconf(), and getpagesize() */ #endif commit 1804def12f26b9f64453fb9d641034f8de92ff7d Author: Thomas Klausner <[email protected]> Date: Tue Mar 18 22:51:45 2014 +0100 Fix abs() usage. For long arguments, use labs(). From Jörg Sonnenberger <[email protected]> Reviewed-by: Matt Turner <[email protected]> Signed-off-by: Thomas Klausner <[email protected]> diff --git a/src/Text.c b/src/Text.c index a1ae74a..8100122 100644 --- a/src/Text.c +++ b/src/Text.c @@ -2837,7 +2837,7 @@ DoSelection(TextWidget ctx, XawTextPosition pos, Time time, Bool motion) if (motion) newType = ctx->text.s.type; else { - if ((abs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME) + if ((labs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME) && (pos >= ctx->text.s.left && pos <= ctx->text.s.right)) { sarray = ctx->text.sarray; for (; *sarray != XawselectNull && *sarray != ctx->text.s.type; commit 1a1bf8404229b5636892d4be2fe9122304603c25 Author: Alan Coopersmith <[email protected]> Date: Sat May 31 21:39:32 2014 -0700 autogen.sh: Honor NOCONFIGURE=1 See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/autogen.sh b/autogen.sh index 354f254..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi commit ad1bb9a727c067a586882a478e36bbce532b0fb0 Author: Alan Coopersmith <[email protected]> Date: Sat May 31 21:38:41 2014 -0700 configure: Drop AM_MAINTAINER_MODE Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/autogen.sh b/autogen.sh index 904cd67..354f254 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,4 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +$srcdir/configure "$@" diff --git a/configure.ac b/configure.ac index 1cbe866..a4d4764 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,6 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL commit 6234ea0ba30861547e5cf1f7d4259e39f36618d3 Author: Gaetan Nadon <[email protected]> Date: Sat Dec 14 13:23:29 2013 -0500 Makefile: use $(LN_S) for better code portability Autoconf recommends using LN_S to safeguard against actual or future portability issues. Autoconf: "Symbolic links are not available on old systems; use ‘$(LN_S)’ as a portable substitute". AC_PROG_LN_S is brought in by AC_PROG_LIBTOOL Reviewed-by: Alan Coopersmith <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 55dba7b..befd850 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -84,10 +84,10 @@ if !PLATFORM_WIN32 install-exec-hook:: if PLATFORM_DARWIN $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ - $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@) + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@) else $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] - $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw6.@[email protected] libXaw.@[email protected]) + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.@[email protected] libXaw.@[email protected]) endif uninstall-local:: @@ -123,10 +123,10 @@ if !PLATFORM_WIN32 install-exec-hook:: if PLATFORM_DARWIN $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@ - $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@) + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@) else $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] - $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.@[email protected] libXaw.@[email protected]) + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw7.@[email protected] libXaw.@[email protected]) endif uninstall-local:: commit ec7d7c303385a6bdb0833a5aaae96be697cca7ab Author: Adam Jackson <[email protected]> Date: Thu Nov 21 11:43:55 2013 -0500 Fix build with gcc -Werror=format-security DisplayList.c:290:4: error: format not a string literal and no format arguments [-Werror=format-security] Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/DisplayList.c b/src/DisplayList.c index 3e99df4..0581bf7 100644 --- a/src/DisplayList.c +++ b/src/DisplayList.c @@ -287,7 +287,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen, } if (fp) { - snprintf(cname, fp - fname + 1, fname); + snprintf(cname, fp - fname + 1, "%s", fname); memmove(fname, fp + 1, strlen(fp)); lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc; if (!lc) commit 0543fa37ebdc48c0432425de80abc63235182085 Author: Gaetan Nadon <[email protected]> Date: Sun Sep 22 16:06:00 2013 -0400 Makefile: use AM_V_GEN and AM_V_at to implement automake silent rules Passing --enable-silent-rules to configure will cause build rules to be less verbose; the option --disable-silent-rules will cause normal verbose output. At make run time, the default chosen at configure time may be overridden: make V=1 will produce verbose output, make V=0 less verbose output. Reviewed-by: Alan Coopersmith <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 951dc26..55dba7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -83,18 +83,18 @@ libXaw6_la_LIBADD = $(XAW6_LIBS) if !PLATFORM_WIN32 install-exec-hook:: if PLATFORM_DARWIN - -rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ - (cd $(DESTDIR)$(libdir) && ln -s libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@) + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@) else - -rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] - (cd $(DESTDIR)$(libdir) && ln -s libXaw6.@[email protected] libXaw.@[email protected]) + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw6.@[email protected] libXaw.@[email protected]) endif uninstall-local:: if PLATFORM_DARWIN - -rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ else - -rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] endif endif @@ -122,18 +122,18 @@ libXaw7_la_LIBADD = $(XAW7_LIBS) if !PLATFORM_WIN32 install-exec-hook:: if PLATFORM_DARWIN - -rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@ - (cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@) + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@ + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@) else - -rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] - (cd $(DESTDIR)$(libdir) && ln -s libXaw7.@[email protected] libXaw.@[email protected]) + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] + $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.@[email protected] libXaw.@[email protected]) endif uninstall-local:: if PLATFORM_DARWIN - -rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@ + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@ else - -rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected] endif endif -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
