[arch-commits] Commit in dwb/repos (10 files)
Daniel Wallace
dwallace at nymeria.archlinux.org
Sun Jun 1 01:14:38 UTC 2014
Date: Sunday, June 1, 2014 @ 03:14:38
Author: dwallace
Revision: 112343
archrelease: copy trunk to community-i686, community-x86_64
Added:
dwb/repos/community-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
(from rev 112342, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
dwb/repos/community-i686/PKGBUILD
(from rev 112342, dwb/trunk/PKGBUILD)
dwb/repos/community-i686/dwb.install
(from rev 112342, dwb/trunk/dwb.install)
dwb/repos/community-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
(from rev 112342, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
dwb/repos/community-x86_64/PKGBUILD
(from rev 112342, dwb/trunk/PKGBUILD)
dwb/repos/community-x86_64/dwb.install
(from rev 112342, dwb/trunk/dwb.install)
Deleted:
dwb/repos/community-i686/PKGBUILD
dwb/repos/community-i686/dwb.install
dwb/repos/community-x86_64/PKGBUILD
dwb/repos/community-x86_64/dwb.install
----------------------------------------------------------------------------------+
/PKGBUILD | 64 ++++++++++
/dwb.install | 26 ++++
community-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch | 31 ++++
community-i686/PKGBUILD | 26 ----
community-i686/dwb.install | 13 --
community-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch | 31 ++++
community-x86_64/PKGBUILD | 26 ----
community-x86_64/dwb.install | 13 --
8 files changed, 152 insertions(+), 78 deletions(-)
Copied: dwb/repos/community-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (from rev 112342, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
===================================================================
--- community-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (rev 0)
+++ community-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch 2014-06-01 01:14:38 UTC (rev 112343)
@@ -0,0 +1,31 @@
+From 86057e813b61a20ee8ffc414d842625db5221123 Mon Sep 17 00:00:00 2001
+From: portix <portix at gmx.net>
+Date: Tue, 15 Apr 2014 16:49:08 +0200
+Subject: [PATCH] Set G_APPLICATION_HANDLES_COMMANDLINE for glib2 > 2.40
+
+Conflicts:
+ src/application.c
+---
+ src/application.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/application.c b/src/application.c
+index 77e7412..51b5c36 100644
+--- a/src/application.c
++++ b/src/application.c
+@@ -227,6 +227,12 @@ dwb_application_local_command_line(GApplication *app, gchar ***argv, gint *exit_
+ single_instance = GET_BOOL("single-instance");
+ if (s_opt_single || !single_instance)
+ g_application_set_flags(app, G_APPLICATION_NON_UNIQUE);
++#if GLIB_CHECK_VERSION(2, 40, 0)
++ else {
++ int flags = g_application_get_flags(app);
++ g_application_set_flags(app, flags | G_APPLICATION_HANDLES_COMMAND_LINE);
++ }
++#endif
+
+ bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+ if (!s_opt_fallback && bus != NULL && g_application_register(app, NULL, &error))
+--
+2.0.0
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-06-01 01:13:17 UTC (rev 112342)
+++ community-i686/PKGBUILD 2014-06-01 01:14:38 UTC (rev 112343)
@@ -1,26 +0,0 @@
-#$Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: portix <portix at gmx.net>
-
-pkgname=dwb
-pkgver=2014.03.07
-pkgrel=1
-pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot"
-url="http://portix.bitbucket.org/dwb/"
-arch=('i686' 'x86_64')
-install=dwb.install
-license=('GPL')
-depends=('webkitgtk2' 'desktop-file-utils')
-makedepends=('json-c')
-source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz)
-sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d')
-
-build() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- make
-}
-package() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- export BASHCOMPLETION=/usr/share/bash-completion/completions
- make DESTDIR=${pkgdir} install
-}
Copied: dwb/repos/community-i686/PKGBUILD (from rev 112342, dwb/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-06-01 01:14:38 UTC (rev 112343)
@@ -0,0 +1,32 @@
+#$Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: portix <portix at gmx.net>
+
+pkgname=dwb
+pkgver=2014.03.07
+pkgrel=2
+pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot"
+url="http://portix.bitbucket.org/dwb/"
+arch=('i686' 'x86_64')
+install=dwb.install
+license=('GPL')
+depends=('webkitgtk2' 'desktop-file-utils')
+makedepends=('json-c')
+source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz
+ 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
+sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d'
+ 'd026b4caf83920b1319591d1f1487fc9f49035df')
+
+prepare(){
+ patch -Np1 -d $srcdir/$pkgname-$pkgver -i $srcdir/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
+}
+
+build() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ make
+}
+package() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ export BASHCOMPLETION=/usr/share/bash-completion/completions
+ make DESTDIR=${pkgdir} install
+}
Deleted: community-i686/dwb.install
===================================================================
--- community-i686/dwb.install 2014-06-01 01:13:17 UTC (rev 112342)
+++ community-i686/dwb.install 2014-06-01 01:14:38 UTC (rev 112343)
@@ -1,13 +0,0 @@
-post_install(){
- update-desktop-database -q
- echo "==> If you are using extensions you should update the extensions with"
- echo "==> dwbem -u or dwbem -Nu"
-}
-
-post_upgrade(){
- post_install
-}
-
-post_remove(){
- post_install
-}
Copied: dwb/repos/community-i686/dwb.install (from rev 112342, dwb/trunk/dwb.install)
===================================================================
--- community-i686/dwb.install (rev 0)
+++ community-i686/dwb.install 2014-06-01 01:14:38 UTC (rev 112343)
@@ -0,0 +1,13 @@
+post_install(){
+ update-desktop-database -q
+ echo "==> If you are using extensions you should update the extensions with"
+ echo "==> dwbem -u or dwbem -Nu"
+}
+
+post_upgrade(){
+ post_install
+}
+
+post_remove(){
+ post_install
+}
Copied: dwb/repos/community-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (from rev 112342, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
===================================================================
--- community-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (rev 0)
+++ community-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch 2014-06-01 01:14:38 UTC (rev 112343)
@@ -0,0 +1,31 @@
+From 86057e813b61a20ee8ffc414d842625db5221123 Mon Sep 17 00:00:00 2001
+From: portix <portix at gmx.net>
+Date: Tue, 15 Apr 2014 16:49:08 +0200
+Subject: [PATCH] Set G_APPLICATION_HANDLES_COMMANDLINE for glib2 > 2.40
+
+Conflicts:
+ src/application.c
+---
+ src/application.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/application.c b/src/application.c
+index 77e7412..51b5c36 100644
+--- a/src/application.c
++++ b/src/application.c
+@@ -227,6 +227,12 @@ dwb_application_local_command_line(GApplication *app, gchar ***argv, gint *exit_
+ single_instance = GET_BOOL("single-instance");
+ if (s_opt_single || !single_instance)
+ g_application_set_flags(app, G_APPLICATION_NON_UNIQUE);
++#if GLIB_CHECK_VERSION(2, 40, 0)
++ else {
++ int flags = g_application_get_flags(app);
++ g_application_set_flags(app, flags | G_APPLICATION_HANDLES_COMMAND_LINE);
++ }
++#endif
+
+ bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+ if (!s_opt_fallback && bus != NULL && g_application_register(app, NULL, &error))
+--
+2.0.0
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-06-01 01:13:17 UTC (rev 112342)
+++ community-x86_64/PKGBUILD 2014-06-01 01:14:38 UTC (rev 112343)
@@ -1,26 +0,0 @@
-#$Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: portix <portix at gmx.net>
-
-pkgname=dwb
-pkgver=2014.03.07
-pkgrel=1
-pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot"
-url="http://portix.bitbucket.org/dwb/"
-arch=('i686' 'x86_64')
-install=dwb.install
-license=('GPL')
-depends=('webkitgtk2' 'desktop-file-utils')
-makedepends=('json-c')
-source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz)
-sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d')
-
-build() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- make
-}
-package() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- export BASHCOMPLETION=/usr/share/bash-completion/completions
- make DESTDIR=${pkgdir} install
-}
Copied: dwb/repos/community-x86_64/PKGBUILD (from rev 112342, dwb/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-06-01 01:14:38 UTC (rev 112343)
@@ -0,0 +1,32 @@
+#$Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: portix <portix at gmx.net>
+
+pkgname=dwb
+pkgver=2014.03.07
+pkgrel=2
+pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot"
+url="http://portix.bitbucket.org/dwb/"
+arch=('i686' 'x86_64')
+install=dwb.install
+license=('GPL')
+depends=('webkitgtk2' 'desktop-file-utils')
+makedepends=('json-c')
+source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz
+ 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
+sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d'
+ 'd026b4caf83920b1319591d1f1487fc9f49035df')
+
+prepare(){
+ patch -Np1 -d $srcdir/$pkgname-$pkgver -i $srcdir/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
+}
+
+build() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ make
+}
+package() {
+ cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+ export BASHCOMPLETION=/usr/share/bash-completion/completions
+ make DESTDIR=${pkgdir} install
+}
Deleted: community-x86_64/dwb.install
===================================================================
--- community-x86_64/dwb.install 2014-06-01 01:13:17 UTC (rev 112342)
+++ community-x86_64/dwb.install 2014-06-01 01:14:38 UTC (rev 112343)
@@ -1,13 +0,0 @@
-post_install(){
- update-desktop-database -q
- echo "==> If you are using extensions you should update the extensions with"
- echo "==> dwbem -u or dwbem -Nu"
-}
-
-post_upgrade(){
- post_install
-}
-
-post_remove(){
- post_install
-}
Copied: dwb/repos/community-x86_64/dwb.install (from rev 112342, dwb/trunk/dwb.install)
===================================================================
--- community-x86_64/dwb.install (rev 0)
+++ community-x86_64/dwb.install 2014-06-01 01:14:38 UTC (rev 112343)
@@ -0,0 +1,13 @@
+post_install(){
+ update-desktop-database -q
+ echo "==> If you are using extensions you should update the extensions with"
+ echo "==> dwbem -u or dwbem -Nu"
+}
+
+post_upgrade(){
+ post_install
+}
+
+post_remove(){
+ post_install
+}
More information about the arch-commits
mailing list