Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / applications / networking / linssid / 0001-unbundled-qwt.patch
blob46224ede33d40f5661f1d2d54f82928aad5aa7b2
1 From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001
2 From: Thomas Tuegel <ttuegel@gmail.com>
3 Date: Sat, 19 Sep 2015 11:10:32 -0500
4 Subject: [PATCH] unbundled qwt
6 ---
7 linssid-app/linssid-app.pro | 4 +---
8 linssid.pro | 4 +---
9 2 files changed, 2 insertions(+), 6 deletions(-)
11 diff --git a/linssid-app/linssid-app.pro b/linssid-app/linssid-app.pro
12 index 26f61e7..7b80b60 100644
13 --- a/linssid-app/linssid-app.pro
14 +++ b/linssid-app/linssid-app.pro
15 @@ -19,13 +19,11 @@ QMAKE_CC = gcc
16 QMAKE_CXX = g++
17 DEFINES +=
18 INCLUDEPATH += /usr/include/qt5
19 -# /usr/local/qwt-6.1.0/include
20 -INCLUDEPATH += ../qwt-lib/src
21 # LIBS += /usr/lib/x86_64-linux-gnu/libboost_regex.a
22 # LIBS += -lboost_regex
23 LIBS += -l:libboost_regex.a
24 # /usr/local/qwt-6.1.0/lib/libqwt.a
25 -LIBS += ../qwt-lib/lib/libqwt.a
26 +LIBS += -lqwt
27 QMAKE_CXXFLAGS += -std=c++11
29 TARGET = linssid
30 diff --git a/linssid.pro b/linssid.pro
31 index 42dc277..26d1a2c 100644
32 --- a/linssid.pro
33 +++ b/linssid.pro
34 @@ -1,5 +1,3 @@
35 TEMPLATE = subdirs
36 CONFIG += ordered
37 -SUBDIRS = qwt-lib \
38 - linssid-app
39 -linssid-app.depends = qwt-lib
40 +SUBDIRS = linssid-app
41 --
42 2.5.2