From 72013d593ef332228ec66fa5183787703d6641b3 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 29 Sep 2011 12:08:58 +0000 Subject: avoid one compiler warning git-svn-id: svn://tug.org/texlive/trunk@24132 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/lcdf-typetools/Makefile.am | 13 ++---- Build/source/texk/lcdf-typetools/Makefile.in | 53 ++++++---------------- .../lcdf-typetools-2.92-PATCHES/ChangeLog | 9 ++++ .../lcdf-typetools-2.92-PATCHES/patch-01-const | 16 +++++++ .../source/texk/lcdf-typetools/liblcdf/permstr.cc | 4 +- 5 files changed, 47 insertions(+), 48 deletions(-) create mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const (limited to 'Build/source/texk/lcdf-typetools') diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index 6fdf3937d43..68ea02b9644 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -15,19 +15,16 @@ config.force: $(KPATHSEA_DEPEND) DISTCLEANFILES = config.force if texlive_build - glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist -glyphlist_DATA = glyphlist.txt texglyphlist.txt - encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base -enc_DATA = 7t.enc - else !texlive_build - -pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc - +glyphlistdir = $(pkgdatadir) +encdir = $(pkgdatadir) endif !texlive_build +glyphlist_DATA = glyphlist.txt texglyphlist.txt +enc_DATA = 7t.enc + EXTRA_DIST = \ ONEWS \ lcdf-typetools.spec \ diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index 586689e7d86..d3a61de461d 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -98,9 +98,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)" \ - "$(DESTDIR)$(pkgdatadir)" -DATA = $(enc_DATA) $(glyphlist_DATA) $(pkgdata_DATA) +am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)" +DATA = $(enc_DATA) $(glyphlist_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -278,11 +277,12 @@ DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea SUBDIRS = . liblcdf libefont @SELECTED_SUBDIRS@ DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 DISTCLEANFILES = config.force +@texlive_build_FALSE@glyphlistdir = $(pkgdatadir) @texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist -@texlive_build_TRUE@glyphlist_DATA = glyphlist.txt texglyphlist.txt +@texlive_build_FALSE@encdir = $(pkgdatadir) @texlive_build_TRUE@encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base -@texlive_build_TRUE@enc_DATA = 7t.enc -@texlive_build_FALSE@pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc +glyphlist_DATA = glyphlist.txt texglyphlist.txt +enc_DATA = 7t.enc EXTRA_DIST = ONEWS lcdf-typetools.spec include/config.h \ include/lcdf/bezier.hh include/lcdf/clp.h \ include/lcdf/error.hh include/lcdf/filename.hh \ @@ -416,26 +416,6 @@ uninstall-glyphlistDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(glyphlistdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(glyphlistdir)" && rm -f $$files -install-pkgdataDATA: $(pkgdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done - -uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -761,7 +741,7 @@ check: check-recursive all-am: Makefile $(DATA) autoconf.h all-local installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -812,8 +792,7 @@ info: info-recursive info-am: -install-data-am: install-encDATA install-glyphlistDATA \ - install-pkgdataDATA +install-data-am: install-encDATA install-glyphlistDATA install-dvi: install-dvi-recursive @@ -859,8 +838,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-encDATA uninstall-glyphlistDATA \ - uninstall-pkgdataDATA +uninstall-am: uninstall-encDATA uninstall-glyphlistDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-strip tags-recursive @@ -877,13 +855,12 @@ uninstall-am: uninstall-encDATA uninstall-glyphlistDATA \ install-encDATA install-exec install-exec-am \ install-glyphlistDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgdataDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-encDATA uninstall-glyphlistDATA \ - uninstall-pkgdataDATA + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-encDATA \ + uninstall-glyphlistDATA all-local: config.force diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog index f46a2ad6def..e1d144c5299 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog @@ -1,3 +1,12 @@ +2011-09-25 Peter Breitenlohner + + * patch-01-const (new): Avoid cast from const to non-const. + +2011-09-07 Peter Breitenlohner + + * Makefile.am: Avoid pkgdata_DATA in order not to install an + empty $(pkgdatadir). + 2011-06-06 Peter Breitenlohner Import lcdf-typetools-2.92. diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const new file mode 100644 index 00000000000..01bb341d512 --- /dev/null +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const @@ -0,0 +1,16 @@ + No need to cast from const to non-const. + +diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.92.orig/liblcdf/permstr.cc lcdf-typetools-2.92/liblcdf/permstr.cc +--- lcdf-typetools-2.92.orig/liblcdf/permstr.cc 2011-02-07 15:30:19.000000000 +0100 ++++ lcdf-typetools-2.92/liblcdf/permstr.cc 2011-09-25 15:35:00.000000000 +0200 +@@ -110,8 +110,8 @@ + void + PermString::initialize(const char* s, int length) + { +- register unsigned char* m = (unsigned char*) s; +- register unsigned char* mm; ++ register const unsigned char* m = (const unsigned char*) s; ++ register const unsigned char* mm; + + if (length < 0) + length = (s ? strlen(s) : 0); diff --git a/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc index aea480a0c85..556706d9c7d 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc +++ b/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc @@ -110,8 +110,8 @@ static int scatter[] = { /* map characters to random values */ void PermString::initialize(const char* s, int length) { - register unsigned char* m = (unsigned char*) s; - register unsigned char* mm; + register const unsigned char* m = (const unsigned char*) s; + register const unsigned char* mm; if (length < 0) length = (s ? strlen(s) : 0); -- cgit v1.2.3