[arch-commits] Commit in appmenu-qt/repos/extra-i686 (4 files)
Date: Friday, January 2, 2015 @ 17:13:43
Author: andrea
Revision: 228345
archrelease: copy trunk to extra-i686
Added:
appmenu-qt/repos/extra-i686/PKGBUILD
(from rev 228344, appmenu-qt/trunk/PKGBUILD)
appmenu-qt/repos/extra-i686/appmenu-async.diff
(from rev 228344, appmenu-qt/trunk/appmenu-async.diff)
Deleted:
appmenu-qt/repos/extra-i686/PKGBUILD
appmenu-qt/repos/extra-i686/appmenu-async.diff
+
PKGBUILD | 77 ++---
appmenu-async.diff | 298 +--
2 files changed, 188 insertions(+), 187 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-01-02 16:13:34 UTC (rev 228344)
+++ PKGBUILD2015-01-02 16:13:43 UTC (rev 228345)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=appmenu-qt
-pkgver=0.2.6
-pkgrel=5
-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')
-
-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/extra-i686/PKGBUILD (from rev 228344,
appmenu-qt/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-01-02 16:13:43 UTC (rev 228345)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=appmenu-qt
+pkgver=0.2.6
+pkgrel=5
+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'
+ '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
+}
Deleted: appmenu-async.diff
===
--- appmenu-async.diff 2015-01-02 16:13:34 UTC (rev 228344)
+++ appmenu-async.diff 2015-01-02 16:13:43 UTC (rev 228345)
@@ -1,149 +0,0 @@
-=== 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
[arch-commits] Commit in appmenu-qt/repos/extra-i686 (4 files)
Date: Saturday, March 1, 2014 @ 09:09:19
Author: andrea
Revision: 206526
archrelease: copy trunk to extra-i686
Added:
appmenu-qt/repos/extra-i686/PKGBUILD
(from rev 206525, appmenu-qt/trunk/PKGBUILD)
appmenu-qt/repos/extra-i686/appmenu-async.diff
(from rev 206525, appmenu-qt/trunk/appmenu-async.diff)
Deleted:
appmenu-qt/repos/extra-i686/PKGBUILD
appmenu-qt/repos/extra-i686/appmenu-async.diff
+
PKGBUILD | 76 ++---
appmenu-async.diff | 298 +--
2 files changed, 187 insertions(+), 187 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2014-03-01 08:08:58 UTC (rev 206525)
+++ PKGBUILD2014-03-01 08:09:19 UTC (rev 206526)
@@ -1,38 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 206525,
appmenu-qt/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-03-01 08:09:19 UTC (rev 206526)
@@ -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')
+
+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
+}
Deleted: appmenu-async.diff
===
--- appmenu-async.diff 2014-03-01 08:08:58 UTC (rev 206525)
+++ appmenu-async.diff 2014-03-01 08:09:19 UTC (rev 206526)
@@ -1,149 +0,0 @@
-=== 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
