public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Tue, 17 Jan 2012 09:08:53 +0000 (UTC)	[thread overview]
Message-ID: <260580eb2a6df508f756024f33c36dcd5588336a.plaes@gentoo> (raw)

commit:     260580eb2a6df508f756024f33c36dcd5588336a
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 09:05:32 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 09:05:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=260580eb

net-libs/webkit-gtk: 1.7.3 → 1.7.4

---
 .../files/webkit-gtk-1.7.1-install-docs.patch      |   43 --------------------
 net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild   |    3 -
 ....1-r200.ebuild => webkit-gtk-1.7.4-r200.ebuild} |    2 +-
 ....1-r300.ebuild => webkit-gtk-1.7.4-r300.ebuild} |    9 +---
 4 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch
deleted file mode 100644
index b053908..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Enable gtk-doc installation when building with --enable-gtk-doc
-
---- a/Source/WebKit/gtk/GNUmakefile.gtk-doc.am
-+++ b/Source/WebKit/gtk/GNUmakefile.gtk-doc.am
-@@ -180,6 +180,38 @@
- 	@rm -rf Documentation/xml Documentation/html
- 	-@rmdir Documentation
- 
-+if ENABLE_GTK_DOC
-+install-data-local:
-+	@installfiles=`echo $(builddir)/html/*`; \
-+	if test "$$installfiles" = '$(builddir)/html/*'; \
-+	then echo 1>&2 'Nothing to install' ; \
-+	else \
-+	  if test -n "$(DOC_MODULE_VERSION)"; then \
-+	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-+	  else \
-+	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
-+	  fi; \
-+	  $(mkinstalldirs) $${installdir} ; \
-+	  for i in $$installfiles; do \
-+	    echo ' $(INSTALL_DATA) '$$i ; \
-+	    $(INSTALL_DATA) $$i $${installdir}; \
-+	  done; \
-+	  if test -n "$(DOC_MODULE_VERSION)"; then \
-+	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
-+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-+	  fi; \
-+	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+	fi
-+
-+uninstall-local:
-+	@if test -n "$(DOC_MODULE_VERSION)"; then \
-+	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-+	else \
-+	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-+	fi; \
-+	rm -rf $${installdir}
-+endif
-+
- #
- # Require gtk-doc when making dist
- #

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
index 4ae3a69..e896d47 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
@@ -95,9 +95,6 @@ src_prepare() {
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
 
-	# Install docs on "make install" when USE=doc
-	#epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch"
-
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
index 3506b3c..f62db47 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r200.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic eutils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
similarity index 92%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
index 80fa1b5..6adaa5e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.4-r300.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic eutils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-libs/glib-2.27.90:2
 	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	>=net-libs/libsoup-2.37.2.1:2.4[introspection?]
 	dev-db/sqlite:3
 	>=x11-libs/pango-1.12
 	x11-libs/libXrender
@@ -95,9 +95,6 @@ src_prepare() {
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
 
-	# Install docs on "make install" when USE=doc
-	epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch"
-
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -115,8 +112,6 @@ src_configure() {
 	local myconf
 
 	# XXX: Check Web Audio support
-	# XXX: files for generating DerivedSources/WebKit2/* are missing, see
-	#      https://bugs.webkit.org/show_bug.cgi?id=66527
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)



             reply	other threads:[~2012-01-17  9:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-17  9:08 Priit Laes [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-04-21 14:40 [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Gilles Dartiguelongue
2013-11-27 23:32 Gilles Dartiguelongue
2013-03-03  0:57 Priit Laes
2013-02-13 14:05 Priit Laes
2013-01-15  9:39 Priit Laes
2012-11-04  6:25 Alexandre Rostovtsev
2012-10-27  8:43 Priit Laes
2012-10-10 17:34 Priit Laes
2012-09-13  5:35 Alexandre Rostovtsev
2012-07-12 12:33 Priit Laes
2012-04-14  6:10 Alexandre Restovtsev
2012-04-06  2:36 Alexandre Restovtsev
2012-03-04 21:11 Alexandre Restovtsev
2012-02-26 19:20 Alexandre Restovtsev
2011-12-20 17:37 Priit Laes
2011-11-28  5:35 Priit Laes
2011-11-26  8:43 Priit Laes
2011-10-30  0:13 Alexandre Restovtsev
2011-06-11  1:44 Nirbheek Chauhan
2011-06-05 20:12 Priit Laes
2011-05-07 19:18 Priit Laes
2011-03-22 13:22 Priit Laes
2011-03-04 10:23 Nirbheek Chauhan
2011-02-25 11:54 Priit Laes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=260580eb2a6df508f756024f33c36dcd5588336a.plaes@gentoo \
    --to=plaes@plaes.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox