X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from ncopa-desktop.alpinelinux.org (3.203.202.84.customer.cdi.no [84.202.203.3]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by mail.alpinelinux.org (Postfix) with ESMTPSA id DDD01DC0265; Tue, 15 Jul 2014 14:28:20 +0000 (UTC) Date: Tue, 15 Jul 2014 16:28:18 +0200 From: Natanael Copa To: Isaac Dunham Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH] testing/sword: add new package Message-ID: <20140715162818.0f5adca9@ncopa-desktop.alpinelinux.org> In-Reply-To: <1405457044-3186-1-git-send-email-ibid.ag@gmail.com> References: <1405457044-3186-1-git-send-email-ibid.ag@gmail.com> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-alpine-linux-musl) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 15 Jul 2014 13:44:04 -0700 Isaac Dunham wrote: > Sword is a library for free Bible software. > It can also be used for other books. ... > +++ b/testing/sword/01-corediatheke.patch > @@ -0,0 +1,18 @@ > +diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp > +index 6e05e7c..c2b6efb 100644 > +--- a/utilities/diatheke/corediatheke.cpp > ++++ b/utilities/diatheke/corediatheke.cpp > +@@ -454,7 +454,6 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI > + if (font) { *output << "style=\"font:\"" << font << ";\" " ;} > + if (strcmp(modlocale,locale) !=0 ) { *output << "lang=\"" << modlocale << "\"";} > + *output << ">"; > +- } > + } > + > + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { > +@@ -498,4 +497,4 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI > + } > + > + } > +- > ++} I saw your work with upstream to get this fixed. What I find interesting is that they didn't catch an error like this upstream. Why didn't the problem show up on glibc? musl again causes hidden bugs bubble up to the surface. Good job! Applied. Thanks! -nc --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---