diff options
author | Unit 193 <unit193@ubuntu.com> | 2015-01-30 19:32:48 -0500 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2015-01-30 19:32:48 -0500 |
commit | f359735b60cd4ad55a99695c7009a5ba66825e6b (patch) | |
tree | 6b756d8c2e3183fadf72ade259739e15d581462f | |
parent | e4767514ed04e6a0bddf3f4a47f5f0b09e65e0ee (diff) | |
download | sqlitestudio-f359735b60cd4ad55a99695c7009a5ba66825e6b.tar.bz2 sqlitestudio-f359735b60cd4ad55a99695c7009a5ba66825e6b.tar.xz sqlitestudio-f359735b60cd4ad55a99695c7009a5ba66825e6b.tar.zst |
Refresh patches.
-rw-r--r-- | debian/patches/disable_rpath.patch | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/debian/patches/disable_rpath.patch b/debian/patches/disable_rpath.patch index a533d15..4a8bb0a 100644 --- a/debian/patches/disable_rpath.patch +++ b/debian/patches/disable_rpath.patch @@ -2,10 +2,12 @@ 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 +Last-Update: 2015-01-30 ---- sqlitestudio-2.99.2.orig/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro -+++ sqlitestudio-2.99.2/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro +Index: sqlitestudio/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro +=================================================================== +--- sqlitestudio.orig/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro ++++ sqlitestudio/SQLiteStudio3/UpdateSQLiteStudio/UpdateSQLiteStudio.pro @@ -21,7 +21,7 @@ LIBS += -lcoreSQLiteStudio TEMPLATE = app
@@ -15,25 +17,29 @@ Last-Update: 2014-11-10 QMAKE_LFLAGS += -Wl,-rpath,./lib
}
---- sqlitestudio-2.99.2.orig/SQLiteStudio3/sqlitestudio/sqlitestudio.pro -+++ sqlitestudio-2.99.2/SQLiteStudio3/sqlitestudio/sqlitestudio.pro +Index: sqlitestudio/SQLiteStudio3/sqlitestudio/sqlitestudio.pro +=================================================================== +--- sqlitestudio.orig/SQLiteStudio3/sqlitestudio/sqlitestudio.pro ++++ sqlitestudio/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 + + CONFIG += c++11 + QMAKE_CXXFLAGS += -pedantic +-linux|portable { ++portable { + QMAKE_LFLAGS += -Wl,-rpath,./lib + } + +Index: sqlitestudio/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro +=================================================================== +--- sqlitestudio.orig/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro ++++ sqlitestudio/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro @@ -21,7 +21,7 @@ TEMPLATE = app -
- CONFIG += c++11
- QMAKE_CXXFLAGS += -pedantic
--linux|portable {
-+portable {
- QMAKE_LFLAGS += -Wl,-rpath,./lib
- }
-
+ + CONFIG += c++11 + QMAKE_CXXFLAGS += -pedantic +-linux|portable { ++portable { + QMAKE_LFLAGS += -Wl,-rpath,./lib + } + |