From 4680c8c562bbd2b1164379131908efc65445b4a5 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 18 May 2017 18:56:57 +0200 Subject: [PATCH] dev-db/wxsqlite3: bump to 3.5.3 --- .../wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch | 31 ------------------- ...wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch | 27 ---------------- ....1.exheres-0 => wxsqlite3-3.5.3.exheres-0} | 7 +---- 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch delete mode 100644 packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch rename packages/dev-db/wxsqlite3/{wxsqlite3-3.5.1.exheres-0 => wxsqlite3-3.5.3.exheres-0} (80%) diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch deleted file mode 100644 index 98a78831..00000000 --- a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d13a710fc0f362a98438db9a55b56136d58c94cc Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Sun, 5 Feb 2017 15:42:55 +0100 -Subject: [PATCH 1/2] Fix wxsqlite3.pc -Upstream: pending https://github.com/utelle/wxsqlite3/pull/10 - -For more information see https://autotools.io/pkgconfig/file-format.html ---- - wxsqlite3.pc.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/wxsqlite3.pc.in b/wxsqlite3.pc.in -index 65ea404..39fe17a 100644 ---- a/wxsqlite3.pc.in -+++ b/wxsqlite3.pc.in -@@ -1,9 +1,9 @@ - # Package Information for pkg-config - --prefix=/usr -+prefix=@prefix@ - wxver=@WX_VERSION_MAJOR@.@WX_VERSION_MINOR@ --includedir=${prefix}/include/wx-${wxver}/ --libdir=${prefix}/@LIBDIR@ -+includedir=@includedir@ -+libdir=@libdir@ - - Name: wxsqlite3-@WX_VERSION_MAJOR@.@WX_VERSION_MINOR@ - Description: SQLite3 C++ wrapper for use in programs based on wxWidgets --- -2.11.0 - diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch deleted file mode 100644 index beb1b621..00000000 --- a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50fa069824950451a5a8c9a96f9de17ba897786e Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Sun, 5 Feb 2017 15:55:09 +0100 -Subject: [PATCH] Install wxsqlite3.pc -Upstream: pending https://github.com/utelle/wxsqlite3/pull/10 - ---- - Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 521d963..50e0643 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -19,6 +19,9 @@ LDADD = lib@WXSQLITE3_LIBNAME@.la $(WX_LIBS) - # Define the directory where the library headers are installed. - includewxdir = $(includedir)/wx - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = wxsqlite3.pc -+ - # The main library. Notice that it uses dynamic, i.e. determined when running - # configure, name because it depends on the version of wxWidgets used. This is - # rather unusual, but Automake doesn't seem to mind. --- -2.11.0 - diff --git a/packages/dev-db/wxsqlite3/wxsqlite3-3.5.1.exheres-0 b/packages/dev-db/wxsqlite3/wxsqlite3-3.5.3.exheres-0 similarity index 80% rename from packages/dev-db/wxsqlite3/wxsqlite3-3.5.1.exheres-0 rename to packages/dev-db/wxsqlite3/wxsqlite3-3.5.3.exheres-0 index a511b6f7..876256b6 100644 --- a/packages/dev-db/wxsqlite3/wxsqlite3-3.5.1.exheres-0 +++ b/packages/dev-db/wxsqlite3/wxsqlite3-3.5.3.exheres-0 @@ -16,15 +16,10 @@ MYOPTIONS=" DEPENDENCIES=" build+run: - dev-db/sqlite:3[>=3.12.1] + dev-db/sqlite:3[>=3.18.0] x11-libs/wxGTK:${SLOT}[providers:gtk3?][providers:gtk2?] " -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-Fix-wxsqlite3.pc.patch - "${FILES}"/${PNV}-Install-wxsqlite3.pc.patch -) - src_configure() { econf \ --with-wx-config="/usr/$(exhost --target)/bin/wx-config-${SLOT}-$(option providers:gtk3 gtk3 gtk2)"