commit libKF5ModemManagerQt for openSUSE:Factory

1 Oct 2014

Hello community,

here is the log from the commit of package libKF5ModemManagerQt for openSUSE:Factory checked in at 2014-10-01 11:22:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5ModemManagerQt (Old)
 and      /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libKF5ModemManagerQt"

Changes:
--------

--- /work/SRC/openSUSE:Factory/libKF5ModemManagerQt/libKF5ModemManagerQt.changes	2014-08-16 15:43:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new/libKF5ModemManagerQt.changes	2014-10-01 11:23:00.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 26 14:24:04 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.0.95:
+   * Fixes for both MM 1.0 and 1.2
+- Drop pkgconfig(Qt5Network) >= 5.2.0, no longer needed
+
+-------------------------------------------------------------------

Old:
----
  libmm-qt-5.0.92.tar.xz

New:
----
  libmm-qt-5.0.95.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libKF5ModemManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.nZTwPm/_old	2014-10-01 11:23:01.000000000 +0200
+++ /var/tmp/diff_new_pack.nZTwPm/_new	2014-10-01 11:23:01.000000000 +0200
@@ -20,7 +20,7 @@
 %define soversion 5
 
 Name:           libKF5ModemManagerQt
-Version:        5.0.92
+Version:        5.0.95
 Release:        0
 Summary:        Qt wrapper for ModemManager DBus API
 License:        LGPL-2.1 or LGPL-3.0
@@ -32,7 +32,6 @@
 BuildRequires:  pkgconfig(ModemManager)
 BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Network) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Test) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Xml) >= 5.2.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ libmm-qt-5.0.92.tar.xz -> libmm-qt-5.0.95.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-5.0.92/CMakeLists.txt new/libmm-qt-5.0.95/CMakeLists.txt
--- old/libmm-qt-5.0.92/CMakeLists.txt	2014-08-08 17:20:57.000000000 +0200
+++ new/libmm-qt-5.0.95/CMakeLists.txt	2014-09-25 20:42:01.000000000 +0200
@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 project(ModemManagerQt)
+set(PROJECT_VERSION "5.0.95")
 
 find_package(ECM 1.0.0 REQUIRED NO_MODULE)
 
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+find_package(ModemManager 1.0 REQUIRED)
 
-include(FindPkgConfig)
 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings)
 include(KDECMakeSettings)
@@ -14,12 +16,6 @@
 set(REQUIRED_QT_VERSION 5.2.0)
 find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Xml)
 
-pkg_check_modules(MODEMMANAGER REQUIRED ModemManager>=1.0)
-
-if (MODEMMANAGER_FOUND AND "${MODEMMANAGER_VERSION}" VERSION_LESS 1.1)
-   message(STATUS "This is a development version of this library and some functionality require a newer version of ModemManager")
-endif()
-
 add_definitions(${QT_DEFINITIONS})
 
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
@@ -34,20 +30,20 @@
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 
-set(KF5_VERSION "5.0.92")
+set(KF5_VERSION ${PROJECT_VERSION})
 
 ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX MODEMMANAGERQT
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/modemmanagerqt_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ModemManagerQtConfigVersion.cmake"
                         SOVERSION 5)
 
-add_subdirectory(src)
-
 ##################  examples  ################################
