Remove kde4.rekonq and dependencies
- No upstream activity - Known vulnerabilities
This commit is contained in:
parent
9d6bfacc85
commit
43d306c2f5
@ -1,33 +0,0 @@
|
|||||||
--- a/src/webpage.cpp
|
|
||||||
+++ b/src/webpage.cpp
|
|
||||||
@@ -226,23 +226,26 @@
|
|
||||||
doc += QL1S( "<h3>" );
|
|
||||||
doc += i18n( "Details of the Request:" );
|
|
||||||
doc += QL1S( "</h3><ul><li>" );
|
|
||||||
- doc += i18n( "URL: %1", reqUrl.url() );
|
|
||||||
+ // escape URL twice: once for i18n, and once for HTML.
|
|
||||||
+ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
|
|
||||||
doc += QL1S( "</li><li>" );
|
|
||||||
|
|
||||||
const QString protocol (reqUrl.protocol());
|
|
||||||
if ( !protocol.isNull() ) {
|
|
||||||
- doc += i18n( "Protocol: %1", protocol );
|
|
||||||
+ // escape protocol twice: once for i18n, and once for HTML.
|
|
||||||
+ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
|
|
||||||
doc += QL1S( "</li><li>" );
|
|
||||||
}
|
|
||||||
|
|
||||||
doc += i18n( "Date and Time: %1",
|
|
||||||
KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
|
|
||||||
doc += QL1S( "</li><li>" );
|
|
||||||
- doc += i18n( "Additional Information: %1" , text );
|
|
||||||
+ // escape text twice: once for i18n, and once for HTML.
|
|
||||||
+ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
|
|
||||||
doc += QL1S( "</li></ul><h3>" );
|
|
||||||
doc += i18n( "Description:" );
|
|
||||||
doc += QL1S( "</h3><p>" );
|
|
||||||
- doc += description;
|
|
||||||
+ doc += Qt::escape( description );
|
|
||||||
doc += QL1S( "</p>" );
|
|
||||||
|
|
||||||
if ( causes.count() ) {
|
|
@ -1,25 +0,0 @@
|
|||||||
{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "kwebkitpart-${version}";
|
|
||||||
version = "1.3.3";
|
|
||||||
|
|
||||||
src = fetchgit {
|
|
||||||
url = git://anongit.kde.org/kwebkitpart;
|
|
||||||
rev = "refs/tags/v${version}";
|
|
||||||
sha256 = "13vfv88njml7x67a37ymmlv9qs30fkmvkq0278lp7llmvp5qnxcj";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./CVE-2014-8600.diff ];
|
|
||||||
|
|
||||||
buildInputs = [ kdelibs ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.phreedom ];
|
|
||||||
description = "A WebKit KPart for Konqueror, Akregator and other KDE applications";
|
|
||||||
homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
|
|
||||||
, kde4, shared_desktop_ontologies, qca2, qoauth }:
|
|
||||||
|
|
||||||
assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/rekonq/${name}.tar.xz";
|
|
||||||
sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ kde4.kdelibs qca2 qoauth ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.urkud ];
|
|
||||||
description = "KDE Webkit browser";
|
|
||||||
homepage = https://rekonq.kde.org/;
|
|
||||||
};
|
|
||||||
}
|
|
@ -96,7 +96,6 @@ doNotDisplayTwice rec {
|
|||||||
quake3game = ioquake3; # added 2016-01-14
|
quake3game = ioquake3; # added 2016-01-14
|
||||||
qwt6 = qt5.qwt; # added 2015-12-19
|
qwt6 = qt5.qwt; # added 2015-12-19
|
||||||
rdiff_backup = rdiff-backup; # added 2014-11-23
|
rdiff_backup = rdiff-backup; # added 2014-11-23
|
||||||
rekonqWrapper = rekonq; # added 2015-01
|
|
||||||
rssglx = rss-glx; #added 2015-03-25
|
rssglx = rss-glx; #added 2015-03-25
|
||||||
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
|
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
|
||||||
rustUnstable = rustNightly; # added 2016-11-29
|
rustUnstable = rustNightly; # added 2016-11-29
|
||||||
|
@ -16758,11 +16758,6 @@ with pkgs;
|
|||||||
|
|
||||||
psi = callPackage ../applications/networking/instant-messengers/psi { };
|
psi = callPackage ../applications/networking/instant-messengers/psi { };
|
||||||
|
|
||||||
rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
|
|
||||||
rekonq = wrapFirefox rekonq-unwrapped { };
|
|
||||||
|
|
||||||
kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
|
|
||||||
|
|
||||||
semnotes = callPackage ../applications/misc/semnotes { };
|
semnotes = callPackage ../applications/misc/semnotes { };
|
||||||
|
|
||||||
telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
|
telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
|
||||||
@ -17884,8 +17879,6 @@ with pkgs;
|
|||||||
};
|
};
|
||||||
vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
|
vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
|
||||||
|
|
||||||
inherit (kde4) rekonq;
|
|
||||||
|
|
||||||
vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
|
vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
|
||||||
webkit = webkitgtk2;
|
webkit = webkitgtk2;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user