Attachment 176273 Details for Bug 213881 – Patch to be applied to www/uzbl to update to 0.9.1

[patch] Patch to be applied to www/uzbl to update to 0.9.1

uzbl.diff (text/plain), 4.88 KB, created by Klaus Aehlig on 2016-10-29 13:27:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2016-10-29 13:27:30 UTC

Size: 4.88 KB

patch

obsolete

>diff -ruN uzbl.orig/Makefile uzbl/Makefile
>--- uzbl.orig/Makefile	2016-10-29 15:16:32.137413000 +0200
>+++ uzbl/Makefile	2016-10-29 15:20:31.410094000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/uzbl/Makefile 424411 2016-10-21 12:51:40Z mat $
> 
> PORTNAME=	uzbl
>-PORTVERSION=	0.9.0
>+PORTVERSION=	0.9.1
> DISTVERSIONPREFIX=v
> CATEGORIES=	www
> 
>@@ -13,13 +13,17 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
>-LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
>+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2 \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2  \
>+		libsoup-2.4.so:devel/libsoup 
> RUN_DEPENDS=	socat:net/socat \
> 		dmenu:x11/dmenu \
> 		${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
> 
>-USES=		gmake pkgconfig python:2 desktop-file-utils
>-USE_GNOME=	gtk20 pygtk2
>+USES=		gmake pkgconfig python:2 desktop-file-utils gettext-runtime
>+USE_XORG=	x11
>+USE_GNOME=	gtk20 pygtk2 cairo
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> 
>diff -ruN uzbl.orig/distinfo uzbl/distinfo
>--- uzbl.orig/distinfo	2016-10-29 15:16:32.137507000 +0200
>+++ uzbl/distinfo	2016-10-29 15:20:31.410149000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (uzbl-uzbl-v0.9.0_GH0.tar.gz) = 931cf0bd91ebf140ddb0659d8ee547826bfa5d8235b618552eb5b951cc865347
>-SIZE (uzbl-uzbl-v0.9.0_GH0.tar.gz) = 254468
>+TIMESTAMP = 1477745493
>+SHA256 (uzbl-uzbl-v0.9.1_GH0.tar.gz) = e01c3220378b1d539567d5287f8fea7466f7817873858917d22d72bccad63e2c
>+SIZE (uzbl-uzbl-v0.9.1_GH0.tar.gz) = 257504
>diff -ruN uzbl.orig/files/patch-examples__data__scripts__instance-select-wii.sh uzbl/files/patch-examples__data__scripts__instance-select-wii.sh
>--- uzbl.orig/files/patch-examples__data__scripts__instance-select-wii.sh	2016-10-29 15:16:32.136505000 +0200
>+++ uzbl/files/patch-examples__data__scripts__instance-select-wii.sh	2016-10-29 15:20:31.409530000 +0200
>@@ -1,6 +1,6 @@
>---- examples/data/scripts/instance-select-wmii.sh.orig	2016-03-23 07:35:11 UTC
>-+++ examples/data/scripts/instance-select-wmii.sh
>-@@ -40,7 +40,7 @@ case "$action" in
>+--- examples/data/scripts/instance-select-wmii.sh.orig	2016-10-29 14:53:48.987875000 +0200
>++++ examples/data/scripts/instance-select-wmii.sh	2016-10-29 14:54:09.084640000 +0200
>+@@ -40,7 +40,7 @@
>      ;;
>  "prev")
>      readonly current="$( wmiir read /client/sel/ctl | head -n 1 )"
>diff -ruN uzbl.orig/files/patch-examples__data__scripts__load_url_from_history.sh uzbl/files/patch-examples__data__scripts__load_url_from_history.sh
>--- uzbl.orig/files/patch-examples__data__scripts__load_url_from_history.sh	2016-10-29 15:16:32.136336000 +0200
>+++ uzbl/files/patch-examples__data__scripts__load_url_from_history.sh	2016-10-29 15:20:31.409630000 +0200
>@@ -1,11 +1,11 @@
>---- examples/data/scripts/load_url_from_history.sh.orig	2016-02-28 14:27:33 UTC
>-+++ examples/data/scripts/load_url_from_history.sh
>-@@ -13,7 +13,7 @@
>- if $DMENU_HAS_VERTICAL; then
>-     # choose an item in reverse order, showing also the date and page titles
>-     # pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url.
>--    goto="$( tac "$UZBL_HISTORY_FILE" | $DMENU | cut -d ' ' -f -3  | awk '{ print $NF }' )"
>-+    goto="$( tail -r "$UZBL_HISTORY_FILE" | $DMENU | cut -d ' ' -f -3  | awk '{ print $NF }' )"
>+--- examples/data/scripts/load_url_from_history.sh.orig	2016-10-29 15:00:34.816505000 +0200
>++++ examples/data/scripts/load_url_from_history.sh	2016-10-29 15:01:01.835001000 +0200
>+@@ -17,7 +17,7 @@
>+     # cut: get the first three fields, awk: pick the last field
>+     # As opposed to just getting the third field directly, the combination of cut+awk allows
>+     # to enter a completely new URL (which would be field number 1 or $NF, but not 3).
>+-    goto="$( tac "$UZBL_HISTORY_FILE" | awk '!a[$3]++' | $DMENU | cut -d ' ' -f -3  | awk '{ print $NF }' )"
>++    goto="$( tail -r "$UZBL_HISTORY_FILE" | awk '!a[$3]++' | $DMENU | cut -d ' ' -f -3  | awk '{ print $NF }' )"
>  else
>      readonly current="$( tail -n 1 "$UZBL_HISTORY_FILE" | cut -d ' ' -f 3 )"
>      goto="$( ( print "$current\n"; cut -d ' ' -f 3 < "$UZBL_HISTORY_FILE" | grep -v -e "^$current\$" | sort -u ) | $DMENU )"
>diff -ruN uzbl.orig/pkg-plist uzbl/pkg-plist
>--- uzbl.orig/pkg-plist	2016-10-29 15:16:32.137316000 +0200
>+++ uzbl/pkg-plist	2016-10-29 15:20:31.410037000 +0200
>@@ -9,6 +9,8 @@
> %%PYTHON_SITELIBDIR%%/uzbl/arguments.pyc
> %%PYTHON_SITELIBDIR%%/uzbl/core.py
> %%PYTHON_SITELIBDIR%%/uzbl/core.pyc
>+%%PYTHON_SITELIBDIR%%/uzbl/daemon.py
>+%%PYTHON_SITELIBDIR%%/uzbl/daemon.pyc
> %%PYTHON_SITELIBDIR%%/uzbl/event_manager.py
> %%PYTHON_SITELIBDIR%%/uzbl/event_manager.pyc
> %%PYTHON_SITELIBDIR%%/uzbl/ext.py
>@@ -58,6 +60,7 @@
> %%DATADIR%%/docs/CONTRIBUTING.md
> %%DATADIR%%/docs/FAQ.md
> %%DATADIR%%/docs/INSTALL.md
>+%%DATADIR%%/docs/KEYBINDINGS.md
> %%DATADIR%%/docs/README.event-manager.md
> %%DATADIR%%/docs/README.md
> %%DATADIR%%/docs/README.scripts.md

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 213881: 176273 | 178030