alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #4544 from k0ral/webkitgtk

Browse source 
webkitgtk: 2.4.6 -> 2.6.1
This commit is contained in:
wmertens 2014-10-28 09:36:02 +01:00
parent 2ee8b30b64 f24f7010b7
commit 114a775254
6 changed files with 210 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/desktops/gnome-3/3.10/default.nix
View file

@ -17,9 +17,13 @@ rec {
dconf = callPackage ./core/dconf { };
empathy = callPackage ./core/empathy { };
empathy = callPackage ./core/empathy {
webkitgtk = pkgs.webkitgtk24x;
};
epiphany = callPackage ./core/epiphany { };
epiphany = callPackage ./core/epiphany {
webkitgtk = pkgs.webkitgtk24x;
};
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
@ -67,7 +71,9 @@ rec {
folks = callPackage ./core/folks { };
gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
gnome_online_accounts = callPackage ./core/gnome-online-accounts {
webkitgtk = pkgs.webkitgtk24x;
};
gnome-online-miners = callPackage ./core/gnome-online-miners { };
@ -127,7 +133,9 @@ rec {
rest = callPackage ./core/rest { };
sushi = callPackage ./core/sushi { };
sushi = callPackage ./core/sushi {
webkitgtk = pkgs.webkitgtk24x;
};
totem = callPackage ./core/totem { };
@ -139,7 +147,9 @@ rec {
vino = callPackage ./core/vino { };
yelp = callPackage ./core/yelp { };
yelp = callPackage ./core/yelp {
webkitgtk = pkgs.webkitgtk24x;
};
yelp_xsl = callPackage ./core/yelp-xsl { };
@ -150,9 +160,13 @@ rec {
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
bijiben = callPackage ./apps/bijiben { };
bijiben = callPackage ./apps/bijiben {
webkitgtk = pkgs.webkitgtk24x;
};
evolution = callPackage ./apps/evolution { };
evolution = callPackage ./apps/evolution {
webkitgtk = pkgs.webkitgtk24x;
};
file-roller = callPackage ./apps/file-roller { };
@ -162,7 +176,9 @@ rec {
gnome-clocks = callPackage ./apps/gnome-clocks { };
gnome-documents = callPackage ./apps/gnome-documents { };
gnome-documents = callPackage ./apps/gnome-documents {
webkitgtk = pkgs.webkitgtk24x;
};
gnome-music = callPackage ./apps/gnome-music { };
@ -182,14 +198,16 @@ rec {
goffice = callPackage ./misc/goffice { };
gitg = callPackage ./misc/gitg { };
gitg = callPackage ./misc/gitg {
webkitgtk = pkgs.webkitgtk24x;
};
libgit2-glib = callPackage ./misc/libgit2-glib {
libgit2 = pkgs.libgit2.override { libssh2 = null; };
};
libmediaart = callPackage ./misc/libmediaart { };
gexiv2 = callPackage ./misc/gexiv2 { };
gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };

40
pkgs/desktops/gnome-3/3.12/default.nix
View file

@ -22,9 +22,13 @@ rec {
dconf = callPackage ./core/dconf { };
empathy = callPackage ./core/empathy { };
empathy = callPackage ./core/empathy {
webkitgtk = pkgs.webkitgtk24x;
};
epiphany = callPackage ./core/epiphany { };
epiphany = callPackage ./core/epiphany {
webkitgtk = pkgs.webkitgtk24x;
};
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
@ -76,7 +80,9 @@ rec {
folks = callPackage ./core/folks { };
gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
gnome_online_accounts = callPackage ./core/gnome-online-accounts {
webkitgtk = pkgs.webkitgtk24x;
};
gnome-online-miners = callPackage ./core/gnome-online-miners { };
@ -158,7 +164,9 @@ rec {
rest = callPackage ./core/rest { };
sushi = callPackage ./core/sushi { };
sushi = callPackage ./core/sushi {
webkitgtk = pkgs.webkitgtk24x;
};
totem = callPackage ./core/totem { };
@ -172,7 +180,9 @@ rec {
vino = callPackage ./core/vino { };
yelp = callPackage ./core/yelp { };
yelp = callPackage ./core/yelp {
webkitgtk = pkgs.webkitgtk24x;
};
yelp_xsl = callPackage ./core/yelp-xsl { };
@ -183,9 +193,13 @@ rec {
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
bijiben = callPackage ./apps/bijiben { };
bijiben = callPackage ./apps/bijiben {
webkitgtk = pkgs.webkitgtk24x;
};
evolution = callPackage ./apps/evolution { };
evolution = callPackage ./apps/evolution {
webkitgtk = pkgs.webkitgtk24x;
};
file-roller = callPackage ./apps/file-roller { };
@ -200,7 +214,9 @@ rec {
gnome-clocks = callPackage ./apps/gnome-clocks { };
gnome-documents = callPackage ./apps/gnome-documents { };
gnome-documents = callPackage ./apps/gnome-documents {
webkitgtk = pkgs.webkitgtk24x;
};
gnome-music = callPackage ./apps/gnome-music { };
@ -223,13 +239,17 @@ rec {
#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
geary = callPackage ./misc/geary { };
geary = callPackage ./misc/geary {
webkitgtk = pkgs.webkitgtk24x;
};
gfbgraph = callPackage ./misc/gfbgraph { };
goffice = callPackage ./misc/goffice { };
gitg = callPackage ./misc/gitg { };
gitg = callPackage ./misc/gitg {
webkitgtk = pkgs.webkitgtk24x;
};
libgda = callPackage ./misc/libgda { };

62
pkgs/development/libraries/webkitgtk/2.4.6.nix Normal file
View file

@ -0,0 +1,62 @@
{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
, pkgconfig, which, gettext, gobjectIntrospection
, gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz
, gst-plugins-base
, withGtk2 ? false
, enableIntrospection ? true
}:
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.4.6";
meta = with stdenv.lib; {
description = "Web content rendering engine, GTK+ port";
homepage = "http://webkitgtk.org/";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.iyzsong ];
};
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
};
patches = [ ./webcore-svg-libxml-cflags.patch ];
CC = "cc";
prePatch = ''
patchShebangs Tools/gtk
'';
configureFlags = with stdenv.lib; [
"--disable-geolocation"
(optionalString enableIntrospection "--enable-introspection")
] ++ stdenv.lib.optional withGtk2 [
"--with-gtk=2.0"
"--disable-webkit2"
];
dontAddDisableDepTrack = true;
nativeBuildInputs = [
perl python ruby bison gperf flex
pkgconfig which gettext gobjectIntrospection
];
buildInputs = [
gtk2 wayland libwebp enchant
libxml2 libsecret libxslt harfbuzz
gst-plugins-base
];
propagatedBuildInputs = [
libsoup
(if withGtk2 then gtk2 else gtk3)
];
#enableParallelBuilding = true; # build problems on Hydra
}

50
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -1,61 +1,45 @@
{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
, pkgconfig, which, gettext, gobjectIntrospection
{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection
, gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
, gst-plugins-base
, withGtk2 ? false
, enableIntrospection ? true
}:
stdenv.mkDerivation rec {
name = "webkitgtk-2.4.6";
name = "webkitgtk-${version}";
version = "2.6.1";
meta = {
meta = with stdenv.lib; {
description = "Web content rendering engine, GTK+ port";
homepage = "http://webkitgtk.org/";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.iyzsong ];
};
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
sha256 = "0m3ddi3s3998zkfdpcjv738iglh6wx4678vzwwk9rmrdfriacin8";
};
patches = [ ./webcore-svg-libxml-cflags.patch ];
patches = [ ./finding-harfbuzz-icu.patch ];
CC = "cc";
prePatch = ''
patchShebangs Tools/gtk
'';
configureFlags = with stdenv.lib; [
"--disable-geolocation"
(optionalString enableIntrospection "--enable-introspection")
] ++ stdenv.lib.optional withGtk2 [
"--with-gtk=2.0"
"--disable-webkit2"
];
dontAddDisableDepTrack = true;
cmakeFlags = [ "-DPORT=GTK" ];
nativeBuildInputs = [
perl python ruby bison gperf flex
pkgconfig which gettext gobjectIntrospection
cmake perl python ruby bison gperf
pkgconfig gettext gobjectIntrospection
];
buildInputs = [
gtk2 wayland libwebp enchant
libxml2 libsecret libxslt harfbuzz
libxml2 libsecret libxslt harfbuzz libpthreadstubs
gst-plugins-base
];
propagatedBuildInputs = [
libsoup
(if withGtk2 then gtk2 else gtk3)
libsoup gtk3
];
#enableParallelBuilding = true; # build problems on Hydra
enableParallelBuilding = true;
}

52
pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch Normal file
View file

@ -0,0 +1,52 @@
--- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake 2014-10-09 01:54:38.000000000 +0800
+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake 2014-10-15 13:41:29.832290412 +0800
@@ -34,21 +34,39 @@
pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
-find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
- HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-)
-
-find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
- HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
-)
-
# HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.
if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")
pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED)
- find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
+
+ find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h
+ HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+ )
+
+ find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu
HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
)
- list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")
+
+ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+ )
+
+ set(HARFBUZZ_INCLUDE_DIRS
+ ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR}
+ CACHE INTERNAL ""
+ )
+
+ set(HARFBUZZ_LIBRARIES
+ ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY}
+ CACHE INTERNAL ""
+ )
+else ()
+ find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
+ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+ )
+
+ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+ )
endif ()
include(FindPackageHandleStandardArgs)

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

