[arch-commits] Commit in appmenu-qt/repos (6 files)

[Allan McRae]

Date: Sunday, December 6, 2015 @ 17:26:01
  Author: allan
Revision: 252845

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  appmenu-qt/repos/staging-i686/
  appmenu-qt/repos/staging-i686/PKGBUILD
(from rev 252844, appmenu-qt/trunk/PKGBUILD)
  appmenu-qt/repos/staging-i686/appmenu-async.diff
(from rev 252844, appmenu-qt/trunk/appmenu-async.diff)
  appmenu-qt/repos/staging-x86_64/
  appmenu-qt/repos/staging-x86_64/PKGBUILD
(from rev 252844, appmenu-qt/trunk/PKGBUILD)
  appmenu-qt/repos/staging-x86_64/appmenu-async.diff
(from rev 252844, appmenu-qt/trunk/appmenu-async.diff)

---+
 staging-i686/PKGBUILD |   39 +
 staging-i686/appmenu-async.diff   |  149 
 staging-x86_64/PKGBUILD   |   39 +
 staging-x86_64/appmenu-async.diff |  149 
 4 files changed, 376 insertions(+)

Copied: appmenu-qt/repos/staging-i686/PKGBUILD (from rev 252844, 
appmenu-qt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-12-06 16:26:01 UTC (rev 252845)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+
+pkgname=appmenu-qt
+pkgver=0.2.6
+pkgrel=6
+pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
+arch=('i686' 'x86_64')
+url='https://launchpad.net/appmenu-qt'
+license=('GPL')
+depends=('libdbusmenu-qt4')
+makedepends=('cmake')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"{,.asc}
+'appmenu-async.diff')
+md5sums=('90cce750e5412d43ce075b0a9bdb6782'
+ 'SKIP'
+ '5db00ca92274c8b1797c204321961189')
+validpgpkeys=('45C43F82329D77F384214CCABEED35A5EEE34473') # Aurelien Gateau
+
+prepare() {
+  mkdir build
+
+  # FS#33286
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}"/appmenu-async.diff
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Copied: appmenu-qt/repos/staging-i686/appmenu-async.diff (from rev 252844, 
appmenu-qt/trunk/appmenu-async.diff)
===
--- staging-i686/appmenu-async.diff (rev 0)
+++ staging-i686/appmenu-async.diff 2015-12-06 16:26:01 UTC (rev 252845)
@@ -0,0 +1,149 @@
+=== modified file 'src/CMakeLists.txt'
+--- src/CMakeLists.txt 2012-02-27 14:27:17 +
 src/CMakeLists.txt 2013-01-04 10:33:53 +
+@@ -15,6 +15,10 @@
+ ${QT_QTXML_INCLUDE_DIR}
+ )
+ 
++qt4_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml
++   registrar)
++
++
+ qt4_automoc(${appmenu_qt_SRCS})
+ 
+ link_directories(
+
+=== modified file 'src/appmenuplatformmenubar.cpp'
+--- src/appmenuplatformmenubar.cpp 2012-04-04 16:06:06 +
 src/appmenuplatformmenubar.cpp 2013-01-04 10:36:25 +
+@@ -15,6 +15,7 @@
+along with appmenu-qt.  If not, see .
+ */
+ #include "appmenuplatformmenubar.h"
++#include "registrar.h"
+ 
+ // dbusmenu-qt
+ #include 
+@@ -393,6 +394,8 @@
+ 
+ bool MenuBarAdapter::registerWindow()
+ {
++static com::canonical::AppMenu::Registrar *registrar = 0;
++
+ if (!m_menuBar->window()) {
+ WARN << "No parent for this menubar";
+ return false;
+@@ -403,9 +406,8 @@
+ return true;
+ }
+ 
+-QDBusInterface host(REGISTRAR_SERVICE, REGISTRAR_PATH, REGISTRAR_IFACE);
+-if (!host.isValid()) {
+-return false;
++if (!registrar) {
++registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, 
REGISTRAR_PATH, QDBusConnection::sessionBus(), 0);
+ }
+ 
+ Q_FOREACH(QAction *action, m_menuBar->actions()) {
+@@ -428,8 +430,9 @@
+ }
+ 
+ m_registeredWinId = winId;
+-QVariant path = 
QVariant::fromValue(QDBusObjectPath(m_objectPath));
+-host.asyncCall(QLatin1String("RegisterWindow"), QVariant(winId), path);
++if (registrar) {
++registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath));
++}
+ return true;
+ }
+ 
+
+=== added file 'src/com.canonical.AppMenu.Registrar.xml'
+--- src/com.canonical.AppMenu.Registrar.xml1970-01-01 00:00:00 +
 src/com.canonical.AppMenu.Registrar.xml2013-01-04 10:04:35 +