-# option(BUILD_EXAMPLES "Build example applications" FALSE)
-# if (BUILD_EXAMPLES)
-#     add_subdirectory(examples)
-# endif(BUILD_EXAMPLES)
+option(BUILD_EXAMPLES "Build example applications" FALSE)
+if (BUILD_EXAMPLES)
+    add_subdirectory(examples)
+endif(BUILD_EXAMPLES)
+
+add_subdirectory(src)
 
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5ModemManagerQt")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-5.0.92/cmake/FindModemManager.cmake new/libmm-qt-5.0.95/cmake/FindModemManager.cmake
--- old/libmm-qt-5.0.92/cmake/FindModemManager.cmake	1970-01-01 01:00:00.000000000 +0100
+++ new/libmm-qt-5.0.95/cmake/FindModemManager.cmake	2014-09-25 20:42:01.000000000 +0200
@@ -0,0 +1,42 @@
+# - Try to find ModemManager
+# Once done this will define
+#
+#  MODEMMANAGER_FOUND - system has ModemManager
+#  MODEMMANAGER_INCLUDE_DIRS - the ModemManager include directories
+#  MODEMMANAGER_LIBRARIES - the libraries needed to use ModemManager
+#  MODEMMANAGER_CFLAGS - Compiler switches required for using ModemManager
+#  MODEMMANAGER_VERSION - version number of ModemManager
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2007, Will Stephenson, <wstephenson@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+IF (MODEMMANAGER_INCLUDE_DIRS)
+   # in cache already
+   SET(ModemManager_FIND_QUIETLY TRUE)
+ENDIF (MODEMMANAGER_INCLUDE_DIRS)
+
+IF (NOT WIN32)
+   # use pkg-config to get the directories and then use these values
+   # in the FIND_PATH() and FIND_LIBRARY() calls
+   find_package(PkgConfig)
+   PKG_SEARCH_MODULE( MODEMMANAGER ModemManager )
+ENDIF (NOT WIN32)
+
+IF (MODEMMANAGER_FOUND)
+   IF (ModemManager_FIND_VERSION AND ("${MODEMMANAGER_VERSION}" VERSION_LESS "${ModemManager_FIND_VERSION}"))
+      MESSAGE(FATAL_ERROR "ModemManager ${MODEMMANAGER_VERSION} is too old, need at least ${ModemManager_FIND_VERSION}")
+   ELSEIF (NOT ModemManager_FIND_QUIETLY)
+      MESSAGE(STATUS "Found ModemManager ${MODEMMANAGER_VERSION}: ${MODEMMANAGER_LIBRARY_DIRS}")
+   ENDIF()
+ELSE (MODEMMANAGER_FOUND)
+   IF (ModemManager_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could NOT find ModemManager, check FindPkgConfig output above!")
+   ENDIF (ModemManager_FIND_REQUIRED)
+ENDIF (MODEMMANAGER_FOUND)
+
+MARK_AS_ADVANCED(MODEMMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-5.0.92/examples/CMakeLists.txt new/libmm-qt-5.0.95/examples/CMakeLists.txt
--- old/libmm-qt-5.0.92/examples/CMakeLists.txt	2014-08-08 17:20:57.000000000 +0200
+++ new/libmm-qt-5.0.95/examples/CMakeLists.txt	2014-09-25 20:42:01.000000000 +0200
@@ -1,22 +1,26 @@
 project(exampleModemManagerQt)
-cmake_minimum_required(VERSION 2.6)
+
+cmake_minimum_required(VERSION 2.8.12)
 
 include(FindPkgConfig)
-find_package(Qt4 REQUIRED)
+pkg_check_modules(MODEMMANAGER REQUIRED ModemManager>=1.0)
 
-pkg_check_modules(MODEMMANAGERQT REQUIRED ModemManagerQt)
-if (NOT MODEMMANAGERQT_FOUND)
-    message(FATAL_ERROR "ERROR: ModemManagerQt not found. http://projects.kde.org/search?q=networkmanager&scope=all&all_words=1&projects=1&submit=Submit")
-endif (NOT MODEMMANAGERQT_FOUND)
+find_package(KF5ModemManagerQt ${KF5_VERSION} REQUIRED)
 
-pkg_check_modules(MODEMMANAGER REQUIRED ModemManager)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+    Core
+    DBus
+    Xml
+)
 
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QTNETWORK_INCLUDE_DIRS} ${MODEMMANAGERQT_INCLUDE_DIRS} ${MODEMMANAGER_INCLUDE_DIRS} ${QT_INCLUDES})
-link_directories(${QTNETWORK_LIBRARY_DIRS} ${MODEMMANAGERQT_LIBRARY_DIRS} ${QT_QTDBUS_LIBRARY_DIRS})
+include_directories(${MODEMMANAGER_INCLUDE_DIRS})
 
 set(exampleModemManagerQt_SRCS
    main.cpp
 )
 
 add_executable(exampleModemManagerQt ${exampleModemManagerQt_SRCS})
-target_link_libraries(exampleModemManagerQt ModemManagerQt QtCore)
+target_link_libraries(exampleModemManagerQt
+    KF5::ModemManagerQt
+    Qt5::Core
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-5.0.92/examples/main.cpp new/libmm-qt-5.0.95/examples/main.cpp
--- old/libmm-qt-5.0.92/examples/main.cpp	2014-08-08 17:20:57.000000000 +0200
+++ new/libmm-qt-5.0.95/examples/main.cpp	2014-09-25 20:42:01.000000000 +0200
@@ -30,6 +30,8 @@
 
 int main(int argc, char *argv[])
 {
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
     qDebug() << "List of Modem Devices:";
     foreach (ModemManager::ModemDevice::Ptr modemdevice, ModemManager::modemDevices()) {
         ModemManager::Modem::Ptr modemInterface = modemdevice->modemInterface();

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)