summaryrefslogtreecommitdiff
path: root/Build/source/utils/pmx/pmx-2.7.0-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/pmx/pmx-2.7.0-PATCHES')
-rw-r--r--Build/source/utils/pmx/pmx-2.7.0-PATCHES/ChangeLog11
-rw-r--r--Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-common81
-rw-r--r--Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-ptr-to-int16
3 files changed, 27 insertions, 81 deletions
diff --git a/Build/source/utils/pmx/pmx-2.7.0-PATCHES/ChangeLog b/Build/source/utils/pmx/pmx-2.7.0-PATCHES/ChangeLog
index c3f90e96932..4faa12f492d 100644
--- a/Build/source/utils/pmx/pmx-2.7.0-PATCHES/ChangeLog
+++ b/Build/source/utils/pmx/pmx-2.7.0-PATCHES/ChangeLog
@@ -1,3 +1,14 @@
+2013-11-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Updated pmx-2.7.0 source tree from a modifies version of
+ pmx-2.7.0.tar.gz (dated 2014-11-22) again from:
+ http://www.ctan.org/tex-archive/support/pmx/
+
+ * patch-01-common (removed): Now included upstream.
+
+ * patch-01-ptr-to-int (new): Avoid cast from pointer to integer
+ of different size.
+
2013-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-common: Make sure f2c can convert pmx270.for, i.e.,
diff --git a/Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-common b/Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-common
deleted file mode 100644
index 54614abae3a..00000000000
--- a/Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-common
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur pmx-2.7.0.orig/pmx270.for pmx-2.7.0/pmx270.for
---- pmx-2.7.0.orig/pmx270.for 2013-04-03 09:02:49.000000000 +0200
-+++ pmx-2.7.0/pmx270.for 2013-04-12 08:47:44.000000000 +0200
-@@ -10904,7 +10904,7 @@
- end if
- go to 1
- end
-- subroutine getmidi(noinst,lineq,iccount,ibarcnt,ibaroff,nbars,
-+ subroutine getmidi(noinstarg,lineq,iccount,ibarcnt,ibaroff,nbars,
- * lenbar,
- c subroutine getmidi(nv,lineq,iccount,ibarcnt,ibaroff,nbars,lenbar,
- * mtrdenl,first)
-@@ -10933,7 +10933,7 @@
- * debugmidi
- logical debugmidi
- common /commvel/ midivel(nm),midvelc(0:nm),midibal(nm),midbc(0:nm)
-- * ,miditran(nm),midtc(0:nm),noinstdum,iinsiv(nm)
-+ * ,miditran(nm),midtc(0:nm),noinst,iinsiv(nm)
- integer*2 iinsiv
- character*1 durq
- character*2 instq
-@@ -11010,7 +11010,7 @@
- c Instrument numbers or letters. Expect noinst of them.
- c
- c do 2 ivx = 1 , nv
-- do 2 ivx = 1 , noinst
-+ do 2 ivx = 1 , noinstarg
- call getchar(lineq,iccount,durq)
- if (ichar(durq) .gt. 96) then
- c
-@@ -11055,7 +11055,7 @@
- c Follow same pattern as for insttrument numbers above.
- c
- c do 7 ivx = 1 , nv
-- do 7 ivx = 1 , noinst
-+ do 7 ivx = 1 , noinstarg
- call getchar(lineq,iccount,durq)
- if (index('123456789',durq) .eq. 0) then
- call errmsg(lineq,iccount,ibarcnt-ibaroff+nbars+1,
-@@ -11078,7 +11078,7 @@
- c Follow same pattern as for instrument numbers above.
- c
- c do 8 ivx = 1 , nv
-- do 8 ivx = 1 , noinst
-+ do 8 ivx = 1 , noinstarg
- call getchar(lineq,iccount,durq)
- if (index('123456789',durq) .eq. 0) then
- call errmsg(lineq,iccount,ibarcnt-ibaroff+nbars+1,
-@@ -11101,7 +11101,7 @@
- c Follow similar pattern as above, but separator is +|-.
- c
- c do 9 ivx = 1 , nv
-- do 9 ivx = 1 , noinst
-+ do 9 ivx = 1 , noinstarg
- call getchar(lineq,iccount,durq)
- ipm = index('-+',durq)
- if (ipm .eq. 0) then
-diff -ur pmx-2.7.0.orig/scor2prt.c pmx-2.7.0/scor2prt.c
---- pmx-2.7.0.orig/scor2prt.c 2013-04-03 08:54:13.000000000 +0200
-+++ pmx-2.7.0/scor2prt.c 2013-04-11 08:47:42.000000000 +0200
-@@ -25,7 +25,7 @@
- integer noinow, iorig[24], noinst;
- logical insetup, replacing;
- integer instnum[24];
-- real botv[24];
-+ logical botv[24];
- integer nvi[24], nsyst, nvnow;
- };
-
-diff -ur pmx-2.7.0.orig/scor2prt.for pmx-2.7.0/scor2prt.for
---- pmx-2.7.0.orig/scor2prt.for 2013-04-03 08:48:23.000000000 +0200
-+++ pmx-2.7.0/scor2prt.for 2013-04-11 08:40:28.000000000 +0200
-@@ -1482,7 +1482,7 @@
- common /all/ noinow,iorig(noimax),noinst,insetup,replacing,
- * instnum(noimax),botv(noimax),nvi(noimax),nsyst,nvnow
- character*128 line
-- logical insetup,replacing
-+ logical insetup,replacing,botv
- iccount = 0
- do 1 iset = 1 , 12
- call partnum(iv,iccount,line,xdata)
diff --git a/Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-ptr-to-int b/Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-ptr-to-int
new file mode 100644
index 00000000000..b2662315f34
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.7.0-PATCHES/patch-01-ptr-to-int
@@ -0,0 +1,16 @@
+diff -ur pmx-2.7.0.orig/libf2c/signal_.c pmx-2.7.0/libf2c/signal_.c
+--- pmx-2.7.0.orig/libf2c/signal_.c 2013-03-12 18:54:34.000000000 +0100
++++ pmx-2.7.0/libf2c/signal_.c 2014-11-25 09:31:31.000000000 +0100
+@@ -14,7 +14,11 @@
+ int sig;
+ sig = (int)*sigp;
+
+- return (ftnint)signal(sig, proc);
++#ifdef _WIN64
++ return (ftnint)(__int64)signal(sig, proc);
++#else
++ return (ftnint)(long)signal(sig, proc);
++#endif
+ }
+ #ifdef __cplusplus
+ }