The branch, master has been updated via f330ab5f4ec1caa3fe3e81788ca7784cebaa931e (commit) from 0848056ce8186bb01c9691ee3c2fe59e9112a9b7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f330ab5f4ec1caa3fe3e81788ca7784cebaa931e Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Dec 12 13:52:22 2013 +0100 build on older version of plasma without widgets/separator.h ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 13 +++++++++++-- config.h.in | 1 + debian/changelog | 3 +++ plasmax2godialog.cpp | 8 +++++++- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 config.h.in The diff of changes is: diff --git a/CMakeLists.txt b/CMakeLists.txt index 9793a02..ed03f80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,15 @@ # Project Needs a name ofcourse project(plasma-x2goplasmoid) + + # Find the required Libaries find_package( KDE4 REQUIRED ) include(KDE4Defaults) - + + add_definitions ( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} @@ -16,7 +19,11 @@ include_directories( ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ) - + +find_file(HAVE_PLASMA_SEPARATOR separator.h ${KDE4_INCLUDES}/plasma/widgets) + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + # We add our source code here set( x2goplasmoid_SRCS @@ -37,6 +44,8 @@ target_link_libraries( ${KDE4_KDEUI_LIBS} ) + + add_subdirectory( po ) diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..2052b04 --- /dev/null +++ b/config.h.in @@ -0,0 +1 @@ +#cmakedefine HAVE_PLASMA_SEPARATOR \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 44dc727..4a72537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2goplasmabindings (3.0.2.0-0x2go1) UNRELEASED; urgency=low Provide X2Go Plasmoid in plasma-widget-x2go sub-package. + Add to BR: kdelibs4-devel. + [ Oleksandr Shneyder ] + * build on older version of plasma without widgets/separator.h + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 31 Dec 2012 16:43:11 +0100 x2goplasmabindings (3.0.1.5-0~x2go1) unstable; urgency=low diff --git a/plasmax2godialog.cpp b/plasmax2godialog.cpp index c8fb335..77bd5cd 100644 --- a/plasmax2godialog.cpp +++ b/plasmax2godialog.cpp @@ -14,6 +14,7 @@ Boston, MA 02110-1301, USA. */ +#include "config.h" #include "plasmax2godialog.h" #include <QGraphicsWidget> #include <QGraphicsLinearLayout> @@ -21,7 +22,11 @@ #include "plasmoidhovereditem.h" #include "fsitem.h" #include <plasma/widgets/scrollwidget.h> + +#ifdef HAVE_PLASMA_SEPARATOR #include <plasma/widgets/separator.h> +#endif + #include <plasma/widgets/iconwidget.h> #include <plasma/widgets/label.h> #include <QGraphicsSceneMouseEvent> @@ -60,8 +65,9 @@ void PlasmaX2goDialog::initDialog() headLay->addStretch(); lay->addItem(headLay); +#ifdef HAVE_PLASMA_SEPARATOR lay->addItem((new Plasma::Separator(m_widget))); - +#endif Plasma::ScrollWidget* widg=new Plasma::ScrollWidget(m_widget); widg->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); itemWidget=new QGraphicsWidget(0); hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2Go).