libsForQt5.qtpim: init at unstable-2020-11-02 (#214164)
* libsForQt5.qtpim: init at unstable-2020-11-02 * libsForQt5.qtpim: Move to pkgs/development/libraries/qt-5 * libsForQt5.qtpim: unstable-2020-11-02 -> unstable-2021-04-09 By try reverting Qt6 commits instead of pulling in Qt5-compatible ones * Revert "libsForQt5.qtpim: unstable-2020-11-02 -> unstable-2021-04-09" This reverts commit 9384825791ee59c7981afb3ee3c1b3b83c992d34.
This commit is contained in:
Christoph Neidahl
GitHub
parent
36f6a3c2cf
commit
434cd1057f
|
|
@ -52,6 +52,98 @@ let
|
|||
# prevent headaches from stale qmlcache data
|
||||
./qtdeclarative-default-disable-qmlcache.patch
|
||||
];
|
||||
qtpim = [
|
||||
## Upstream patches after the Qt6 transition that apply without problems & fix bugs
|
||||
|
||||
# Fixes QList -> QSet conversion
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/f337e281e28904741a3b1ac23d15c3a83ef2bbc9.patch";
|
||||
hash = "sha256-zlxD45JnbhIgdJxMmGxGMUBcQPcgzpu3s4bLX939jL0=";
|
||||
})
|
||||
# Fixes invalid syntax from a previous bad patch in tests
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/2aefdd8bd28a4decf9ef8381f5b255f39f1ee90c.patch";
|
||||
hash = "sha256-mg93QF3hi50igw1/Ok7fEs9iCaN6co1+p2/5fQtxTmc=";
|
||||
})
|
||||
# Unit test account for QList index change
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/79b41af6a4117f5efb0298289e20c30b4d0b0b2e.patch";
|
||||
hash = "sha256-u+cLl4lu6r2+j5GAiasqbB6/OZPz5A6GpSB33vd/VBg=";
|
||||
})
|
||||
# Remove invalid method overload which confuses the QML engine
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/5679a6141c76ae7d64c3acc8a87b1adb048289e0.patch";
|
||||
hash = "sha256-z8f8kLhC9CqBOfGPL8W9KJq7MwALAAicXfRkHiQEVJ4=";
|
||||
})
|
||||
# Specify enum flag type properly in unit test
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/a43cc24e57db8d3c3939fa540d67da3294dcfc5c.patch";
|
||||
hash = "sha256-SsYkxX6prxi8VRZr4az+wqawcRN8tR3UuIFswJL+3T4=";
|
||||
})
|
||||
# Update qHash methods to return size_t instead of uint
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/9c698155d82fc2b68a87c59d0443c33f9085b117.patch";
|
||||
hash = "sha256-rb8D8taaglhQikYSAPrtLvazgIw8Nga/a9+J21k8gIo=";
|
||||
})
|
||||
# Mark virtual methods with override keyword
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/f34cf2ff2b0f428d5b8a70763b29088075ebbd1c.patch";
|
||||
hash = "sha256-tNPOEVpx1eqHx5T23ueW32KxMQ/SB+TBCJ4PZ6SA3LI=";
|
||||
})
|
||||
# Fix calendardemo example
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/a66590d473753bc49105d3132fb9e4150c92a14a.patch";
|
||||
hash = "sha256-RPRtGQ24NQYewnv6+IqYITpwD/XxuK68a1iKgFmKm3c=";
|
||||
})
|
||||
# Make the tests pass on big endian systems
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/7802f038ed1391078e27fa3f37d785a69314537b.patch";
|
||||
hash = "sha256-hogUXyPXjGE0q53PWOjiQbQ2YzOsvrJ7mo9djGIbjVQ=";
|
||||
})
|
||||
# Fix some deprecated QChar constructor issues in unit tests
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/114615812dcf9398c957b0833e860befe15f840f.patch";
|
||||
hash = "sha256-yZ1qs8y5DSq8FDXRPyuSPRIzjEUTWAhpVide/b+xaLQ=";
|
||||
})
|
||||
# Accessors should be const
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/a2bf7cdf05c264b5dd2560f799760b5508f154e4.patch";
|
||||
hash = "sha256-+YfPrKyOKnPkqFokwW/aDsEivg4TzdJwQpDdAtM+rQE=";
|
||||
})
|
||||
# Enforce detail access constraints in contact operations by default
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/8765a35233aa21a932ee92bbbb92a5f8edd4dc68.patch";
|
||||
hash = "sha256-vp/enerVecEXz4zyxQ66DG+fVVWxI4bYnLj92qaaqNk=";
|
||||
})
|
||||
# Fixes broken file generation, which breaks reverse dependencies that try to find one of its modules
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtpim/commit/4b2bdce30bd0629c9dc0567af6eeaa1d038f3152.patch";
|
||||
hash = "sha256-2dXhkZyxPvY2KQq2veerAlpXkpU5/FeArWRlm1aOcEY=";
|
||||
})
|
||||
|
||||
## Patches that haven't been upstreamed
|
||||
|
||||
# Fix tst_QContactManager::compareVariant_data test
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/qt-kde-team/qt/qtpim/-/raw/360682f88457b5ae7c92f32f574e51ccc5edbea0/debian/patches/1001_fix-qtdatetime-null-comparison.patch";
|
||||
hash = "sha256-k/rO9QjwSlRChwFTZLkxDjZWqFkua4FNbaNf1bJKLxc=";
|
||||
})
|
||||
# Avoid crash while parsing vCards from different threads
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/qt-kde-team/qt/qtpim/-/raw/360682f88457b5ae7c92f32f574e51ccc5edbea0/debian/patches/1002_Avoid-crash-while-parsing-vcards-from-different-threads.patch";
|
||||
hash = "sha256-zhayAoWgcmKosEGVBy2k6a2e6BxyVwfGX18tBbzqEk8=";
|
||||
})
|
||||
# Adapt to JSON parser behavior change in Qt 5.15
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/qt-kde-team/qt/qtpim/-/raw/360682f88457b5ae7c92f32f574e51ccc5edbea0/debian/patches/1003_adapt_to_json_parser_change.patch";
|
||||
hash = "sha256-qAIa48hmDd8vMH/ywqW+22vISKai76XnjgFuB+tQbIU=";
|
||||
})
|
||||
# Fix version being 0.0.0
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/qt-kde-team/qt/qtpim/-/raw/360682f88457b5ae7c92f32f574e51ccc5edbea0/debian/patches/2000_revert_module_version.patch";
|
||||
hash = "sha256-6wg/eVu9J83yvIO428U1FX3otz58tAy6pCvp7fqOBKU=";
|
||||
})
|
||||
];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtsystems = [
|
||||
|
|
@ -167,6 +259,7 @@ let
|
|||
inherit gstreamer gst-plugins-base;
|
||||
};
|
||||
qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
|
||||
qtpim = callPackage ../modules/qtpim.nix {};
|
||||
qtpositioning = callPackage ../modules/qtpositioning.nix {};
|
||||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
|
|
|
|||
|
|
@ -22,6 +22,18 @@ let
|
|||
in
|
||||
lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
// {
|
||||
# qtpim has no official releases
|
||||
qtpim = {
|
||||
version = "unstable-2020-11-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtpim";
|
||||
# Last commit before Qt5 support was broken
|
||||
rev = "f9a8f0fc914c040d48bbd0ef52d7a68eea175a98";
|
||||
hash = "sha256-/1g+vvHjuRLB1vsm41MrHbBZ+88Udca0iEcbz0Q1BNQ=";
|
||||
};
|
||||
};
|
||||
|
||||
# Has no kde/5.15 branch
|
||||
qtpositioning = rec {
|
||||
version = "5.15.2";
|
||||
|
|
|
|||
27
pkgs/development/libraries/qt-5/modules/qtpim.nix
Normal file
27
pkgs/development/libraries/qt-5/modules/qtpim.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ qtModule
|
||||
, lib
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
pname = "qtpim";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
qtInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"CONFIG+=git_build"
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ OPNA2608 ];
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue