[arch-commits] Commit in dwb/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Tue Aug 16 06:41:16 UTC 2016
Date: Tuesday, August 16, 2016 @ 06:41:15
Author: eworm
Revision: 186840
upgpkg: dwb 2014.03.07.r135.gf9e861e-1
update to git snapshot
Modified:
dwb/trunk/PKGBUILD
Deleted:
dwb/trunk/0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
dwb/trunk/Werror.patch
dwb/trunk/isnan.patch
-----------------------------------------------------------------+
0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch | 31 -------
PKGBUILD | 40 +++------
Werror.patch | 23 -----
isnan.patch | 43 ----------
4 files changed, 15 insertions(+), 122 deletions(-)
Deleted: 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch
===================================================================
--- 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch 2016-08-16 06:10:20 UTC (rev 186839)
+++ 0001-Set-G_APPLICATION_HANDLES_COMMANDLINE-for-glib2-2.40.patch 2016-08-16 06:41:15 UTC (rev 186840)
@@ -1,31 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-16 06:10:20 UTC (rev 186839)
+++ PKGBUILD 2016-08-16 06:41:15 UTC (rev 186840)
@@ -3,38 +3,28 @@
# Contributor: portix <portix at gmx.net>
pkgname=dwb
-pkgver=2014.03.07
-pkgrel=4
-pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot"
-url="http://portix.bitbucket.org/dwb/"
+_commit=f9e861e
+pkgver=2014.03.07.r135.g${_commit}
+pkgrel=1
+pkgdesc='A webkit web browser with vi-like keyboard shortcuts'
+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
- isnan.patch
- Werror.patch)
-sha1sums=('006e9df0c52219b9f022c1b4a3aa0518ff96295d'
- 'd026b4caf83920b1319591d1f1487fc9f49035df'
- '557b50d0e8ecee1315371b5629d30959fcdf1919'
- 'd5a66e8a16c25053a0693c0a3107aa1244ce3d88')
+makedepends=('git' 'json-c')
+source=("git+https://bitbucket.org/portix/dwb.git#commit=${_commit}")
+sha256sums=('SKIP')
-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"/isnan.patch
- patch -Np1 -d "$srcdir"/"$pkgname"-"$pkgver" -i "$srcdir"/Werror.patch
+build() {
+ cd "${srcdir}/dwb/"
- sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' "$srcdir"/"$pkgname"-"$pkgver"/{config.mk,dwbem/dwbem.c,exar/exar.c}
+ make
}
-build() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- make
-}
package() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"
- export BASHCOMPLETION=/usr/share/bash-completion/completions
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}/dwb/"
+
+ export BASHCOMPLETION=/usr/share/bash-completion/completions
+ make DESTDIR="${pkgdir}" install
}
Deleted: Werror.patch
===================================================================
--- Werror.patch 2016-08-16 06:10:20 UTC (rev 186839)
+++ Werror.patch 2016-08-16 06:41:15 UTC (rev 186840)
@@ -1,23 +0,0 @@
-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)\"
Deleted: isnan.patch
===================================================================
--- isnan.patch 2016-08-16 06:10:20 UTC (rev 186839)
+++ isnan.patch 2016-08-16 06:41:15 UTC (rev 186840)
@@ -1,43 +0,0 @@
-diff --git a/src/scripts.c b/src/scripts.c
-index 16784fc..71efc50 100644
---- a/src/scripts.c
-+++ b/src/scripts.c
-@@ -3231,16 +3231,17 @@ sutil_checksum(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, s
- if (original == NULL)
- return NIL;
-
-+ double dtype;
- GChecksumType type = G_CHECKSUM_SHA256;
- if (argc > 1)
- {
-- type = JSValueToNumber(ctx, argv[1], exc);
-- if (isnan(type))
-+ dtype = JSValueToNumber(ctx, argv[1], exc);
-+ if (isnan(dtype))
- {
- ret = NIL;
- goto error_out;
- }
-- type = MIN(MAX(type, G_CHECKSUM_MD5), G_CHECKSUM_SHA256);
-+ type = MIN(MAX((GChecksumType)dtype, G_CHECKSUM_MD5), G_CHECKSUM_SHA256);
- }
- checksum = g_compute_checksum_for_data(type, original, -1);
-
-@@ -6247,11 +6248,14 @@ gobject_unblock_signal(JSContextRef ctx, JSObjectRef function, JSObjectRef this,
- static JSValueRef
- gobject_disconnect(JSContextRef ctx, JSObjectRef function, JSObjectRef this, size_t argc, const JSValueRef argv[], JSValueRef* exc)
- {
-- int id;
-- if (argc > 0 && JSValueIsNumber(ctx, argv[0]) && !isnan(id = JSValueToNumber(ctx, argv[0], exc)))
-+ if (argc == 0) {
-+ return JSValueMakeBoolean(ctx, false);
-+ }
-+ double id = JSValueToNumber(ctx, argv[0], exc);
-+ if (!isnan(id))
- {
- GObject *o = JSObjectGetPrivate(this);
-- if (o != NULL && g_signal_handler_is_connected(o, id))
-+ if (o != NULL && g_signal_handler_is_connected(o, (int)id))
- {
- sigdata_remove(id, o);
- g_signal_handler_disconnect(o, id);
More information about the arch-commits
mailing list