Fix compiler warnings.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/net-print/epson-inkjet-printer-escpr/ChangeLog b/net-print/epson-inkjet-printer-escpr/ChangeLog
index 1fb9f5b8c6a6522000f3cc263b477c0b86df67ae..6a87703a567e8be58fdd949b95583c139807ef3b 100644 (file)
--- a/net-print/epson-inkjet-printer-escpr/ChangeLog
+++ b/net-print/epson-inkjet-printer-escpr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/epson-inkjet-printer-escpr
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/epson-inkjet-printer-escpr/ChangeLog,v 1.2 2015/01/15 04:50:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/epson-inkjet-printer-escpr/ChangeLog,v 1.3 2015/01/15 05:15:22 floppym Exp $
+
+  15 Jan 2015; Mike Gilbert <floppym@gentoo.org> +files/1.4.4-warnings.patch,
+  epson-inkjet-printer-escpr-1.4.4.ebuild:
+  Fix compiler warnings.
 
   15 Jan 2015; Mike Gilbert <floppym@gentoo.org>
   epson-inkjet-printer-escpr-1.4.4.ebuild:

diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 2e0e5852993bd1910b3d97c80b40c027573f5541..65078cb2cde830b191f6044bb840594e9d441418 100644 (file)
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.4.4-warnings.patch 1212 SHA256 0bc24ca3ee21776ea9c167f5213bd6f0678f2c83598597653b815ba5b8f82716 SHA512 81bc2e87d911bcad7530aac458c4d8e3759167d18f92c8a9dad99fd3a500ec7d3a76e9ca3c239e70916a06f1d0cc29fdb618dc41a6005e12ebde8ee3d7c1e1f6 WHIRLPOOL 67d164d3885bd19dc6c1fe3b969c189bc30809be6734765631da4bd85741e5041858d080003f21d94d6e06130bbe69ca41a2b422bbb0c51e1f77ba37c89f79b4
 DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d96b6448bd96b5e9ac622786e3fc5024e13cae2fc248f8858db2f6 SHA512 7a3f1f880dba9048773d051cfe54ea2ee929d82a85efb496d4df4b84b33ed2f48bb6020892615d5d22da6b5671501b82df55cea6e11b35fea392392f115a6330 WHIRLPOOL 856bcffc4fe45c6bb15c7ecbe1c41e315ee68bf2c3c93697ac4f314324e2b3a0a8796ba741c04e962f1ca9148dbf38d529649ffd5d7ddaaa757666ea066e32a0
-EBUILD epson-inkjet-printer-escpr-1.4.4.ebuild 718 SHA256 0fb3a9ddac6250503f50d7b5b33347fe852a613eeb1523abb94219b75c4188a8 SHA512 36316e781907f995953747bec5d27f906a5db7b462637a00da58adbf4c8e8eb6c7396c1c56e33c81b4afc6f72e67018bad5d5eceeed71244fffda46840cb2879 WHIRLPOOL c6ccf5f6dcaaa7360915f2620ccb1533675ba3d329071a474feee6def2ce2f41e4d86c8810307c60e206393f8fe8fabe39b6e9f27084ea312e4d5c4fbf48026f
-MISC ChangeLog 542 SHA256 7a2e68426617ccab799a5ddbc39827d7c6c2e290104edb9eba94dd03e247e5e1 SHA512 ecc04548bd66ba2b3333cf8a7be30ccb230257ea4bd572fa1e0bda70e4c34e3adba8c8a5453f1eb77ac4c944e72b315fb87e8e85db6cd8d018927c64230dc4fe WHIRLPOOL d4b80ace0c3c75d6f9dd70358e635b40390efc97698d2afacd6642840a228cb57bb8c81d56a48a5a80cb04aa44b131920782c22755f251534dc43ffbccdb3b32
+EBUILD epson-inkjet-printer-escpr-1.4.4.ebuild 780 SHA256 9b3e8fb3db15942daaca4b99aee8977712f8e508cbd9262c72795585c55ccf61 SHA512 8ea9f3605170eadb3c455d132fec398d0622b672941b8a3a24481ef7a0789c66967c5b22eb80e725f0c266b85481e9b56b507495a52ecfc76bd708ec1d353538 WHIRLPOOL 3522e995beeac44fd9eee3ef2e430fa9b00df10e6786c0f8a0b711c71dabe6a0d39efa0f88caf61601a7fa7432a87307d12716362a8bda51761727b5328c327a
+MISC ChangeLog 689 SHA256 9244b508b4ef141c0bdaf3aebf0afbab2e69dab6e13f655a2998970d0869698b SHA512 5db012f28f36832cadc613fbe390e12a9be670c539beb0cd804dad42811611ac77b74dde6ebc13d05e206ca630269cce00c294aaec9abedddc8a548741a9dfef WHIRLPOOL 9895373eb95146b467217347384832ccfd55834c285244614f442d384942cb8a61d74549ab3efe2668b808310fbdb132f4048aec3120498ddf493d380a932d4f
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS3RxoACgkQC77qH+pIQ6QeNQD/fpSZ5zqUQ3gn8EdxpWhw7d27
-rZtdyVndBwLYhKGXDhsA/RY1hkDfx7uu+F5YdFvoOH6BOu5LO3ya7BB9U7QzjHV3
-=8w1V
+iF4EAREIAAYFAlS3TOsACgkQC77qH+pIQ6QZXQD5ARQkQxtrJzUxq1lWOFDsNLN4
+4XiWVbzRF+ZBlsKrmLcBAI+BnlTFuk2ddCG+aUC2ltnfwCGnlf3A7Tb1E9z+Rs1s
+=IgTu
 -----END PGP SIGNATURE-----

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild
index d96f20261e74c72c8fd48055e3ccca479ac378d1..2388af965e6d896eee05e8f33af77afc0779be74 100644 (file)
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild,v 1.2 2015/01/15 04:50:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild,v 1.3 2015/01/15 05:15:22 floppym Exp $
 
 EAPI=5
 
@@ -18,6 +18,10 @@ IUSE=""
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+       epatch "${FILESDIR}/1.4.4-warnings.patch"
+}
+
 src_configure() {
        econf --disable-static
 }

diff --git a/net-print/epson-inkjet-printer-escpr/files/1.4.4-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.4.4-warnings.patch
new file mode 100644 (file)
index 0000000..34ec173
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.4.4-warnings.patch
@@ -0,0 +1,43 @@
+--- a/lib/epson-escpage-mono.c
++++ b/lib/epson-escpage-mono.c
+@@ -885,7 +885,7 @@
+ \r
+       EPS_LOG_FUNCIN;\r
+ \r
+-      memset(pBand, 0, sizeof(pBand));\r
++      memset(pBand, 0, sizeof(EPS_PAGE_BAND_M));\r
+ \r
+     pBand->WidthInPixels = widthInPixels;\r
+     pBand->WidthInBytes = (pBand->WidthInPixels+7)/8;\r
+--- a/lib/epson-escpr-api.h
++++ b/lib/epson-escpr-api.h
+@@ -98,6 +98,9 @@
+     /*** -------------------------------------------------------------------------------*/\r
+ extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );\r
+ \r
++extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );\r
++extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );\r
++extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );\r
+ #ifdef __cplusplus\r
+ }\r
+ #endif\r
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -38,6 +38,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include "err.h"
+ #include "mem.h"
+ 
+ void *