Attachment #114688 for bug #156379

View | Details | Raw Unified | Return to bug 156379
Collapse All | Expand All




USE_GMAKE=	yes
USE_PYTHON=	yes

GITDATE=	2011.04.12
GITVERSION=	ed8f45d

WRKSRC=		${WRKDIR}/Dieterbe-uzbl-${GITVERSION}


post-patch:
	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
		${WRKSRC}/examples/config/config \
		${WRKSRC}/bin/uzbl-browser \
		${WRKSRC}/bin/uzbl-event-manager
	@${REINPLACE_CMD} -e "s|share/uzbl|${DATADIR_REL}|" \
		${WRKSRC}/examples/config/config \
		${WRKSRC}/bin/uzbl-browser \
		${WRKSRC}/bin/uzbl-event-manager
	@${REINPLACE_CMD} -e "s|/usr/share/uzbl|${DATADIR}|" \
		${WRKSRC}/bin/uzbl-tabbed

post-build:
	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
.for f in uzbl-event-manager uzbl-browser uzbl-tabbed
	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin
	${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
.endfor
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}

	${MKDIR} ${DATADIR}/examples/data/dforms ${DATADIR}/examples/config
.for f in data/bookmarks \
	data/dforms/bbs.archlinux.org \
	config/style.css data/uzbl.png
		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${f}
.endfor
	${INSTALL_DATA} ${WRKSRC}/examples/config/config ${DATADIR}/examples/config/config

Lines 1-2 Link Here

(-)uzbl/distinfo (-2 / +2 lines)
1	SHA256 (uzbl-0.0.0.2011.03.17.tar.gz) = b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4	1	SHA256 (uzbl-0.0.0.2011.04.12.tar.gz) = 6d2fb50bf89c94593f258a274f68f44a10d6e1f685dc3f11e1b56282f526d7b5
2	SIZE (uzbl-0.0.0.2011.03.17.tar.gz) = 143726	2	SIZE (uzbl-0.0.0.2011.04.12.tar.gz) = 144532




--- 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[0]:
+                if args:
                     self.parent.next_tab(int(args[0]))
                 else:
                     self.parent.next_tab()
             elif type == "PREV_TAB":
-                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)

Lines 1-5 Link Here

(-)uzbl/files/patch-src__uzbl-browser (-2 / +2 lines)
1	--- src/uzbl-browser.orig 2010-12-01 00:06:50.000000000 +0100	1	--- bin/uzbl-browser.orig 2010-12-01 00:06:50.000000000 +0100
2	+++ src/uzbl-browser 2010-12-01 00:07:09.000000000 +0100	2	+++ bin/uzbl-browser 2010-12-01 00:07:09.000000000 +0100
3	@@ -74,7 +74,7 @@	3	@@ -74,7 +74,7 @@
4	DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon	4	DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon
5	#if [ ! -f "$DAEMON_SOCKET".pid ]	5	#if [ ! -f "$DAEMON_SOCKET".pid ]

Return to bug 156379

Lines 22-29 Link Here

