public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into closure-size

Browse Source 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/webkitgtk/2.4.nix
+35 -7
View File
@@ -4,9 +4,15 @@
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
, gst-plugins-base
, withGtk2 ? false
, enableIntrospection ? true
, enableIntrospection ? !stdenv.isDarwin
, enableCredentialStorage ? !stdenv.isDarwin
, readline, libedit
}:
assert stdenv.isDarwin -> !enableIntrospection;
assert stdenv.isDarwin -> !enableCredentialStorage;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.4.9";
@@ -16,7 +22,7 @@ stdenv.mkDerivation rec {
homepage = "http://webkitgtk.org/";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.iyzsong ];
maintainers = [];
};
src = fetchurl {
@@ -29,16 +35,32 @@ stdenv.mkDerivation rec {
prePatch = ''
patchShebangs Tools/gtk
'';
patches = [ ./webcore-svg-libxml-cflags.patch ];
patches = [
./webcore-svg-libxml-cflags.patch
] ++ optionals stdenv.isDarwin [
./impure-icucore.patch
./quartz-webcore.patch
./libc++.patch
./plugin-none.patch
];
configureFlags = with stdenv.lib; [
"--disable-geolocation"
(optionalString enableIntrospection "--enable-introspection")
] ++ stdenv.lib.optional withGtk2 [
] ++ optional withGtk2 [
"--with-gtk=2.0"
] ++ optionals (withGtk2 || stdenv.isDarwin) [
"--disable-webkit2"
] ++ optionals stdenv.isDarwin [
"--disable-x11-target"
"--enable-quartz-target"
"--disable-web-audio"
] ++ optionals (!enableCredentialStorage) [
"--disable-credential-storage"
];
NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT=";
dontAddDisableDepTrack = true;
nativeBuildInputs = [
@@ -47,10 +69,16 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk2 wayland libwebp enchant
libxml2 libsecret libxslt
gtk2 libwebp enchant
libxml2 libxslt
gst-plugins-base sqlite xorg.libXt
];
] ++ optionals enableCredentialStorage [
libsecret
] ++ (if stdenv.isDarwin then [
readline libedit
] else [
wayland
]);
propagatedBuildInputs = [
libsoup harfbuzz/*icu in *.la*/
pkgs/development/libraries/webkitgtk/adding-libintl.patch
+10
View File
@@ -0,0 +1,10 @@
--- webkitgtk-2.10.4-orig/Source/WebKit2/CMakeLists.txt 2015-11-11 02:42:51.000000000 -0500
+++ webkitgtk-2.10.4/Source/WebKit2/CMakeLists.txt 2016-01-31 18:27:49.000000000 -0500
@@ -738,6 +738,7 @@
set(WebKit2_LIBRARIES
JavaScriptCore
WebCore
+ intl
)
set(PluginProcess_LIBRARIES
pkgs/development/libraries/webkitgtk/default.nix
+38 -9
View File
@@ -2,11 +2,13 @@
, pkgconfig, gettext, gobjectIntrospection, libnotify
, gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
, enableGeoLocation ? true, geoclue2, sqlite, xorg
, gst-plugins-base
, enableGeoLocation ? false, geoclue2, sqlite, xorg
, enableCredentialStorage ? !stdenv.isDarwin
, gst-plugins-base, readline, libedit
}:
assert enableGeoLocation -> geoclue2 != null;
assert stdenv.isDarwin -> !enableCredentialStorage;
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
platforms = platforms.linux;
hydraPlatforms = [];
maintainers = with maintainers; [ iyzsong koral ];
maintainers = with maintainers; [ koral ];
};
preConfigure = "patchShebangs Tools";
@@ -29,16 +31,37 @@ stdenv.mkDerivation rec {
sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
};
patches = [ ./finding-harfbuzz-icu.patch
patches = [
./finding-harfbuzz-icu.patch
(fetchpatch {
name = "glibc-isnan.patch";
url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore"
+ "/runtime/Options.cpp?format=diff&new=194518";
sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm";
})
];
] ++ optional stdenv.isDarwin ./adding-libintl.patch;
cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
cmakeFlags = [
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=OFF"
] ++ optionals (!enableCredentialStorage) [
"-DENABLE_CREDENTIAL_STORAGE=OFF"
] ++ optionals (!enableGeoLocation) [
"-DENABLE_GEOLOCATION=OFF"
] ++ optionals stdenv.isDarwin [
"-DENABLE_WEBKIT=ON"
"-DENABLE_X11_TARGET=OFF"
"-DENABLE_QUARTZ_TARGET=ON"
"-DENABLE_TOOLS=ON"
"-DENABLE_MINIBROWSER=ON"
"-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
"-DENABLE_VIDEO=OFF"
"-DENABLE_WEB_AUDIO=OFF"
"-DENABLE_OPENGL=OFF"
"-DENABLE_INTROSPECTION=OFF"
"-DUSE_LIBNOTIFY=OFF"
"-DCMAKE_SHARED_LINKER_FLAGS=-L/path/to/nonexistent/folder"
];
# XXX: WebKit2 missing include path for gst-plugins-base.
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
@@ -50,10 +73,16 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk2 wayland libwebp enchant libnotify
libxml2 libsecret libxslt harfbuzz libpthreadstubs
gtk2 libwebp enchant libnotify
libxml2 libxslt harfbuzz libpthreadstubs
gst-plugins-base xorg.libXt
] ++ optional enableGeoLocation geoclue2;
] ++ optionals enableCredentialStorage [
libsecret
] ++ (if stdenv.isDarwin then [
readline libedit
] else [
wayland
]) ++ optional enableGeoLocation geoclue2;
propagatedBuildInputs = [
libsoup gtk3
pkgs/development/libraries/webkitgtk/impure-icucore.patch
+12
View File
@@ -0,0 +1,12 @@
diff -ru webkitgtk-2.4.9-orig/configure webkitgtk-2.4.9/configure
--- webkitgtk-2.4.9-orig/configure 2016-02-02 13:23:22.000000000 -0500
+++ webkitgtk-2.4.9/configure 2016-02-02 13:24:13.000000000 -0500
@@ -17715,7 +17715,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*)
pkgs/development/libraries/webkitgtk/libc++.patch
+20
View File
@@ -0,0 +1,20 @@
--- 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
pkgs/development/libraries/webkitgtk/plugin-none.patch
+38
View File
@@ -0,0 +1,38 @@
--- 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 \
pkgs/development/libraries/webkitgtk/quartz-webcore.patch
+22
View File
@@ -0,0 +1,22 @@
--- 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;