pkgbuild/scidavis/scidavis-origin.patch
2014-07-23 13:45:01 +04:00

34 lines
1.1 KiB
Diff

diff -ruN scidavis.1.D8.orig/config.pri scidavis.1.D8/config.pri
--- scidavis.1.D8.orig/config.pri 2014-07-23 12:39:15.000000000 +0400
+++ scidavis.1.D8/config.pri 2014-07-23 13:37:24.654969180 +0400
@@ -198,7 +198,7 @@
# code for maintained branch of liborigin.
contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += ../3rdparty/liborigin/liborigin.a
+# LIBS += ../3rdparty/liborigin/liborigin.a
INCLUDEPATH += ../3rdparty/liborigin
}
@@ -274,6 +274,8 @@
# LIBS += -L../3rdparty/liborigin -lorigin
# INCLUDEPATH += ../3rdparty/liborigin
# }
+ INCLUDEPATH += /usr/include/liborigin2
+ LIBS += -lorigin2
}
contains(PRESET, self_contained) {
diff -ruN scidavis.1.D8.orig/scidavis.pro scidavis.1.D8/scidavis.pro
--- scidavis.1.D8.orig/scidavis.pro 2014-07-23 09:01:09.000000000 +0400
+++ scidavis.1.D8/scidavis.pro 2014-07-23 13:37:01.634969788 +0400
@@ -7,7 +7,7 @@
#################################################
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/liborigin scidavis test
+SUBDIRS = scidavis test
CONFIG+=ordered
# Overwrite the qmake generated Makefile by the cmake one