summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-client/midori
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-client/midori')
-rw-r--r--www-client/midori/Manifest3
-rw-r--r--www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch22
-rw-r--r--www-client/midori/metadata.xml14
-rw-r--r--www-client/midori/midori-0.5.10.ebuild138
-rw-r--r--www-client/midori/midori-0.5.8-r1.ebuild136
-rw-r--r--www-client/midori/midori-0.5.8.ebuild134
6 files changed, 447 insertions, 0 deletions
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
new file mode 100644
index 000000000000..a78e4e529052
--- /dev/null
+++ b/www-client/midori/Manifest
@@ -0,0 +1,3 @@
+DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
+DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7
+DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07
diff --git a/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch
new file mode 100644
index 000000000000..3c6059c229b6
--- /dev/null
+++ b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch
@@ -0,0 +1,22 @@
+https://launchpadlibrarian.net/204464340/0002-fix-webkit2-build-breakage.patch
+
+webkit_web_view_get_main_frame() is a webkit1 API function.
+Using it without a check breaks webkit2 builds.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura midori-0.5.10.orig/midori/midori-view.c midori-0.5.10.wk2/midori/midori-view.c
+--- midori-0.5.10.orig/midori/midori-view.c 2015-04-24 08:50:24.940501790 -0300
++++ midori-0.5.10.wk2/midori/midori-view.c 2015-04-25 07:19:21.707132362 -0300
+@@ -1256,9 +1256,11 @@
+ message, error->message, NULL,
+ _("Try Again"), web_frame);
+
++#ifdef WEBKIT2
+ /* if the main frame for the whole tab has a network error, set tab error status */
+ if (web_frame == webkit_web_view_get_main_frame (web_view))
+ midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
++#endif
+
+ g_free (message);
+ g_free (title);
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
new file mode 100644
index 000000000000..bb27af6e2e8d
--- /dev/null
+++ b/www-client/midori/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
+ <use>
+ <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
+ <flag name='granite'>Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
+ <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
+ <flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
+ </use>
+</pkgmetadata>
diff --git a/www-client/midori/midori-0.5.10.ebuild b/www-client/midori/midori-0.5.10.ebuild
new file mode 100644
index 000000000000..7667988fb9f4
--- /dev/null
+++ b/www-client/midori/midori-0.5.10.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+ _live_inherits=git-2
+else
+ KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd"
+ SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND="
+ >=app-crypt/gcr-3[gtk]
+ >=dev-db/sqlite-3.6.19:3
+ >=dev-libs/glib-2.32.3
+ dev-libs/libxml2
+ >=net-libs/libsoup-2.38:2.4
+ >=net-libs/libsoup-gnome-2.38:2.4
+ >=x11-libs/libnotify-0.7
+ x11-libs/libXScrnSaver
+ deprecated? (
+ >=net-libs/webkit-gtk-1.8.1:2[jit=]
+ >=x11-libs/gtk+-2.24:2
+ )
+ !deprecated? (
+ x11-libs/gtk+:3
+ webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+ !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+ )
+ granite? ( >=dev-libs/granite-0.2 )
+ introspection? ( dev-libs/gobject-introspection:= )
+ zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ dev-util/intltool
+ gnome-base/librsvg
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )
+"
+REQUIRED_USE="
+ granite? ( !deprecated )
+ introspection? ( deprecated )
+ webkit2? ( !deprecated )
+"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-webkit2-build-breakage.patch"
+ vala_src_prepare
+ sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+ strip-linguas -i po
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ $(cmake-utils_use_use doc APIDOCS)
+ $(cmake-utils_use_use introspection GIR)
+ $(cmake-utils_use_use granite)
+ $(cmake-utils_use_use zeitgeist)
+ -DVALA_EXECUTABLE="${VALAC}"
+ )
+
+ if use deprecated; then
+ mycmakeargs+=(
+ -DUSE_GTK3=OFF
+ -DHALF_BRO_INCOM_WEBKIT2=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DUSE_GTK3=ON
+ $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local jit_is_enabled
+ if use deprecated; then
+ has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+ else
+ has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+ fi
+ [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
diff --git a/www-client/midori/midori-0.5.8-r1.ebuild b/www-client/midori/midori-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..3ddbd49f17c4
--- /dev/null
+++ b/www-client/midori/midori-0.5.8-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.16
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+ _live_inherits=git-2
+else
+ KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+ SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2
+ http://dev.gentoo.org/~ssuominen/${P}-save_as.patch.xz"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND=">=dev-db/sqlite-3.6.19:3
+ >=dev-libs/glib-2.32.3
+ dev-libs/libxml2
+ >=net-libs/libsoup-2.38:2.4
+ >=net-libs/libsoup-gnome-2.38:2.4
+ >=x11-libs/libnotify-0.7
+ x11-libs/libXScrnSaver
+ deprecated? (
+ >=net-libs/webkit-gtk-1.8.1:2[jit=]
+ >=x11-libs/gtk+-2.24:2
+ )
+ !deprecated? (
+ >=app-crypt/gcr-3
+ x11-libs/gtk+:3
+ webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+ !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+ )
+ granite? ( >=dev-libs/granite-0.2 )
+ introspection? ( dev-libs/gobject-introspection )
+ zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ dev-util/intltool
+ gnome-base/librsvg
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+REQUIRED_USE="granite? ( !deprecated )
+ introspection? ( deprecated )
+ webkit2? ( !deprecated )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${WORKDIR}"/${P}-save_as.patch #498898
+ vala_src_prepare
+ sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+ strip-linguas -i po
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ $(cmake-utils_use_use doc APIDOCS)
+ $(cmake-utils_use_use introspection GIR)
+ $(cmake-utils_use_use granite)
+ $(cmake-utils_use_use zeitgeist)
+ -DVALA_EXECUTABLE="${VALAC}"
+ )
+
+ if use deprecated; then
+ mycmakeargs+=(
+ -DUSE_GTK3=OFF
+ -DHALF_BRO_INCOM_WEBKIT2=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DUSE_GTK3=ON
+ $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local jit_is_enabled
+ if use deprecated; then
+ has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+ else
+ has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+ fi
+ [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
diff --git a/www-client/midori/midori-0.5.8.ebuild b/www-client/midori/midori-0.5.8.ebuild
new file mode 100644
index 000000000000..91481280d44c
--- /dev/null
+++ b/www-client/midori/midori-0.5.8.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.16
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+ _live_inherits=git-2
+else
+ KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+ SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND=">=dev-db/sqlite-3.6.19:3
+ >=dev-libs/glib-2.32.3
+ dev-libs/libxml2
+ >=net-libs/libsoup-2.38:2.4
+ >=net-libs/libsoup-gnome-2.38:2.4
+ >=x11-libs/libnotify-0.7
+ x11-libs/libXScrnSaver
+ deprecated? (
+ >=net-libs/webkit-gtk-1.8.1:2[jit=]
+ >=x11-libs/gtk+-2.24:2
+ )
+ !deprecated? (
+ >=app-crypt/gcr-3
+ x11-libs/gtk+:3
+ webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+ !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+ )
+ granite? ( >=dev-libs/granite-0.2 )
+ introspection? ( dev-libs/gobject-introspection )
+ zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ dev-util/intltool
+ gnome-base/librsvg
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+REQUIRED_USE="granite? ( !deprecated )
+ introspection? ( deprecated )
+ webkit2? ( !deprecated )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ vala_src_prepare
+ sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+ strip-linguas -i po
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ $(cmake-utils_use_use doc APIDOCS)
+ $(cmake-utils_use_use introspection GIR)
+ $(cmake-utils_use_use granite)
+ $(cmake-utils_use_use zeitgeist)
+ -DVALA_EXECUTABLE="${VALAC}"
+ )
+
+ if use deprecated; then
+ mycmakeargs+=(
+ -DUSE_GTK3=OFF
+ -DHALF_BRO_INCOM_WEBKIT2=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DUSE_GTK3=ON
+ $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local jit_is_enabled
+ if use deprecated; then
+ has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+ else
+ has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+ fi
+ [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}