+@@ -0,0 +1,56 @@
++http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd;>
++http://www.ayatana.org/dbus/dox.dtd;>
++  
++  http://www.ayatana.org/dbus/dox.dtd;>
++  
++An interface to register a menu from an application's window 
to be displayed in another
++window.  This manages that association between XWindow Window 
IDs and the dbus
++address and object that provides the 

[arch-commits] Commit in appmenu-qt/repos (6 files)

[Andrea Scarpino]

Date: Tuesday, February 19, 2013 @ 00:11:19
  Author: andrea
Revision: 178253

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  appmenu-qt/repos/staging-i686/
  appmenu-qt/repos/staging-i686/PKGBUILD
(from rev 178252, appmenu-qt/trunk/PKGBUILD)
  appmenu-qt/repos/staging-i686/appmenu-async.diff
(from rev 178252, appmenu-qt/trunk/appmenu-async.diff)
  appmenu-qt/repos/staging-x86_64/
  appmenu-qt/repos/staging-x86_64/PKGBUILD
(from rev 178252, appmenu-qt/trunk/PKGBUILD)
  appmenu-qt/repos/staging-x86_64/appmenu-async.diff
(from rev 178252, appmenu-qt/trunk/appmenu-async.diff)

---+
 staging-i686/PKGBUILD |   38 +
 staging-i686/appmenu-async.diff   |  149 
 staging-x86_64/PKGBUILD   |   38 +
 staging-x86_64/appmenu-async.diff |  149 
 4 files changed, 374 insertions(+)

Copied: appmenu-qt/repos/staging-i686/PKGBUILD (from rev 178252, 
appmenu-qt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-02-18 23:11:19 UTC (rev 178253)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=appmenu-qt
+pkgver=0.2.6
+pkgrel=4
+pkgdesc=Allows Qt applications to export menus over DBus to a menu applet
+arch=('i686' 'x86_64')
+url='https://launchpad.net/appmenu-qt'
+license=('GPL')
+depends=('libdbusmenu-qt')
+makedepends=('cmake')
+source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2{,.asc}
+'appmenu-async.diff')
+md5sums=('90cce750e5412d43ce075b0a9bdb6782'
+ 'de499d01369fc85040f5bbfc53ae1700'
+ '5db00ca92274c8b1797c204321961189')
+
+build() {
+  . /etc/profile.d/qt4.sh
+
+  # FS#33286
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i ${srcdir}/appmenu-async.diff
+  cd ../
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=${pkgdir} install
+}

Copied: appmenu-qt/repos/staging-i686/appmenu-async.diff (from rev 178252, 
appmenu-qt/trunk/appmenu-async.diff)
===
--- staging-i686/appmenu-async.diff (rev 0)
+++ staging-i686/appmenu-async.diff 2013-02-18 23:11:19 UTC (rev 178253)
@@ -0,0 +1,149 @@
+=== modified file 'src/CMakeLists.txt'
+--- src/CMakeLists.txt 2012-02-27 14:27:17 +
 src/CMakeLists.txt 2013-01-04 10:33:53 +
