cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

webkitgtk24x-gtk{3.2}: remove

Browse source 
It goes without saying that we should remove this 😅️.
This commit is contained in:
worldofpeace 2019-12-05 05:21:51 -05:00
parent 989711d6f4
commit a11e023201
9 changed files with 2 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
pkgs/development/libraries/webkitgtk/2.4.nix
View file

@ -1,111 +0,0 @@
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
, pkgconfig, which, gettext, gobject-introspection
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
, gst-plugins-base, libobjc
, withGtk2 ? false
, enableIntrospection ? !stdenv.isDarwin
, enableCredentialStorage ? !stdenv.isDarwin
, readline, libedit
}:
assert stdenv.isDarwin -> !enableIntrospection;
assert stdenv.isDarwin -> !enableCredentialStorage;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.4.11";
meta = with stdenv.lib; {
description = "Web content rendering engine, GTK port";
homepage = http://webkitgtk.org/;
license = licenses.bsd2;
platforms = with platforms; linux ++ darwin;
maintainers = [];
knownVulnerabilities = [
"WSA-2016-0004"
"WSA-2016-0005"
"WSA-2016-0006"
"WSA-2017-0001"
"WSA-2017-0002"
];
};
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
};
CC = "cc";
prePatch = ''
patchShebangs Tools/gtk
'';
patches = [
./webcore-svg-libxml-cflags.patch
(fetchpatch {
url = https://raw.githubusercontent.com/gentoo/gentoo/7c5457e265bd40c156a8fe6b2ff94a4e34bcea8e/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch;
sha256 = "0ll93dr5vxd40wvly1jaw41lvw86krac0jc6k6cacrps4i5ql5j0";
})
] ++ optionals stdenv.isDarwin [
./configure.patch
./quartz-webcore.patch
./libc++.patch
./plugin-none.patch
] ++ optionals stdenv.hostPlatform.isMusl [
./fix-execinfo.patch
];
configureFlags = with stdenv.lib; [
"--disable-geolocation"
"--disable-jit"
# needed for parallel building
"--enable-dependency-tracking"
(optionalString enableIntrospection "--enable-introspection")
] ++ optional withGtk2 [
"--with-gtk=2.0"
] ++ optionals (withGtk2 || stdenv.isDarwin) [
"--disable-webkit2"
] ++ optionals stdenv.isDarwin [
"--disable-x11-target"
"--enable-quartz-target"
"--disable-web-audio"
"CFLAGS=-DJSC_OBJC_API_ENABLED=0"
"CXXFLAGS=-DJSC_OBJC_API_ENABLED=0"
] ++ optionals (!enableCredentialStorage) [
"--disable-credential-storage"
];
NIX_CFLAGS_COMPILE = [
"-DU_NOEXCEPT="
"-Wno-expansion-to-defined"
];
dontAddDisableDepTrack = true;
nativeBuildInputs = [
perl python ruby bison gperf flex
pkgconfig which gettext gobject-introspection
];
buildInputs = [
gtk2 libwebp enchant
libxml2 libxslt
gst-plugins-base sqlite xorg.libXt xorg.libXdamage
] ++ optionals enableCredentialStorage [
libsecret
] ++ (if stdenv.isDarwin then [
readline libedit libobjc
] else [
wayland
]);
propagatedBuildInputs = [
libsoup harfbuzz/*icu in *.la*/
(if withGtk2 then gtk2 else gtk3)
];
enableParallelBuilding = true;
}

20
pkgs/development/libraries/webkitgtk/configure.patch
View file

@ -1,20 +0,0 @@
--- webkitgtk-2.4.11-orig/configure 2016-04-10 17:00:06.000000000 +0800
+++ webkitgtk-2.4.11/configure 2016-07-21 23:04:10.000000000 +0800
@@ -17738,7 +17738,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_WEBP_DECODE_H 1
_ACEOF
- WEBP_LIBS='-lwebp'
+ WEBP_LIBS=`$PKG_CONFIG --libs libwebp`
else
as_fn_error $? "WebP library (libwebp) not found" "$LINENO" 5
fi
@@ -18388,7 +18388,7 @@
case "$host" in
*-*-darwin*)
UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
- UNICODE_LIBS="-licucore"
+ UNICODE_LIBS="/usr/lib/libicucore.dylib"
;;
*-*-mingw*)

20
pkgs/development/libraries/webkitgtk/fix-execinfo.patch
View file

@ -1,20 +0,0 @@
--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp
+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp
@@ -64,7 +64,7 @@
#include <windows.h>
#endif
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -242,7 +242,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined

20
pkgs/development/libraries/webkitgtk/libc++.patch
View file

@ -1,20 +0,0 @@
--- webkitgtk-2.4.9-orig/GNUmakefile.in 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/GNUmakefile.in 2016-02-02 22:10:23.000000000 -0500
@@ -23321,7 +23321,7 @@
$(WINMM_LIBS) \
-lm \
-lpthread \
- -lstdc++
+ -lc++
Programs_minidom_LDFLAGS = \
-no-install
@@ -23344,7 +23344,7 @@
$(WINMM_LIBS) \
-lm \
-lpthread \
- -lstdc++
+ -lc++
Programs_LLIntOffsetsExtractor_LDFLAGS = \
-no-install

