[arch-commits] Commit in ario/repos (14 files)
Balló György
bgyorgy at archlinux.org
Thu Jan 26 14:55:42 UTC 2017
Date: Thursday, January 26, 2017 @ 14:55:41
Author: bgyorgy
Revision: 209141
archrelease: copy trunk to community-i686, community-x86_64
Added:
ario/repos/community-i686/PKGBUILD
(from rev 209140, ario/trunk/PKGBUILD)
ario/repos/community-i686/ario.changelog
(from rev 209140, ario/trunk/ario.changelog)
ario/repos/community-i686/drop-libunique.patch
(from rev 209140, ario/trunk/drop-libunique.patch)
ario/repos/community-i686/glib.patch
(from rev 209140, ario/trunk/glib.patch)
ario/repos/community-x86_64/PKGBUILD
(from rev 209140, ario/trunk/PKGBUILD)
ario/repos/community-x86_64/ario.changelog
(from rev 209140, ario/trunk/ario.changelog)
ario/repos/community-x86_64/drop-libunique.patch
(from rev 209140, ario/trunk/drop-libunique.patch)
ario/repos/community-x86_64/glib.patch
(from rev 209140, ario/trunk/glib.patch)
Deleted:
ario/repos/community-i686/PKGBUILD
ario/repos/community-i686/ario.changelog
ario/repos/community-i686/glib.patch
ario/repos/community-x86_64/PKGBUILD
ario/repos/community-x86_64/ario.changelog
ario/repos/community-x86_64/glib.patch
---------------------------------------+
/PKGBUILD | 80 ++++++++++++++++++++++++++++++++
/ario.changelog | 78 +++++++++++++++++++++++++++++++
/glib.patch | 48 +++++++++++++++++++
community-i686/PKGBUILD | 36 --------------
community-i686/ario.changelog | 39 ---------------
community-i686/drop-libunique.patch | 65 ++++++++++++++++++++++++++
community-i686/glib.patch | 24 ---------
community-x86_64/PKGBUILD | 36 --------------
community-x86_64/ario.changelog | 39 ---------------
community-x86_64/drop-libunique.patch | 65 ++++++++++++++++++++++++++
community-x86_64/glib.patch | 24 ---------
11 files changed, 336 insertions(+), 198 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-01-26 14:55:34 UTC (rev 209140)
+++ community-i686/PKGBUILD 2017-01-26 14:55:41 UTC (rev 209141)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-
-pkgname=ario
-pkgver=1.5.1
-pkgrel=4
-pkgdesc="A GTK client for MPD inspired by Rhythmbox but much lighter and faster"
-arch=('i686' 'x86_64')
-url="http://ario-player.sourceforge.net/"
-license=('GPL')
-depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade'
- 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils')
-makedepends=('intltool' 'perl-xml-parser' 'patch')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
- glib.patch)
-sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e'
- '16481cc5fe3fb52ee36bae63522e319193285542fe0c8ab4281ecc5794a82184')
-
-prepare() {
- cd "${srcdir}"/$pkgname-$pkgver
- patch -p1 -i ../glib.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc
- make
- }
-
-package () {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: ario/repos/community-i686/PKGBUILD (from rev 209140, ario/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+
+pkgname=ario
+pkgver=1.5.1
+pkgrel=5
+pkgdesc="A GTK client for MPD inspired by Rhythmbox but much lighter and faster"
+arch=('i686' 'x86_64')
+url="http://ario-player.sourceforge.net/"
+license=('GPL')
+depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'gtk2'
+ 'libmpdclient' 'libnotify' 'libsoup' 'taglib' 'xdg-utils')
+makedepends=('intltool' 'perl-xml-parser' 'patch')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
+ glib.patch
+ drop-libunique.patch)
+sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e'
+ '16481cc5fe3fb52ee36bae63522e319193285542fe0c8ab4281ecc5794a82184'
+ '6531b09c8e9d1b077a25ca4a37e34a09fdf8d1d0966cf3b0a93f539c324c6a8b')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ patch -p1 -i ../glib.patch
+ patch -p1 -i ../drop-libunique.patch
+ autoreconf -fi
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+ }
+
+package () {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/ario.changelog
===================================================================
--- community-i686/ario.changelog 2017-01-26 14:55:34 UTC (rev 209140)
+++ community-i686/ario.changelog 2017-01-26 14:55:41 UTC (rev 209141)
@@ -1,39 +0,0 @@
-2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * ario 1.5.1-4 pacman hooks part 1 rebuild
-
-2012-01-26 Eric Belanger <eric at archlinux.org>
- * Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-07-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.5.1
-
-2010-08-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.5
-
-2010-02-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.4.4
-
-2010-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.4.3
-
-2009-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.4.2
-
-2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.4.1
-
-2009-12-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.4
-
-2009-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * 'taglib' dependency added - version 1.3-2
-
-2009-05-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.3
-
-2009-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.2.2
-
-2009-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * adopted in [community]
- * updated to major version 1.2.1
Copied: ario/repos/community-i686/ario.changelog (from rev 209140, ario/trunk/ario.changelog)
===================================================================
--- community-i686/ario.changelog (rev 0)
+++ community-i686/ario.changelog 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,39 @@
+2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * ario 1.5.1-4 pacman hooks part 1 rebuild
+
+2012-01-26 Eric Belanger <eric at archlinux.org>
+ * Rebuild against libpng 1.5 and libtiff 4.0
+
+2011-07-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.5.1
+
+2010-08-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.5
+
+2010-02-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.4.4
+
+2010-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.4.3
+
+2009-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.4.2
+
+2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.4.1
+
+2009-12-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.4
+
+2009-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * 'taglib' dependency added - version 1.3-2
+
+2009-05-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.3
+
+2009-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.2.2
+
+2009-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * adopted in [community]
+ * updated to major version 1.2.1
Copied: ario/repos/community-i686/drop-libunique.patch (from rev 209140, ario/trunk/drop-libunique.patch)
===================================================================
--- community-i686/drop-libunique.patch (rev 0)
+++ community-i686/drop-libunique.patch 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,65 @@
+diff -Naur ario-1.5.1.orig/configure.ac ario-1.5.1/configure.ac
+--- ario-1.5.1.orig/configure.ac 2011-06-13 18:11:30.000000000 +0200
++++ ario-1.5.1/configure.ac 2017-01-26 14:20:51.574818457 +0100
+@@ -36,7 +36,6 @@
+ gthread-2.0
+ gio-2.0
+ libxml-2.0
+- unique-1.0
+ libcurl
+ gnutls])
+
+diff -Naur ario-1.5.1.orig/src/ario-main.c ario-1.5.1/src/ario-main.c
+--- ario-1.5.1.orig/src/ario-main.c 2011-06-13 11:58:37.000000000 +0200
++++ ario-1.5.1/src/ario-main.c 2017-01-26 15:15:24.790597138 +0100
+@@ -36,20 +36,14 @@
+
+ #ifdef WIN32
+ #include <windows.h>
+-#else
+-#include <unique/unique.h>
+ #endif
+
+ #ifndef WIN32
+-static UniqueResponse
+-ario_main_on_message_received (G_GNUC_UNUSED UniqueApp *app,
+- G_GNUC_UNUSED UniqueCommand command,
+- G_GNUC_UNUSED UniqueMessageData *message,
+- G_GNUC_UNUSED guint time_,
+- ArioShell *shell)
++static void
++ario_main_on_activated (G_GNUC_UNUSED GApplication *app,
++ ArioShell *shell)
+ {
+ ario_shell_present (shell);
+- return UNIQUE_RESPONSE_OK;
+ }
+ #endif
+
+@@ -89,11 +83,12 @@
+ return 0;
+ }
+ #else
+- UniqueApp *app;
+- app = unique_app_new ("org.Ario", NULL);
+- if (unique_app_is_running (app)) {
++ GApplication *app;
++ app = g_application_new ("org.Ario", G_APPLICATION_FLAGS_NONE);
++ g_application_register (app, NULL, NULL);
++ if (g_application_get_is_remote (app)) {
+ if (ario_conf_get_boolean (PREF_ONE_INSTANCE, PREF_ONE_INSTANCE_DEFAULT)) {
+- unique_app_send_message (app, UNIQUE_ACTIVATE, NULL);
++ g_application_activate (app);
+ g_object_unref (app);
+ return 0;
+ }
+@@ -134,8 +129,7 @@
+ ario_shell_construct (shell, minimized);
+
+ #ifndef WIN32
+- unique_app_watch_window (app, GTK_WINDOW (shell));
+- g_signal_connect (app, "message-received", G_CALLBACK (ario_main_on_message_received), shell);
++ g_signal_connect (app, "activate", G_CALLBACK (ario_main_on_activated), shell);
+ #endif
+ /* Initialisation of plugins engine */
+ ario_plugins_engine_init (shell);
Deleted: community-i686/glib.patch
===================================================================
--- community-i686/glib.patch 2017-01-26 14:55:34 UTC (rev 209140)
+++ community-i686/glib.patch 2017-01-26 14:55:41 UTC (rev 209141)
@@ -1,24 +0,0 @@
-diff -rupN a/src/ario-profiles.c b/src/ario-profiles.c
---- a/src/ario-profiles.c 2011-05-17 17:54:49.000000000 +0000
-+++ b/src/ario-profiles.c 2013-12-25 10:52:06.668807328 +0000
-@@ -22,7 +22,7 @@
- #include <config.h>
- #include <stdlib.h>
- #include <libxml/parser.h>
--#include <glib/gi18n.h>
-+#include <glib.h>
- #include "ario-util.h"
- #include "ario-debug.h"
-
-diff -rupN a/src/ario-profiles.h b/src/ario-profiles.h
---- a/src/ario-profiles.h 2011-05-17 17:54:49.000000000 +0000
-+++ b/src/ario-profiles.h 2013-12-25 10:50:47.839363409 +0000
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_PROFILES_H
- #define __ARIO_PROFILES_H
-
--#include <glib/gslist.h>
-+#include <glib.h>
- #include "servers/ario-server.h"
-
- G_BEGIN_DECLS
Copied: ario/repos/community-i686/glib.patch (from rev 209140, ario/trunk/glib.patch)
===================================================================
--- community-i686/glib.patch (rev 0)
+++ community-i686/glib.patch 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,24 @@
+diff -rupN a/src/ario-profiles.c b/src/ario-profiles.c
+--- a/src/ario-profiles.c 2011-05-17 17:54:49.000000000 +0000
++++ b/src/ario-profiles.c 2013-12-25 10:52:06.668807328 +0000
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #include <stdlib.h>
+ #include <libxml/parser.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ #include "ario-util.h"
+ #include "ario-debug.h"
+
+diff -rupN a/src/ario-profiles.h b/src/ario-profiles.h
+--- a/src/ario-profiles.h 2011-05-17 17:54:49.000000000 +0000
++++ b/src/ario-profiles.h 2013-12-25 10:50:47.839363409 +0000
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+
+ G_BEGIN_DECLS
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-01-26 14:55:34 UTC (rev 209140)
+++ community-x86_64/PKGBUILD 2017-01-26 14:55:41 UTC (rev 209141)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-
-pkgname=ario
-pkgver=1.5.1
-pkgrel=4
-pkgdesc="A GTK client for MPD inspired by Rhythmbox but much lighter and faster"
-arch=('i686' 'x86_64')
-url="http://ario-player.sourceforge.net/"
-license=('GPL')
-depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade'
- 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils')
-makedepends=('intltool' 'perl-xml-parser' 'patch')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
- glib.patch)
-sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e'
- '16481cc5fe3fb52ee36bae63522e319193285542fe0c8ab4281ecc5794a82184')
-
-prepare() {
- cd "${srcdir}"/$pkgname-$pkgver
- patch -p1 -i ../glib.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc
- make
- }
-
-package () {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: ario/repos/community-x86_64/PKGBUILD (from rev 209140, ario/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+
+pkgname=ario
+pkgver=1.5.1
+pkgrel=5
+pkgdesc="A GTK client for MPD inspired by Rhythmbox but much lighter and faster"
+arch=('i686' 'x86_64')
+url="http://ario-player.sourceforge.net/"
+license=('GPL')
+depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'gtk2'
+ 'libmpdclient' 'libnotify' 'libsoup' 'taglib' 'xdg-utils')
+makedepends=('intltool' 'perl-xml-parser' 'patch')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
+ glib.patch
+ drop-libunique.patch)
+sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e'
+ '16481cc5fe3fb52ee36bae63522e319193285542fe0c8ab4281ecc5794a82184'
+ '6531b09c8e9d1b077a25ca4a37e34a09fdf8d1d0966cf3b0a93f539c324c6a8b')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ patch -p1 -i ../glib.patch
+ patch -p1 -i ../drop-libunique.patch
+ autoreconf -fi
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+ }
+
+package () {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/ario.changelog
===================================================================
--- community-x86_64/ario.changelog 2017-01-26 14:55:34 UTC (rev 209140)
+++ community-x86_64/ario.changelog 2017-01-26 14:55:41 UTC (rev 209141)
@@ -1,39 +0,0 @@
-2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * ario 1.5.1-4 pacman hooks part 1 rebuild
-
-2012-01-26 Eric Belanger <eric at archlinux.org>
- * Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-07-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.5.1
-
-2010-08-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.5
-
-2010-02-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.4.4
-
-2010-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.4.3
-
-2009-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.4.2
-
-2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.4.1
-
-2009-12-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.4
-
-2009-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * 'taglib' dependency added - version 1.3-2
-
-2009-05-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.3
-
-2009-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * updated to major version 1.2.2
-
-2009-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * adopted in [community]
- * updated to major version 1.2.1
Copied: ario/repos/community-x86_64/ario.changelog (from rev 209140, ario/trunk/ario.changelog)
===================================================================
--- community-x86_64/ario.changelog (rev 0)
+++ community-x86_64/ario.changelog 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,39 @@
+2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * ario 1.5.1-4 pacman hooks part 1 rebuild
+
+2012-01-26 Eric Belanger <eric at archlinux.org>
+ * Rebuild against libpng 1.5 and libtiff 4.0
+
+2011-07-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.5.1
+
+2010-08-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.5
+
+2010-02-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.4.4
+
+2010-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.4.3
+
+2009-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.4.2
+
+2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.4.1
+
+2009-12-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.4
+
+2009-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * 'taglib' dependency added - version 1.3-2
+
+2009-05-24 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.3
+
+2009-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * updated to major version 1.2.2
+
+2009-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * adopted in [community]
+ * updated to major version 1.2.1
Copied: ario/repos/community-x86_64/drop-libunique.patch (from rev 209140, ario/trunk/drop-libunique.patch)
===================================================================
--- community-x86_64/drop-libunique.patch (rev 0)
+++ community-x86_64/drop-libunique.patch 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,65 @@
+diff -Naur ario-1.5.1.orig/configure.ac ario-1.5.1/configure.ac
+--- ario-1.5.1.orig/configure.ac 2011-06-13 18:11:30.000000000 +0200
++++ ario-1.5.1/configure.ac 2017-01-26 14:20:51.574818457 +0100
+@@ -36,7 +36,6 @@
+ gthread-2.0
+ gio-2.0
+ libxml-2.0
+- unique-1.0
+ libcurl
+ gnutls])
+
+diff -Naur ario-1.5.1.orig/src/ario-main.c ario-1.5.1/src/ario-main.c
+--- ario-1.5.1.orig/src/ario-main.c 2011-06-13 11:58:37.000000000 +0200
++++ ario-1.5.1/src/ario-main.c 2017-01-26 15:15:24.790597138 +0100
+@@ -36,20 +36,14 @@
+
+ #ifdef WIN32
+ #include <windows.h>
+-#else
+-#include <unique/unique.h>
+ #endif
+
+ #ifndef WIN32
+-static UniqueResponse
+-ario_main_on_message_received (G_GNUC_UNUSED UniqueApp *app,
+- G_GNUC_UNUSED UniqueCommand command,
+- G_GNUC_UNUSED UniqueMessageData *message,
+- G_GNUC_UNUSED guint time_,
+- ArioShell *shell)
++static void
++ario_main_on_activated (G_GNUC_UNUSED GApplication *app,
++ ArioShell *shell)
+ {
+ ario_shell_present (shell);
+- return UNIQUE_RESPONSE_OK;
+ }
+ #endif
+
+@@ -89,11 +83,12 @@
+ return 0;
+ }
+ #else
+- UniqueApp *app;
+- app = unique_app_new ("org.Ario", NULL);
+- if (unique_app_is_running (app)) {
++ GApplication *app;
++ app = g_application_new ("org.Ario", G_APPLICATION_FLAGS_NONE);
++ g_application_register (app, NULL, NULL);
++ if (g_application_get_is_remote (app)) {
+ if (ario_conf_get_boolean (PREF_ONE_INSTANCE, PREF_ONE_INSTANCE_DEFAULT)) {
+- unique_app_send_message (app, UNIQUE_ACTIVATE, NULL);
++ g_application_activate (app);
+ g_object_unref (app);
+ return 0;
+ }
+@@ -134,8 +129,7 @@
+ ario_shell_construct (shell, minimized);
+
+ #ifndef WIN32
+- unique_app_watch_window (app, GTK_WINDOW (shell));
+- g_signal_connect (app, "message-received", G_CALLBACK (ario_main_on_message_received), shell);
++ g_signal_connect (app, "activate", G_CALLBACK (ario_main_on_activated), shell);
+ #endif
+ /* Initialisation of plugins engine */
+ ario_plugins_engine_init (shell);
Deleted: community-x86_64/glib.patch
===================================================================
--- community-x86_64/glib.patch 2017-01-26 14:55:34 UTC (rev 209140)
+++ community-x86_64/glib.patch 2017-01-26 14:55:41 UTC (rev 209141)
@@ -1,24 +0,0 @@
-diff -rupN a/src/ario-profiles.c b/src/ario-profiles.c
---- a/src/ario-profiles.c 2011-05-17 17:54:49.000000000 +0000
-+++ b/src/ario-profiles.c 2013-12-25 10:52:06.668807328 +0000
-@@ -22,7 +22,7 @@
- #include <config.h>
- #include <stdlib.h>
- #include <libxml/parser.h>
--#include <glib/gi18n.h>
-+#include <glib.h>
- #include "ario-util.h"
- #include "ario-debug.h"
-
-diff -rupN a/src/ario-profiles.h b/src/ario-profiles.h
---- a/src/ario-profiles.h 2011-05-17 17:54:49.000000000 +0000
-+++ b/src/ario-profiles.h 2013-12-25 10:50:47.839363409 +0000
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_PROFILES_H
- #define __ARIO_PROFILES_H
-
--#include <glib/gslist.h>
-+#include <glib.h>
- #include "servers/ario-server.h"
-
- G_BEGIN_DECLS
Copied: ario/repos/community-x86_64/glib.patch (from rev 209140, ario/trunk/glib.patch)
===================================================================
--- community-x86_64/glib.patch (rev 0)
+++ community-x86_64/glib.patch 2017-01-26 14:55:41 UTC (rev 209141)
@@ -0,0 +1,24 @@
+diff -rupN a/src/ario-profiles.c b/src/ario-profiles.c
+--- a/src/ario-profiles.c 2011-05-17 17:54:49.000000000 +0000
++++ b/src/ario-profiles.c 2013-12-25 10:52:06.668807328 +0000
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #include <stdlib.h>
+ #include <libxml/parser.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ #include "ario-util.h"
+ #include "ario-debug.h"
+
+diff -rupN a/src/ario-profiles.h b/src/ario-profiles.h
+--- a/src/ario-profiles.h 2011-05-17 17:54:49.000000000 +0000
++++ b/src/ario-profiles.h 2013-12-25 10:50:47.839363409 +0000
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+
+ G_BEGIN_DECLS
More information about the arch-commits
mailing list