From 1bb53029fe891d6540332ae17c2194dda9060338 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Mon, 13 Jun 2016 20:14:29 -0400 Subject: d/p/correct_includes.patch: Expand to fix DbSqliteCipher too. --- debian/patches/correct_dbadnroid_include.patch | 17 ---------------- debian/patches/correct_includes.patch | 28 ++++++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 29 insertions(+), 18 deletions(-) delete mode 100644 debian/patches/correct_dbadnroid_include.patch create mode 100644 debian/patches/correct_includes.patch diff --git a/debian/patches/correct_dbadnroid_include.patch b/debian/patches/correct_dbadnroid_include.patch deleted file mode 100644 index b2d1368..0000000 --- a/debian/patches/correct_dbadnroid_include.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix an include that otherwise causes an FTBFS. -Author: Unit 193 -Origin: vendor -Forwarded: no -Last-Update: 2015-11-25 - ---- sqlitestudio-3.0.7.orig/Plugins/DbAndroid/DbAndroid.pro -+++ sqlitestudio-3.0.7/Plugins/DbAndroid/DbAndroid.pro -@@ -6,7 +6,7 @@ - - QT += widgets network - --include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri) -+include($$PWD/../../SQLiteStudio3/plugins.pri) - - TARGET = DbAndroid - TEMPLATE = lib diff --git a/debian/patches/correct_includes.patch b/debian/patches/correct_includes.patch new file mode 100644 index 0000000..af96e41 --- /dev/null +++ b/debian/patches/correct_includes.patch @@ -0,0 +1,28 @@ +Description: Fix a couple includes that otherwise cause FTBFS. +Author: Unit 193 +Origin: vendor +Forwarded: no +Last-Update: 2016-06-13 + +--- sqlitestudio-3.0.7.orig/Plugins/DbAndroid/DbAndroid.pro ++++ sqlitestudio-3.0.7/Plugins/DbAndroid/DbAndroid.pro +@@ -6,7 +6,7 @@ + + QT += widgets network + +-include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri) ++include($$PWD/../../SQLiteStudio3/plugins.pri) + + TARGET = DbAndroid + TEMPLATE = lib +--- sqlitestudio-3.1.0.orig/Plugins/DbSqliteCipher/DbSqliteCipher.pro ++++ sqlitestudio-3.1.0/Plugins/DbSqliteCipher/DbSqliteCipher.pro +@@ -6,7 +6,7 @@ + + QT -= gui + +-include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri) ++include($$PWD/../../SQLiteStudio3/plugins.pri) + + TARGET = DbSqliteCipher + TEMPLATE = lib diff --git a/debian/patches/series b/debian/patches/series index 16e07b8..135005a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ disable_rpath.patch -correct_dbadnroid_include.patch +correct_includes.patch -- cgit v1.2.3