[Reproducible-commits] [texlive-bin] 58/400: include config file inclusion patches
Maria Valentina Marin Rodrigues
akira-guest at moszumanska.debian.org
Thu Jul 9 21:39:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
akira-guest pushed a commit to branch master
in repository texlive-bin.
commit 12eff3baf7e260174772e2077ad09ebf989b516f
Author: Norbert Preining <preining at debian.org>
Date: Fri Mar 30 02:25:23 2012 +0000
include config file inclusion patches
---
debian/changelog | 9 ++++
debian/patches/dvipdfmx-config-i-directive | 42 ++++++++++++++++++
debian/patches/dvips-config-c-directive | 67 +++++++++++++++++++++++++++++
debian/patches/series | 3 ++
debian/patches/xdvipdfmx-config-i-directive | 41 ++++++++++++++++++
5 files changed, 162 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5f6298b..8804ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+texlive-bin (2011.20120328-2) unstable; urgency=low
+
+ * UNRELEASED
+ * add patches (maybe to be included upstream) that allows inclusion of
+ one config file in another for dvips and (x)dvipdfmx. This will be
+ used by the paper code.
+
+ -- Norbert Preining <preining at debian.org> Fri, 30 Mar 2012 11:24:12 +0900
+
texlive-bin (2011.20120328-1) unstable; urgency=low
* build with system libgraphite, adapt build dependencies
diff --git a/debian/patches/dvipdfmx-config-i-directive b/debian/patches/dvipdfmx-config-i-directive
new file mode 100644
index 0000000..71f4969
--- /dev/null
+++ b/debian/patches/dvipdfmx-config-i-directive
@@ -0,0 +1,42 @@
+---
+ texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg | 3 +++
+ texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c | 8 ++++++++
+ 2 files changed, 11 insertions(+)
+
+Index: texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg 2011-05-09 18:18:23.000000000 +0900
++++ texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg 2012-03-30 10:33:25.410473003 +0900
+@@ -198,3 +198,6 @@
+
+ %% Put additonal fontmap files here (usually for Type0 fonts)
+ f cid-x.map
++
++%% Include other config files
++%i <filename>
+Index: texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c 2011-03-09 20:02:16.000000000 +0900
++++ texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c 2012-03-30 10:33:25.414473001 +0900
+@@ -102,6 +102,9 @@
+ char *dvi_filename = NULL, *pdf_filename = NULL;
+
+ static void
++read_config_file (const char *config);
++
++static void
+ set_default_pdf_filename(void)
+ {
+ const char *dvi_base;
+@@ -562,6 +565,11 @@
+ case 'E':
+ compat_mode = 1;
+ break;
++ case 'i':
++ CHECK_ARG(1, "subsidiary config file");
++ read_config_file(argv[1]);
++ POP_ARG();
++ break;
+ case 'e':
+ if (compat_mode) {
+ WARN("dvipdfm \"-e\" option not supported.");
diff --git a/debian/patches/dvips-config-c-directive b/debian/patches/dvips-config-c-directive
new file mode 100644
index 0000000..77594f5
--- /dev/null
+++ b/debian/patches/dvips-config-c-directive
@@ -0,0 +1,67 @@
+---
+ texk/dvipsk/ChangeLog | 7 +++++++
+ texk/dvipsk/contrib/config.proto | 4 ++++
+ texk/dvipsk/dvips.texi | 5 +++++
+ texk/dvipsk/resident.c | 6 ++++++
+ 4 files changed, 22 insertions(+)
+
+Index: texlive-bin-2011.20120328/texk/dvipsk/ChangeLog
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/dvipsk/ChangeLog 2012-03-16 15:55:48.000000000 +0900
++++ texlive-bin-2011.20120328/texk/dvipsk/ChangeLog 2012-03-30 10:31:33.854669863 +0900
+@@ -1,3 +1,10 @@
++2012-03-30 Norbert Preining <preining at logic.at>
++
++ * resident.c: add new directive "c<filename> to config files, allowing
++ to include other config files:
++ * contrib/config.proto: add exmaple "c<filename>" directive
++ * dvips.texi: document "c" config file directive
++
+ 2012-03-15 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * Makefile.am: Fixed a typo (in comment).
+Index: texlive-bin-2011.20120328/texk/dvipsk/contrib/config.proto
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/dvipsk/contrib/config.proto 2009-12-25 03:38:47.000000000 +0900
++++ texlive-bin-2011.20120328/texk/dvipsk/contrib/config.proto 2012-03-30 10:31:33.850669876 +0900
+@@ -44,3 +44,7 @@
+ % You will also want definitions for alternative paper sizes -- A4,
+ % legal, and such. Examples in @file{contrib/papersize.level2} and
+ % @file{contrib/papersize.simple}.
++
++%
++% Inclusion of additional configuration files
++%c<filename>
+Index: texlive-bin-2011.20120328/texk/dvipsk/dvips.texi
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/dvipsk/dvips.texi 2011-07-26 23:14:39.000000000 +0900
++++ texlive-bin-2011.20120328/texk/dvipsk/dvips.texi 2012-03-30 10:31:33.850669876 +0900
+@@ -1419,6 +1419,11 @@
+ @opindex b @r{config command (#copies)}
+ Multiple copies. Same as @samp{-b}, @pxref{Option details}.
+
++ at item c @var{name}
++ at opindex c @r{include additional config file}
++Include an additional config file as if the additional config file's
++content would be included literally.
++
+ @item D @var{dpi}
+ @opindex D @r{config command (dpi)}
+ Output resolution. Same as @samp{-D}, @pxref{Option details}.
+Index: texlive-bin-2011.20120328/texk/dvipsk/resident.c
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/dvipsk/resident.c 2011-07-20 16:00:05.000000000 +0900
++++ texlive-bin-2011.20120328/texk/dvipsk/resident.c 2012-03-30 10:31:33.850669876 +0900
+@@ -765,6 +765,12 @@
+ paperfmt = newstring(PSname);
+ }
+ break;
++case 'c' :
++ if (sscanf(was_inline+1, "%s", PSname) != 1)
++ bad_config("missing arg to c");
++ else
++ getdefaults(PSname);
++ break;
+ default:
+ bad_config("strange line");
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 35b9722..0e4404d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,6 @@ debian-no-linked-scripts
build-wovp2ovf
60_unneeded_linking
61_path_max.diff
+dvips-config-c-directive
+dvipdfmx-config-i-directive
+xdvipdfmx-config-i-directive
diff --git a/debian/patches/xdvipdfmx-config-i-directive b/debian/patches/xdvipdfmx-config-i-directive
new file mode 100644
index 0000000..f291592
--- /dev/null
+++ b/debian/patches/xdvipdfmx-config-i-directive
@@ -0,0 +1,41 @@
+---
+ texk/xdvipdfmx/data/config/dvipdfmx.cfg | 2 ++
+ texk/xdvipdfmx/src/dvipdfmx.c | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
+Index: texlive-bin-2011.20120328/texk/xdvipdfmx/data/config/dvipdfmx.cfg
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/xdvipdfmx/data/config/dvipdfmx.cfg 2010-10-09 02:46:38.000000000 +0900
++++ texlive-bin-2011.20120328/texk/xdvipdfmx/data/config/dvipdfmx.cfg 2012-03-30 10:35:18.270516325 +0900
+@@ -183,3 +183,5 @@
+ %% Put additonal fontmap files here
+ f cid-x.map
+
++%% Include additional config files
++%i <filename>
+Index: texlive-bin-2011.20120328/texk/xdvipdfmx/src/dvipdfmx.c
+===================================================================
+--- texlive-bin-2011.20120328.orig/texk/xdvipdfmx/src/dvipdfmx.c 2011-03-10 21:07:25.000000000 +0900
++++ texlive-bin-2011.20120328/texk/xdvipdfmx/src/dvipdfmx.c 2012-03-30 10:35:18.266516319 +0900
+@@ -105,6 +105,9 @@
+ char *dvi_filename = NULL, *pdf_filename = NULL;
+
+ static void
++read_config_file (const char *config);
++
++static void
+ set_default_pdf_filename(void)
+ {
+ const char *dvi_base;
+@@ -453,6 +456,11 @@
+ pdf_load_fontmap_file(argv[1], FONTMAP_RMODE_REPLACE);
+ POP_ARG();
+ break;
++ case 'i':
++ CHECK_ARG(1, "subsidiary config file");
++ read_config_file(argv[1]);
++ POP_ARG();
++ break;
+ case 'e':
+ WARN("dvipdfm \"-e\" option not supported.");
+ break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git
More information about the Reproducible-commits
mailing list