Browse Source

Cherry-pick upstream commit FILE5_18-2-g1ecdd15, FILE5_18-7-g2c947ac "reduce strength of windows cursors"

... and the fix "raise the strength of the targa magic"
Christoph Biedl 10 years ago
parent
commit
cdccccb548

+ 26 - 0
debian/patches/cherry-pick.FILE5_18-2-g1ecdd15.fix-targa-detection.patch

@@ -0,0 +1,26 @@
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Fri Mar 28 19:06:09 2014 +0000
+Upstream-Commit: 1ecdd15c966ae6bee3ba558a53edf1dd4155d204
+Description:
+    reduce strength of windows cursors so that they don't win over Targa files
+    (Christoph Biedl)
+
+--- a/magic/Magdir/msdos
++++ b/magic/Magdir/msdos
+@@ -590,7 +590,7 @@
+ >4  ubyte   !0  \b, %d colors
+ 
+ 0   belong  0x00000100
+-
++!:strength - 2
+ >9  byte    0
+ >>0 byte    x           MS Windows icon resource
+ !:mime	image/x-icon
+@@ -614,6 +614,7 @@
+ 
+ 0   belong  0x00000200
+ >9  byte    0
++!:strength - 2
+ >>0 byte    x           MS Windows cursor resource
+ !:mime image/x-cur
+ >>4 use     cur-dir

+ 45 - 0
debian/patches/cherry-pick.FILE5_18-7-g2c947ac.raise-the-strength-of-the-targa.patch

@@ -0,0 +1,45 @@
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sun Mar 30 21:41:45 2014 +0000
+Commit: 2c947accbc7066cf1c78a9268a1d5b27ab798945
+Description:
+    raise the strength of the targa magic, instead of dropping the cursor magic
+    so that they does not get recognized as lotus 123 files. From Christoph Biedl
+
+--- a/magic/Magdir/images
++++ b/magic/Magdir/images
+@@ -18,14 +18,17 @@
+ # `xv' recognizes only a subset of the following (RGB with pixelsize = 24)
+ # `tgatoppm' recognizes a superset (Index may be anything)
+ 1	belong&0xfff7ffff	0x01010000	Targa image data - Map
++!:strength + 2
+ >2	byte&8			8		- RLE
+ >12	leshort			>0		%hd x
+ >14	leshort			>0		%hd
+ 1	belong&0xfff7ffff	0x00020000	Targa image data - RGB
++!:strength + 2
+ >2	byte&8			8		- RLE
+ >12	leshort			>0		%hd x
+ >14	leshort			>0		%hd
+ 1	belong&0xfff7ffff	0x00030000	Targa image data - Mono
++!:strength + 2
+ >2	byte&8			8		- RLE
+ >12	leshort			>0		%hd x
+ >14	leshort			>0		%hd
+--- a/magic/Magdir/msdos
++++ b/magic/Magdir/msdos
+@@ -590,7 +590,6 @@
+ >4  ubyte   !0  \b, %d colors
+ 
+ 0   belong  0x00000100
+-!:strength - 2
+ >9  byte    0
+ >>0 byte    x           MS Windows icon resource
+ !:mime	image/x-icon
+@@ -614,7 +613,6 @@
+ 
+ 0   belong  0x00000200
+ >9  byte    0
+-!:strength - 2
+ >>0 byte    x           MS Windows cursor resource
+ !:mime image/x-cur
+ >>4 use     cur-dir

+ 2 - 0
debian/patches/series

@@ -11,3 +11,5 @@
 0012-lxt.patch
 extra.fix-8bit-in-cdf.patch
 revert.beb312b.add-fmtcheck.patch
+cherry-pick.FILE5_18-2-g1ecdd15.fix-targa-detection.patch
+cherry-pick.FILE5_18-7-g2c947ac.raise-the-strength-of-the-targa.patch