Accepting request 249675 from KDE:Qt5

Update to 0.9.3+14.10.20140619

OBS-URL: https://build.opensuse.org/request/show/249675
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbusmenu-qt5?expand=0&rev=6

full_include_dir.patch

@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 980e872..fbcd0b1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -95,7 +95,7 @@ endif()
+ 
+ # Make sure linking to the target adds dbusmenu-qt install directory
+ target_include_directories(dbusmenu-${QT_SUFFIX}
+-    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}>")
+ 
+ install(TARGETS dbusmenu-${QT_SUFFIX}
+     EXPORT dbusmenu-${QT_SUFFIX}-targets

libdbusmenu-qt5.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 15 19:31:29 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 0.9.3+14.10.20140619
+  * Users of dbusmenu-qt no longer need to call
+    include_directories(${dbusmenu-qt5_INCLUDE_DIRS}).
+    Simply adding dbusmenu-qt5 to the target_link_libraries()
+    call takes care of defining the include directory.
+- Rebase noqDebug-qWarnings.patch
+- Added full_include_dir.patch for openSUSE 13.1
+
 -------------------------------------------------------------------
 Mon Jun  2 21:37:10 UTC 2014 - hrvoje.senjan@gmail.com
 

libdbusmenu-qt5.spec

@@ -19,17 +19,19 @@
 %define rname libdbusmenu-qt
 
 Name:           libdbusmenu-qt5
-Version:        0.9.2+14.04.20131209
+Version:        0.9.3+14.10.20140619
 Release:        0
 Url:            https://launchpad.net/libdbusmenu-qt/
 Summary:        A Qt implementation of the DBusMenu protocol
 License:        LGPL-2.0+
 Group:          System/Libraries
-Source0:        http://archive.ubuntu.com/ubuntu/pool/main/libd/%{rname}/%{rname}_%{version}.orig.tar.gz
+Source:         http://archive.ubuntu.com/ubuntu/pool/main/libd/%{rname}/%{rname}_%{version}.orig.tar.gz
-Source99:       baselibs.conf
+Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings,
 # which are useless, and annoy users, so this patch just disables them in release mode
 Patch1:         noqDebug-qWarnings.patch
+# PATCH-FIX-UPSTREAM full_include_dir.patch -- CMake 2.8.12 creates a fatal error on relative include dirs for a target. silence that policy
+Patch2:         full_include_dir.patch
 #Needed for DISABLE_FIND_PACKAGE
 BuildRequires:  cmake >= 2.8.6
 BuildRequires:  doxygen
@@ -69,6 +71,9 @@ This package contains development files for libdbusmenu-qt5.
 %prep
 %setup -q -n %{rname}-%{version}
 %patch1 -p1
+%if 0%{?suse_version} <= 1310
+%patch2 -p1
+%endif
 
 # Remove build time references so build-compare can do its work
 sed -i "s/HTML_TIMESTAMP         = YES/HTML_TIMESTAMP         = NO/" Doxyfile.in

libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7caf94fe27ce146a637af3062aa5bac90caec37cc30cd5ef638e46ccd4f264b
-size 45800

libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968
+size 46641

noqDebug-qWarnings.patch

@@ -1,7 +1,8 @@
-diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/CMakeLists.txt libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
---- libdbusmenu-qt-0.9.2+14.04.20131209.orig/CMakeLists.txt	2013-12-09 03:29:47.000000000 +0100
+index 0ee9154..597a7de 100644
-+++ libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt	2013-12-18 21:58:01.847669366 +0100
+--- a/CMakeLists.txt
-@@ -91,7 +91,7 @@
++++ b/CMakeLists.txt
+@@ -91,7 +91,7 @@ install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc
  
  add_subdirectory(src)
  if (NOT USE_QT5) # TODO port tests to Qt5
@@ -10,10 +11,11 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/CMakeLists.txt libdbusmenu-q
  endif()
  add_subdirectory(tools)
  
-diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.cpp
+diff --git a/src/dbusmenuexporter.cpp b/src/dbusmenuexporter.cpp
---- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp	2013-12-09 03:29:47.000000000 +0100
+index f25718d..8868efb 100644
-+++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.cpp	2013-12-18 21:59:13.984767528 +0100
+--- a/src/dbusmenuexporter.cpp
-@@ -160,7 +160,9 @@
++++ b/src/dbusmenuexporter.cpp
+@@ -160,7 +160,9 @@ void DBusMenuExporterPrivate::fillLayoutItem(DBusMenuLayoutItem *item, QMenu *me
          Q_FOREACH(QAction *action, menu->actions()) {
              int actionId = m_idForAction.value(action, -1);
              if (actionId == -1) {
@@ -23,7 +25,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp lib
                  continue;
              }
  
-@@ -185,7 +187,9 @@
+@@ -185,7 +187,9 @@ void DBusMenuExporterPrivate::addAction(QAction *action, int parentId)
  {
      int id = m_idForAction.value(action, -1);
      if (id != -1) {
@@ -33,10 +35,21 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp lib
          return;
      }
      QVariantMap map = propertiesForAction(action);
-diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp
+diff --git a/src/dbusmenuimporter.cpp b/src/dbusmenuimporter.cpp
---- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp	2013-12-09 03:29:47.000000000 +0100
+index 2a4c514..2f03729 100644
-+++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp	2013-12-18 22:06:44.057140849 +0100
+--- a/src/dbusmenuimporter.cpp
-@@ -191,7 +191,9 @@
++++ b/src/dbusmenuimporter.cpp
+@@ -94,7 +94,9 @@ public:
+     QDBusPendingCallWatcher *refresh(int id)
+     {
+         #ifdef BENCHMARK
++#ifndef QT_NO_DEBUG
+         DMDEBUG << "Starting refresh chrono for id" << id;
++#endif
+         sChrono.start();
+         #endif
+         QDBusPendingCall call = m_interface->asyncCall("GetLayout", id, 1, QStringList());
+@@ -193,7 +195,9 @@ public:
              updateActionShortcut(action, value);
          } else if (key == "children-display") {
          } else {
@@ -46,7 +59,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          }
      }
  
-@@ -239,7 +241,9 @@
+@@ -241,7 +245,9 @@ public:
          action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash);
          QPixmap pix;
          if (!pix.loadFromData(data)) {
@@ -56,7 +69,17 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
              action->setIcon(QIcon());
              return;
          }
-@@ -390,7 +394,9 @@
+@@ -312,7 +318,9 @@ public:
+         }
+ 
+         if (watcher->isError()) {
++#ifndef QT_NO_DEBUG
+             DMWARNING << watcher->error().message();
++#endif
+             return false;
+         }
+ 
+@@ -436,18 +444,24 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
  
      QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;
      if (!reply.isValid()) {
@@ -66,7 +89,12 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          return;
      }
  
-@@ -401,7 +407,9 @@
+     #ifdef BENCHMARK
++#ifndef QT_NO_DEBUG
+     DMDEBUG << "- items received:" << sChrono.elapsed() << "ms";
++#endif
+     #endif
+     DBusMenuLayoutItem rootItem = reply.argumentAt<1>();
  
      QMenu *menu = d->menuForId(parentId);
      if (!menu) {
@@ -76,17 +104,27 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          return;
      }
  
-@@ -494,7 +502,9 @@
+@@ -474,7 +488,9 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
+         }
+     }
+     #ifdef BENCHMARK
++#ifndef QT_NO_DEBUG
+     DMDEBUG << "- Menu filled:" << sChrono.elapsed() << "ms";
++#endif
+     #endif
+ }
+ 
+@@ -513,7 +529,9 @@ void DBusMenuImporter::slotMenuAboutToShow()
      QPointer<QObject> guard(this);
  
