Date: Sunday, June 1, 2014 @ 03:13:17 Author: dwallace Revision: 112342
upgpkg: dwb 2014.03.07-2 upgpkg: dwb fix execute Added: dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch Modified: dwb/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch | 31 ++++++++++ PKGBUILD | 12 ++- 2 files changed, 40 insertions(+), 3 deletions(-) Added: 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch =================================================================== --- 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (rev 0) +++ 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch 2014-06-01 01:13:17 UTC (rev 112342) @@ -0,0 +1,31 @@ +From 86057e813b61a20ee8ffc414d842625db5221123 Mon Sep 17 00:00:00 2001 +From: portix <por...@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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-31 18:24:19 UTC (rev 112341) +++ PKGBUILD 2014-06-01 01:13:17 UTC (rev 112342) @@ -4,7 +4,7 @@ pkgname=dwb pkgver=2014.03.07 -pkgrel=1 +pkgrel=2 pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" url="http://portix.bitbucket.org/dwb/" arch=('i686' 'x86_64') @@ -12,9 +12,15 @@ license=('GPL') depends=('webkitgtk2' 'desktop-file-utils') makedepends=('json-c') -source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz) -sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d') +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