diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.3.1-respect-includedir.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.3.1-respect-includedir.patch new file mode 100644 index 00000000..62263f14 --- /dev/null +++ b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.3.1-respect-includedir.patch @@ -0,0 +1,82 @@ +From 4674332a4edfa415cda74acbbe6552eaa938d966 Mon Sep 17 00:00:00 2001 +From: Julian Ospald <hasufell@posteo.de> +Date: Sat, 14 May 2016 13:07:04 +0200 +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 +--- + build/wxsqlite3.bkl | 8 ++++---- + wx | 1 + + wxcode/bakefiles/presets/defaults.bkl | 2 +- + wxcode/bakefiles/presets/templates.bkl | 4 ++-- + 4 files changed, 8 insertions(+), 7 deletions(-) + create mode 120000 wx + +diff --git a/build/wxsqlite3.bkl b/build/wxsqlite3.bkl +index 7d0f380..92d4b94 100644 +--- a/build/wxsqlite3.bkl ++++ b/build/wxsqlite3.bkl +@@ -22,10 +22,10 @@ + + <!-- COMP_HDR lists the component's headers with path relative to ../include --> + <set var="COMP_HDR"> +- include/wx/wxsqlite3def.h +- include/wx/wxsqlite3.h +- include/wx/wxsqlite3dyn.h +- include/wx/wxsqlite3opt.h ++ wx/wxsqlite3def.h ++ wx/wxsqlite3.h ++ wx/wxsqlite3dyn.h ++ wx/wxsqlite3opt.h + </set> + + <set var="USE_DYNAMIC_SQLITE3_LOAD_DEFAULT">0</set> +diff --git a/wx b/wx +new file mode 120000 +index 0000000..b00f3db +--- /dev/null ++++ b/wx +@@ -0,0 +1 @@ ++include/wx +\ No newline at end of file +diff --git a/wxcode/bakefiles/presets/defaults.bkl b/wxcode/bakefiles/presets/defaults.bkl +index f653bad..37ab793 100644 +--- a/wxcode/bakefiles/presets/defaults.bkl ++++ b/wxcode/bakefiles/presets/defaults.bkl +@@ -23,7 +23,7 @@ + you can set them once in these vars and wxcode-* templates will automatically + use them. --> + <set var="COMP_SRC" overwrite="0">$(fileList('src/*.c*'))</set> +- <set var="COMP_HDR" overwrite="0">$(fileList('include/wx/*.h'))</set> ++ <set var="COMP_HDR" overwrite="0">$(fileList('wx/*.h'))</set> + + + <!-- A simple variable used to understand if we are --> +diff --git a/wxcode/bakefiles/presets/templates.bkl b/wxcode/bakefiles/presets/templates.bkl +index a18433f..d33cdf8 100644 +--- a/wxcode/bakefiles/presets/templates.bkl ++++ b/wxcode/bakefiles/presets/templates.bkl +@@ -54,7 +54,7 @@ + + <template id="wxcode-lib" template="wx-lib,wxlike,wxcode-basic"> + <install-to>$(LIBDIR)</install-to> +- <install-headers-to>$(PREFIX)</install-headers-to> ++ <install-headers-to>$(INCLUDEDIR)</install-headers-to> + + <wxcode-dirname>$(SRCDIR)/lib</wxcode-dirname> + <wxlike-libname prefix="wxcode">$(COMP_NAME)</wxlike-libname> +@@ -65,7 +65,7 @@ + + <template id="wxcode-dll" template="wx,wxlike,wxcode-basic"> + <install-to>$(LIBDIR)</install-to> +- <install-headers-to>$(PREFIX)</install-headers-to> ++ <install-headers-to>$(INCLUDEDIR)</install-headers-to> + + <wxlike-dirname>$(SRCDIR)/lib</wxlike-dirname> + <wxlike-dllname prefix="wxcode">$(COMP_NAME)</wxlike-dllname> +-- +2.8.1 + diff --git a/packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0 b/packages/dev-db/wxsqlite3/wxsqlite3-3.3.1.exheres-0 similarity index 67% rename from packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0 rename to packages/dev-db/wxsqlite3/wxsqlite3-3.3.1.exheres-0 index 3a49be6c..a7d542c2 100644 --- a/packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0 +++ b/packages/dev-db/wxsqlite3/wxsqlite3-3.3.1.exheres-0 @@ -1,6 +1,8 @@ # Copyright 2016 Julian Ospald <hasufell@posteo.de> # Distributed under the terms of the GNU General Public License v2 + +require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ] require github [ user=utelle tag=v${PV} ] SUMMARY="C++ wrapper around the public domain SQLite 3.x database" @@ -13,18 +15,37 @@ MYOPTIONS=" " DEPENDENCIES=" + build: + dev-util/bakefile[~0.2.9] build+run: - dev-db/sqlite:3 + dev-db/sqlite:3[>=3.12.1] x11-libs/wxGTK:${SLOT}[providers:gtk3?][providers:gtk2?] " +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PNV}-respect-includedir.patch +) + +src_prepare() { + default + edo pushd build + edo bakefile_gen -f autoconf + edo eaclocal + edo eautoconf + edo mv configure .. + edo popd +} + src_configure() { econf \ --enable-shared \ --enable-unicode \ --with-wx-config="/usr/$(exhost --target)/lib/wx/config/$(option providers:gtk3 'gtk3' 'gtk2')-unicode-3.0" \ --with-wxshared \ - --with-sqlite3-prefix="/usr/$(exhost --target)" + --with-sqlite3-prefix="/usr/$(exhost --target)" \ + --includedir="/usr/$(exhost --target)/include/wx-${SLOT}/" \ + --hates=disable-silent-rules \ + --hates=enable-fast-install } src_install() {