Accepting request 714038 from home:Andreas_Schwab:Factory
- signed-char.patch: fix bad use of plain char - big-endian.patch: fix dependency on byte order OBS-URL: https://build.opensuse.org/request/show/714038 OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=111
This commit is contained in:
parent
8069d6fc7d
commit
b2cf595ce7
16
big-endian.patch
Normal file
16
big-endian.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
Index: netpbm-10.86.3/converter/pbm/pbmtozinc.c
|
||||||
|
===================================================================
|
||||||
|
--- netpbm-10.86.3.orig/converter/pbm/pbmtozinc.c
|
||||||
|
+++ netpbm-10.86.3/converter/pbm/pbmtozinc.c
|
||||||
|
@@ -107,7 +107,10 @@ packer_putitem(Packer * const packerP) {
|
||||||
|
putchar(' ');
|
||||||
|
|
||||||
|
++packerP->itemsperline;
|
||||||
|
- printf ("0x%02x%02x", packerP->item & 255, packerP->item >> 8);
|
||||||
|
+ if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||||
|
+ printf ("0x%02x%02x", packerP->item & 255, packerP->item >> 8);
|
||||||
|
+ else
|
||||||
|
+ printf ("0x%02x%02x", packerP->item >> 8, packerP->item & 255);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 8 07:49:42 UTC 2019 - Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
- signed-char.patch: fix bad use of plain char
|
||||||
|
- big-endian.patch: fix dependency on byte order
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 31 09:32:34 UTC 2019 - pgajdos@suse.com
|
Fri May 31 09:32:34 UTC 2019 - pgajdos@suse.com
|
||||||
|
|
||||||
|
@ -41,6 +41,10 @@ Patch4: %{name}-security-code.patch
|
|||||||
Patch5: %{name}-security-scripts.patch
|
Patch5: %{name}-security-scripts.patch
|
||||||
Patch6: %{name}-gcc-warnings.patch
|
Patch6: %{name}-gcc-warnings.patch
|
||||||
Patch7: makeman-py3.patch
|
Patch7: makeman-py3.patch
|
||||||
|
# PATCH-FIX-UPSTREAM fix bad use of plain char
|
||||||
|
Patch8: signed-char.patch
|
||||||
|
# PATCH-FIX-UPSTREAM fix dependency on byte order
|
||||||
|
Patch9: big-endian.patch
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: libjasper-devel
|
BuildRequires: libjasper-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -94,6 +98,8 @@ source package.
|
|||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
mkdir pnmtopalm # for %%doc pnmtopalm
|
mkdir pnmtopalm # for %%doc pnmtopalm
|
||||||
cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm
|
cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm
|
||||||
|
|
||||||
|
22
signed-char.patch
Normal file
22
signed-char.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
Index: netpbm-10.86.3/converter/other/pnmtopalm/palmtopnm.c
|
||||||
|
===================================================================
|
||||||
|
--- netpbm-10.86.3.orig/converter/other/pnmtopalm/palmtopnm.c
|
||||||
|
+++ netpbm-10.86.3/converter/other/pnmtopalm/palmtopnm.c
|
||||||
|
@@ -823,7 +823,7 @@ readPackBitsRow16(FILE * const
|
||||||
|
unsigned int j;
|
||||||
|
|
||||||
|
for (j = 0; j < bytesPerRow; ) {
|
||||||
|
- char incount;
|
||||||
|
+ signed char incount;
|
||||||
|
pm_readchar(ifP, &incount);
|
||||||
|
if (incount < 0) {
|
||||||
|
/* How do we handle incount == -128 ? */
|
||||||
|
@@ -865,7 +865,7 @@ readPackBitsRow(FILE * const if
|
||||||
|
unsigned int j;
|
||||||
|
|
||||||
|
for (j = 0; j < bytesPerRow; ) {
|
||||||
|
- char incount;
|
||||||
|
+ signed char incount;
|
||||||
|
pm_readchar(ifP, &incount);
|
||||||
|
if (incount < 0) {
|
||||||
|
/* How do we handle incount == -128 ? */
|
Loading…
Reference in New Issue
Block a user