[Reproducible-commits] [texlive-bin] 103/400: new upstream release, the final (???) sources: - remove several patches already included in upstream
Maria Valentina Marin Rodrigues
akira-guest at moszumanska.debian.org
Thu Jul 9 21:39:39 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 e7400b4fe8d99be136b1853b36a581a1c0bc55a1
Author: Norbert Preining <preining at debian.org>
Date: Thu Jun 28 14:48:27 2012 +0000
new upstream release, the final (???) sources:
- remove several patches already included in upstream
---
debian/changelog | 7 +-
debian/quilt/fix-pipe-in-out-regression | 98 -----
debian/quilt/patch-icu | 480 -------------------------
debian/quilt/patch-pdftex | 79 ----
debian/quilt/series | 8 +-
debian/quilt/upstream-fix-ini-synctex-segfault | 33 --
6 files changed, 9 insertions(+), 696 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e597e0..481e66e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-texlive-bin (2012.20120623-3) UNRELEASED; urgency=low
+texlive-bin (2012.20120628-1) unstable; urgency=low
+ * new upstream (some emergency fixes), the following patches have
+ been removed since they are included upstream: patch-icu, patch-pdftex,
+ fix-pipe-in-out-regression, upstream-fix-ini-synctex-segfault
* Build with -marm on armhf to fix lilypond FTBFS (Closes: #678604)
(Thanks Peter Michael Green)
- -- Norbert Preining <preining at debian.org> Thu, 28 Jun 2012 09:34:16 +0900
+ -- Norbert Preining <preining at debian.org> Thu, 28 Jun 2012 23:47:26 +0900
texlive-bin (2012.20120623-2) unstable; urgency=low
diff --git a/debian/quilt/fix-pipe-in-out-regression b/debian/quilt/fix-pipe-in-out-regression
deleted file mode 100644
index 68cb697..0000000
--- a/debian/quilt/fix-pipe-in-out-regression
+++ /dev/null
@@ -1,98 +0,0 @@
-reading from pipes and writing to pipes is currently broken, because
-the argument passed to popen is one that should only be used on
-Windows. (additional "b"). Since we will never compile these sources
-on Windows, simply remove the problematics "b"s and get it back on.
----
- texk/web2c/lib/ChangeLog | 8 ++++++++
- texk/web2c/lib/texmfmp.c | 22 +++++++++++++++-------
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-Index: texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/lib/texmfmp.c 2012-06-28 09:38:21.810278326 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c 2012-06-28 09:44:56.514267775 +0900
-@@ -527,7 +527,9 @@
- /* Like runsystem(), the runpopen() function is called only when
- shellenabledp == 1. Unlike runsystem(), here we write errors to
- stderr, since we have nowhere better to use; and of course we return
-- a file handle (or NULL) instead of a status indicator. */
-+ a file handle (or NULL) instead of a status indicator.
-+
-+ Also, we append "b" to MODE on Windows. */
-
- static FILE *
- runpopen (char *cmd, const char *mode)
-@@ -536,9 +538,14 @@
- char *safecmd = NULL;
- char *cmdname = NULL;
- int allow;
--
- #ifdef WIN32
- char *pp;
-+#endif
-+ string realmode = xmalloc(strlen(mode)+2);
-+
-+ strcpy(realmode, mode);
-+#ifdef WIN32
-+ strcat(realmode, "b");
-
- for (pp = cmd; *pp; pp++) {
- if (*pp == '\'') *pp = '"';
-@@ -552,9 +559,9 @@
- allow = shell_cmd_is_allowed (cmd, &safecmd, &cmdname);
-
- if (allow == 1)
-- f = popen (cmd, mode);
-+ f = popen (cmd, realmode);
- else if (allow == 2)
-- f = popen (safecmd, mode);
-+ f = popen (safecmd, realmode);
- else if (allow == -1)
- fprintf (stderr, "\nrunpopen quotation error in command line: %s\n",
- cmd);
-@@ -565,6 +572,7 @@
- free (safecmd);
- if (cmdname)
- free (cmdname);
-+ free (realmode);
- return f;
- }
- #endif /* ENABLE_PIPES */
-@@ -1857,7 +1865,7 @@
- fname = xmalloc(strlen((const_string)(nameoffile+1))+1);
- strcpy(fname,(const_string)(nameoffile+1));
- recorder_record_input (fname + 1);
-- *f_ptr = runpopen(fname+1,"rb");
-+ *f_ptr = runpopen(fname+1,"r");
- free(fname);
- for (i=0; i<NUM_PIPES; i++) {
- if (pipes[i]==NULL) {
-@@ -1899,10 +1907,10 @@
- is better to be prepared */
- if (STREQ((fname+strlen(fname)-4),".tex"))
- *(fname+strlen(fname)-4) = 0;
-- *f_ptr = runpopen(fname+1,"wb");
-+ *f_ptr = runpopen(fname+1,"w");
- *(fname+strlen(fname)) = '.';
- } else {
-- *f_ptr = runpopen(fname+1,"wb");
-+ *f_ptr = runpopen(fname+1,"w");
- }
- recorder_record_output (fname + 1);
- free(fname);
-Index: texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/lib/ChangeLog 2012-06-28 09:38:52.014277080 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog 2012-06-28 09:40:08.130274192 +0900
-@@ -1,3 +1,11 @@
-+2012-06-27 Norbert Preining <preining at logic.at>
-+
-+ * texmfmp.c (runpopen): append "b" on Windows.
-+ (open_in_or_pipe): do not use the "b" here.
-+ (This makes pdftex's \input"|..." feature work again,
-+ unintentionally broken.)
-+ tex-live mail, 26 Jun 2012 14:02:26.
-+
- 2012-06-27 Karl Berry <karl at tug.org>
-
- * texmfmp.c (generic_synctex_get_current_name): return the
diff --git a/debian/quilt/patch-icu b/debian/quilt/patch-icu
deleted file mode 100644
index 7aed6a1..0000000
--- a/debian/quilt/patch-icu
+++ /dev/null
@@ -1,480 +0,0 @@
-Index: libs/icu/icu-49.1/layout/IndicReordering.h
-===================================================================
---- libs/icu/icu-49.1/layout/IndicReordering.h (revision 26897)
-+++ libs/icu/icu-49.1/layout/IndicReordering.h (working copy)
-@@ -50,7 +50,6 @@
- #define CF_BELOW_BASE 0x10000000U
- #define CF_POST_BASE 0x08000000U
- #define CF_LENGTH_MARK 0x04000000U
--#define CF_PRE_BASE 0x02000000U
-
- #define CF_POS_BEFORE 0x00300000U
- #define CF_POS_BELOW 0x00200000U
-@@ -121,7 +120,6 @@
- inline le_bool hasPostBaseForm(LEUnicode ch) const;
- inline le_bool hasBelowBaseForm(LEUnicode ch) const;
- inline le_bool hasAboveBaseForm(LEUnicode ch) const;
-- inline le_bool hasPreBaseForm(LEUnicode ch) const;
-
- inline static le_bool isVowelModifier(CharClass charClass);
- inline static le_bool isStressMark(CharClass charClass);
-@@ -138,7 +136,6 @@
- inline static le_bool hasPostBaseForm(CharClass charClass);
- inline static le_bool hasBelowBaseForm(CharClass charClass);
- inline static le_bool hasAboveBaseForm(CharClass charClass);
-- inline static le_bool hasPreBaseForm(CharClass charClass);
-
- static const IndicClassTable *getScriptClassTable(le_int32 scriptCode);
- };
-@@ -260,11 +257,6 @@
- return (charClass & CF_POST_BASE) != 0;
- }
-
--inline le_bool IndicClassTable::hasPreBaseForm(CharClass charClass)
--{
-- return (charClass & CF_PRE_BASE) != 0;
--}
--
- inline le_bool IndicClassTable::hasBelowBaseForm(CharClass charClass)
- {
- return (charClass & CF_BELOW_BASE) != 0;
-@@ -345,11 +337,6 @@
- return hasBelowBaseForm(getCharClass(ch));
- }
-
--inline le_bool IndicClassTable::hasPreBaseForm(LEUnicode ch) const
--{
-- return hasPreBaseForm(getCharClass(ch));
--}
--
- inline le_bool IndicClassTable::hasAboveBaseForm(LEUnicode ch) const
- {
- return hasAboveBaseForm(getCharClass(ch));
-Index: libs/icu/icu-49.1/layout/IndicReordering.cpp
-===================================================================
---- libs/icu/icu-49.1/layout/IndicReordering.cpp (revision 26897)
-+++ libs/icu/icu-49.1/layout/IndicReordering.cpp (working copy)
-@@ -129,10 +129,6 @@
- le_int32 fSMIndex;
- FeatureMask fSMFeatures;
-
-- LEUnicode fPreBaseConsonant;
-- LEUnicode fPreBaseVirama;
-- le_int32 fPBCIndex;
-- FeatureMask fPBCFeatures;
-
- void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
- {
-@@ -179,8 +175,7 @@
- fMpost(0), fMpostIndex(0), fLengthMark(0), fLengthMarkIndex(0), fAlLakuna(0), fAlLakunaIndex(0),
- fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
- fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
-- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
-- fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
-+ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
- {
- // nothing else to do...
- }
-@@ -199,8 +194,6 @@
-
- fVMabove = fVMpost = 0;
- fSMabove = fSMbelow = 0;
--
-- fPreBaseConsonant = fPreBaseVirama = 0;
- }
-
- void writeChar(LEUnicode ch, le_uint32 charIndex, FeatureMask charFeatures)
-@@ -396,14 +389,6 @@
- }
- }
-
-- void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
-- {
-- fPBCIndex = index;
-- fPreBaseConsonant = PBConsonant;
-- fPreBaseVirama = PBVirama;
-- fPBCFeatures = features;
-- }
--
- void noteBaseConsonant()
- {
- if (fMPreFixups != NULL && fMPreOutIndex >= 0) {
-@@ -483,22 +468,6 @@
- }
- }
-
-- void writePreBaseConsonant()
-- {
-- // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However,
-- // it seems that almost none of the fonts for Malayalam are set up to handle this.
-- // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
--
-- if (fPreBaseConsonant == 0x0d31) { // RRA
-- fPreBaseConsonant = 0x0d30; // RA
-- }
--
-- if (fPreBaseConsonant != 0) {
-- writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
-- writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
-- }
-- }
--
- le_int32 getOutputIndex()
- {
- return fOutIndex;
-@@ -765,7 +734,6 @@
- lastConsonant -= 1;
- }
-
--
- IndicClassTable::CharClass charClass = CC_RESERVED;
- IndicClassTable::CharClass nextClass = CC_RESERVED;
- le_int32 baseConsonant = lastConsonant;
-@@ -773,11 +741,9 @@
- le_int32 postBaseLimit = classTable->scriptFlags & SF_POST_BASE_LIMIT_MASK;
- le_bool seenVattu = FALSE;
- le_bool seenBelowBaseForm = FALSE;
-- le_bool seenPreBaseForm = FALSE;
- le_bool hasNukta = FALSE;
- le_bool hasBelowBaseForm = FALSE;
- le_bool hasPostBaseForm = FALSE;
-- le_bool hasPreBaseForm = FALSE;
-
- if (postBase < markStart && classTable->isNukta(chars[postBase])) {
- charClass = CC_NUKTA;
-@@ -791,22 +757,14 @@
-
- hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
- hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta;
-- hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
-
- if (IndicClassTable::isConsonant(charClass)) {
- if (postBaseLimit == 0 || seenVattu ||
- (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
-- !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
-+ !(hasBelowBaseForm || hasPostBaseForm)) {
- break;
- }
-
-- // Note any pre-base consonants
-- if ( baseConsonant == lastConsonant && lastConsonant > 0 &&
-- hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
-- output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
-- seenPreBaseForm = TRUE;
--
-- }
- // consonants with nuktas are never vattus
- seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
-
-@@ -839,14 +797,12 @@
- }
-
- // write any pre-base consonants
-- output.writePreBaseConsonant();
--
- le_bool supressVattu = TRUE;
-
- for (i = baseLimit; i < baseConsonant; i += 1) {
- LEUnicode ch = chars[i];
-- // Don't put 'pstf' or 'blwf' on anything before the base consonant.
-- FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
-+ // Don't put 'blwf' on first consonant.
-+ FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
-
- charClass = classTable->getCharClass(ch);
- nextClass = classTable->getCharClass(chars[i + 1]);
-@@ -897,7 +853,7 @@
- }
-
- // write below-base consonants
-- if (baseConsonant != lastConsonant && !seenPreBaseForm) {
-+ if (baseConsonant != lastConsonant) {
- for (i = bcSpan + 1; i < postBase; i += 1) {
- output.writeChar(chars[i], i, tagArray1);
- }
-@@ -927,7 +883,7 @@
-
- // write post-base consonants
- // FIXME: does this put the right tags on post-base consonants?
-- if (baseConsonant != lastConsonant && !seenPreBaseForm) {
-+ if (baseConsonant != lastConsonant) {
- if (postBase <= lastConsonant) {
- for (i = postBase; i <= lastConsonant; i += 1) {
- output.writeChar(chars[i], i, tagArray3);
-@@ -1195,7 +1151,7 @@
- }
-
-
--void IndicReordering::getDynamicProperties( DynamicProperties *, const IndicClassTable *classTable ) {
-+void IndicReordering::getDynamicProperties( DynamicProperties */*dProps*/, const IndicClassTable *classTable ) {
-
-
- LEUnicode currentChar;
-Index: libs/icu/icu-49.1/layout/IndicClassTables.cpp
-===================================================================
---- libs/icu/icu-49.1/layout/IndicClassTables.cpp (revision 26897)
-+++ libs/icu/icu-49.1/layout/IndicClassTables.cpp (working copy)
-@@ -66,7 +66,6 @@
- // special forms... (Bengali RA?)
- #define _bb (_ct | CF_BELOW_BASE)
- #define _pb (_ct | CF_POST_BASE)
--#define _fb (_ct | CF_PRE_BASE)
- #define _vt (_bb | CF_VATTU)
- #define _rv (_vt | CF_REPH)
- #define _rp (_pb | CF_REPH)
-@@ -198,7 +197,7 @@
- _xx, _xx, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _iv, _iv, // 0D00 - 0D0F
- _iv, _xx, _iv, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0D10 - 0D1F
- _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _xx, _ct, _ct, _ct, _ct, _ct, _pb, // 0D20 - 0D2F
-- _fb, _fb, _bb, _ct, _ct, _pb, _ct, _ct, _ct, _ct, _xx, _xx, _xx, _xx, _r2, _dr, // 0D30 - 0D3F
-+ _pb, _cn, _bb, _ct, _ct, _pb, _ct, _ct, _ct, _ct, _xx, _xx, _xx, _xx, _r2, _dr, // 0D30 - 0D3F
- _dr, _dr, _dr, _dr, _xx, _xx, _l1, _l1, _dl, _xx, _s1, _s2, _s3, _vr, _xx, _xx, // 0D40 - 0D4F
- _xx, _xx, _xx, _xx, _xx, _xx, _xx, _m2, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 0D50 - 0D5F
- _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0D60 - 0D6F
-Index: libs/icu/icu-49.1-PATCHES/ChangeLog
-===================================================================
---- libs/icu/icu-49.1-PATCHES/ChangeLog (revision 26897)
-+++ libs/icu/icu-49.1-PATCHES/ChangeLog (working copy)
-@@ -1,3 +1,7 @@
-+2012-06-18 Peter Breitenlohner <peb at mppmu.mpg.de>
-+
-+ * patch-82-Indic-bugfix (new): Revert ICU SVN commit 26090.
-+
- 2012-04-24 Peter Breitenlohner <peb at mppmu.mpg.de>
-
- * patch-02-FreeBSD (new): Build fix for FreeBSD.
-Index: libs/icu/icu-49.1-PATCHES/patch-82-Indic-bugfix
-===================================================================
---- libs/icu/icu-49.1-PATCHES/patch-82-Indic-bugfix (revision 0)
-+++ libs/icu/icu-49.1-PATCHES/patch-82-Indic-bugfix (revision 0)
-@@ -0,0 +1,230 @@
-+diff -ur icu-49.1.orig/source/layout/IndicClassTables.cpp icu-49.1/source/layout/IndicClassTables.cpp
-+--- icu-49.1.orig/source/layout/IndicClassTables.cpp 2012-03-21 18:38:10.000000000 +0100
-++++ icu-49.1/source/layout/IndicClassTables.cpp 2012-06-18 14:23:38.000000000 +0200
-+@@ -66,7 +66,6 @@
-+ // special forms... (Bengali RA?)
-+ #define _bb (_ct | CF_BELOW_BASE)
-+ #define _pb (_ct | CF_POST_BASE)
-+-#define _fb (_ct | CF_PRE_BASE)
-+ #define _vt (_bb | CF_VATTU)
-+ #define _rv (_vt | CF_REPH)
-+ #define _rp (_pb | CF_REPH)
-+@@ -198,7 +197,7 @@
-+ _xx, _xx, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _iv, _iv, // 0D00 - 0D0F
-+ _iv, _xx, _iv, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0D10 - 0D1F
-+ _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _xx, _ct, _ct, _ct, _ct, _ct, _pb, // 0D20 - 0D2F
-+- _fb, _fb, _bb, _ct, _ct, _pb, _ct, _ct, _ct, _ct, _xx, _xx, _xx, _xx, _r2, _dr, // 0D30 - 0D3F
-++ _pb, _cn, _bb, _ct, _ct, _pb, _ct, _ct, _ct, _ct, _xx, _xx, _xx, _xx, _r2, _dr, // 0D30 - 0D3F
-+ _dr, _dr, _dr, _dr, _xx, _xx, _l1, _l1, _dl, _xx, _s1, _s2, _s3, _vr, _xx, _xx, // 0D40 - 0D4F
-+ _xx, _xx, _xx, _xx, _xx, _xx, _xx, _m2, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 0D50 - 0D5F
-+ _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0D60 - 0D6F
-+diff -ur icu-49.1.orig/source/layout/IndicReordering.cpp icu-49.1/source/layout/IndicReordering.cpp
-+--- icu-49.1.orig/source/layout/IndicReordering.cpp 2012-03-21 18:38:10.000000000 +0100
-++++ icu-49.1/source/layout/IndicReordering.cpp 2012-06-18 14:38:25.000000000 +0200
-+@@ -129,10 +129,6 @@
-+ le_int32 fSMIndex;
-+ FeatureMask fSMFeatures;
-+
-+- LEUnicode fPreBaseConsonant;
-+- LEUnicode fPreBaseVirama;
-+- le_int32 fPBCIndex;
-+- FeatureMask fPBCFeatures;
-+
-+ void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
-+ {
-+@@ -179,8 +175,7 @@
-+ fMpost(0), fMpostIndex(0), fLengthMark(0), fLengthMarkIndex(0), fAlLakuna(0), fAlLakunaIndex(0),
-+ fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
-+ fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
-+- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
-+- fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
-++ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
-+ {
-+ // nothing else to do...
-+ }
-+@@ -199,8 +194,6 @@
-+
-+ fVMabove = fVMpost = 0;
-+ fSMabove = fSMbelow = 0;
-+-
-+- fPreBaseConsonant = fPreBaseVirama = 0;
-+ }
-+
-+ void writeChar(LEUnicode ch, le_uint32 charIndex, FeatureMask charFeatures)
-+@@ -396,14 +389,6 @@
-+ }
-+ }
-+
-+- void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
-+- {
-+- fPBCIndex = index;
-+- fPreBaseConsonant = PBConsonant;
-+- fPreBaseVirama = PBVirama;
-+- fPBCFeatures = features;
-+- }
-+-
-+ void noteBaseConsonant()
-+ {
-+ if (fMPreFixups != NULL && fMPreOutIndex >= 0) {
-+@@ -483,22 +468,6 @@
-+ }
-+ }
-+
-+- void writePreBaseConsonant()
-+- {
-+- // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However,
-+- // it seems that almost none of the fonts for Malayalam are set up to handle this.
-+- // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
-+-
-+- if (fPreBaseConsonant == 0x0d31) { // RRA
-+- fPreBaseConsonant = 0x0d30; // RA
-+- }
-+-
-+- if (fPreBaseConsonant != 0) {
-+- writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
-+- writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
-+- }
-+- }
-+-
-+ le_int32 getOutputIndex()
-+ {
-+ return fOutIndex;
-+@@ -765,7 +734,6 @@
-+ lastConsonant -= 1;
-+ }
-+
-+-
-+ IndicClassTable::CharClass charClass = CC_RESERVED;
-+ IndicClassTable::CharClass nextClass = CC_RESERVED;
-+ le_int32 baseConsonant = lastConsonant;
-+@@ -773,11 +741,9 @@
-+ le_int32 postBaseLimit = classTable->scriptFlags & SF_POST_BASE_LIMIT_MASK;
-+ le_bool seenVattu = FALSE;
-+ le_bool seenBelowBaseForm = FALSE;
-+- le_bool seenPreBaseForm = FALSE;
-+ le_bool hasNukta = FALSE;
-+ le_bool hasBelowBaseForm = FALSE;
-+ le_bool hasPostBaseForm = FALSE;
-+- le_bool hasPreBaseForm = FALSE;
-+
-+ if (postBase < markStart && classTable->isNukta(chars[postBase])) {
-+ charClass = CC_NUKTA;
-+@@ -791,22 +757,14 @@
-+
-+ hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
-+ hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta;
-+- hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
-+
-+ if (IndicClassTable::isConsonant(charClass)) {
-+ if (postBaseLimit == 0 || seenVattu ||
-+ (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
-+- !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
-++ !(hasBelowBaseForm || hasPostBaseForm)) {
-+ break;
-+ }
-+
-+- // Note any pre-base consonants
-+- if ( baseConsonant == lastConsonant && lastConsonant > 0 &&
-+- hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
-+- output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
-+- seenPreBaseForm = TRUE;
-+-
-+- }
-+ // consonants with nuktas are never vattus
-+ seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
-+
-+@@ -839,14 +797,12 @@
-+ }
-+
-+ // write any pre-base consonants
-+- output.writePreBaseConsonant();
-+-
-+ le_bool supressVattu = TRUE;
-+
-+ for (i = baseLimit; i < baseConsonant; i += 1) {
-+ LEUnicode ch = chars[i];
-+- // Don't put 'pstf' or 'blwf' on anything before the base consonant.
-+- FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
-++ // Don't put 'blwf' on first consonant.
-++ FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
-+
-+ charClass = classTable->getCharClass(ch);
-+ nextClass = classTable->getCharClass(chars[i + 1]);
-+@@ -897,7 +853,7 @@
-+ }
-+
-+ // write below-base consonants
-+- if (baseConsonant != lastConsonant && !seenPreBaseForm) {
-++ if (baseConsonant != lastConsonant) {
-+ for (i = bcSpan + 1; i < postBase; i += 1) {
-+ output.writeChar(chars[i], i, tagArray1);
-+ }
-+@@ -927,7 +883,7 @@
-+
-+ // write post-base consonants
-+ // FIXME: does this put the right tags on post-base consonants?
-+- if (baseConsonant != lastConsonant && !seenPreBaseForm) {
-++ if (baseConsonant != lastConsonant) {
-+ if (postBase <= lastConsonant) {
-+ for (i = postBase; i <= lastConsonant; i += 1) {
-+ output.writeChar(chars[i], i, tagArray3);
-+@@ -1195,7 +1151,7 @@
-+ }
-+
-+
-+-void IndicReordering::getDynamicProperties( DynamicProperties *, const IndicClassTable *classTable ) {
-++void IndicReordering::getDynamicProperties( DynamicProperties */*dProps*/, const IndicClassTable *classTable ) {
-+
-+
-+ LEUnicode currentChar;
-+diff -ur icu-49.1.orig/source/layout/IndicReordering.h icu-49.1/source/layout/IndicReordering.h
-+--- icu-49.1.orig/source/layout/IndicReordering.h 2012-03-21 18:38:08.000000000 +0100
-++++ icu-49.1/source/layout/IndicReordering.h 2012-06-18 14:27:48.000000000 +0200
-+@@ -50,7 +50,6 @@
-+ #define CF_BELOW_BASE 0x10000000U
-+ #define CF_POST_BASE 0x08000000U
-+ #define CF_LENGTH_MARK 0x04000000U
-+-#define CF_PRE_BASE 0x02000000U
-+
-+ #define CF_POS_BEFORE 0x00300000U
-+ #define CF_POS_BELOW 0x00200000U
-+@@ -121,7 +120,6 @@
-+ inline le_bool hasPostBaseForm(LEUnicode ch) const;
-+ inline le_bool hasBelowBaseForm(LEUnicode ch) const;
-+ inline le_bool hasAboveBaseForm(LEUnicode ch) const;
-+- inline le_bool hasPreBaseForm(LEUnicode ch) const;
-+
-+ inline static le_bool isVowelModifier(CharClass charClass);
-+ inline static le_bool isStressMark(CharClass charClass);
-+@@ -138,7 +136,6 @@
-+ inline static le_bool hasPostBaseForm(CharClass charClass);
-+ inline static le_bool hasBelowBaseForm(CharClass charClass);
-+ inline static le_bool hasAboveBaseForm(CharClass charClass);
-+- inline static le_bool hasPreBaseForm(CharClass charClass);
-+
-+ static const IndicClassTable *getScriptClassTable(le_int32 scriptCode);
-+ };
-+@@ -260,11 +257,6 @@
-+ return (charClass & CF_POST_BASE) != 0;
-+ }
-+
-+-inline le_bool IndicClassTable::hasPreBaseForm(CharClass charClass)
-+-{
-+- return (charClass & CF_PRE_BASE) != 0;
-+-}
-+-
-+ inline le_bool IndicClassTable::hasBelowBaseForm(CharClass charClass)
-+ {
-+ return (charClass & CF_BELOW_BASE) != 0;
-+@@ -345,11 +337,6 @@
-+ return hasBelowBaseForm(getCharClass(ch));
-+ }
-+
-+-inline le_bool IndicClassTable::hasPreBaseForm(LEUnicode ch) const
-+-{
-+- return hasPreBaseForm(getCharClass(ch));
-+-}
-+-
-+ inline le_bool IndicClassTable::hasAboveBaseForm(LEUnicode ch) const
-+ {
-+ return hasAboveBaseForm(getCharClass(ch));
diff --git a/debian/quilt/patch-pdftex b/debian/quilt/patch-pdftex
deleted file mode 100644
index 155abd3..0000000
--- a/debian/quilt/patch-pdftex
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: texk/web2c/pdftexdir/utils.c
-===================================================================
---- texk/web2c/pdftexdir/utils.c (revision 26897)
-+++ texk/web2c/pdftexdir/utils.c (working copy)
-@@ -25,11 +25,7 @@
- #else
- #include <sysexits.h>
- #endif
--#ifdef __MINGW32__
--#include <regex/regex.h>
--#else
- #include <regex.h>
--#endif
- #include <kpathsea/c-proto.h>
- #include <kpathsea/c-stat.h>
- #include <kpathsea/c-fopen.h>
-Index: texk/web2c/pdftexdir/ChangeLog
-===================================================================
---- texk/web2c/pdftexdir/ChangeLog (revision 26897)
-+++ texk/web2c/pdftexdir/ChangeLog (working copy)
-@@ -1,3 +1,14 @@
-+2012-06-21 Peter Breitenlohner <peb at mppmu.mpg.de>
-+
-+ * pdftosrc.cc: Use XRef::getNumObjects instead of XRef::getSize,
-+ required for poppler >= 0.19.0.
-+
-+2012-06-15 Peter Breitenlohner <peb at mppmu.mpg.de>
-+
-+ * utils.c [__MINGW32__]: #include <regex.h> as for Unix instead
-+ of <regex/regex.h>.
-+ * am/libpdftex.am (libpdftex_a_CPPFLAGS): Change accordingly.
-+
- 2012-05-20 Thanh Han The <thanh at river-valley.org>
-
- * pdftex.defines (get/setimagegroupref): these replace imagegroupref.
-Index: texk/web2c/pdftexdir/am/libpdftex.am
-===================================================================
---- texk/web2c/pdftexdir/am/libpdftex.am (revision 26897)
-+++ texk/web2c/pdftexdir/am/libpdftex.am (working copy)
-@@ -1,13 +1,13 @@
- ## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex.
- ##
--## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live at tug.org>
-+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live at tug.org>
- ## You may freely use, modify and/or distribute this file.
-
- ## libpdftex
- ##
- EXTRA_LIBRARIES += libpdftex.a
-
--libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
-+libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
- libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
-
- libpdftex_a_SOURCES = \
-@@ -41,6 +41,7 @@
- pdftexdir/writezip.c
-
- if MINGW32
-+REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
- libpdftex_a_SOURCES += \
- pdftexdir/regex/regex.c \
- pdftexdir/regex/regex.h
-Index: texk/web2c/pdftexdir/pdftosrc.cc
-===================================================================
---- texk/web2c/pdftexdir/pdftosrc.cc (revision 26897)
-+++ texk/web2c/pdftexdir/pdftosrc.cc (working copy)
-@@ -134,7 +134,11 @@
- exit(1);
- }
- if (extract_xref_table) {
-+#ifdef POPPLER_VERSION
-+ int size = xref->getNumObjects();
-+#else
- int size = xref->getSize();
-+#endif
- int i;
- for (i = 0; i < size; i++) {
- if (xref->getEntry(i)->offset == 0xffffffff)
diff --git a/debian/quilt/series b/debian/quilt/series
index 4db4c85..f054dad 100644
--- a/debian/quilt/series
+++ b/debian/quilt/series
@@ -19,10 +19,10 @@ pmpost-20120415-tl11.diff
pmpost-svg-20120119-tl11.diff
#xdvi-zoom-with-eps-figures.patch
patch-dvi2tty -p0
-patch-icu -p0
+#upstream included# patch-icu -p0
patch-lacheck -p0
-patch-pdftex -p0
+#upstream included# patch-pdftex -p0
patch-update-updmap-manpage
xdvi-upupstream-fixes
-upstream-fix-ini-synctex-segfault
-fix-pipe-in-out-regression
+#upstream included# upstream-fix-ini-synctex-segfault
+#upstream included# fix-pipe-in-out-regression
diff --git a/debian/quilt/upstream-fix-ini-synctex-segfault b/debian/quilt/upstream-fix-ini-synctex-segfault
deleted file mode 100644
index ba23020..0000000
--- a/debian/quilt/upstream-fix-ini-synctex-segfault
+++ /dev/null
@@ -1,33 +0,0 @@
----
- texk/web2c/lib/ChangeLog | 5 +++++
- texk/web2c/lib/texmfmp.c | 4 ++++
- 2 files changed, 9 insertions(+)
-
-Index: texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/lib/ChangeLog 2012-05-04 16:10:16.000000000 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog 2012-06-28 09:38:52.014277080 +0900
-@@ -1,3 +1,8 @@
-+2012-06-27 Karl Berry <karl at tug.org>
-+
-+ * texmfmp.c (generic_synctex_get_current_name): return the
-+ empty string if passed null (can happen with -ini).
-+
- 2012-05-04 Peter Breitenlohner <peb at mppmu.mpg.de>
-
- * printversion.c (printversionandexit): Update 'Copyright 2012'.
-Index: texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/lib/texmfmp.c 2012-06-28 09:36:56.706282341 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c 2012-06-28 09:38:21.810278326 +0900
-@@ -127,6 +127,10 @@
- char *generic_synctex_get_current_name (void)
- {
- char *pwdbuf, *ret;
-+ if (!fullnameoffile) {
-+ ret = xstrdup("");
-+ return ret;
-+ }
- if (kpse_absolute_p(fullnameoffile, false)) {
- return xstrdup(fullnameoffile);
- }
--
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