diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2013-12-29 02:30:49 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2013-12-29 02:30:49 +0000 |
| commit | e00c0eff6beeb015bec223f02d8f5226b529fc68 (patch) | |
| tree | 58e9ceedd9f7ef85d5472f5a81dc189205327cf0 /dev-db/wxsqlite3 | |
| parent | Bump for CVE-2013-6436 and CVE-2013-6457 (diff) | |
| download | gentoo-2-e00c0eff6beeb015bec223f02d8f5226b529fc68.tar.gz gentoo-2-e00c0eff6beeb015bec223f02d8f5226b529fc68.tar.bz2 gentoo-2-e00c0eff6beeb015bec223f02d8f5226b529fc68.zip | |
Add debug USE flag and remove unicode (bug #143950).
Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Diffstat (limited to 'dev-db/wxsqlite3')
| -rw-r--r-- | dev-db/wxsqlite3/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in | 2 | ||||
| -rw-r--r-- | dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild | 12 |
3 files changed, 14 insertions, 6 deletions
diff --git a/dev-db/wxsqlite3/ChangeLog b/dev-db/wxsqlite3/ChangeLog index 74aa59a1e23d..631840dd3ba7 100644 --- a/dev-db/wxsqlite3/ChangeLog +++ b/dev-db/wxsqlite3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/wxsqlite3 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/wxsqlite3/ChangeLog,v 1.3 2013/12/28 22:29:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/wxsqlite3/ChangeLog,v 1.4 2013/12/29 02:30:49 dirtyepic Exp $ + + 29 Dec 2013; Ryan Hill <dirtyepic@gentoo.org> wxsqlite3-3.0.6.1-r1.ebuild, + files/wxsqlite3-3.0.6.1.pc.in: + Add debug USE flag and remove unicode (bug #143950). *wxsqlite3-3.0.6.1-r1 (28 Dec 2013) diff --git a/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in b/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in index 4bbe1041f466..fe30b1f5d467 100644 --- a/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in +++ b/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in @@ -9,6 +9,6 @@ Name: wxsqlite3-@WXVERSION@ Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets Version: @VERSION@ #Requires: sqlite3 -Libs: -L${libdir} -lwxcode_gtk2u_wxsqlite3-@WXVERSION@ +Libs: -L${libdir} -lwxcode_gtk2u@WXDEBUG@_wxsqlite3-@WXVERSION@ Libs.private: -lpthread Cflags: -I${includedir} diff --git a/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild b/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild index 70a15efd4d76..0098614c1bdd 100644 --- a/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild +++ b/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild,v 1.1 2013/12/28 22:29:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild,v 1.2 2013/12/29 02:30:49 dirtyepic Exp $ EAPI=5 @@ -15,19 +15,23 @@ SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz" LICENSE="wxWinLL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="unicode" +IUSE="debug" DEPEND=" - x11-libs/wxGTK:2.8[X] + x11-libs/wxGTK:2.8[X,debug=] dev-db/sqlite:3" RDEPEND="${DEPEND}" S="${WORKDIR}/${P%.1}" src_prepare() { + local wxdebug + rm -rf sqlite3 || die cp configure28 configure || die + use debug && wxdebug="d" sed \ + -e "s:@WXDEBUG@:${wxdebug}:g" \ -e "s:@WXVERSION@:${WX_GTK_VER}:g" \ -e "s:@LIBDIR@:$(get_libdir):g" \ -e "s:@VERSION@:${PV}:g" \ @@ -36,8 +40,8 @@ src_prepare() { src_configure() { econf \ - $(use_enable unicode) \ --enable-shared \ + --enable-unicode \ --with-wx-config="${WX_CONFIG}" \ --with-wxshared \ --with-sqlite3-prefix="${PREFIX}/usr" |