[arch-commits] Commit in dwb/repos (10 files)

Andreas Radke andyrtr at archlinux.org
Fri Apr 17 21:03:18 UTC 2015


    Date: Friday, April 17, 2015 @ 23:03:17
  Author: andyrtr
Revision: 131559

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

Added:
  dwb/repos/staging-i686/
  dwb/repos/staging-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
    (from rev 131558, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
  dwb/repos/staging-i686/PKGBUILD
    (from rev 131558, dwb/trunk/PKGBUILD)
  dwb/repos/staging-i686/Werror.patch
    (from rev 131558, dwb/trunk/Werror.patch)
  dwb/repos/staging-i686/dwb.install
    (from rev 131558, dwb/trunk/dwb.install)
  dwb/repos/staging-x86_64/
  dwb/repos/staging-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
    (from rev 131558, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
  dwb/repos/staging-x86_64/PKGBUILD
    (from rev 131558, dwb/trunk/PKGBUILD)
  dwb/repos/staging-x86_64/Werror.patch
    (from rev 131558, dwb/trunk/Werror.patch)
  dwb/repos/staging-x86_64/dwb.install
    (from rev 131558, dwb/trunk/dwb.install)

--------------------------------------------------------------------------------+
 staging-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch   |   31 ++++++++
 staging-i686/PKGBUILD                                                          |   35 ++++++++++
 staging-i686/Werror.patch                                                      |   23 ++++++
 staging-i686/dwb.install                                                       |   13 +++
 staging-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch |   31 ++++++++
 staging-x86_64/PKGBUILD                                                        |   35 ++++++++++
 staging-x86_64/Werror.patch                                                    |   23 ++++++
 staging-x86_64/dwb.install                                                     |   13 +++
 8 files changed, 204 insertions(+)

Copied: dwb/repos/staging-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (from rev 131558, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
===================================================================
--- staging-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch	                        (rev 0)
+++ staging-i686/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch	2015-04-17 21:03:17 UTC (rev 131559)
@@ -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
+

Copied: dwb/repos/staging-i686/PKGBUILD (from rev 131558, dwb/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-04-17 21:03:17 UTC (rev 131559)
@@ -0,0 +1,35 @@
+#$Id$ 
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: portix <portix at gmx.net>
+
+pkgname=dwb
+pkgver=2014.03.07
+pkgrel=3
+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
+        Werror.patch)
+sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d'
+          'd026b4caf83920b1319591d1f1487fc9f49035df'
+          'd5a66e8a16c25053a0693c0a3107aa1244ce3d88')
+
+prepare(){
+    patch -Np1 -d $srcdir/$pkgname-$pkgver -i $srcdir/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
+    patch -Np1 -d $srcdir/$pkgname-$pkgver -i $srcdir/Werror.patch
+}
+
+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/staging-i686/Werror.patch (from rev 131558, dwb/trunk/Werror.patch)
===================================================================
--- staging-i686/Werror.patch	                        (rev 0)
+++ staging-i686/Werror.patch	2015-04-17 21:03:17 UTC (rev 131559)
@@ -0,0 +1,23 @@
+diff -rupN dwb-2014.03.07.original/exar/Makefile dwb-2014.03.07/exar/Makefile
+--- dwb-2014.03.07.original/exar/Makefile	2014-03-07 15:29:57.737105453 +0100
++++ dwb-2014.03.07/exar/Makefile	2014-03-07 15:31:41.171106513 +0100
+@@ -1,6 +1,6 @@
+ ORIG_CFLAGS := $(CFLAGS)
+ 
+-CFLAGS := -Wall -pedantic -Werror -Wextra -std=c99 -O2
++CFLAGS := -Wall -pedantic -Wextra -std=c99 -O2
+ CFLAGS += $(ORIG_CFLAGS)
+ 
+ DCFLAGS += -g -O0 -Wall -pedantic -Werror -Wextra -std=c99 
+
+--- dwb-2014.03.07/dwbremote/Makefile	2014-03-07 12:39:43.000000000 +0100
++++ dwb-2014.03.07/dwbremote/Makefile.new	2015-04-17 22:59:41.289518737 +0200
+@@ -7,7 +7,7 @@
+ include $(BASE_DIR)/version.mk
+ 
+ 
+-CFLAGS += -Wall -pedantic -Werror -Wextra -std=c99 -Os
++CFLAGS += -Wall -pedantic -Wextra -std=c99 -Os
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -DNAME=\"$(NAME)\"
+ CFLAGS += -DCOPYRIGHT=\"$(COPYRIGHT)\"

Copied: dwb/repos/staging-i686/dwb.install (from rev 131558, dwb/trunk/dwb.install)
===================================================================
--- staging-i686/dwb.install	                        (rev 0)
+++ staging-i686/dwb.install	2015-04-17 21:03:17 UTC (rev 131559)
@@ -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/staging-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch (from rev 131558, dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch)
===================================================================
--- staging-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch	                        (rev 0)
+++ staging-x86_64/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch	2015-04-17 21:03:17 UTC (rev 131559)
@@ -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
+

Copied: dwb/repos/staging-x86_64/PKGBUILD (from rev 131558, dwb/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-04-17 21:03:17 UTC (rev 131559)
@@ -0,0 +1,35 @@
+#$Id$ 
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: portix <portix at gmx.net>
+
+pkgname=dwb
+pkgver=2014.03.07
+pkgrel=3
+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
+        Werror.patch)
+sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d'
+          'd026b4caf83920b1319591d1f1487fc9f49035df'
+          'd5a66e8a16c25053a0693c0a3107aa1244ce3d88')
+
+prepare(){
+    patch -Np1 -d $srcdir/$pkgname-$pkgver -i $srcdir/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
+    patch -Np1 -d $srcdir/$pkgname-$pkgver -i $srcdir/Werror.patch
+}
+
+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/staging-x86_64/Werror.patch (from rev 131558, dwb/trunk/Werror.patch)
===================================================================
--- staging-x86_64/Werror.patch	                        (rev 0)
+++ staging-x86_64/Werror.patch	2015-04-17 21:03:17 UTC (rev 131559)
@@ -0,0 +1,23 @@
+diff -rupN dwb-2014.03.07.original/exar/Makefile dwb-2014.03.07/exar/Makefile
+--- dwb-2014.03.07.original/exar/Makefile	2014-03-07 15:29:57.737105453 +0100
++++ dwb-2014.03.07/exar/Makefile	2014-03-07 15:31:41.171106513 +0100
+@@ -1,6 +1,6 @@
+ ORIG_CFLAGS := $(CFLAGS)
+ 
+-CFLAGS := -Wall -pedantic -Werror -Wextra -std=c99 -O2
++CFLAGS := -Wall -pedantic -Wextra -std=c99 -O2
+ CFLAGS += $(ORIG_CFLAGS)
+ 
+ DCFLAGS += -g -O0 -Wall -pedantic -Werror -Wextra -std=c99 
+
+--- dwb-2014.03.07/dwbremote/Makefile	2014-03-07 12:39:43.000000000 +0100
++++ dwb-2014.03.07/dwbremote/Makefile.new	2015-04-17 22:59:41.289518737 +0200
+@@ -7,7 +7,7 @@
+ include $(BASE_DIR)/version.mk
+ 
+ 
+-CFLAGS += -Wall -pedantic -Werror -Wextra -std=c99 -Os
++CFLAGS += -Wall -pedantic -Wextra -std=c99 -Os
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -DNAME=\"$(NAME)\"
+ CFLAGS += -DCOPYRIGHT=\"$(COPYRIGHT)\"

Copied: dwb/repos/staging-x86_64/dwb.install (from rev 131558, dwb/trunk/dwb.install)
===================================================================
--- staging-x86_64/dwb.install	                        (rev 0)
+++ staging-x86_64/dwb.install	2015-04-17 21:03:17 UTC (rev 131559)
@@ -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