diff options
| author | Matthias Klumpp <matthias@tenstral.net> | 2015-11-09 21:18:11 (GMT) |
|---|---|---|
| committer | Matthias Klumpp <matthias@tenstral.net> | 2015-11-09 21:18:11 (GMT) |
| commit | 6e3f1aa391fc0d3c6f075fd13ca3be65c362a44e (patch) | |
| tree | c1280f0b82e571f3fae086b60ba175670e780ed4 | |
| parent | 239961f77412d39ab006e67dd0c094c65351db4d (diff) | |
trivial: Drop some code only used by Discover
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.PACKAGERS | 1 | ||||
| -rw-r--r-- | TODO | 8 | ||||
| -rw-r--r-- | cmake/FindAkabeiClient.cmake | 108 | ||||
| -rw-r--r-- | cmake/FindAkabeiCore.cmake | 102 | ||||
| -rw-r--r-- | cmake/FindPackageKitQt2.cmake | 57 | ||||
| -rw-r--r-- | cmake/FindQtOAuth.cmake | 58 |
7 files changed, 1 insertions, 335 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 919ccda..daec927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ option(MUON_INSTALL_EXPORTER "Install muon-exporter [development utility]" OFF) find_package(ECM REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake") +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) find_package(Qt5 5.2.0 REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Svg Qml QuickWidgets) include(KDEInstallDirs) diff --git a/README.PACKAGERS b/README.PACKAGERS index 8c66ab8..aaf7dd1 100644 --- a/README.PACKAGERS +++ b/README.PACKAGERS @@ -7,4 +7,3 @@ apt-backend: - apt-xapian-index - kde-cli-tools (kdesu) - software-properties-kde - @@ -1,15 +1,7 @@ Legend: - [MPM] = Muon Package Manager - - [MUM] = Muon Update Manager - - [MSC] = Muon Software Center -[MPM] Supplemental "slow" search that does a search over package information fields, as opposed to the quick xapian-based search -[MPM] Config GUI for confirmation dialogs (save on quit) -[MPM] Optional columns for installed and available versions in the Muon Package Manager --[MSC] Commercial app support. (See: software-center/db/update.py, backends/restfulclient.py) - Example URL: https://software-center.ubuntu.com/api/2.0/applications/en/ubuntu/precise/amd64/ --[MSC] Review submittal (Use KIO::storedHttpPost) --[MSC] Add an on-hover magnifying graphic to the screenshot preview --[MSC] Include addons size in Total size calculation --[MSC] When going back from a child breadcrumb, hide the crumb, but still be able to go forward -[MPM] Configurable status column colors diff --git a/cmake/FindAkabeiClient.cmake b/cmake/FindAkabeiClient.cmake deleted file mode 100644 index 48a11b1..0000000 --- a/cmake/FindAkabeiClient.cmake +++ /dev/null @@ -1,108 +0,0 @@ -# -# CMake module to locate the AkabeiClient library. -# -# Once done this will define: -# -# AKABEICLIENT_FOUND — System has AkabeiClient library. -# AKABEICLIENT_INCLUDE_DIR — AkabeiClient library include directory. -# AKABEICLIENT_LIBRARIES — Paths to the library files of the AkabeiClient library. -# -# Copyright © 2007 Joris Guisson <joris.guisson@gmail.com> (This was based upon FindKTorrent.cmake) -# Copyright © 2007 Charles Connell <charles@connells.org> (This was based upon FindKopete.cmake) -# Copyright © 2010 Lukas Appelhans <l.appelhans@gmx.de> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the <organization> nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# Search for the AkabeiClient library include path if not provided. -if(NOT AKABEICLIENT_INCLUDE_DIR) - - FIND_PATH(AKABEICLIENT_INCLUDE_DIR - NAMES - akabeiclientbackend.h - PATHS - ${INCLUDE_INSTALL_DIR} - PATH_SUFFIXES - akabeiclient - ) - -endif(NOT AKABEICLIENT_INCLUDE_DIR) - -# Search for the AkabeiClient library files. -FIND_LIBRARY(AKABEICLIENT_LIBRARIES - NAMES - akabeiclient - PATHS - ${AKABEICLIENT_LIB_DIR} - ${LIB_INSTALL_DIR} -) - -if(AKABEICLIENT_INCLUDE_DIR AND AKABEICLIENT_LIBRARIES) - - # Read from cache. - set(AKABEICLIENT_FOUND TRUE) - - # Announce. - if(NOT AkabeiClient_FIND_QUIETLY) - message(STATUS "Looking for AkabeiClient library… FOUND.") - endif(NOT AkabeiClient_FIND_QUIETLY) - -# Akabei could not be found. -else(AKABEICLIENT_INCLUDE_DIR AND AKABEICLIENT_LIBRARIES) - - if (NOT AkabeiClient_FIND_QUIETLY) - message(STATUS "Looking for AkabeiClient library… NOT FOUND.") - endif() - - function(MSG_AKABEI_INCLUDES SEVERITY) - if (NOT AkabeiClient_FIND_QUIETLY) - message(${SEVERITY} " - Could not find AkabeiClient library header files.") - message(${SEVERITY} " Use AKABEICLIENT_INCLUDE_DIR to point to the directory where they are located.") - endif() - endfunction(MSG_AKABEI_INCLUDES) - - function(MSG_AKABEI_LIBRARY SEVERITY) - if (NOT AkabeiClient_FIND_QUIETLY) - message(${SEVERITY} " - Could not find AkabeiClient library files.") - message(${SEVERITY} " Use AKABEICLIENT_LIB_DIR to point to the directory where they are located.") - endif() - endfunction(MSG_AKABEI_LIBRARY) - - if(AKABEICLIENT_FIND_REQUIRED) - if(NOT AKABEICLIENT_INCLUDE_DIR) - MSG_AKABEI_INCLUDES("FATAL_ERROR") - endif(NOT AKABEICLIENT_INCLUDE_DIR) - if(NOT AKABEICLIENT_LIBRARIES) - MSG_AKABEI_LIBRARY("FATAL_ERROR") - endif(NOT AKABEICLIENT_LIBRARIES) - else(AKABEICLIENT_FIND_REQUIRED) - if(NOT AKABEICLIENT_INCLUDE_DIR) - MSG_AKABEI_INCLUDES("STATUS") - endif(NOT AKABEICLIENT_INCLUDE_DIR) - if(NOT AKABEICLIENT_LIBRARIES) - MSG_AKABEI_LIBRARY("STATUS") - endif(NOT AKABEICLIENT_LIBRARIES) - endif(AKABEICLIENT_FIND_REQUIRED) - -endif(AKABEICLIENT_INCLUDE_DIR AND AKABEICLIENT_LIBRARIES) diff --git a/cmake/FindAkabeiCore.cmake b/cmake/FindAkabeiCore.cmake deleted file mode 100644 index e37353d..0000000 --- a/cmake/FindAkabeiCore.cmake +++ /dev/null @@ -1,102 +0,0 @@ -# -# CMake module to locate the AkabeiCore library. -# -# Once done this will define: -# -# AKABEICORE_FOUND — System has AkabeiCore library. -# AKABEICORE_INCLUDE_DIR — AkabeiCore library include directory. -# AKABEICORE_LIBRARIES — Paths to the library files of the AkabeiCore library. -# -# Copyright © 2007 Joris Guisson <joris.guisson@gmail.com> (This was based upon FindKTorrent.cmake) -# Copyright © 2007 Charles Connell <charles@connells.org> (This was based upon FindKopete.cmake) -# Copyright © 2010 Lukas Appelhans <l.appelhans@gmx.de> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the <organization> nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# Search for the AkabeiCore library include path if not provided. -if(NOT AKABEICORE_INCLUDE_DIR) - - FIND_PATH(AKABEICORE_INCLUDE_DIR - NAMES - akabeibackend.h - PATHS - ${INCLUDE_INSTALL_DIR} - PATH_SUFFIXES - akabeicore - ) - -endif(NOT AKABEICORE_INCLUDE_DIR) - -# Search for the AkabeiCore library files. -FIND_LIBRARY(AKABEICORE_LIBRARIES - NAMES - akabeicore - PATHS - ${AKABEICORE_LIB_DIR} - ${LIB_INSTALL_DIR} -) - -if(AKABEICORE_INCLUDE_DIR AND AKABEICORE_LIBRARIES) - - # Read from cache. - set(AKABEICORE_FOUND TRUE) - - # Announce. - if(NOT AKABEICORE_FIND_QUIETLY) - message(STATUS "Looking for AkabeiCore library… FOUND.") - endif(NOT AKABEICORE_FIND_QUIETLY) - -# Akabei could not be found. -else(AKABEICORE_INCLUDE_DIR AND AKABEICORE_LIBRARIES) - - message(STATUS "Looking for AkabeiCore library… NOT FOUND.") - - function(MSG_AKABEI_INCLUDES SEVERITY) - message(${SEVERITY} " - Could not find AkabeiCore library header files.") - message(${SEVERITY} " Use AKABEICORE_INCLUDE_DIR to point to the directory where they are located.") - endfunction(MSG_AKABEI_INCLUDES) - - function(MSG_AKABEI_LIBRARY SEVERITY) - message(${SEVERITY} " - Could not find AkabeiCore library files.") - message(${SEVERITY} " Use AKABEICORE_LIB_DIR to point to the directory where they are located.") - endfunction(MSG_AKABEI_LIBRARY) - - if(AKABEICORE_FIND_REQUIRED) - if(NOT AKABEICORE_INCLUDE_DIR) - MSG_AKABEI_INCLUDES("FATAL_ERROR") - endif(NOT AKABEICORE_INCLUDE_DIR) - if(NOT AKABEICORE_LIBRARIES) - MSG_AKABEI_LIBRARY("FATAL_ERROR") - endif(NOT AKABEICORE_LIBRARIES) - else(AKABEICORE_FIND_REQUIRED) - if(NOT AKABEICORE_INCLUDE_DIR) - MSG_AKABEI_INCLUDES("STATUS") - endif(NOT AKABEICORE_INCLUDE_DIR) - if(NOT AKABEICORE_LIBRARIES) - MSG_AKABEI_LIBRARY("STATUS") - endif(NOT AKABEICORE_LIBRARIES) - endif(AKABEICORE_FIND_REQUIRED) - -endif(AKABEICORE_INCLUDE_DIR AND AKABEICORE_LIBRARIES) diff --git a/cmake/FindPackageKitQt2.cmake b/cmake/FindPackageKitQt2.cmake deleted file mode 100644 index 0887e8f..0000000 --- a/cmake/FindPackageKitQt2.cmake +++ /dev/null @@ -1,57 +0,0 @@ -# - Try to find the PackageKitQt2 library -# Once done this will define -# -# PACKAGEKITQT2_FOUND - system has the PackageKitQt2 library -# PACKAGEKITQT2_INCLUDEDIR - the PackageKitQt2 include directory -# PACKAGEKITQT2_LIBRARY - Link this to use the PackageKitQt2 -# -# Copyright © 2010, Mehrdad Momeny <mehrdad.momeny@gmail.com> -# Copyright © 2010, Harald Sitter <apachelogger@ubuntu.com> -# Copyright © 2013, Lukas Appelhans <l.appelhans@gmx.de> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -if (NOT WIN32) - find_package(PkgConfig) - pkg_check_modules(QPACKAGEKIT2 packagekit-qt2>=0.8) -endif() - -set(PackageKitQt2_FOUND FALSE) -if(QPACKAGEKIT2_FOUND) - find_library(PACKAGEKITQT2_LIBRARY NAMES packagekit-qt2 - HINTS ${QPACKAGEKIT2_LIBRARIES} - ) - - find_path(PACKAGEKITQT2_INCLUDEDIR PackageKit/packagekit-qt2/daemon.h - HINTS ${QPACKAGEKIT2_INCLUDEDIR} - ) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(PackageKitQt2 DEFAULT_MSG PACKAGEKITQT2_LIBRARY PACKAGEKITQT2_INCLUDEDIR) - if(PACKAGEKITQT2_LIBRARY AND PACKAGEKITQT2_INCLUDEDIR) - mark_as_advanced(PACKAGEKITQT2_INCLUDEDIR PACKAGEKITQT2_LIBRARY) - set(PackageKitQt2_FOUND TRUE) - endif() -endif() diff --git a/cmake/FindQtOAuth.cmake b/cmake/FindQtOAuth.cmake deleted file mode 100644 index 9bec3a5..0000000 --- a/cmake/FindQtOAuth.cmake +++ /dev/null @@ -1,58 +0,0 @@ -# - Try to find the QtOAuth library -# Once done this will define -# -# QTOAUTH_FOUND - system has the QtOAuth library -# QTOAUTH_INCLUDE_DIR - the QtOAuth include directory -# QTOAUTH_LIBRARY - Link this to use the QtOAuth -# QTOAUTH_DEFINITIONS - Compiler switches required for using QOAuth -# -# Copyright © 2010, Mehrdad Momeny <mehrdad.momeny@gmail.com> -# Copyright © 2010, Harald Sitter <apachelogger@ubuntu.com> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -if (QTOAUTH_INCLUDE_DIR AND QTOAUTH_LIBRARY) - # in cache already - set(QTOAUTH_FOUND TRUE) -else (QTOAUTH_INCLUDE_DIR AND QTOAUTH_LIBRARY) - if (NOT WIN32) - find_package(PkgConfig) - pkg_check_modules(PC_QTOAUTH QUIET qoauth) - set(QTOAUTH_DEFINITIONS ${PC_QTOAUTH_CFLAGS_OTHER}) - endif(NOT WIN32) - - find_library(QTOAUTH_LIBRARY NAMES qoauth - HINTS ${PC_QTOAUTH_LIBDIR} ${PC_QTOAUTH_LIBRARY_DIRS} - ) - - find_path(QTOAUTH_INCLUDE_DIR QtOAuth/interface.h - HINTS ${PC_QTOAUTH_INCLUDEDIR} ${PC_QTOAUTH_INCLUDE_DIRS} - ) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(QtOAuth DEFAULT_MSG QTOAUTH_LIBRARY QTOAUTH_INCLUDE_DIR) - - mark_as_advanced(QTOAUTH_INCLUDE_DIR QTOAUTH_LIBRARY) -endif (QTOAUTH_INCLUDE_DIR AND QTOAUTH_LIBRARY) |
