pool/libdbusmenu-qt5
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osc copypac from project:KDE:Qt5 package:libdbusmenu-qt revision:3, using expand

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=1
This commit is contained in:
Hrvoje Senjan 2013-11-25 20:47:49 +00:00 committed by Git OBS Bridge
commit 9b1b1254bc
7 changed files with 474 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

2
baselibs.conf Normal file
View File

@ -0,0 +1,2 @@
libdbusmenu-qt2
libdbusmenu-qt5-2

147
libdbusmenu-qt.changes Normal file
View File

@ -0,0 +1,147 @@
-------------------------------------------------------------------
Wed Nov 6 22:50:10 UTC 2013 - hrvoje.senjan@gmail.com
- Update to 0.9.2+13.10.20130826
* Various bugfixes
* Qt5 port
- Build Qt5 library in the same build
- Droped 237_236.diff, merged upstream
-------------------------------------------------------------------
Sun Aug 25 20:00:50 UTC 2013 - hrvoje.senjan@gmail.com
- Added 237_236.diff from upstream, fixes lp#1068050 (Some icons of
kate menu are wrong when run with the global menubar) and
noqDebug-qWarnings.patch, which disables spamming users with
useless debug
-------------------------------------------------------------------
Wed Apr 11 20:02:44 UTC 2012 - asterios.dramis@gmail.com
- Update to 0.9.2:
* Fix disabling and hiding actions
* Avoid spamming dbus at startup
* Do not print warnings when not necessary
From 0.9.1:
* Add support for "opened" and "closed" events
* Add support for icon-data (LP BUG 633339)
- Install also the development documentation.
-------------------------------------------------------------------
Thu Sep 1 18:12:05 UTC 2011 - asterios.dramis@gmail.com
- Update to 0.9.0:
* Add support for the "Status" dbusmenu property. Will be used by appmenu-qt
for LP BUG 737419
- Collapse multiple separators, get rid of starting and trailing separators
(LP BUG 793339) (Aurelien Gateau)
- Spec file updates:
* Changed License: to LGPL-2.0+.
* Minor other updates.
-------------------------------------------------------------------
Sat Jun 25 10:57:05 UTC 2011 - asterios.dramis@gmail.com
- Update to 0.8.3:
* If DBusMenuExporter is deleted, delete all DBusMenu instances which were
working with it
* Only show icons in menu if the platform allows them
-------------------------------------------------------------------
Sun May 15 18:01:13 UTC 2011 - asterios.dramis@gmail.com
- Update to 0.8.2:
* Shortcut handling: Translate "+" into "plus" and "-" into "minus" (LP BUG
712565)
From 0.8.1:
* Added target to build documentation with Doxygen
From 0.8.0:
* Implements version 2 of the dbusmenu protocol
* Merged support for KMenu titles
From 0.7.0:
* Switched DBus domain from org.ayatana to com.canonical
- Spec file updates:
* Changes based on spec-cleaner run.
* Changed License: to LGPLv2+.
* Removed dbus-1-devel from BuildRequires:.
* Added doxygen and libqjson-devel in BuildRequires:.
* Updates in Summary, %description and Group entries.
* Removed /sbin/ldconfig from devel package %post* scripts (not needed).
* Minor other updates.
-------------------------------------------------------------------
Wed Dec 22 10:42:32 UTC 2010 - rwooninck@opensuse.org
- update to 0.6.6
* Avoid false warnings
* Make sure we don't track actions twice (bko254066)
* CMake-parser-friendly of dbusmenu_version.h
* Trigger action asynchronously when the "clicked" event is
received (LP bug 643393)
* Fixed copyright headers
* Removed all code which did not belong to Canonical.
* Fix some memory leaks
* Do not keep dangling pointers to deleted actions (LP bug 624964)
* Added the DBusMenuImporter::actionActivationRequested(QAction*)
signal
* Fix hardcoded libdir in pkgconfig file (LP BUG 610633)
-------------------------------------------------------------------
Tue Sep 14 19:46:03 CEST 2010 - dmueller@suse.de
- fix runtime dependencies
-------------------------------------------------------------------
Fri Aug 13 09:44:41 UTC 2010 - tittiatcoke@gmail.com
- update to 0.5.2
* Fix implementation of GetGroupProperties()
* Fix detection of QIcon::name() with gold
* Add support for KMenu titles
* Queue calls to refresh() because we may be spammed with many
LayoutUpdated() signals at once
* Turned DBusMenuImporter::updateMenu() into a slot
* Introduce a dbusmenu_version.h file
* Introduce updateMenu() and menuUpdated(), deprecate
menuReadyToBeShown()
* Better build check for QIcon::name() (LP BUG 597975)
* Rework the way menuReadyToBeShown() is emitted
* Queue LayoutUpdated() signal to avoid emitting it too often
* Increase timeouts: prefer slow but complete menus to fast
but incomplete
* Use QIcon::name() to return the icon name, when built
with Qt 4.7
* Correctly handle non-exclusive action groups
* bugfix (bko#237156)
* Added support for shortcuts
* Make the connection to LayoutUpdated() work
-------------------------------------------------------------------
Mon Jun 7 13:37:55 CEST 2010 - dmueller@suse.de
- add baselibs.conf
-------------------------------------------------------------------
Mon May 31 10:51:54 CEST 2010 - dmueller@suse.de
- correct license (bnc#610291)
-------------------------------------------------------------------
Fri May 28 11:18:30 CEST 2010 - dmueller@suse.de
- update to 0.3.3:
* package rename to libdbusmenu-qt
* Introduce a qt minimum version. Qt 4.5 doesn't work. (Michael Jansen)
* Use the FindQjson.cmake file made by pinotree for chokoq because it works.
* Refresh after LayoutUpdated signal (Marco Martin)
* Test items added to an existing menu are properly imported (Aurelien Gateau)
* Allow notification of the menu being filled, don't call aboutToShow more than
once per actual menu showing (Aaron Seigo)
* Win32 fixes from Ralf Habacker (Patrick Spendrin)
* Added option to disable tests (Alex Elsayed)
-------------------------------------------------------------------
Wed Apr 28 10:03:30 UTC 2010 - tittiatcoke@gmail.com
- Initial package

174
libdbusmenu-qt.spec Normal file
View File

@ -0,0 +1,174 @@
#
# spec file for package libdbusmenu-qt
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libdbusmenu-qt
Version: 0.9.2+13.10.20130826
Release: 0
Url: https://launchpad.net/libdbusmenu-qt/
Summary: A Qt implementation of the DBusMenu protocol
License: LGPL-2.0+
Group: System/Libraries
Source0: https://launchpad.net/ubuntu/trusty/+source/%{name}/%{version}-0ubuntu1/+files/%{name}_%{version}.orig.tar.gz
Source99: 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
#Needed for DISABLE_FIND_PACKAGE
BuildRequires: cmake >= 2.8.6
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libqjson-devel
BuildRequires: libqt4-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(Qt5Core)
Provides: dbusmenu-qt = 0.3.3
Obsoletes: dbusmenu-qt < 0.3.3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This library provides a Qt implementation of the DBusMenu protocol.
The DBusMenu protocol makes it possible for applications to export and import
their menus over DBus.
%package devel
Summary: Development package for libdbusmenu-qt
Group: Development/Libraries/Other
Requires: libdbusmenu-qt2 = %{version}
Provides: dbusmenu-qt-devel = 0.3.3
Obsoletes: dbusmenu-qt-devel < 0.3.3
%description devel
This package contains development files for libdbusmenu-qt.
%package -n libdbusmenu-qt2
Summary: Development package for dbusmenu-qt
Group: System/Libraries
%requires_ge libqt4-x11
%description -n libdbusmenu-qt2
This library provides a Qt implementation of the DBusMenu protocol.
The DBusMenu protocol makes it possible for applications to export and import
their menus over DBus. Qt4 library
%package -n libdbusmenu-qt5-2
Summary: Development package for dbusmenu-qt5
Group: System/Libraries
%description -n libdbusmenu-qt5-2
This library provides a Qt implementation of the DBusMenu protocol.
The DBusMenu protocol makes it possible for applications to export and import
their menus over DBus. Qt5 library
%package -n libdbusmenu-qt5-devel
Summary: Development package for libdbusmenu-qt5
Group: Development/Libraries/Other
Requires: libdbusmenu-qt5-2 = %{version}
Requires: pkgconfig(Qt5Core)
%description -n libdbusmenu-qt5-devel
This package contains development files for libdbusmenu-qt5.
%prep
%setup -q
%patch1 -p1
# Remove build time references so build-compare can do its work
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in
%build
mkdir build-qt4
pushd build-qt4
export CFLAGS="%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT"
export CXXFLAGS="%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT"
export LDFLAGS="-Wl,-Bsymbolic-functions $LDFLAGS"
_libsuffix=$(echo %{_lib} | cut -b4-)
cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DLIB_SUFFIX="$_libsuffix" \
-DUSE_QT4=ON \
-DCMAKE_BUILD_TYPE=release ..
make %{?_smp_mflags} VERBOSE=1
popd
mkdir build-qt5
pushd build-qt5
export CFLAGS="%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT"
export CXXFLAGS="%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT"
export LDFLAGS="-Wl,-Bsymbolic-functions $LDFLAGS"
_libsuffix=$(echo %{_lib} | cut -b4-)
cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DLIB_SUFFIX="$_libsuffix" \
-DUSE_QT5=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=TRUE \
-DCMAKE_BUILD_TYPE=release ..
make %{?_smp_mflags} VERBOSE=1
popd
%install
pushd build-qt4
%makeinstall
popd
pushd build-qt5
%makeinstall
popd
# Install the documentation in the correct location
mkdir -p %{buildroot}%{_docdir}/%{name}-devel
mkdir -p %{buildroot}%{_docdir}/libdbusmenu-qt5-devel
mv %{buildroot}%{_datadir}/doc/libdbusmenu-qt-doc/ %{buildroot}%{_docdir}/%{name}-devel/html/
mv %{buildroot}%{_datadir}/doc/libdbusmenu-qt5-doc/ %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/html/
# Install additional documentation
install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/%{name}-devel/
install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
%fdupes -s %{buildroot}%{_docdir}/%{name}-devel/
%fdupes -s %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
%post -n libdbusmenu-qt2 -p /sbin/ldconfig
%postun -n libdbusmenu-qt2 -p /sbin/ldconfig
%post -n libdbusmenu-qt5-2 -p /sbin/ldconfig
%postun -n libdbusmenu-qt5-2 -p /sbin/ldconfig
%files -n libdbusmenu-qt2
%defattr(-,root,root,-)
%{_libdir}/libdbusmenu-qt.so.2*
%files -n libdbusmenu-qt5-2
%defattr(-,root,root,-)
%{_libdir}/libdbusmenu-qt5.so.2*
%files -n libdbusmenu-qt5-devel
%defattr(-,root,root,-)
%doc %{_docdir}/libdbusmenu-qt5-devel/
%{_libdir}/libdbusmenu-qt5.so
%{_includedir}/dbusmenu-qt5/
%{_libdir}/pkgconfig/dbusmenu-qt5.pc
%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-devel/
%{_libdir}/libdbusmenu-qt.so
%{_includedir}/dbusmenu-qt/
%{_libdir}/pkgconfig/dbusmenu-qt.pc
%changelog

3
libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz Normal file
View File

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

124
noqDebug-qWarnings.patch Normal file
View File

@ -0,0 +1,124 @@
diff -Naur libdbusmenu-qt-0.9.2.orig/CMakeLists.txt libdbusmenu-qt-0.9.2/CMakeLists.txt
--- libdbusmenu-qt-0.9.2.orig/CMakeLists.txt 2012-03-29 17:47:52.000000000 +0200
+++ libdbusmenu-qt-0.9.2/CMakeLists.txt 2013-08-25 22:31:17.238891142 +0200
@@ -88,7 +88,7 @@
add_subdirectory(src)
if (NOT USE_QT5) # TODO port tests to Qt5
-add_subdirectory(tests)
+#add_subdirectory(tests)
endif()
add_subdirectory(tools)
diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp
--- libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp 2012-03-29 17:47:52.000000000 +0200
+++ libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp 2013-08-25 21:53:59.005872906 +0200
@@ -160,7 +160,9 @@
Q_FOREACH(QAction *action, menu->actions()) {
int actionId = m_idForAction.value(action, -1);
if (actionId == -1) {
+#ifndef QT_NO_DEBUG
DMWARNING << "No id for action";
+#endif
continue;
}
@@ -185,7 +187,9 @@
{
int id = m_idForAction.value(action, -1);
if (id != -1) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Already tracking action" << action->text() << "under id" << id;
+#endif
return;
}
QVariantMap map = propertiesForAction(action);
diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp
--- libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp 2012-03-29 17:47:52.000000000 +0200
+++ libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp 2013-08-25 21:53:10.844475006 +0200
@@ -190,7 +190,9 @@
} else if (key == "shortcut") {
updateActionShortcut(action, value);
} else {
+#ifndef QT_NO_DEBUG
DMWARNING << "Unhandled property update" << key;
+#endif
}
}
@@ -238,7 +240,9 @@
action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash);
QPixmap pix;
if (!pix.loadFromData(data)) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Failed to decode icon-data property for action" << action->text();
+#endif
action->setIcon(QIcon());
return;
}
@@ -390,7 +394,9 @@
QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;
if (!reply.isValid()) {
+#ifndef QT_NO_DEBUG
DMWARNING << reply.error().message();
+#endif
return;
}
@@ -401,7 +407,9 @@
QMenu *menu = d->menuForId(parentId);
if (!menu) {
+#ifndef QT_NO_DEBUG
DMWARNING << "No menu for id" << parentId;
+#endif
return;
}
@@ -489,7 +497,9 @@
QPointer<QObject> guard(this);
if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Application did not answer to AboutToShow() before timeout";
+#endif
}
#ifdef BENCHMARK
@@ -517,7 +527,9 @@
QDBusPendingReply<bool> reply = *watcher;
if (reply.isError()) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Call to AboutToShow() failed:" << reply.error().message();
+#endif
return;
}
bool needRefresh = reply.argumentAt<0>();
@@ -529,7 +541,9 @@
d->m_idsRefreshedByAboutToShow << id;
watcher = d->refresh(id);
if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Application did not refresh before timeout";
+#endif
}
}
}
diff -Naur libdbusmenu-qt-0.9.2.orig/src/debug_p.h libdbusmenu-qt-0.9.2/src/debug_p.h
--- libdbusmenu-qt-0.9.2.orig/src/debug_p.h 2012-03-29 17:47:52.000000000 +0200
+++ libdbusmenu-qt-0.9.2/src/debug_p.h 2013-08-25 22:28:20.231104044 +0200
@@ -36,12 +36,10 @@
#define DMVAR(var) DMDEBUG << #var ":" << var
#define DMRETURN_IF_FAIL(cond) if (!(cond)) { \
- DMWARNING << "Condition failed: " #cond; \
return; \
}
#define DMRETURN_VALUE_IF_FAIL(cond, value) if (!(cond)) { \
- DMWARNING << "Condition failed: " #cond; \
return (value); \
}