Author: martinkg Update of /cvs/free/rpms/vokoscreen/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25503/F-20 Modified Files: vokoscreen-main.patch Log Message: vokoscreen-main.patch: QtSingleApplication/qtsingleapplication.pri | 4 ++-- libqxt/libqxt.pri | 6 +++--- main.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) Index: vokoscreen-main.patch =================================================================== RCS file: /cvs/free/rpms/vokoscreen/F-20/vokoscreen-main.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vokoscreen-main.patch 28 Sep 2014 15:51:00 -0000 1.1 +++ vokoscreen-main.patch 23 Nov 2014 09:59:21 -0000 1.2 @@ -1,43 +1,43 @@ ---- main.orig.cpp 2014-03-19 08:46:47.000000000 +0100 -+++ main.cpp 2014-09-20 11:51:16.903702078 +0200 -@@ -17,7 +17,7 @@ - - #include "screencast.h" - //#include <QSplashScreen> --#include <QtSingleApplication/qtsingleapplication.h> -+#include <qtsingleapplication.h> - #include <QDebug> - #include <QTranslator> - #include <QLocale> - ---- QtSingleApplication/qtsingleapplication.orig.pri 2014-03-19 08:46:47.000000000 +0100 -+++ QtSingleApplication/qtsingleapplication.pri 2014-09-20 12:19:44.953276406 +0200 -@@ -1,4 +1,4 @@ --INCLUDEPATH += $$PWD -+INCLUDEPATH += /usr/include - DEPENDPATH += $$PWD - QT *= network - -@@ -6,7 +6,7 @@ - LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME - } else { - SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp -- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h -+ HEADERS += $$INCLUDEPATH/QtSolutions/qtsingleapplication.h $$PWD/qtlocalpeer.h - } - - win32 { - ---- libqxt/libqxt.orig.pri 2014-03-19 08:46:47.000000000 +0100 -+++ libqxt/libqxt.pri 2014-09-20 12:08:57.727640675 +0200 -@@ -1,6 +1,6 @@ - --INCLUDEPATH += $$PWD -+INCLUDEPATH += /usr/include - DEPENDPATH += $$PWD --HEADERS += $$PWD/qxtglobal.h $$PWD/qxtwindowsystem.h $$PWD/qxtglobalshortcut.h $$PWD/qxtglobalshortcut_p.h -+HEADERS += $$INCLUDEPATH/QxtCore/qxtglobal.h $$INCLUDEPATH/QxtGui/qxtwindowsystem.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut_p.h - SOURCES += $$PWD/qxtglobal.cpp $$PWD/qxtwindowsystem_x11.cpp $$PWD/qxtglobalshortcut_x11.cpp $$PWD/qxtglobalshortcut.cpp --LIBS += -lX11 -\ No newline at end of file -+LIBS += -lX11 +--- main.orig.cpp 2014-03-19 08:46:47.000000000 +0100 ++++ main.cpp 2014-09-20 11:51:16.903702078 +0200 +@@ -17,7 +17,7 @@ + + #include "screencast.h" + //#include <QSplashScreen> +-#include <QtSingleApplication/qtsingleapplication.h> ++#include <qtsingleapplication.h> + #include <QDebug> + #include <QTranslator> + #include <QLocale> + +--- QtSingleApplication/qtsingleapplication.orig.pri 2014-03-19 08:46:47.000000000 +0100 ++++ QtSingleApplication/qtsingleapplication.pri 2014-09-20 12:19:44.953276406 +0200 +@@ -1,4 +1,4 @@ +-INCLUDEPATH += $$PWD ++INCLUDEPATH += /usr/include + DEPENDPATH += $$PWD + QT *= network + +@@ -6,7 +6,7 @@ + LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME + } else { + SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp +- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h ++ HEADERS += $$INCLUDEPATH/QtSolutions/qtsingleapplication.h $$PWD/qtlocalpeer.h + } + + win32 { + +--- libqxt/libqxt.orig.pri 2014-03-19 08:46:47.000000000 +0100 ++++ libqxt/libqxt.pri 2014-09-20 12:08:57.727640675 +0200 +@@ -1,6 +1,6 @@ + +-INCLUDEPATH += $$PWD ++INCLUDEPATH += /usr/include + DEPENDPATH += $$PWD +-HEADERS += $$PWD/qxtglobal.h $$PWD/qxtwindowsystem.h $$PWD/qxtglobalshortcut.h $$PWD/qxtglobalshortcut_p.h ++HEADERS += $$INCLUDEPATH/QxtCore/qxtglobal.h $$INCLUDEPATH/QxtGui/qxtwindowsystem.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut_p.h + SOURCES += $$PWD/qxtglobal.cpp $$PWD/qxtwindowsystem_x11.cpp $$PWD/qxtglobalshortcut_x11.cpp $$PWD/qxtglobalshortcut.cpp +-LIBS += -lX11 +\ No newline at end of file ++LIBS += -lX11