From b534e5079948c93c510fed6fd1b51f84ace48e48 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Sat, 6 Dec 2014 17:33:58 -0500
Subject: Initial import.

---
 debian/patches/cpp4.9_incompatibilities.patch | 67 +++++++++++++++++++++++++++
 debian/patches/disable_rpath.patch            | 39 ++++++++++++++++
 debian/patches/fix_tcl_path.patch             | 18 +++++++
 debian/patches/series                         |  3 ++
 4 files changed, 127 insertions(+)
 create mode 100644 debian/patches/cpp4.9_incompatibilities.patch
 create mode 100644 debian/patches/disable_rpath.patch
 create mode 100644 debian/patches/fix_tcl_path.patch
 create mode 100644 debian/patches/series

(limited to 'debian/patches')

diff --git a/debian/patches/cpp4.9_incompatibilities.patch b/debian/patches/cpp4.9_incompatibilities.patch
new file mode 100644
index 0000000..a089d8f
--- /dev/null
+++ b/debian/patches/cpp4.9_incompatibilities.patch
@@ -0,0 +1,67 @@
+Description: Fix some gcc 4.9 incompatibilities.
+Author: Unit 193 <unit193@ninthfloor.org>
+Origin: vendor
+Forwarded: yes
+Bug: http://bugs.sqlitestudio.pl/?id=2678
+Last-Update: 2014-10-28
+
+--- sqlitestudio-2.99.1.orig/SQLiteStudio3/coreSQLiteStudio/common/utils.h
++++ sqlitestudio-2.99.1/SQLiteStudio3/coreSQLiteStudio/common/utils.h
+@@ -8,6 +8,7 @@
+ #include <QChar>
+ #include <QStringList>
+ #include <QFileInfo>
++#include <functional>
+ 
+ class QTextCodec;
+ 
+--- sqlitestudio-2.99.1.orig/SQLiteStudio3/coreSQLiteStudio/plugins/plugintype.h
++++ sqlitestudio-2.99.1/SQLiteStudio3/coreSQLiteStudio/plugins/plugintype.h
+@@ -5,6 +5,7 @@
+ #include <QList>
+ #include <QString>
+ #include <QObject>
++#include <typeinfo>
+ 
+ class Plugin;
+ 
+--- sqlitestudio-2.99.1.orig/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h
++++ sqlitestudio-2.99.1/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h
+@@ -7,6 +7,7 @@
+ #include <QSharedPointer>
+ #include <QObject>
+ #include <QStringList>
++#include <functional>
+ 
+ class Db;
+ 
+--- sqlitestudio-2.99.1.orig/SQLiteStudio3/guiSQLiteStudio/common/datawidgetmapper.h
++++ sqlitestudio-2.99.1/SQLiteStudio3/guiSQLiteStudio/common/datawidgetmapper.h
+@@ -3,6 +3,7 @@
+ 
+ #include <QObject>
+ #include <QHash>
++#include <functional>
+ 
+ class QAbstractItemModel;
+ 
+--- sqlitestudio-2.99.1.orig/SQLiteStudio3/guiSQLiteStudio/common/verifiablewizardpage.h
++++ sqlitestudio-2.99.1/SQLiteStudio3/guiSQLiteStudio/common/verifiablewizardpage.h
+@@ -3,6 +3,7 @@
+ 
+ #include "guiSQLiteStudio_global.h"
+ #include <QWizardPage>
++#include <functional>
+ 
+ class GUI_API_EXPORT VerifiableWizardPage : public QWizardPage
+ {
+--- sqlitestudio-2.99.1.orig/SQLiteStudio3/guiSQLiteStudio/uiloader.h
++++ sqlitestudio-2.99.1/SQLiteStudio3/guiSQLiteStudio/uiloader.h
+@@ -6,6 +6,7 @@
+ #include <QHash>
+ #include <QStack>
+ #include <QXmlDefaultHandler>
++#include <functional>
+ 
+ class UiLoaderPropertyHandler;
+ 
diff --git a/debian/patches/disable_rpath.patch b/debian/patches/disable_rpath.patch
new file mode 100644
index 0000000..a533d15
--- /dev/null
+++ b/debian/patches/disable_rpath.patch
@@ -0,0 +1,39 @@
+Description: Don't use rpath, https://wiki.debian.org/RpathIssue
+Author: Unit 193 <unit193@ninthfloor.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2014-11-10
+
+--- sqlitestudio-2.99.2.orig/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro
++++ sqlitestudio-2.99.2/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro
+@@ -21,7 +21,7 @@ LIBS += -lcoreSQLiteStudio
+ 
+ TEMPLATE = app
+ 
+-linux|portable {
++portable {
+     QMAKE_LFLAGS += -Wl,-rpath,./lib
+ }
+ 
+--- sqlitestudio-2.99.2.orig/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
++++ sqlitestudio-2.99.2/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
+@@ -25,7 +25,7 @@ TEMPLATE = app
+ 
+ CONFIG   += c++11
+ QMAKE_CXXFLAGS += -pedantic
+-linux|portable {
++portable {
+     QMAKE_LFLAGS += -Wl,-rpath,./lib
+ }
+ 
+--- sqlitestudio-2.99.2.orig/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro
++++ sqlitestudio-2.99.2/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro
+@@ -21,7 +21,7 @@ TEMPLATE = app
+ 
+ CONFIG   += c++11
+ QMAKE_CXXFLAGS += -pedantic
+-linux|portable {
++portable {
+     QMAKE_LFLAGS += -Wl,-rpath,./lib
+ }
+ 
diff --git a/debian/patches/fix_tcl_path.patch b/debian/patches/fix_tcl_path.patch
new file mode 100644
index 0000000..3928ac4
--- /dev/null
+++ b/debian/patches/fix_tcl_path.patch
@@ -0,0 +1,18 @@
+Description: Correct the tcl.h path to tcl/tcl.h.
+Author: Unit 193 <unit193@ninthfloor.org>
+Origin: vendor
+Forwarded: yes
+Bug: http://bugs.sqlitestudio.pl/?id=2679
+Last-Update: 2014-11-10
+
+--- sqlitestudio-2.99.2.orig/Plugins/ScriptingTcl/scriptingtcl.h
++++ sqlitestudio-2.99.2/Plugins/ScriptingTcl/scriptingtcl.h
+@@ -6,7 +6,7 @@
+ #include "plugins/scriptingplugin.h"
+ #include "db/sqlquery.h"
+ #include <QCache>
+-#include <tcl.h>
++#include <tcl/tcl.h>
+ 
+ class QMutex;
+ struct Tcl_Interp;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1bec71b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+cpp4.9_incompatibilities.patch
+fix_tcl_path.patch
+disable_rpath.patch
-- 
cgit v1.2.3