+@@ -15,6 +15,10 @@
+ ${QT_QTXML_INCLUDE_DIR}
+ )
+ 
++qt4_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml
++   registrar)
++
++
+ qt4_automoc(${appmenu_qt_SRCS})
+ 
+ link_directories(
+
+=== modified file 'src/appmenuplatformmenubar.cpp'
+--- src/appmenuplatformmenubar.cpp 2012-04-04 16:06:06 +
 src/appmenuplatformmenubar.cpp 2013-01-04 10:36:25 +
+@@ -15,6 +15,7 @@
+along with appmenu-qt.  If not, see http://www.gnu.org/licenses/.
+ */
+ #include appmenuplatformmenubar.h
++#include registrar.h
+ 
+ // dbusmenu-qt
+ #include dbusmenuexporter.h
+@@ -393,6 +394,8 @@
+ 
+ bool MenuBarAdapter::registerWindow()
+ {
++static com::canonical::AppMenu::Registrar *registrar = 0;
++
+ if (!m_menuBar-window()) {
+ WARN  No parent for this menubar;
+ return false;
+@@ -403,9 +406,8 @@
+ return true;
+ }
+ 
+-QDBusInterface host(REGISTRAR_SERVICE, REGISTRAR_PATH, REGISTRAR_IFACE);
+-if (!host.isValid()) {
+-return false;
++if (!registrar) {
++registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, 
REGISTRAR_PATH, QDBusConnection::sessionBus(), 0);
+ }
+ 
+ Q_FOREACH(QAction *action, m_menuBar-actions()) {
+@@ -428,8 +430,9 @@
+ }
+ 
+ m_registeredWinId = winId;
+-QVariant path = 
QVariant::fromValueQDBusObjectPath(QDBusObjectPath(m_objectPath));
+-host.asyncCall(QLatin1String(RegisterWindow), QVariant(winId), path);
++if (registrar) {
++registrar-RegisterWindow(winId, QDBusObjectPath(m_objectPath));
++}
+ return true;
+ }
+ 
+
+=== added file 'src/com.canonical.AppMenu.Registrar.xml'
+--- src/com.canonical.AppMenu.Registrar.xml1970-01-01 00:00:00 +
 src/com.canonical.AppMenu.Registrar.xml2013-01-04 10:04:35 +
+@@ -0,0 +1,56 @@
++!DOCTYPE node PUBLIC -//freedesktop//DTD D-BUS Object Introspection 
1.0//EN http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd;
++node xmlns:dox=http://www.ayatana.org/dbus/dox.dtd;
++  dox:d![CDATA[
++@mainpage
++   
++An interface to register menus that are associated with a window in 
an application.  The
++main interface is docuemented here: @ref 
com::canonical::AppMenu::Registrar.
++  
++ 

[arch-commits] Commit in appmenu-qt/repos (6 files)

[Andrea Scarpino]

Date: Saturday, January 5, 2013 @ 07:47:25
  Author: andrea
Revision: 174631

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  appmenu-qt/repos/extra-i686/PKGBUILD
(from rev 174630, appmenu-qt/trunk/PKGBUILD)
  appmenu-qt/repos/extra-i686/appmenu-async.diff
(from rev 174630, appmenu-qt/trunk/appmenu-async.diff)
  appmenu-qt/repos/extra-x86_64/PKGBUILD
(from rev 174630, appmenu-qt/trunk/PKGBUILD)
  appmenu-qt/repos/extra-x86_64/appmenu-async.diff
(from rev 174630, appmenu-qt/trunk/appmenu-async.diff)
Deleted:
  appmenu-qt/repos/extra-i686/PKGBUILD
  appmenu-qt/repos/extra-x86_64/PKGBUILD

-+
 extra-i686/PKGBUILD |   66 +++-
 extra-i686/appmenu-async.diff   |  121 ++
 extra-x86_64/PKGBUILD   |   66 +++-
 extra-x86_64/appmenu-async.diff |  121 ++
 4 files changed, 314 insertions(+), 60 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-01-05 12:46:56 UTC (rev 174630)
+++ extra-i686/PKGBUILD 2013-01-05 12:47:25 UTC (rev 174631)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=appmenu-qt
-pkgver=0.2.6
-pkgrel=1
-pkgdesc=Allows Qt applications to export menus over DBus to a menu applet
-arch=('i686' 'x86_64')
-url='https://launchpad.net/appmenu-qt'
-license=('GPL')
-depends=('libdbusmenu-qt')
-makedepends=('cmake')
-source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('90cce750e5412d43ce075b0a9bdb6782'
- 'de499d01369fc85040f5bbfc53ae1700')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}

Copied: appmenu-qt/repos/extra-i686/PKGBUILD (from rev 174630, 
appmenu-qt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-05 12:47:25 UTC (rev 174631)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=appmenu-qt
+pkgver=0.2.6
+pkgrel=2
+pkgdesc=Allows Qt applications to export menus over DBus to a menu applet
+arch=('i686' 'x86_64')
+url='https://launchpad.net/appmenu-qt'
+license=('GPL')
+depends=('libdbusmenu-qt')
+makedepends=('cmake')
+source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2{,.asc}
+'appmenu-async.diff')
+md5sums=('90cce750e5412d43ce075b0a9bdb6782'
+ 'de499d01369fc85040f5bbfc53ae1700'
+ '82947207881702d88403c149406b502a')
+
+build() {
+  # FS#33286
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i ${srcdir}/appmenu-async.diff
+  cd ../
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=${pkgdir} install
+}

Copied: appmenu-qt/repos/extra-i686/appmenu-async.diff (from rev 174630, 
appmenu-qt/trunk/appmenu-async.diff)
===
--- extra-i686/appmenu-async.diff   (rev 0)
+++ extra-i686/appmenu-async.diff   2013-01-05 12:47:25 UTC (rev 174631)
@@ -0,0 +1,121 @@
+=== modified file 'src/CMakeLists.txt'
+--- src/CMakeLists.txt 2012-02-27 14:27:17 +
 src/CMakeLists.txt 2013-01-04 10:33:53 +
+@@ -15,6 +15,10 @@
+ ${QT_QTXML_INCLUDE_DIR}
+ )
+ 
++qt4_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml
++   registrar)
++
++
+ qt4_automoc(${appmenu_qt_SRCS})
+ 
+ link_directories(
+
+=== modified file 'src/appmenuplatformmenubar.cpp'
+--- src/appmenuplatformmenubar.cpp 2012-04-04 16:06:06 +
 src/appmenuplatformmenubar.cpp 2013-01-04 10:36:25 +
+@@ -15,6 +15,7 @@
+along with appmenu-qt.  If not, see http://www.gnu.org/licenses/.
+ */
+ #include appmenuplatformmenubar.h
++#include registrar.h
+ 
+ // dbusmenu-qt
+ #include dbusmenuexporter.h
+@@ -393,6 +394,8 @@
+ 
+ bool MenuBarAdapter::registerWindow()
+ {
++static com::canonical::AppMenu::Registrar *registrar = 0;
++
+ if (!m_menuBar-window()) {
+ WARN  No parent for this menubar;
+ return false;
+@@ -403,9 +406,8 @@
+ return true;
+ }
+ 
+-QDBusInterface host(REGISTRAR_SERVICE, REGISTRAR_PATH, REGISTRAR_IFACE);
+-if (!host.isValid()) {
+-return false;
++if (!registrar) {
++registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, 
REGISTRAR_PATH, QDBusConnection::sessionBus(), 0);
+ }
+ 
+ Q_FOREACH(QAction *action, m_menuBar-actions()) {
+@@ -428,8 +430,9 @@
+ }
+ 
+ m_registeredWinId =