packages: uzbl/uzbl.spec, uzbl/uzbl-dmenu.patch (NEW) - added uzbl-dmenu.patch

[pawelz]

Author: pawelz                       Date: Sat Jul 18 23:17:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added uzbl-dmenu.patch

---- Files affected:
packages/uzbl:
   uzbl.spec (1.16 -> 1.17) , uzbl-dmenu.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/uzbl/uzbl.spec
diff -u packages/uzbl/uzbl.spec:1.16 packages/uzbl/uzbl.spec:1.17
--- packages/uzbl/uzbl.spec:1.16	Sat Jul 18 21:25:52 2009
+++ packages/uzbl/uzbl.spec	Sun Jul 19 01:17:21 2009
@@ -15,6 +15,7 @@
 Source0:	%{name}-%{gitdate}.tar.bz2
 # Source0-md5:	f5018ec67508bd35a018471a64575d65
 Patch0:		uzbl-config.patch
+Patch1:		uzbl-dmenu.patch
 URL:		http://www.uzbl.org/
 BuildRequires:	curl-devel
 BuildRequires:	gtk+2-devel
@@ -77,6 +78,7 @@
 %setup -q -n %{name}-%{gitdate}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make}
@@ -128,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2009/07/18 23:17:21  pawelz
+- added uzbl-dmenu.patch
+
 Revision 1.16  2009/07/18 19:25:52  pawelz
 - up to git:refs/tags/2009.07.18
 

================================================================
Index: packages/uzbl/uzbl-dmenu.patch
diff -u /dev/null packages/uzbl/uzbl-dmenu.patch:1.1
--- /dev/null	Sun Jul 19 01:17:27 2009
+++ packages/uzbl/uzbl-dmenu.patch	Sun Jul 19 01:17:21 2009
@@ -0,0 +1,53 @@
+diff --git a/examples/data/uzbl/scripts/load_url_from_bookmarks.sh b/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
+index f57d7b3..f77dfe4 100755
+--- a/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
++++ b/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
+@@ -5,16 +5,10 @@
+ file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/bookmarks
+ [ -r "$file" ] || exit
+ COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
+-if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]'
+-then
+-	DMENU="dmenu -i -xs -rs -l 10" # vertical patch
+-	# show tags as well
+-	goto=`$DMENU $COLORS < $file | awk '{print $1}'`
+-else
+-	DMENU="dmenu -i"
+-	# because they are all after each other, just show the url, not their tags.
+-	goto=`awk '{print $1}' $file | $DMENU $COLORS`
+-fi
++
++DMENU="dmenu -i -l 10" # vertical patch
++# show tags as well
++goto=`$DMENU $COLORS < $file | awk '{print $1}'`
+ 
+ #[ -n "$goto" ] && echo "uri $goto" > $4
+ [ -n "$goto" ] && uzblctrl -s $5 -c "uri $goto"
+diff --git a/examples/data/uzbl/scripts/load_url_from_history.sh b/examples/data/uzbl/scripts/load_url_from_history.sh
+index 1eaf0f2..ff5e790 100755
+--- a/examples/data/uzbl/scripts/load_url_from_history.sh
++++ b/examples/data/uzbl/scripts/load_url_from_history.sh
+@@ -6,19 +6,10 @@ history_file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history
+ # choose from all entries, sorted and uniqued
+ # goto=`awk '{print $3}' $history_file | sort -u | dmenu -i`
+ COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
+-if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]';
+-then
+-        DMENU="dmenu -i -xs -rs -l 10" # vertical patch
+-        # 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 $history_file | $DMENU $COLORS | cut -d ' ' -f -3  | awk '{print $NF}'`
+-else
+-        DMENU="dmenu -i"
+-	# choose from all entries (no date or title), the first one being current url, and after that all others, sorted and uniqued, in ascending order
+-	current=`tail -n 1 $history_file | awk '{print $3}'`;
+-  goto=`(echo $current; awk '{print $3}' $history_file | grep -v "^$current\$" \
+-      | sort -u) | $DMENU $COLORS`
+-fi
++DMENU="dmenu -i -l 10" # vertical patch
++# 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 $history_file | $DMENU $COLORS | cut -d ' ' -f -3  | awk '{print $NF}'`
+ 
+ [ -n "$goto" ] && echo "uri $goto" > $4
+ #[ -n "$goto" ] && uzblctrl -s $5 -c "uri $goto"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uzbl/uzbl.spec?r1=1.16&r2=1.17&f=u