diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6daf00a..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/contour-0.1.2.tar.bz2 -/contour-0.3.tar.xz diff --git a/changeset_r688e2a2ce823d99e5ca1def1861fdf7591603cf2.diff b/changeset_r688e2a2ce823d99e5ca1def1861fdf7591603cf2.diff deleted file mode 100644 index 3c2f1f2..0000000 --- a/changeset_r688e2a2ce823d99e5ca1def1861fdf7591603cf2.diff +++ /dev/null @@ -1,128 +0,0 @@ -commit 688e2a2ce823d99e5ca1def1861fdf7591603cf2 -Author: Lamarque V. Souza -Date: Tue Jul 2 00:26:02 2013 -0300 - - Add missing files from last commit. - -diff --git a/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp -new file mode 100644 -index 0000000..bccbaf1 ---- /dev/null -+++ b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp -@@ -0,0 +1,66 @@ -+/* -+ * Copyright (C) 2013 Lamarque V. Souza -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2, -+ * or (at your option) any later version, as published by the Free -+ * Software Foundation -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details -+ * -+ * You should have received a copy of the GNU General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include "NetworkManagerQtNotifier.h" -+ -+#include -+#include -+#include -+ -+#include -+ -+#include -+ -+REGISTER_NETWORK_NOTIFIER(NetworkManagerQtNotifier) -+ -+class NetworkManagerQtNotifier::Private { -+public: -+ QHash devices; -+}; -+ -+ -+NetworkManagerQtNotifier::NetworkManagerQtNotifier(QObject *parent) -+ : NetworkNotifier(parent), d(new Private()) -+{ -+} -+ -+void NetworkManagerQtNotifier::init() -+{ -+ kDebug() << "NetworkManagerQt"; -+ -+ foreach (const NetworkManager::Device::Ptr &device, NetworkManager::networkInterfaces()) { -+ // Check whether it is a wifi device. -+ if (device->type() != NetworkManager::Device::Wifi) { -+ continue; -+ } -+ -+ NetworkManager::WirelessDevice::Ptr wifiDevice = device.objectCast(); -+ -+ d->devices[device->interfaceName()] = wifiDevice; -+ -+ connect(wifiDevice.data(), SIGNAL(activeAccessPointChanged(QString)), -+ this, SLOT(setActiveAccessPoint(QString))); -+ } -+} -+ -+NetworkManagerQtNotifier::~NetworkManagerQtNotifier() -+{ -+ delete d; -+} -+ -diff --git a/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.h b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.h -new file mode 100644 -index 0000000..765d66c ---- /dev/null -+++ b/contourd/location/network-engines/networkmanager/NetworkManagerQtNotifier.h -@@ -0,0 +1,44 @@ -+/* -+ * Copyright (C) 2013 Lamarque V. Souza -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2, -+ * or (at your option) any later version, as published by the Free -+ * Software Foundation -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details -+ * -+ * You should have received a copy of the GNU General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef NETWORK_MANAGER_QT_NOTIFIER_H -+#define NETWORK_MANAGER_QT_NOTIFIER_H -+ -+#include "../NetworkNotifier.h" -+ -+/** -+ * NetworkManagerQtNotifier -+ */ -+class NetworkManagerQtNotifier: public NetworkNotifier { -+ Q_OBJECT -+ -+public: -+ NetworkManagerQtNotifier(QObject *parent = 0); -+ virtual ~NetworkManagerQtNotifier(); -+ -+protected: -+ void init(); -+ -+private: -+ class Private; -+ Private * const d; -+}; -+ -+#endif // NETWORK_MANAGER_QT_NOTIFIER_H -+ diff --git a/changeset_rd5306e452fd64f8bcb2dab6d5cef770584131486.diff b/changeset_rd5306e452fd64f8bcb2dab6d5cef770584131486.diff deleted file mode 100644 index ef5eb46..0000000 --- a/changeset_rd5306e452fd64f8bcb2dab6d5cef770584131486.diff +++ /dev/null @@ -1,70 +0,0 @@ -commit d5306e452fd64f8bcb2dab6d5cef770584131486 -Author: Lamarque V. Souza -Date: Mon Jul 1 22:55:58 2013 -0300 - - Fix build against kde-workspace > 4.10.50. - -diff --git a/contourd/CMakeLists.txt b/contourd/CMakeLists.txt -index a9fec47..bea1dd6 100644 ---- a/contourd/CMakeLists.txt -+++ b/contourd/CMakeLists.txt -@@ -95,15 +95,41 @@ soprano_add_ontology(recommendationmanager_SRC - ######################################################################## - set(ADDITIONAL_LINK_LIBRARIES) - --set(recommendationmanager_SRC -- ${recommendationmanager_SRC} -- location/network-engines/solid/SolidNetworkNotifier.cpp -- ) -- --set(ADDITIONAL_LINK_LIBRARIES -- ${ADDITIONAL_LINK_LIBRARIES} -- ${KDE4_SOLID_LIBS} -- ) -+if (${KDE_VERSION} VERSION_GREATER 4.10.50) -+ find_package(NetworkManager) -+ -+ pkg_check_modules(NETWORKMANAGERQT REQUIRED NetworkManagerQt) -+ if (NOT NETWORKMANAGERQT_FOUND) -+ message(FATAL_ERROR "ERROR: NetworkManagerQt not found. http://projects.kde.org/search?q=networkmanager&scope=all&all_words=1&projects=1&submit=Submit") -+ endif (NOT NETWORKMANAGERQT_FOUND) -+ -+ include_directories( -+ ${NETWORKMANAGER_INCLUDE_DIRS} -+ ${NETWORKMANAGERQT_INCLUDE_DIRS} -+ ) -+ -+ set(ADDITIONAL_LINK_LIBRARIES -+ ${ADDITIONAL_LINK_LIBRARIES} -+ NetworkManagerQt -+ ) -+ -+ set(recommendationmanager_SRC -+ ${recommendationmanager_SRC} -+ location/network-engines/networkmanager/NetworkManagerQtNotifier.cpp -+ ) -+else() -+ set(ADDITIONAL_LINK_LIBRARIES -+ ${ADDITIONAL_LINK_LIBRARIES} -+ ${KDE4_SOLID_LIBS} -+ solidcontrol -+ solidcontrolifaces -+ ) -+ -+ set(recommendationmanager_SRC -+ ${recommendationmanager_SRC} -+ location/network-engines/solid/SolidNetworkNotifier.cpp -+ ) -+endif() - - ######################################################################## - -@@ -122,8 +148,6 @@ target_link_libraries( - ${NEPOMUK_QUERY_LIBRARIES} - ${ADDITIONAL_LINK_LIBRARIES} - kworkspace -- solidcontrol -- solidcontrolifaces - # QtLocation - # QtContacts - # QtSensors diff --git a/contour-0.1.1-find-qtmobility.patch b/contour-0.1.1-find-qtmobility.patch deleted file mode 100644 index 6fd329c..0000000 --- a/contour-0.1.1-find-qtmobility.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up contour-0.1.1/CMakeLists.txt.find-qtmobility contour-0.1.1/CMakeLists.txt ---- contour-0.1.1/CMakeLists.txt.find-qtmobility 2011-09-28 19:05:15.000000000 +0200 -+++ contour-0.1.1/CMakeLists.txt 2011-11-08 11:43:56.988493119 +0100 -@@ -1,6 +1,6 @@ - project(contour) - --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${nepomuk_kde_SOURCE_DIR}/cmake) -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ${nepomuk_kde_SOURCE_DIR}/cmake) - - # set the version to be used by ContourConfig.cmake and the lib version - # =============================================================================================== diff --git a/contour.spec b/contour.spec deleted file mode 100644 index 8049ba2..0000000 --- a/contour.spec +++ /dev/null @@ -1,114 +0,0 @@ -Name: contour -Version: 0.3 -Release: 9%{?dist} -Summary: A context sensitive user interface for Plasma Active - -License: GPLv2+ -URL: http://community.kde.org/Plasma/Active/Contour -Source0: http://download.kde.org/stable/active/3.0/src/%{name}-%{version}.tar.xz -Patch0: qtmobility.diff -Patch1: contour-0.1.1-find-qtmobility.patch -Patch100: changeset_rd5306e452fd64f8bcb2dab6d5cef770584131486.diff -Patch101: changeset_r688e2a2ce823d99e5ca1def1861fdf7591603cf2.diff - -BuildRequires: kdelibs4-devel -BuildRequires: kde-runtime-devel -BuildRequires: kde-workspace-devel -BuildRequires: pkgconfig(libkactivities) -BuildRequires: pkgconfig(soprano) -BuildRequires: pkgconfig(shared-desktop-ontologies) -BuildRequires: kde-runtime-devel -BuildRequires: kde-workspace-devel -BuildRequires: libnm-qt-devel -BuildRequires: NetworkManager-devel - -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} - -%description -Contour contributes a new usage paradigm using adaptive activities and -intelligent recommendations. Contour creates a context-sensitive user -interface that adapts to current context, current activities and behavioral -patterns of the user. - -Contour is part of Plasma Active project. - - -%prep -%setup -q - -# FindQtMobility is under review for inclusion to kdelibs, not needed -# by any other package -# TODO: remove once included in kdelibs -%patch0 -p1 -%patch1 -p1 -b .find-qtmobility - -# Upstream patches -%patch100 -p1 -b .makefile -%patch101 -p1 -b .notifier - -%build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake_kde4} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - - -%install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} - - -%files -%doc -%{_kde4_bindir}/contour -%{_kde4_libdir}/kde4/contour_recommendationengine_documents.so -%{_kde4_libdir}/kde4/plasma_engine_recommendations.so -%{_kde4_datadir}/autostart/contour.desktop -%{_kde4_datadir}/cmake/Contour/ -%{_kde4_appsdir}/contour/ -%{_kde4_appsdir}/plasma/ -%{_kde4_sharedir}/kde4/services/* -%{_kde4_sharedir}/kde4/servicetypes/* - - -%changelog -* Wed Feb 03 2016 Fedora Release Engineering - 0.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Jan Grulich - 0.3-5 -- Rebuild for libnm-qt - -* Sat Aug 03 2013 Fedora Release Engineering - 0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 03 2013 Lukáš Tinkl - 0.3-3 -- fix FTBS, build against libnm-qt - -* Wed Feb 13 2013 Fedora Release Engineering - 0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Oct 27 2012 Rex Dieter 0.3-1 -- 0.3 - -* Wed Jul 18 2012 Fedora Release Engineering - 0.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Feb 18 2012 Radek Novacek - 0.1.2-1 -- Update to 0.1.2 (PA2) - -* Thu Jan 12 2012 Fedora Release Engineering - 0.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 08 2011 Jaroslav Reznik - 0.1.1-1 -- initial try - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5f1127d --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Dead upstream and depends on Nepomuk that's going to be retired too diff --git a/qtmobility.diff b/qtmobility.diff deleted file mode 100644 index 930300b..0000000 --- a/qtmobility.diff +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/cmake/modules-tests/QtMobility/CMakeLists.txt b/cmake/modules-tests/QtMobility/CMakeLists.txt ---- /dev/null -+++ b/cmake/modules-tests/QtMobility/CMakeLists.txt -@@ -0,0 +1,5 @@ -+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake") -+ -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" ) -+ -+test_find_package(QtMobility QTMOBILITY INCLUDE_DIR INCLUDE_DIRS LIBRARIES) -diff --git a/cmake/modules/FindQtMobility.cmake b/cmake/modules/FindQtMobility.cmake ---- /dev/null -+++ b/cmake/modules/FindQtMobility.cmake -@@ -0,0 +1,102 @@ -+# - Try to find the QtMobility libraries -+# -+# This module will search for the QtMobility libraries. -+# -+# It supports both a minimum version and searching for individual -+# components. For the minimum version, use -+# find_package(QtMobility 1.2.0). For specific components, use -+# find_package(QtMobility COMPONENTS ...). See below for a list of known -+# components. -+# -+# Once done this will define -+# QTMOBILITY_FOUND - QtMobility and all specified components were found. -+# QTMOBILITY_INCLUDE_DIR - Include directory for global QtMobility files. -+# QTMOBILITY_INCLUDE_DIRS - All found QtMobility components' include dirs. -+# QTMOBILITY_LIBRARIES - All found QtMobility components' libraries. -+# QTMOBILITY_VERSION - The version of QtMobility that was found. -+# -+# For each found component the following will be defined: -+# QTMOBILITY_{COMPONENT}_INCLUDE_DIR - The include directory for the component. -+# QTMOBILITY_{COMPONENT}_LIBRARY - The location of the library for the component. -+# -+# Note that searching for components will be limited to the specified components -+# if the components option is used. -+# -+# Copyright (c) 2011 Arjen Hiemstra -+# Redistribution and use is allowed according to the terms of the BSD license. -+ -+set(QTMOBILITY_COMPONENTS -+ Bearer -+ Connectivity -+ Contacts -+ Feedback -+ Gallery -+ Location -+ Messaging -+ MultimediaKit -+ Organizer -+ PublishSubscribe -+ Sensors -+ ServiceFramework -+ SystemInfo -+ Versit -+) -+ -+if (QtMobility_FIND_COMPONENTS) -+ foreach (component ${QtMobility_FIND_COMPONENTS}) -+ string(TOUPPER ${component} _COMPONENT) -+ set(QTMOBILITY_USE_${_COMPONENT} 1) -+ endforeach (component) -+endif (QtMobility_FIND_COMPONENTS) -+ -+find_path(QTMOBILITY_INCLUDE_DIR qmobilityglobal.h PATH_SUFFIXES QtMobility) -+ -+#Find the mobility version -+if(QTMOBILITY_INCLUDE_DIR) -+ file(READ "${QTMOBILITY_INCLUDE_DIR}/qmobilityglobal.h" _qtmobility_global_header LIMIT 2000) -+ string(REGEX MATCH "#define QTM_VERSION_STR \"([0-9.]*)\"" _qtmobility_version_match "${_qtmobility_global_header}") -+ set(QTMOBILITY_VERSION "${CMAKE_MATCH_1}") -+ message(STATUS "QtMobility Version ${QTMOBILITY_VERSION} detected") -+endif(QTMOBILITY_INCLUDE_DIR) -+ -+set(QTMOBILITY_VARIABLES "QTMOBILITY_INCLUDE_DIR") -+set(QTMOBILITY_INCLUDE_DIRS ${QTMOBILITY_INCLUDE_DIR}) -+ -+#A list of files to find for specific components -+set(QTMOBILITY_FIND_FILES -+ QNetworkConfiguration #Bearer -+ QBluetoothSocket #Connectivity -+ QContact #Contacts -+ QFeedbackInterface #Feedback -+ QAbstractGallery #Gallery -+ QLandmark #Location -+ QMessage #Messaging -+ QMediaPlayer #MultimediaKit -+ QOrganizerItem #Organizer -+ QValueSpace #PublishSubscribe -+ QSensor #Sensors -+ QService #ServiceFramework -+ QSystemInfo #SystemInfo -+ QVersitDocument #Versit -+) -+ -+list(LENGTH QTMOBILITY_COMPONENTS _component_count) -+math(EXPR _component_count "${_component_count} - 1") -+foreach (index RANGE ${_component_count}) -+ list(GET QTMOBILITY_COMPONENTS ${index} component) -+ list(GET QTMOBILITY_FIND_FILES ${index} file) -+ string(TOUPPER ${component} _COMPONENT) -+ if (NOT QtMobility_FIND_COMPONENTS OR QTMOBILITY_USE_${_COMPONENT}) -+ message(STATUS "Looking for QtMobility Component \"${component}\"") -+ find_path(QTMOBILITY_${_COMPONENT}_INCLUDE_DIR ${file} PATH_SUFFIXES Qt${component}) -+ find_library(QTMOBILITY_${_COMPONENT}_LIBRARY NAMES Qt${component}) -+ list(APPEND QTMOBILITY_VARIABLES "QTMOBILITY_${_COMPONENT}_INCLUDE_DIR" "QTMOBILITY_${_COMPONENT}_LIBRARY") -+ list(APPEND QTMOBILITY_INCLUDE_DIRS ${QTMOBILITY_${_COMPONENT}_INCLUDE_DIR}) -+ list(APPEND QTMOBILITY_LIBRARIES ${QTMOBILITY_${_COMPONENT}_LIBRARY}) -+ endif (NOT QtMobility_FIND_COMPONENTS OR QTMOBILITY_USE_${_COMPONENT}) -+endforeach (index) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(QtMobility REQUIRED_VARS ${QTMOBILITY_VARIABLES} VERSION_VAR QTMOBILITY_VERSION) -+ -+mark_as_advanced(${QTMOBILITY_VARIABLES}) diff --git a/sources b/sources deleted file mode 100644 index 2c6974b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -fcaa196db5ca5af7699efcbd046d1cd7 contour-0.3.tar.xz