summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs')
-rwxr-xr-xBuild/source/libs/configure2
-rw-r--r--Build/source/libs/paper/Makefile.am5
-rw-r--r--Build/source/libs/paper/Makefile.in14
-rwxr-xr-xBuild/source/libs/paper/configure4
-rw-r--r--Build/source/libs/paper/configure.ac4
-rw-r--r--Build/source/libs/paper/include/Makefile.am4
-rw-r--r--Build/source/libs/paper/include/Makefile.in4
-rw-r--r--Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL51
-rw-r--r--Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in29
-rwxr-xr-xBuild/source/libs/paper/paper.test14
10 files changed, 93 insertions, 38 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 8d735c28a4f..e05fea1852a 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -4175,6 +4175,7 @@ esac
test "x$enable_dvipdf_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdf-x.
@@ -4224,6 +4225,7 @@ esac
test "x$enable_dvipdfm_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdfm-x.
diff --git a/Build/source/libs/paper/Makefile.am b/Build/source/libs/paper/Makefile.am
index 2ab956f7026..4cb4b0f0f46 100644
--- a/Build/source/libs/paper/Makefile.am
+++ b/Build/source/libs/paper/Makefile.am
@@ -37,11 +37,14 @@ bin_PROGRAMS = paperconf
paperconf_SOURCES = @PAPER_TREE@/src/paperconf.c
-man_MANS = @PAPER_TREE@/man/paperconf.1
+man_MANS = paperconf.1
## Tests
##
+if build
+dist_check_SCRIPTS = paper.test
TESTS = paper.test
+endif build
# Rebuild
rebuild_prereq =
diff --git a/Build/source/libs/paper/Makefile.in b/Build/source/libs/paper/Makefile.in
index 59517485d65..128cc25b799 100644
--- a/Build/source/libs/paper/Makefile.in
+++ b/Build/source/libs/paper/Makefile.in
@@ -82,6 +82,7 @@ DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
$(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in \
+ $(am__dist_check_SCRIPTS_DIST) \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/test-driver ChangeLog \
../../build-aux/compile ../../build-aux/config.guess \
@@ -103,7 +104,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libpaper-1.1.24+nmu2/man/paperconf.1
+CONFIG_CLEAN_FILES = paperconf.1
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
@@ -124,6 +125,7 @@ am_paperconf_OBJECTS = @PAPER_TREE@/src/paperconf.$(OBJEXT)
paperconf_OBJECTS = $(am_paperconf_OBJECTS)
paperconf_LDADD = $(LDADD)
paperconf_DEPENDENCIES = libpaper.a
+am__dist_check_SCRIPTS_DIST = paper.test
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -550,8 +552,9 @@ libpaper_a_SOURCES = \
LDADD = libpaper.a
paperconf_SOURCES = @PAPER_TREE@/src/paperconf.c
-man_MANS = @PAPER_TREE@/man/paperconf.1
-TESTS = paper.test
+man_MANS = paperconf.1
+@build_TRUE@dist_check_SCRIPTS = paper.test
+@build_TRUE@TESTS = paper.test
# Rebuild
rebuild_prereq =
@@ -613,7 +616,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-libpaper-1.1.24+nmu2/man/paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in
+paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in
cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
@@ -996,7 +999,7 @@ check-TESTS:
log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
-recheck: all
+recheck: all $(dist_check_SCRIPTS)
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
@@ -1213,6 +1216,7 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
diff --git a/Build/source/libs/paper/configure b/Build/source/libs/paper/configure
index 1b3aa5cbf85..4e5a49b69d4 100755
--- a/Build/source/libs/paper/configure
+++ b/Build/source/libs/paper/configure
@@ -5236,7 +5236,7 @@ _ACEOF
PAPER_TREE=libpaper-1.1.24+nmu2
-ac_config_files="$ac_config_files Makefile include/Makefile libpaper-1.1.24+nmu2/man/paperconf.1"
+ac_config_files="$ac_config_files Makefile include/Makefile paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in"
cat >confcache <<\_ACEOF
@@ -5980,7 +5980,7 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- "libpaper-1.1.24+nmu2/man/paperconf.1") CONFIG_FILES="$CONFIG_FILES libpaper-1.1.24+nmu2/man/paperconf.1" ;;
+ "paperconf.1") CONFIG_FILES="$CONFIG_FILES paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/Build/source/libs/paper/configure.ac b/Build/source/libs/paper/configure.ac
index 2de90609eda..f27d64afc50 100644
--- a/Build/source/libs/paper/configure.ac
+++ b/Build/source/libs/paper/configure.ac
@@ -41,6 +41,8 @@ AC_DEFINE_UNQUOTED([PAPERSIZEVAR], ["$PAPERSIZEVAR"],
AC_SUBST([PAPER_TREE], [libpaper-]paper_version)
-AC_CONFIG_FILES([Makefile include/Makefile libpaper-]paper_version[/man/paperconf.1])
+AC_CONFIG_FILES([Makefile
+ include/Makefile
+ paperconf.1:libpaper-]paper_version[/man/paperconf.1.in])
AC_OUTPUT
diff --git a/Build/source/libs/paper/include/Makefile.am b/Build/source/libs/paper/include/Makefile.am
index 87f357fb9e1..34576a7efa3 100644
--- a/Build/source/libs/paper/include/Makefile.am
+++ b/Build/source/libs/paper/include/Makefile.am
@@ -6,9 +6,9 @@
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
##
-HARFBUZZ_LIB = $(top_srcdir)/$(HARFBUZZ_TREE)/lib
+PAPER_LIB = $(top_srcdir)/$(PAPER_TREE)/lib
-hdr_links = $(HARFBUZZ_LIB)/paper.h
+hdr_links = $(PAPER_LIB)/paper.h
include $(top_srcdir)/../../am/hdr_links.am
diff --git a/Build/source/libs/paper/include/Makefile.in b/Build/source/libs/paper/include/Makefile.in
index 1756c69a4ef..a44b1009b24 100644
--- a/Build/source/libs/paper/include/Makefile.in
+++ b/Build/source/libs/paper/include/Makefile.in
@@ -203,8 +203,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-HARFBUZZ_LIB = $(top_srcdir)/$(HARFBUZZ_TREE)/lib
-hdr_links = $(HARFBUZZ_LIB)/paper.h
+PAPER_LIB = $(top_srcdir)/$(PAPER_TREE)/lib
+hdr_links = $(PAPER_LIB)/paper.h
all: all-am
.SUFFIXES:
diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
index c83c09fe847..601ccb9d252 100644
--- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
+++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
@@ -118,3 +118,54 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c
paperdef = defaultpapername();
paperstr = malloc((strlen(paperdef) + 1) * sizeof(char));
+diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in
+--- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2012-05-03 21:05:12.000000000 +0200
++++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-10-25 08:27:54.783329615 +0200
+@@ -1,4 +1,4 @@
+-.TH PAPERCONF 1 "24 April 2001"
++.TH PAPERCONF 1 "25 October 2013"
+ .SH NAME
+ .B paperconf
+ \- print paper configuration information
+@@ -46,13 +46,10 @@
+ prints the name of the system- or user-specified paper, obtained by
+ looking in order at the
+ .B @PAPERSIZEVAR@
+-environment variable, at the contents of the file specified by the
+-.B @PAPERCONFVAR@
+-environment variable, at the contents of
+-.B @PAPERCONF@
++environment variable
+ or by using
+-.B letter
+-as a fall-back value if none of the other alternatives are successful.
++.B a4
++as a fall-back value.
+ By default, width and height of the paper are printed in PostScript points.
+ .SH OPTIONS
+ .TP
+@@ -98,21 +95,9 @@
+ .SH ENVIRONMENT
+ .TP 20
+ .B @PAPERSIZEVAR@
+-Paper size to use regardless of what the papersize file contains.
+-.TP 20
+-.B @PAPERCONFVAR@
+-Full path to a file containing the paper size to use.
+-.SH FILES
+-.TP 20
+-.B @PAPERCONF@
+-Contains the name of the system-wide default paper size to be used
+-if the
+-.B @PAPERSIZEVAR@
+-and
+-.B @PAPERCONFVAR@
+-variables are not set.
++Paper size to use.
+ .SH AUTHOR
+ Yves Arrouye <arrouye@debian.org>
+-.SH SEE ALSO
+-.BR papersize (5)
++
++Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+
diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in b/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in
index 6be58eb6867..24cf8c13a85 100644
--- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in
+++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in
@@ -1,4 +1,4 @@
-.TH PAPERCONF 1 "24 April 2001"
+.TH PAPERCONF 1 "25 October 2013"
.SH NAME
.B paperconf
\- print paper configuration information
@@ -46,13 +46,10 @@ When called without arguments,
prints the name of the system- or user-specified paper, obtained by
looking in order at the
.B @PAPERSIZEVAR@
-environment variable, at the contents of the file specified by the
-.B @PAPERCONFVAR@
-environment variable, at the contents of
-.B @PAPERCONF@
+environment variable
or by using
-.B letter
-as a fall-back value if none of the other alternatives are successful.
+.B a4
+as a fall-back value.
By default, width and height of the paper are printed in PostScript points.
.SH OPTIONS
.TP
@@ -98,21 +95,9 @@ Use inches as unit for paper size.
.SH ENVIRONMENT
.TP 20
.B @PAPERSIZEVAR@
-Paper size to use regardless of what the papersize file contains.
-.TP 20
-.B @PAPERCONFVAR@
-Full path to a file containing the paper size to use.
-.SH FILES
-.TP 20
-.B @PAPERCONF@
-Contains the name of the system-wide default paper size to be used
-if the
-.B @PAPERSIZEVAR@
-and
-.B @PAPERCONFVAR@
-variables are not set.
+Paper size to use.
.SH AUTHOR
Yves Arrouye <arrouye@debian.org>
-.SH SEE ALSO
-.BR papersize (5)
+
+Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
diff --git a/Build/source/libs/paper/paper.test b/Build/source/libs/paper/paper.test
index 54c4a2c82d2..d20ebbfec37 100755
--- a/Build/source/libs/paper/paper.test
+++ b/Build/source/libs/paper/paper.test
@@ -3,9 +3,17 @@
# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-./paperconf || exit 1
+./paperconf -ans || exit 1
-PAPERSIZE=B3 ./paperconf || exit 1
+PAPERSIZE=B3 ./paperconf -nsc || exit 1
-PAPERSIZE=jisB3 ./paperconf || exit 1
+PAPERSIZE=jisB3 ./paperconf -nsm || exit 1
+
+PAPERSIZE=jisB5 ./paperconf -p lETTER -Nsi || exit 1
+
+./paperconf -dns
+
+./paperconf FOLIO -nw
+
+./paperconf legal -Nh
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 08:21:21 +0000