From 3de90b259cfdb2da93fd49c296d1ee5625ead2e1 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 25 May 2017 22:52:10 +0000 Subject: webkitgtk: 2.14.11 -> 2.16.3 --- pkgs/desktops/gnome-3/3.22/default.nix | 4 +- pkgs/development/libraries/libproxy/default.nix | 4 +- pkgs/development/libraries/webkitgtk/2.14.nix | 104 --------------------- pkgs/development/libraries/webkitgtk/2.16.nix | 104 +++++++++++++++++++++ .../libraries/webkitgtk/PR-152650-2.patch | 2 +- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 111 insertions(+), 111 deletions(-) delete mode 100644 pkgs/development/libraries/webkitgtk/2.14.nix create mode 100644 pkgs/development/libraries/webkitgtk/2.16.nix (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index d9b26d6aee36..b1293cb47ba9 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk214x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,7 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk214x; + webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 163357a0c0f8..cf3ad5f1ebba 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, webkitgtk214x, pcre, python2 }: +, dbus, networkmanager, webkitgtk216x, pcre, python2 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager webkitgtk214x pcre ]; + buildInputs = [ dbus networkmanager webkitgtk216x pcre ]; cmakeFlags = [ "-DWITH_WEBKIT3=ON" diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix deleted file mode 100644 index a1b220948552..000000000000 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit -, libidn, libedit, readline, mesa, libintlOrEmpty -, enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base -}: - -assert enableGeoLocation -> geoclue2 != null; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.14.5"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; - license = licenses.bsd2; - platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; - maintainers = with maintainers; [ ]; - }; - - postConfigure = optionalString stdenv.isDarwin '' - substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ - --replace "../../lib/libWTFGTK.a" "" - substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ - --replace "../../lib/libbmalloc.a" "" - sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ - Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ - Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ - Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ - Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ - Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ - Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ - Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt - substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ - --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" - ''; - - src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w"; - }; - - # see if we can clean this up.... - - patches = [ ./finding-harfbuzz-icu.patch ] - ++ optionals stdenv.isDarwin [ - ./PR-152650-2.patch - ./PR-153138.patch - ./PR-157554.patch - ./PR-157574.patch - ]; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=0" - ] - ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" - ++ optionals stdenv.isDarwin [ - "-DUSE_SYSTEM_MALLOC=ON" - "-DUSE_ACCELERATE=0" - "-DENABLE_INTROSPECTION=ON" - "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_VIDEO=ON" - "-DENABLE_QUARTZ_TARGET=ON" - "-DENABLE_X11_TARGET=OFF" - "-DENABLE_OPENGL=OFF" - "-DENABLE_WEB_AUDIO=OFF" - "-DENABLE_WEBGL=OFF" - "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" - "-DENABLE_GTKDOC=OFF" - ]; - - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" - + (optionalString stdenv.isDarwin " -lintl"); - - nativeBuildInputs = [ - cmake perl python2 ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base libxkbcommon epoxy at_spi2_core - ] ++ optional enableGeoLocation geoclue2 - ++ (with xlibs; [ libXdmcp libXt libXtst ]) - ++ optionals stdenv.isDarwin [ libedit readline mesa ] - ++ optional stdenv.isLinux wayland; - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix new file mode 100644 index 000000000000..4431972b5dd7 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls +, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit +, libidn, libedit, readline, mesa, libintlOrEmpty +, enableGeoLocation ? true, geoclue2, sqlite +, gst-plugins-base +}: + +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.16.3"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = licenses.bsd2; + platforms = with platforms; linux ++ darwin; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + postConfigure = optionalString stdenv.isDarwin '' + substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "" + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libbmalloc.a" "" + sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ + Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ + Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ + Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" + ''; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "04mmfxm8284zrlkrhkcn9gq1l4lpm1q6wwb5hyybj081v8qr2ki0"; + }; + + # see if we can clean this up.... + + patches = [ ./finding-harfbuzz-icu.patch ] + ++ optionals stdenv.isDarwin [ + ./PR-152650-2.patch + ./PR-153138.patch + ./PR-157554.patch + ./PR-157574.patch + ]; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + ] + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_INTROSPECTION=ON" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + + (optionalString stdenv.isDarwin " -lintl"); + + nativeBuildInputs = [ + cmake perl python2 ruby bison gperf sqlite + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = libintlOrEmpty ++ [ + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit + gst-plugins-base libxkbcommon epoxy at_spi2_core + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]) + ++ optionals stdenv.isDarwin [ libedit readline mesa ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch index db84a4a6b26e..f87b8ee73e23 100644 --- a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch +++ b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch @@ -38,9 +38,9 @@ index 6b01f1a..b443d10 100644 - set(ENABLE_GTKDOC OFF) -endif () - - set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) + set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk) diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py index 4c8237b..a628ae0 100644 --- a/Tools/gtk/gtkdoc.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2df2e30fc5e..2fabc84c569d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10344,7 +10344,7 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk214x; + webkitgtk = webkitgtk216x; webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; @@ -10352,7 +10352,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix { + webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; -- cgit 1.4.1