Date: Wed, 23 Mar 2011 09:33:26 +0000 (GMT) From: Klaus Aehlig <aehlig@linta.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/155884: [maintainer] www/uzbl update to 2011.03.17 Message-ID: <20110323093327.0B4A01CC42@curry.linta.de> Resent-Message-ID: <201103230940.p2N9e2Et009433@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155884 >Category: ports >Synopsis: [maintainer] www/uzbl update to 2011.03.17 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Mar 23 09:40:01 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Klaus Aehlig >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD curry.linta.de 8.2-STABLE FreeBSD 8.2-STABLE #11: Sun Feb 27 03:33:40 GMT 2011 aehlig@curry.linta.de:/usr/obj/usr/src/sys/CURRY amd64 >Description: Update to 2011/03/17 (bug fix release) >How-To-Repeat: >Fix: Apply the following patch. Note: files/patch-examples__data__scripts__uzbl-tabbed is removed (it is included upstream now) --- uzbl.diff begins here --- diff -ruN uzbl.orig/Makefile uzbl/Makefile --- uzbl.orig/Makefile 2011-03-23 09:21:41.000000000 +0000 +++ uzbl/Makefile 2011-03-23 09:22:00.000000000 +0000 @@ -22,8 +22,8 @@ USE_GMAKE= yes USE_PYTHON= yes -GITDATE= 2011.03.14 -GITVERSION= f3e52b2 +GITDATE= 2011.03.17 +GITVERSION= 7803561 WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION} diff -ruN uzbl.orig/distinfo uzbl/distinfo --- uzbl.orig/distinfo 2011-03-23 09:21:41.000000000 +0000 +++ uzbl/distinfo 2011-03-23 09:22:00.000000000 +0000 @@ -1,2 +1,2 @@ -SHA256 (uzbl-0.0.0.2011.03.14.tar.gz) = 08b6f5b2c2bc33a76c8d12999795aec8db6ed6636b55f0f600fbab982cbf74d4 -SIZE (uzbl-0.0.0.2011.03.14.tar.gz) = 143473 +SHA256 (uzbl-0.0.0.2011.03.17.tar.gz) = b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4 +SIZE (uzbl-0.0.0.2011.03.17.tar.gz) = 143726 diff -ruN uzbl.orig/files/patch-examples__data__scripts__uzbl-tabbed uzbl/files/patch-examples__data__scripts__uzbl-tabbed --- uzbl.orig/files/patch-examples__data__scripts__uzbl-tabbed 2011-03-23 09:21:41.000000000 +0000 +++ uzbl/files/patch-examples__data__scripts__uzbl-tabbed 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ ---- examples/data/scripts/uzbl-tabbed.orig 2011-03-14 04:36:33.000000000 +0000 -+++ examples/data/scripts/uzbl-tabbed 2011-03-15 16:45:32.000000000 +0000 -@@ -449,8 +449,12 @@ - - type, _, args = cmd.split(" ", 2) - if type == "EVENT": -- type, args = args.split(" ", 1) -+ type, args = (args + " ").split(" ", 1) - if type == "TITLE_CHANGED": -+ try: -+ _,args,_ = args.split("'",2) -+ except: -+ pass - self.title = args.strip() - self.title_changed(False) - elif type == "VARIABLE_SET": -@@ -459,7 +463,13 @@ - try: - val = int(val) - except: -- pass -+ try: -+ val = float(val) -+ except: -+ try: -+ _, val, _ = val.split("'",2) -+ except: -+ pass - - if var in UZBL_TABBED_VARS: - if config[var] != val: -@@ -497,12 +507,12 @@ - self.parent.new_tab(args, '', 0, next=True) - - elif type == "NEXT_TAB": -- if args: -+ if args.strip(): - self.parent.next_tab(int(args)) - else: - self.parent.next_tab() - elif type == "PREV_TAB": -- if args: -+ if args.strip(): - self.parent.prev_tab(int(args)) - else: - self.parent.prev_tab() --- uzbl.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110323093327.0B4A01CC42>