-     if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) {
+     if (!d->waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) {
 +#ifndef QT_NO_DEBUG
          DMWARNING << "Application did not answer to AboutToShow() before timeout";
 +#endif
      }
  
      #ifdef BENCHMARK
-@@ -522,7 +532,9 @@
+@@ -541,7 +559,9 @@ void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *
  
      QDBusPendingReply<bool> reply = *watcher;
      if (reply.isError()) {
@@ -96,19 +134,20 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          return;
      }
      bool needRefresh = reply.argumentAt<0>();
-@@ -534,7 +546,9 @@
+@@ -553,7 +573,9 @@ void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *
          d->m_idsRefreshedByAboutToShow << id;
          watcher = d->refresh(id);
-         if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) {
+         if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) {
 +#ifndef QT_NO_DEBUG
              DMWARNING << "Application did not refresh before timeout";
 +#endif
          }
      }
  }
-diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/debug_p.h libdbusmenu-qt-0.9.2+14.04.20131209/src/debug_p.h
+diff --git a/src/debug_p.h b/src/debug_p.h
---- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/debug_p.h	2013-12-09 03:29:47.000000000 +0100
+index bff37bd..ecdd3a5 100644
-+++ libdbusmenu-qt-0.9.2+14.04.20131209/src/debug_p.h	2013-12-18 22:02:33.923267953 +0100
+--- a/src/debug_p.h
++++ b/src/debug_p.h
 @@ -36,12 +36,10 @@
  #define DMVAR(var) DMDEBUG << #var ":" << var