# ChangeLog for www-client/uzbl
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.20 2010/02/17 07:17:00 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.21 2010/03/14 14:37:35 wired Exp $
+
+*uzbl-2010.02.02-r1 (14 Mar 2010)
+
+ 14 Mar 2010; Alex Alexander <wired@gentoo.org> -uzbl-2010.01.05.ebuild,
+ -uzbl-2010.02.02.ebuild, +uzbl-2010.02.02-r1.ebuild,
+ -files/uzbl-2010.02.02-makefile-cleanup.patch, uzbl-9999.ebuild,
+ -files/uzbl-9999-makefile-cleanup.patch,
+ -files/uzbl-makefile-cleanup.patch, +files/uzbl-makefile-docdir.patch:
+ updated makefile patch and sent it upstream - fixes bug #309159. fixed bug
+ 309163. removed old version
17 Feb 2010; Alex Alexander <wired@gentoo.org>
files/uzbl-9999-makefile-cleanup.patch:
-AUX uzbl-2010.02.02-makefile-cleanup.patch 2049 RMD160 4beb6ee06c5c0bc54f96ad88aa5a9b95cef8802a SHA1 8f5a98b50c3f838096b9b9444e63f39bc6da170b SHA256 121791b6cfb16a3358a9f09ae0dcafbc9a5df70eb3d1fed1894f4881e849a87e
-AUX uzbl-9999-makefile-cleanup.patch 2048 RMD160 8d3168cd4678ab1b9e5630acfab81385445351d1 SHA1 b23ed9ed9639d35c54b7f323e5b4ee7b55610740 SHA256 a6771e86defee4c6d85285ffba8a5108fbf5d03ec78a29e91054dc80780c121f
-AUX uzbl-makefile-cleanup.patch 2252 RMD160 b15afc7e602c8212e24d0f1ec791cbedf0314581 SHA1 cd3a2eb545e8747e63b6bb8d0f2bbea550ca52de SHA256 c1e7d25c8e2da937a746945c16f19b0bbc9078ea0426004b6ae1a113affba7b1
-DIST uzbl-2010.01.05.tar.gz 133875 RMD160 3e65f19c852258fb5e1fad6bf67c430b6e1a9f35 SHA1 c10319ad023f1228ab7b4967637ba146fa1e928b SHA256 0aae5c9994d968b4f4ec7f8f2ce935c25e25d19cabbce27e3ded0672756132c8
+AUX uzbl-makefile-docdir.patch 1167 RMD160 c9e4c7c927e6cef4d35ced2af11c723f4998d7f5 SHA1 71dfd176b83d5459f5c9915cf8651c38dec2c459 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a
DIST uzbl-2010.02.02.tar.gz 136063 RMD160 6175ad388d9946a2f02c22bec3d7dd05b7f3f87a SHA1 a24565f554cb15e49e990a381e6f3322eaf4c5c6 SHA256 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a
-EBUILD uzbl-2010.01.05.ebuild 2601 RMD160 8623834b5bdb15b54b085e4d6f6ae2b3a1233004 SHA1 0156e332e1aa974e27d7a4e2e1810ece247201d4 SHA256 44dc0eaca00f0ae5f1b4364a747db5b4b9ba8a3cbc8404397ba3acbd6439f91e
-EBUILD uzbl-2010.02.02.ebuild 2595 RMD160 8b5621f765c84b1a52b80224dfb70083d0cdbbed SHA1 93fbd498bb28414718556dfab6206558b89c4af1 SHA256 94eea1ac4fd2ac4dff1177e39880b8fbb2f01baaa3d27174ec935af9fa95f61d
-EBUILD uzbl-9999.ebuild 2627 RMD160 453b38652a3b6640e7138b5c4b819a496f1f55aa SHA1 06725f2caaabb5c82835ae10ecdc6ea778fb317e SHA256 badd0ccd6d0786d098911565cbb8370ae779087a4e0b9c1a26cf3f95e67d4503
-MISC ChangeLog 3768 RMD160 4da35feaa223867e6062a621ee8645241396402a SHA1 014dcdb463e82ded005d1c40f821057d7d54c1c5 SHA256 5c0039e0a4a7cf81f855e105f4e70f16a3ed64fb5e1bd30a9cb35654e45d8f7b
+EBUILD uzbl-2010.02.02-r1.ebuild 2620 RMD160 8526f896df032a4b1199cdad41821d6a023b384c SHA1 f84fcdf88f6708cab71f608d13de7866ce749973 SHA256 171683741e6762efef6f8cc17fb92a82284d18eb3fb858caabfa58f4ec9149a9
+EBUILD uzbl-9999.ebuild 2670 RMD160 3190c763b350d7c436e4e1f939e07ee79015ebc5 SHA1 dac0804f9020f3d42489273bcf3ea902103d8919 SHA256 2f6b6b83a63ee6937d8e1b90c08f42838166e4b3822f7e644b82fef3795dc30b
+MISC ChangeLog 4223 RMD160 63462be3179c54a41c4c3a80cce979a7118c03d3 SHA1 61b8184a5972f596ebd598388840349265df4874 SHA256 0227fd8ae38cf52e0f37747b0d81e5919337c7c670697b31f1d14eedb4a5eb16
MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
+++ /dev/null
---- Makefile.orig 2010-02-03 11:20:21.616804753 +0200
-+++ Makefile 2010-02-03 11:21:17.385747630 +0200
-@@ -1,7 +1,7 @@
- # first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
-
--CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
--CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-
- LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
- LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
-@@ -100,14 +100,10 @@
-
- install-uzbl-core: all
- install -d $(INSTALLDIR)/bin
-- install -d $(INSTALLDIR)/share/uzbl/docs
- install -d $(INSTALLDIR)/share/uzbl/examples
-- cp -rp docs $(INSTALLDIR)/share/uzbl/
-- cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
-+ cp -rp src/config.h $(INSTALLDIR)/share/uzbl/
- cp -rp examples $(INSTALLDIR)/share/uzbl/
- install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
-- install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs
-- install -m644 README $(INSTALLDIR)/share/uzbl/docs
- sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
-
- install-uzbl-browser:
+++ /dev/null
---- Makefile.old 2010-02-17 09:13:50.139343494 +0200
-+++ Makefile 2010-02-17 09:15:03.711341985 +0200
-@@ -1,7 +1,7 @@
- # first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
-
--CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
--CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-
- LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
- LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
-@@ -100,14 +100,10 @@
-
- install-uzbl-core: all
- install -d $(INSTALLDIR)/bin
-- install -d $(INSTALLDIR)/share/uzbl/docs
- install -d $(INSTALLDIR)/share/uzbl/examples
-- cp -rp docs $(INSTALLDIR)/share/uzbl/
-- cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
-+ cp -rp src/config.h $(INSTALLDIR)/share/uzbl/
- cp -rp examples $(INSTALLDIR)/share/uzbl/
- install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
-- install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs
-- install -m644 README $(INSTALLDIR)/share/uzbl/docs
- sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
-
- install-uzbl-browser:
+++ /dev/null
---- Makefile.old 2009-12-05 19:22:12.079131232 +0200
-+++ Makefile 2009-12-05 19:24:51.863115587 +0200
-@@ -1,7 +1,7 @@
- # first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
-
--CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
--CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-
- LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
- LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
-@@ -32,10 +32,6 @@
- @echo LINKING object files
- @${CC} -o $@ ${OBJ} ${LDFLAGS}
- @echo ... done.
-- @echo Stripping binary
-- @strip $@
-- @echo ... done.
--
-
- uzbl-browser: uzbl-core
-
-@@ -88,14 +84,10 @@
-
- install-uzbl-core: all
- install -d $(INSTALLDIR)/bin
-- install -d $(INSTALLDIR)/share/uzbl/docs
- install -d $(INSTALLDIR)/share/uzbl/examples
-- cp -rp docs $(INSTALLDIR)/share/uzbl/
-- cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/
-+ cp -rp config.h $(INSTALLDIR)/share/uzbl/
- cp -rp examples $(INSTALLDIR)/share/uzbl/
- install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
-- install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs
-- install -m644 README $(INSTALLDIR)/share/uzbl/docs
- sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
-
- install-uzbl-browser: all
--- /dev/null
+--- Makefile.orig 2010-03-14 15:31:02.685612392 +0200
++++ Makefile 2010-03-14 15:34:02.224647749 +0200
+@@ -43,6 +43,7 @@
+ # RUN_PREFIX : what the prefix is when the software is run. usually the same as PREFIX
+ PREFIX?=/usr/local
+ INSTALLDIR?=$(DESTDIR)$(PREFIX)
++DOCDIR?=$(INSTALLDIR)/share/uzbl/docs
+ RUN_PREFIX?=$(PREFIX)
+
+ # the 'tests' target can never be up to date
+@@ -100,14 +101,14 @@
+
+ install-uzbl-core: all
+ install -d $(INSTALLDIR)/bin
+- install -d $(INSTALLDIR)/share/uzbl/docs
++ install -d $(DOCDIR)
+ install -d $(INSTALLDIR)/share/uzbl/examples
+- cp -rp docs $(INSTALLDIR)/share/uzbl/
+- cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
++ cp -rp docs/* $(DOCDIR)/
++ cp -rp src/config.h $(DOCDIR)/
+ cp -rp examples $(INSTALLDIR)/share/uzbl/
+ install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
+- install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs
+- install -m644 README $(INSTALLDIR)/share/uzbl/docs
++ install -m644 AUTHORS $(DOCDIR)
++ install -m644 README $(DOCDIR)
+ sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+
+ install-uzbl-browser:
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.01.05.ebuild,v 1.1 2010/01/05 20:35:59 wired Exp $
-
-EAPI="2"
-
-inherit base
-
-DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit."
-HOMEPAGE="http://www.uzbl.org"
-SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+browser helpers +tabbed"
-
-COMMON_DEPEND="
- >=dev-libs/icu-4.0.1
- >=net-libs/libsoup-2.24
- >=net-libs/webkit-gtk-1.1.15
- >=x11-libs/gtk+-2.14
-"
-
-DEPEND="
- >=dev-util/pkgconfig-0.19
- ${COMMON_DEPEND}
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-misc/xdg-utils
- browser? (
- x11-misc/xclip
- )
- helpers? (
- dev-lang/perl
- dev-perl/gtk2-perl
- dev-python/pygtk
- dev-python/pygobject
- gnome-extra/zenity
- net-misc/socat
- x11-libs/pango
- x11-misc/dmenu
- x11-misc/xclip
- )
-"
-
-pkg_setup() {
- if ! use helpers; then
- elog "uzbl's extra scripts use various optional applications:"
- elog
- elog " dev-lang/perl"
- elog " dev-perl/gtk2-perl"
- elog " dev-python/pygtk"
- elog " dev-python/pygobject"
- elog " gnome-extra/zenity"
- elog " net-misc/socat"
- elog " x11-libs/pango"
- elog " x11-misc/dmenu"
- elog " x11-misc/xclip"
- elog
- elog "Make sure you emerge the ones you need manually."
- elog "You may also activate the *helpers* USE flag to"
- elog "install all of them automatically."
- else
- einfo "You have enabled the *helpers* USE flag that installs"
- einfo "various optional applications used by uzbl's extra scripts."
- fi
-
- if use tabbed && ! use browser; then
- ewarn
- ewarn "You enabled the *tabbed* USE flag but not *browser*."
- ewarn "*tabbed* depends on *browser*, so it will be disabled."
- ewarn
- ebeep 3
- fi
-}
-
-src_prepare() {
- cd "${WORKDIR}"/Dieterbe-uzbl-*
- S=$(pwd)
-
- # patch Makefile to make it more sane
- epatch "${FILESDIR}"/"${PN}"-makefile-cleanup.patch
-
- # adjust path in default config file to /usr/share
- sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
- examples/config/uzbl/config ||
- die "config path sed failed"
-}
-
-src_compile() {
- emake || die "compile failed"
-}
-
-src_install() {
- local targets="install-uzbl-core"
- use browser && targets="${targets} install-uzbl-browser"
- use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
-
- emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed"
-
- # Install the docs in /usr/share/doc.
- dodoc AUTHORS README docs/* || die "docs install failed"
-}
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.02.02.ebuild,v 1.1 2010/02/03 09:35:13 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.02.02-r1.ebuild,v 1.1 2010/03/14 14:37:35 wired Exp $
EAPI="2"
S=$(pwd)
# patch Makefile to make it more sane
- epatch "${FILESDIR}"/"${P}"-makefile-cleanup.patch
+ epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch
+
+ # remove -ggdb
+ sed -i "s/-ggdb //g" Makefile ||
+ die "-ggdb removal sed failed"
# adjust path in default config file to /usr/share
sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
use browser && targets="${targets} install-uzbl-browser"
use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
- emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed"
-
- # Install the docs in /usr/share/doc.
- dodoc AUTHORS README docs/* || die "docs install failed"
+ emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
+ die "Installation failed"
}
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.9 2010/01/27 15:33:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.10 2010/03/14 14:37:35 wired Exp $
EAPI="2"
"
pkg_setup() {
- use experimental && EGIT_BRANCH="experimental"
+ use experimental && EGIT_BRANCH="experimental" && EGIT_COMMIT="experimental"
if ! use helpers; then
elog "uzbl's extra scripts use various optional applications:"
src_prepare() {
git_src_prepare
- # patch Makefile to make it more sane
- epatch "${FILESDIR}"/"${P}"-makefile-cleanup.patch
+ # patch Makefile for DOCDIR
+ epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch
+
+ # remove -ggdb
+ sed -i "s/-ggdb //g" Makefile ||
+ die "-ggdb removal sed failed"
# adjust path in default config file to /usr/share
sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
use browser && targets="${targets} install-uzbl-browser"
use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
- emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed"
-
- # Install the docs in /usr/share/doc.
- dodoc AUTHORS README docs/* || die "docs install failed"
+ emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
+ die "Installation failed"
}
projects / gentoo.git / commitdiff