38
pkgs/development/libraries/webkitgtk/plugin-none.patch
View file

@ -1,38 +0,0 @@
--- webkitgtk-2.4.9-orig/GNUmakefile.in 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/GNUmakefile.in 2016-02-08 00:27:10.000000000 -0500
@@ -4799,6 +4799,8 @@
Source/WebCore/plugins/PluginViewBase.h \
Source/WebCore/plugins/PluginView.cpp \
Source/WebCore/plugins/PluginView.h \
+ Source/WebCore/plugins/PluginViewNone.cpp \
+ Source/WebCore/plugins/PluginPackageNone.cpp \
Source/WebCore/plugins/npapi.h \
Source/WebCore/plugins/npfunctions.h \
Source/WebCore/plugins/npruntime.h \
@@ -6375,6 +6377,8 @@
Source/WebCore/plugins/libWebCore_la-PluginPackage.lo \
Source/WebCore/plugins/libWebCore_la-PluginStream.lo \
Source/WebCore/plugins/libWebCore_la-PluginView.lo \
+ Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo \
+ Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \
Source/WebCore/rendering/libWebCore_la-AutoTableLayout.lo \
Source/WebCore/rendering/libWebCore_la-BidiRun.lo \
Source/WebCore/rendering/libWebCore_la-break_lines.lo \
@@ -10796,6 +10800,8 @@
Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginProcessConnectionManager.lo \
Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginProxy.lo \
Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginView.lo \
+ Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginViewNone.lo \
+ Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginPackageNone.lo \
Source/WebKit2/WebProcess/ResourceCache/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebResourceCacheManager.lo \
Source/WebKit2/WebProcess/Storage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-StorageAreaImpl.lo \
Source/WebKit2/WebProcess/Storage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-StorageAreaMap.lo \
@@ -19503,6 +19509,8 @@
Source/WebCore/plugins/PluginViewBase.h \
Source/WebCore/plugins/PluginView.cpp \
Source/WebCore/plugins/PluginView.h \
+ Source/WebCore/plugins/PluginViewNone.cpp \
+ Source/WebCore/plugins/PluginPackageNone.cpp \
Source/WebCore/plugins/npapi.h \
Source/WebCore/plugins/npfunctions.h \
Source/WebCore/plugins/npruntime.h \

22
pkgs/development/libraries/webkitgtk/quartz-webcore.patch
View file

@ -1,22 +0,0 @@
--- webkitgtk-2.4.9-orig/Source/WebCore/plugins/PluginView.cpp 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/Source/WebCore/plugins/PluginView.cpp 2016-02-02 18:28:07.000000000 -0500
@@ -839,7 +839,7 @@
#if defined(XP_MACOSX)
, m_contextRef(0)
#endif
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+#if defined(X11) && ENABLE(NETSCAPE_PLUGIN_API)
, m_hasPendingGeometryChange(true)
, m_drawable(0)
, m_visual(0)
--- webkitgtk-2.4.9-orig/Source/WebCore/plugins/PluginView.h 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/Source/WebCore/plugins/PluginView.h 2016-02-02 18:26:37.000000000 -0500
@@ -378,7 +378,7 @@
void setNPWindowIfNeeded();
#endif
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
bool m_hasPendingGeometryChange;
Pixmap m_drawable;
Visual* m_visual;

8
pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
View file

@ -1,8 +0,0 @@
--- webkitgtk-2.2.3-orig/GNUmakefile.in 2013-12-04 17:56:28.000000000 +0800
+++ webkitgtk-2.2.3/GNUmakefile.in 2013-12-05 17:32:37.976689248 +0800
@@ -21911,6 +21911,7 @@
@ENABLE_SVG_TRUE@ $(CAIRO_CFLAGS) \
@ENABLE_SVG_TRUE@ $(FREETYPE_CFLAGS) \
@ENABLE_SVG_TRUE@ $(LIBSOUP_CFLAGS) \
+@ENABLE_SVG_TRUE@ $(LIBXML_CFLAGS) \
@ENABLE_SVG_TRUE@ $(UNICODE_CFLAGS)

2
pkgs/top-level/aliases.nix
View file

@ -425,6 +425,8 @@ mapAliases ({
virtmanager-qt = virt-manager-qt; # added 2019-10-29
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22

13
pkgs/top-level/all-packages.nix
View file

@ -14465,19 +14465,6 @@ in
stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947
};
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzzFull.override {
icu = icu58;
};
gst-plugins-base = gst_all_1.gst-plugins-base;
inherit (darwin) libobjc;
};
webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
withGtk2 = true;
enableIntrospection = false;
};
websocketpp = callPackage ../development/libraries/websocket++ { };
webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { };