libsoup: maintenance 2.60.0 -> 2.60.2 + patch
This commit is contained in:
parent
5cc70518bf
commit
da3679c160
|
@ -1,18 +1,18 @@
|
||||||
{ stdenv, fetchurl, glib, libxml2, pkgconfig
|
{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig
|
||||||
, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection
|
, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection
|
||||||
, valaSupport ? true, vala_0_38
|
, valaSupport ? true, vala_0_38
|
||||||
, libintlOrEmpty
|
, libintlOrEmpty
|
||||||
, intltool, python }:
|
, intltool, python }:
|
||||||
let
|
let
|
||||||
majorVersion = "2.60";
|
majorVersion = "2.60";
|
||||||
version = "${majorVersion}.0";
|
version = "${majorVersion}.2";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "libsoup-${version}";
|
name = "libsoup-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
|
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
|
||||||
sha256 = "b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c";
|
sha256 = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
|
@ -22,6 +22,15 @@ stdenv.mkDerivation {
|
||||||
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
|
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# remove for >= 2.60.3
|
||||||
|
(fetchpatch {
|
||||||
|
name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037
|
||||||
|
url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba";
|
||||||
|
sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
|
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
|
||||||
|
|
Loading…
Reference in a new issue