(-)uzbl/Makefile (-11 / +10 lines)
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	USE_PYTHON= yes	23	USE_PYTHON= yes
24		24
25	GITDATE= 2011.03.17	25	GITDATE= 2011.04.12
26	GITVERSION= 7803561	26	GITVERSION= ed8f45d
27		27
28	WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION}	28	WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
29		29
Lines 44-66 Link Here
44	post-patch:	44	post-patch:
45	@${REINPLACE_CMD} -e "s\|/usr/local\|${PREFIX}\|" \	45	@${REINPLACE_CMD} -e "s\|/usr/local\|${PREFIX}\|" \
46	${WRKSRC}/examples/config/config \	46	${WRKSRC}/examples/config/config \
47	${WRKSRC}/src/uzbl-browser \	47	${WRKSRC}/bin/uzbl-browser \
48	${WRKSRC}/examples/data/scripts/uzbl-event-manager	48	${WRKSRC}/bin/uzbl-event-manager
49	@${REINPLACE_CMD} -e "s\|share/uzbl\|${DATADIR_REL}\|" \	49	@${REINPLACE_CMD} -e "s\|share/uzbl\|${DATADIR_REL}\|" \
50	${WRKSRC}/examples/config/config \	50	${WRKSRC}/examples/config/config \
51	${WRKSRC}/src/uzbl-browser \	51	${WRKSRC}/bin/uzbl-browser \
52	${WRKSRC}/examples/data/scripts/uzbl-event-manager	52	${WRKSRC}/bin/uzbl-event-manager
53	@${REINPLACE_CMD} -e "s\|/usr/share/uzbl\|${DATADIR}\|" \	53	@${REINPLACE_CMD} -e "s\|/usr/share/uzbl\|${DATADIR}\|" \
54	${WRKSRC}/examples/data/scripts/uzbl-tabbed	54	${WRKSRC}/bin/uzbl-tabbed
55		55
56	post-build:	56	post-build:
57	@${FIND} ${WRKSRC} \( -name ".orig" -or -name ".bak" \) -exec ${RM} -f {} \;	57	@${FIND} ${WRKSRC} \( -name ".orig" -or -name ".bak" \) -exec ${RM} -f {} \;
58		58
59	do-install:	59	do-install:
60	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin	60	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
61	${INSTALL_SCRIPT} ${WRKSRC}/src/uzbl-browser ${PREFIX}/bin	61	.for f in uzbl-event-manager uzbl-browser uzbl-tabbed
62	.for f in uzbl-event-manager uzbl-tabbed	62	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin
63	${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
64	.endfor	63	.endfor
65	.if !defined(NOPORTDOCS)	64	.if !defined(NOPORTDOCS)
66	${MKDIR} ${DOCSDIR}	65	${MKDIR} ${DOCSDIR}
Lines 78-84 Link Here
78	${MKDIR} ${DATADIR}/examples/data/dforms ${DATADIR}/examples/config	77	${MKDIR} ${DATADIR}/examples/data/dforms ${DATADIR}/examples/config
79	.for f in data/bookmarks \	78	.for f in data/bookmarks \
80	data/dforms/bbs.archlinux.org \	79	data/dforms/bbs.archlinux.org \
81	data/style.css data/uzbl.png	80	config/style.css data/uzbl.png
82	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${f}	81	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${f}
83	.endfor	82	.endfor
84	${INSTALL_DATA} ${WRKSRC}/examples/config/config ${DATADIR}/examples/config/config	83	${INSTALL_DATA} ${WRKSRC}/examples/config/config ${DATADIR}/examples/config/config

Lines 1-26 Link Here

(-)uzbl/files/patch-examples__data__scripts__uzbl-tabbed (-26 lines)
1	--- examples/data/scripts/uzbl-tabbed.orig 2011-03-17 13:06:03.000000000 +0000
2	+++ examples/data/scripts/uzbl-tabbed 2011-03-23 10:33:53.000000000 +0000
3	@@ -507,12 +507,12 @@
4	self.parent.new_tab(args[0], '', 0, next=True)
5
6	elif type == "NEXT_TAB":
7	- if args[0]:
8	+ if args:
9	self.parent.next_tab(int(args[0]))
10	else:
11	self.parent.next_tab()
12	elif type == "PREV_TAB":
13	- if args[0]:
14	+ if args:
15	self.parent.prev_tab(int(args[0]))
16	else:
17	self.parent.prev_tab()
18	@@ -1016,7 +1016,7 @@
19	title = config['new_tab_title']
20
21	cmd = ['uzbl-browser', '-n', name, '-s', str(sid),
22	- '--connect-socket', self.socket_path, '--uri', uri]
23	+ '--connect-socket', self.socket_path, '--uri', str(uri)]
24	gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
25
26	uzbl = UzblInstance(self, tab, name, uri, title, switch)