Created
September 10, 2016 19:57
-
-
Save kylemanna/d9d249c2368481545496827af7687f4d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 10064ec3e45a6730cc85487b0d2c49cac8e35622 Mon Sep 17 00:00:00 2001 | |
From: Kyle Manna <kyle@kylemanna.com> | |
Date: Sat, 10 Sep 2016 12:53:58 -0700 | |
Subject: [PATCH] filter: Fix clang error with debug_msg return void | |
* Clang fails to build due to -Wreturn-type and a void function | |
returning 0. Fix this. | |
--- | |
.SRCINFO | 6 +++++- | |
0001-filter-Fix-debugt_msg-return.patch | 26 ++++++++++++++++++++++++++ | |
PKGBUILD | 10 +++++++--- | |
3 files changed, 38 insertions(+), 4 deletions(-) | |
create mode 100644 0001-filter-Fix-debugt_msg-return.patch | |
diff --git a/.SRCINFO b/.SRCINFO | |
index bd0cf9b..520e699 100644 | |
--- a/.SRCINFO | |
+++ b/.SRCINFO | |
@@ -1,7 +1,9 @@ | |
+# Generated by mksrcinfo v8 | |
+# Sat Sep 10 19:55:45 UTC 2016 | |
pkgbase = epson-inkjet-printer-201212w | |
pkgdesc = Epson printer driver (WF-3010, WF-3520, WF-3530, WF-3540) | |
pkgver = 1.0.0 | |
- pkgrel = 8 | |
+ pkgrel = 9 | |
url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX | |
arch = i686 | |
arch = x86_64 | |
@@ -10,7 +12,9 @@ pkgbase = epson-inkjet-printer-201212w | |
depends = cups | |
depends = ghostscript | |
source = http://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201212w-1.0.0-1lsb3.2.src.rpm | |
+ source = 0001-filter-Fix-debugt_msg-return.patch | |
sha256sums = 822d659ce1c15183a257b0a88b90b3e7ded43071fb7b98cbb5d433be6e298e02 | |
+ sha256sums = a237d7a318654764b2deeacf07a4225c48b19d0e4906ce82d4190c0708942953 | |
pkgname = epson-inkjet-printer-201212w | |
diff --git a/0001-filter-Fix-debugt_msg-return.patch b/0001-filter-Fix-debugt_msg-return.patch | |
new file mode 100644 | |
index 0000000..2344c52 | |
--- /dev/null | |
+++ b/0001-filter-Fix-debugt_msg-return.patch | |
@@ -0,0 +1,26 @@ | |
+From 2ebbc37c211f5f9dbbbca89d759ba66062bf13e8 Mon Sep 17 00:00:00 2001 | |
+From: Kyle Manna <kyle@kylemanna.com> | |
+Date: Sat, 10 Sep 2016 12:49:39 -0700 | |
+Subject: [PATCH] filter: Fix debugt_msg() return | |
+ | |
+* Resolve error: void function 'debugt_msg' should not return a value | |
+--- | |
+ src/err.c | 2 +- | |
+ 1 file changed, 1 insertion(+), 1 deletion(-) | |
+ | |
+diff --git a/src/err.c b/src/err.c | |
+index 65ab02a..cf4bda8 100644 | |
+--- a/src/err.c | |
++++ b/src/err.c | |
+@@ -104,7 +104,7 @@ void debugt_msg(char * fmt, ...) | |
+ fflush(debug_f2); | |
+ va_end (ap); | |
+ #endif | |
+- return 0; | |
++ return; | |
+ } | |
+ | |
+ void | |
+-- | |
+2.9.3 | |
+ | |
diff --git a/PKGBUILD b/PKGBUILD | |
index 6cdd0eb..ba52ac7 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -4,14 +4,16 @@ pkgname=epson-inkjet-printer-201212w | |
_pkgname_filter=epson-inkjet-printer-filter | |
_suffix=1lsb3.2.src.rpm | |
pkgver=1.0.0 | |
-pkgrel=8 | |
+pkgrel=9 | |
pkgdesc="Epson printer driver (WF-3010, WF-3520, WF-3530, WF-3540)" | |
arch=('i686' 'x86_64') | |
url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" | |
license=('LGPL' 'custom:Epson Licence Agreement') | |
depends=('cups' 'ghostscript') | |
#makedepends=('libtool' 'make' 'automake' 'autoconf') | |
-source=(http://download.ebz.epson.net/dsc/op/stable/SRPMS/${pkgname}-${pkgver}-${_suffix}) | |
+source=(http://download.ebz.epson.net/dsc/op/stable/SRPMS/${pkgname}-${pkgver}-${_suffix} | |
+ '0001-filter-Fix-debugt_msg-return.patch' | |
+ ) | |
build() { | |
cd "$srcdir" | |
@@ -20,6 +22,7 @@ build() { | |
tar xzf $FILTER_FILE | |
cd "${FILTER_FILE%.tar.gz}" | |
+ patch -p1 < $srcdir/0001-filter-Fix-debugt_msg-return.patch | |
aclocal | |
libtoolize | |
chmod +x configure | |
@@ -50,4 +53,5 @@ package() { | |
install -d "$pkgdir/opt/$pkgname/cups/lib/filter/" | |
install -m 755 src/epson_inkjet_printer_filter "$pkgdir/opt/$pkgname/cups/lib/filter/epson_inkjet_printer_filter" | |
} | |
-sha256sums=('822d659ce1c15183a257b0a88b90b3e7ded43071fb7b98cbb5d433be6e298e02') | |
+sha256sums=('822d659ce1c15183a257b0a88b90b3e7ded43071fb7b98cbb5d433be6e298e02' | |
+ 'a237d7a318654764b2deeacf07a4225c48b19d0e4906ce82d4190c0708942953') | |
-- | |
2.9.3 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment