diff options
| author | dhn <dhn@FreeBSD.org> | 2011-03-24 23:56:53 +0800 |
|---|---|---|
| committer | dhn <dhn@FreeBSD.org> | 2011-03-24 23:56:53 +0800 |
| commit | c13cab12fcd3a39561dc13238d041ce902bf45db (patch) | |
| tree | 22ae0eea8632056ddfda427bb5ee00f08cb81caf | |
| parent | c57eadb81afbcd6125299d5bdf2bfd74f2350a55 (diff) | |
| download | freebsd-ports-gnome-c13cab12fcd3a39561dc13238d041ce902bf45db.tar.gz freebsd-ports-gnome-c13cab12fcd3a39561dc13238d041ce902bf45db.tar.zst freebsd-ports-gnome-c13cab12fcd3a39561dc13238d041ce902bf45db.zip | |
- Update to 2011.03.17
PR: ports/155884
Submitted by: Klaus Aehlig <aehlig@linta.de> (maintainer)
| -rw-r--r-- | www/uzbl/Makefile | 4 | ||||
| -rw-r--r-- | www/uzbl/distinfo | 4 | ||||
| -rw-r--r-- | www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed | 58 |
3 files changed, 23 insertions, 43 deletions
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile index ac980364cd42..1e0b0cea218e 100644 --- a/www/uzbl/Makefile +++ b/www/uzbl/Makefile @@ -22,8 +22,8 @@ USE_LDCONFIG= yes USE_GMAKE= yes USE_PYTHON= yes -GITDATE= 2011.03.14 -GITVERSION= f3e52b2 +GITDATE= 2011.03.17 +GITVERSION= 7803561 WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION} diff --git a/www/uzbl/distinfo b/www/uzbl/distinfo index c59524490604..c75661daa2f5 100644 --- a/www/uzbl/distinfo +++ b/www/uzbl/distinfo @@ -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 --git a/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed b/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed index 8b0409c480f2..c9f69f0b6697 100644 --- a/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed +++ b/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed @@ -1,46 +1,26 @@ ---- 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) +--- examples/data/scripts/uzbl-tabbed.orig 2011-03-17 13:06:03.000000000 +0000 ++++ examples/data/scripts/uzbl-tabbed 2011-03-23 10:33:53.000000000 +0000 +@@ -507,12 +507,12 @@ + self.parent.new_tab(args[0], '', 0, next=True) elif type == "NEXT_TAB": -- if args: -+ if args.strip(): - self.parent.next_tab(int(args)) +- if args[0]: ++ if args: + self.parent.next_tab(int(args[0])) else: self.parent.next_tab() elif type == "PREV_TAB": -- if args: -+ if args.strip(): - self.parent.prev_tab(int(args)) +- if args[0]: ++ if args: + self.parent.prev_tab(int(args[0])) else: self.parent.prev_tab() +@@ -1016,7 +1016,7 @@ + title = config['new_tab_title'] + + cmd = ['uzbl-browser', '-n', name, '-s', str(sid), +- '--connect-socket', self.socket_path, '--uri', uri] ++ '--connect-socket', self.socket_path, '--uri', str(uri)] + gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH) + + uzbl = UzblInstance(self, tab, name, uri, title, switch) |