From c43d4d2634a5e58ad35a521fba474af87b42b567 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 14 Aug 2016 15:35:39 +0200 Subject: [PATCH] dev-db/wxsqlite3: bump to 3.4.0 --- ...dir.patch => wxsqlite3-3.4.0-respect-includedir.patch} | 6 +++--- ...xsqlite3-3.3.1.exheres-0 => wxsqlite3-3.4.0.exheres-0} | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) rename packages/dev-db/wxsqlite3/files/{wxsqlite3-3.3.1-respect-includedir.patch => wxsqlite3-3.4.0-respect-includedir.patch} (94%) rename packages/dev-db/wxsqlite3/{wxsqlite3-3.3.1.exheres-0 => wxsqlite3-3.4.0.exheres-0} (89%) diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.3.1-respect-includedir.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.4.0-respect-includedir.patch similarity index 94% rename from packages/dev-db/wxsqlite3/files/wxsqlite3-3.3.1-respect-includedir.patch rename to packages/dev-db/wxsqlite3/files/wxsqlite3-3.4.0-respect-includedir.patch index 62263f14..17fbd800 100644 --- a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.3.1-respect-includedir.patch +++ b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.4.0-respect-includedir.patch @@ -6,7 +6,7 @@ Subject: [PATCH] MAKE: respect --includedir configure flag bakefile is a completely broken build system, this is the 'cleanest' solution I could come up with. -Upstream: no, in discussion https://github.com/utelle/wxsqlite3/issues/3 +Upstream: no, https://github.com/utelle/wxsqlite3/issues/3 --- build/wxsqlite3.bkl | 8 ++++---- wx | 1 + @@ -17,8 +17,8 @@ Upstream: no, in discussion https://github.com/utelle/wxsqlite3/issues/3 diff --git a/build/wxsqlite3.bkl b/build/wxsqlite3.bkl index 7d0f380..92d4b94 100644 ---- a/build/wxsqlite3.bkl -+++ b/build/wxsqlite3.bkl +--- a/build30/wxsqlite3.bkl ++++ b/build30/wxsqlite3.bkl @@ -22,10 +22,10 @@ diff --git a/packages/dev-db/wxsqlite3/wxsqlite3-3.3.1.exheres-0 b/packages/dev-db/wxsqlite3/wxsqlite3-3.4.0.exheres-0 similarity index 89% rename from packages/dev-db/wxsqlite3/wxsqlite3-3.3.1.exheres-0 rename to packages/dev-db/wxsqlite3/wxsqlite3-3.4.0.exheres-0 index d7b42889..84c70501 100644 --- a/packages/dev-db/wxsqlite3/wxsqlite3-3.3.1.exheres-0 +++ b/packages/dev-db/wxsqlite3/wxsqlite3-3.4.0.exheres-0 @@ -28,7 +28,15 @@ DEFAULT_SRC_PREPARE_PATCHES=( src_prepare() { default + + ln -s build30 build edo pushd build + + # upstream is completely clueless as to what they are doing + edo sed -i \ + -e 's#^m4_include.*$#m4_include(../wxcode/autoconf/wxcode.m4)#' \ + configure.ac + edo bakefile_gen -f autoconf edo eaclocal edo eautoconf