mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-19 20:23:19 +02:00
gnome3.geary: 3.36.2 -> 3.38.0.1
https://gitlab.gnome.org/GNOME/geary/-/blob/3.38.0.1/NEWS - add new dependencies gnome3.sound and glade - include a local copy of the test timeout patch, Debian hasn't yet updated theirs - reformat - fix build with patch for https://gitlab.gnome.org/GNOME/geary/-/issues/985 Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
This commit is contained in:
parent
4d173cf1a7
commit
08e633d354
|
@ -0,0 +1,10 @@
|
|||
diff --git a/test/meson.build b/test/meson.build
|
||||
index 6ea5e27a..450c03e3 100644
|
||||
--- a/test/meson.build
|
||||
+++ b/test/meson.build
|
||||
@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration',
|
||||
)
|
||||
|
||||
test('engine-tests', test_engine_bin)
|
||||
-test('client-tests', test_client_bin)
|
||||
+test('client-tests', test_client_bin, timeout: 300)
|
|
@ -1,44 +1,112 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
|
||||
, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
|
||||
, libpeas, libsecret, gmime3, isocodes, libxml2, gettext, fetchpatch
|
||||
, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
|
||||
, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking
|
||||
, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkgconfig
|
||||
, gtk3
|
||||
, vala
|
||||
, enchant2
|
||||
, wrapGAppsHook
|
||||
, meson
|
||||
, ninja
|
||||
, desktop-file-utils
|
||||
, gnome-online-accounts
|
||||
, gsettings-desktop-schemas
|
||||
, adwaita-icon-theme
|
||||
, libpeas
|
||||
, libsecret
|
||||
, gmime3
|
||||
, isocodes
|
||||
, libxml2
|
||||
, gettext
|
||||
, sqlite
|
||||
, gcr
|
||||
, json-glib
|
||||
, itstool
|
||||
, libgee
|
||||
, gnome3
|
||||
, webkitgtk
|
||||
, python3
|
||||
, xvfb_run
|
||||
, dbus
|
||||
, shared-mime-info
|
||||
, libunwind
|
||||
, folks
|
||||
, glib-networking
|
||||
, gobject-introspection
|
||||
, gspell
|
||||
, appstream-glib
|
||||
, libytnef
|
||||
, libhandy
|
||||
, gsound
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geary";
|
||||
version = "3.36.2";
|
||||
version = "3.38.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis";
|
||||
sha256 = "0xbhzjn6sp9qj0iqfgq4q25is3wgjz1c090i8y60azgi9hyjkh79";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils gettext itstool libxml2 meson ninja
|
||||
pkgconfig vala wrapGAppsHook python3 appstream-glib
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gettext
|
||||
gobject-introspection
|
||||
itstool
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
adwaita-icon-theme enchant2 gcr gmime3 gnome-online-accounts
|
||||
gsettings-desktop-schemas gtk3 isocodes json-glib libpeas
|
||||
libgee libsecret sqlite webkitgtk glib-networking
|
||||
libunwind folks gspell libytnef libhandy
|
||||
adwaita-icon-theme
|
||||
enchant2
|
||||
folks
|
||||
gcr
|
||||
glib-networking
|
||||
gmime3
|
||||
gnome-online-accounts
|
||||
gsettings-desktop-schemas
|
||||
gsound
|
||||
gspell
|
||||
gtk3
|
||||
isocodes
|
||||
json-glib
|
||||
libgee
|
||||
libhandy
|
||||
libpeas
|
||||
libsecret
|
||||
libunwind
|
||||
libytnef
|
||||
sqlite
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
checkInputs = [ xvfb_run dbus ];
|
||||
checkInputs = [
|
||||
dbus
|
||||
xvfb_run
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dcontractor=true" # install the contractor file (Pantheon specific)
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Longer timeout for client test.
|
||||
# https://gitlab.gnome.org/GNOME/geary/-/issues/985
|
||||
# drop in 3.38.1
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/gnome-team/geary/raw/04be1e058a2e65075dd8cf8843d469ee45a9e09a/debian/patches/Bump-client-test-timeout-to-300s.patch";
|
||||
sha256 = "1zvnq8bgla160531bjdra8hcg15mp8r1j1n53m1xfgm0ssnj5knx";
|
||||
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/b5abd3f9664c396ad57f177750973695c58e8b7f.patch";
|
||||
sha256 = "zBPhlz8Zujt9tmZrIUkvZSOpD7/UhTeokE9U/704qSE=";
|
||||
})
|
||||
|
||||
# Longer timeout for client test.
|
||||
./Bump-client-test-timeout-to-300s.patch
|
||||
];
|
||||
|
||||
# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
|
||||
|
|
Loading…
Reference in a new issue