@ -5331,6 +5331,10 @@ let
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
harfbuzz = callPackage ../development/libraries/harfbuzz { };
harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
withIcu = true;
withGraphite2 = true;
};
hawknl = callPackage ../development/libraries/hawknl { };
@ -6809,13 +6813,17 @@ let
webkit = webkitgtk;
webkitgtk = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzz.override {
withIcu = true;
};
harfbuzz = harfbuzz-icu;
inherit (xorg) libpthreadstubs;
gst-plugins-base = gst_all_1.gst-plugins-base;
};
webkitgtk2 = webkitgtk.override {
webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.6.nix {
harfbuzz = harfbuzz-icu;
gst-plugins-base = gst_all_1.gst-plugins-base;
};
webkitgtk2 = webkitgtk24x.override {
withGtk2 = true;
enableIntrospection = false;
};
@ -9722,7 +9730,9 @@ let
};
};
liferea = callPackage ../applications/networking/newsreaders/liferea { };
liferea = callPackage ../applications/networking/newsreaders/liferea {
webkitgtk = webkitgtk24x;
};
lingot = callPackage ../applications/audio/lingot {
inherit (gnome) libglade;
@ -9757,7 +9767,9 @@ let
lxdvdrip = callPackage ../applications/video/lxdvdrip { };
handbrake = callPackage ../applications/video/handbrake { };
handbrake = callPackage ../applications/video/handbrake {
webkitgtk = webkitgtk24x;
};
lilyterm = callPackage ../applications/misc/lilyterm {
inherit (gnome) vte;
@ -9798,7 +9810,9 @@ let
mid2key = callPackage ../applications/audio/mid2key { };
midori = callPackage ../applications/networking/browsers/midori { };
midori = callPackage ../applications/networking/browsers/midori {
webkitgtk = webkitgtk24x;
};
midoriWrapper = wrapFirefox
{ browser = midori; browserName = "midori"; desktopName = "Midori";