commit: 57e0176a19d7397410f494d84876759c1af8d75d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 18:53:39 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 19:17:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e0176a
www-client/midori: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
www-client/midori/Manifest | 2 -
.../midori/files/midori-0.5.11-libsoup.patch | 73 ---------------
.../midori/files/midori-0.5.11-vala-0.35.patch | 101 ---------------------
www-client/midori/metadata.xml | 3 -
www-client/midori/midori-0.5.11-r2.ebuild | 88 ------------------
www-client/midori/midori-0.5.11-r3.ebuild | 89 ------------------
www-client/midori/midori-6.0.ebuild | 64 -------------
7 files changed, 420 deletions(-)
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 2ab860caa96..0f2f13542e9 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1 @@
-DIST midori-v6.0.tar.gz 1823209 BLAKE2B
dd00bef8da638d993c9918e991fa4f65d79b9f0d736b865895fae94f7f9d7552d671bda38cff933e65b7017cadfb810b7c180e00ba4e6f26abd471affc4cd903
SHA512
2b3e4808b1297a3ef8436b45ac38782e070658a0ecc62bcf8d0b2cf49f256cdad799ccc5d28df11ff595c042e8474fa2e87065d9a89cdb5a936237c44fdfd9e7
DIST midori-v7.0.tar.gz 1827341 BLAKE2B
e008be32851a3ee12744b7b4e686545a2f9cd84fc6f05a647744c512ea5286fdc1db3b1ec40f546208ffbca4ca8a179752f27b85d9060765a7612ac7c260c67f
SHA512
4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
-DIST midori_0.5.11_all_.tar.bz2 1428791 BLAKE2B
c19872b3271360877b2affa0ab86d93884895037a72cb9182a44a597bf930394153fea5a744c1cf225f2c4bd8f3c691c5622d0b4abdb33c202c4aa1da48b5ee5
SHA512
237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
diff --git a/www-client/midori/files/midori-0.5.11-libsoup.patch
b/www-client/midori/files/midori-0.5.11-libsoup.patch
deleted file mode 100644
index b560075f810..00000000000
--- a/www-client/midori/files/midori-0.5.11-libsoup.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ur midori-0.5.11/CMakeLists.txt midori-0.5.11_p/CMakeLists.txt
---- midori-0.5.11/CMakeLists.txt 2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11_p/CMakeLists.txt 2016-08-21 21:10:30.117983251 +0200
-@@ -112,13 +112,13 @@
- sqlite3>=3.6.19
- gmodule-2.0
- gio-2.0>=2.32.3
-- libsoup-gnome-2.4>=2.37.1
-+ libsoup-2.4>=2.37.1
- )
- add_definitions("-DHAVE_LIBXML")
- add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
--add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
-+add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-2.4_VERSION}\"")
- set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
--if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
-+if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.40.0")
- # valac 0.16 didn't have the bindings yet
- # For consistency we need to ensure C code makes the same assumptions
- if (${VALA_VERSION} VERSION_GREATER "0.17.0")
-@@ -126,7 +126,7 @@
- set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
- endif ()
- endif ()
--if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.48.0")
-+if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.48.0")
- add_definitions("-DHAVE_LIBSOUP_2_48_0")
- set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0)
- endif ()
-diff -ur midori-0.5.11/extensions/cookie-manager/cookie-manager.c
midori-0.5.11_p/extensions/cookie-manager/cookie-manager.c
---- midori-0.5.11/extensions/cookie-manager/cookie-manager.c 2015-08-30
13:56:26.000000000 +0200
-+++ midori-0.5.11_p/extensions/cookie-manager/cookie-manager.c 2016-08-19
23:19:20.000000000 +0200
-@@ -12,7 +12,7 @@
- #include "config.h"
- #include <midori/midori.h>
- #include "katze/katze.h"
--#include <libsoup/soup-cookie-jar-sqlite.h>
-+#include <libsoup/soup-cookie-jar-db.h>
-
- #include "cookie-manager.h"
- #include "cookie-manager-page.h"
-@@ -282,7 +282,7 @@
- /* setup soup */
- #ifdef HAVE_WEBKIT2
- gchar *filename = midori_paths_get_config_filename_for_writing
("cookies.db");
-- priv->jar = soup_cookie_jar_sqlite_new (filename, FALSE);
-+ priv->jar = soup_cookie_jar_db_new (filename, FALSE);
- g_free(filename);
- #else
- SoupSession *session = webkit_get_default_session();
-diff -ur midori-0.5.11/midori/midori-session.c
midori-0.5.11_p/midori/midori-session.c
---- midori-0.5.11/midori/midori-session.c 2015-08-30 13:56:26.000000000
+0200
-+++ midori-0.5.11_p/midori/midori-session.c 2016-08-19 23:56:30.000000000
+0200
-@@ -17,8 +17,8 @@
- #include "sokoke.h"
-
- #include <glib/gi18n-lib.h>
--#include <libsoup/soup-cookie-jar-sqlite.h>
--#include <libsoup/soup-gnome-features.h>
-+#include <libsoup/soup-cookie-jar-db.h>
-+#include <libsoup/soup-types.h>
-
- #define LIBSOUP_USE_UNSTABLE_REQUEST_API
- #include <libsoup/soup-cache.h>
-@@ -297,7 +297,7 @@
- g_object_unref (feature);
-
- katze_assign (config_file, midori_paths_get_config_filename_for_writing
("cookies.db"));
-- jar = soup_cookie_jar_sqlite_new (config_file, FALSE);
-+ jar = soup_cookie_jar_db_new (config_file, FALSE);
- soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
- g_signal_connect (jar, "changed",
- G_CALLBACK (midori_session_cookie_jar_changed_cb),
settings);
diff --git a/www-client/midori/files/midori-0.5.11-vala-0.35.patch
b/www-client/midori/files/midori-0.5.11-vala-0.35.patch
deleted file mode 100644
index 4192b608493..00000000000
--- a/www-client/midori/files/midori-0.5.11-vala-0.35.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Patch provided by Sander Sweers on https://bugs.gentoo.org/628108#c9
-
-diff -ur midori-0.5.11.orig/extensions/adblock/widgets.vala
midori-0.5.11/extensions/adblock/widgets.vala
---- midori-0.5.11.orig/extensions/adblock/widgets.vala 2015-08-30
13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/adblock/widgets.vala 2017-09-30
01:07:04.033922383 +0200
-@@ -227,7 +227,7 @@
- liststore.get (iter, 0, out sub);
- if (sub.mutable) {
- config.remove (sub);
-- liststore.remove (iter);
-+ liststore.remove (ref iter);
- return true;
- }
- }
-diff -ur midori-0.5.11.orig/extensions/apps.vala
midori-0.5.11/extensions/apps.vala
---- midori-0.5.11.orig/extensions/apps.vala 2015-08-30 13:56:26.000000000
+0200
-+++ midori-0.5.11/extensions/apps.vala 2017-09-30 01:08:12.831916408 +0200
-@@ -265,7 +265,7 @@
- store.get (iter, 0, out launcher);
- try {
- launcher.file.trash (null);
-- store.remove (iter);
-+ store.remove (ref iter);
-
- string filename =
Midori.Download.clean_filename (launcher.name);
- #if HAVE_WIN32
-diff -ur midori-0.5.11.orig/extensions/history-list.vala
midori-0.5.11/extensions/history-list.vala
---- midori-0.5.11.orig/extensions/history-list.vala 2015-08-30
13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/history-list.vala 2017-09-30 01:10:25.137904917
+0200
-@@ -223,7 +223,7 @@
- FixMe: the retrun value of `Gtk.ListStore.remove` should
be checked
- Note: in some cases the return value of
`Gtk.ListStore.remove` is wrong
- */
-- model.remove (iter);
-+ model.remove (ref iter);
- this.browser.close_tab (view);
- if (length > 2)
- this.resize_treeview ();
-diff -ur midori-0.5.11.orig/extensions/notes.vala
midori-0.5.11/extensions/notes.vala
---- midori-0.5.11.orig/extensions/notes.vala 2015-08-30 13:56:26.000000000
+0200
-+++ midori-0.5.11/extensions/notes.vala 2017-09-30 01:09:14.703911034
+0200
-@@ -116,7 +116,7 @@
- if (current_note == note) {
- current_note = null;
- }
-- notes_list_store.remove (iter);
-+ notes_list_store.remove (ref iter);
- break;
- }
- } while (notes_list_store.iter_next (ref iter));
-diff -ur midori-0.5.11.orig/extensions/transfers.vala
midori-0.5.11/extensions/transfers.vala
---- midori-0.5.11.orig/extensions/transfers.vala 2015-08-30
13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/transfers.vala 2017-09-30 01:05:00.916933075
+0200
-@@ -275,7 +275,7 @@
- Transfer found;
- store.get (iter, 0, out found);
- if (transfer == found) {
-- store.remove (iter);
-+ store.remove (ref iter);
- break;
- }
- } while (store.iter_next (ref iter));
-@@ -455,7 +455,7 @@
- if (notifications.length () == 1)
- msg = _("The file '<b>%s</b>' has been
downloaded.").printf (filename);
- else
-- msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, notifications.length ());
-+ msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, (int) notifications.length ());
- get_app ().send_notification (_("Transfer completed"), msg);
- notifications = new GLib.List<string> ();
- }
-diff -ur midori-0.5.11.orig/midori/midori-notebook.vala
midori-0.5.11/midori/midori-notebook.vala
---- midori-0.5.11.orig/midori/midori-notebook.vala 2015-08-30
13:56:26.000000000 +0200
-+++ midori-0.5.11/midori/midori-notebook.vala 2017-09-30 00:49:47.947012362
+0200
-@@ -10,7 +10,7 @@
- */
-
- namespace Midori {
-- protected class Tally : Gtk.EventBox {
-+ internal class Tally : Gtk.EventBox {
- public Midori.Tab tab { get; set; }
- Gtk.Spinner spinner;
- public Gtk.Label label;
-@@ -22,7 +22,7 @@
- public bool close_button_left { get; set; default = false; }
- public bool close_button_visible { get; set; default = false; }
-
-- protected Tally (Midori.Tab tab) {
-+ internal Tally (Midori.Tab tab) {
- this.tab = tab;
- box = new Gtk.HBox (false, 1);
- add (box);
-@@ -155,7 +155,7 @@
- int last_tab_size = 0;
-
- #if !HAVE_GTK3
-- static const string style_fixup = """
-+ const string style_fixup = """
- style "midori-close-button-style"
- {
- GtkWidget::focus-padding = 0
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index eedc283b9c4..359901b31db 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -5,7 +5,4 @@
<email>[email protected]</email>
<name>XFCE Team</name>
</maintainer>
- <use>
- <flag name="granite">Enable support for the elementary library
<pkg>dev-libs/granite</pkg></flag>
- </use>
</pkgmetadata>
diff --git a/www-client/midori/midori-0.5.11-r2.ebuild
b/www-client/midori/midori-0.5.11-r2.ebuild
deleted file mode 100644
index ac0b850f894..00000000000
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-VALA_MAX_API_VERSION=0.34
-
-inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx
xdg-utils
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="https://www.midori-browser.org/";
-SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2";
-
-KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="doc granite xscreensaver +jit"
-
-RDEPEND="
- >=app-crypt/gcr-3:=[gtk]
- >=dev-db/sqlite-3.6.19:3
- >=dev-libs/glib-2.32.3:2
- dev-libs/libxml2
- >=net-libs/libsoup-2.38:2.4
- >=x11-libs/libnotify-0.7
- >=x11-libs/gtk+-3.10.0:3
- >=net-libs/webkit-gtk-2.3.91:4[jit=,opengl]
- granite? ( >=dev-libs/granite-0.2 )
- xscreensaver? (
- x11-libs/libX11
- x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(vala_depend)
- dev-util/intltool
- gnome-base/librsvg
- sys-devel/gettext
- doc? ( dev-util/gtk-doc )
-"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${P}-libsoup.patch #587448
-
- cmake-utils_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}
- -DUSE_APIDOCS="$(usex doc)"
- -DUSE_GRANITE="$(usex granite)"
- -DUSE_ZEITGEIST=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DUSE_GTK3=ON
- -DHALF_BRO_INCOM_WEBKIT2=ON
- )
-
- use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/www-client/midori/midori-0.5.11-r3.ebuild
b/www-client/midori/midori-0.5.11-r3.ebuild
deleted file mode 100644
index 7d195ae23f6..00000000000
--- a/www-client/midori/midori-0.5.11-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-VALA_MIN_API_VERSION=0.36
-
-inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx
xdg-utils
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="https://www.midori-browser.org/";
-SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2";
-
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="doc granite xscreensaver +jit"
-
-RDEPEND="
- >=app-crypt/gcr-3:=[gtk]
- >=dev-db/sqlite-3.6.19:3
- >=dev-libs/glib-2.32.3:2
- dev-libs/libxml2
- >=net-libs/libsoup-2.38:2.4
- >=x11-libs/libnotify-0.7
- >=x11-libs/gtk+-3.10.0:3
- >=net-libs/webkit-gtk-2.3.91:4[jit=,opengl]
- granite? ( >=dev-libs/granite-0.2 )
- xscreensaver? (
- x11-libs/libX11
- x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(vala_depend)
- dev-util/intltool
- gnome-base/librsvg
- sys-devel/gettext
- doc? ( dev-util/gtk-doc )
-"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${P}-libsoup.patch #587448
- eapply "${FILESDIR}"/${P}-vala-0.35.patch #628108
-
- cmake-utils_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}
- -DUSE_APIDOCS="$(usex doc)"
- -DUSE_GRANITE="$(usex granite)"
- -DUSE_ZEITGEIST=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DUSE_GTK3=ON
- -DHALF_BRO_INCOM_WEBKIT2=ON
- )
-
- use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/www-client/midori/midori-6.0.ebuild
b/www-client/midori/midori-6.0.ebuild
deleted file mode 100644
index e344c721d0e..00000000000
--- a/www-client/midori/midori-6.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.36
-
-inherit cmake-utils eapi7-ver eutils gnome2-utils vala xdg-utils
-
-MY_P=${PN}-v${PV}
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="https://www.midori-browser.org/";
-SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut
1)/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="+jit"
-
-RDEPEND="
- >=app-crypt/gcr-3:=[gtk,vala]
- >=dev-db/sqlite-3.6.19:3
- >=dev-libs/glib-2.48.0:2
- dev-libs/libpeas[gtk]
- dev-libs/libxml2
- >=net-libs/libsoup-2.38:2.4[vala]
- >=net-libs/webkit-gtk-2.16.6:4[introspection,jit=,opengl]
- >=x11-libs/libnotify-0.7
- >=x11-libs/gtk+-3.12.0:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/intltool
- sys-devel/gettext
-"
-
-S=${WORKDIR}
-
-src_prepare() {
- cmake-utils_src_prepare
- vala_src_prepare
- sed -i -e 's:libsoup-gnome:libsoup:' CMakeLists.txt || die
- sed -i -e '/^install/s:COPYING::' CMakeLists.txt || die
-}
-
-src_configure() {
- strip-linguas -i po/
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DVALA_EXECUTABLE="${VALAC}"
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
