tellico: init at 3.3.0

* tellico: init at 3.3.0

* fix pversion vs version
This commit is contained in:
Sebastien Bariteau 2020-06-19 04:19:34 -04:00 committed by GitHub
parent a1b8192dbf
commit fcbd2e6835
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 84 additions and 0 deletions

View file

@ -0,0 +1,67 @@
{ lib
, fetchurl
, mkDerivation
, kdeApplications
, kinit
, kdelibs4support
, solid
, kxmlgui
, karchive
, kfilemetadata
, khtml
, knewstuff
, libksane
, cmake
, exempi
, extra-cmake-modules
, libcdio
, poppler
, makeWrapper
, kdoctools
}:
mkDerivation rec {
name = "tellico";
version = "3.3.0";
src = fetchurl {
url = "https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz";
sha256 = "1digkpvzrsbv5znf1cgzs6zkmysfz6lzs12n12mrrpgkcdxc426y";
};
patches = [
./hex.patch
];
nativeBuildInputs = [
cmake
extra-cmake-modules
kdoctools
makeWrapper
];
buildInputs = [
kdelibs4support
solid
kxmlgui
karchive
kfilemetadata
khtml
knewstuff
libksane
cmake
exempi
extra-cmake-modules
libcdio
kdeApplications.libkcddb
poppler
];
meta = {
description = "Collection management software, free and simple";
homepage = "https://tellico-project.org/";
maintainers = with lib.maintainers; [ numkem ];
license = with lib.licenses; [ gpl2 gpl3 ];
platforms = lib.platforms.linux;
};
}

View file

@ -0,0 +1,15 @@
index 7ea81c7..0c19767 100644
--- a/src/utils/iso5426converter.cpp
+++ b/src/utils/iso5426converter.cpp
@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) {
return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW
default:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ myDebug() << "no match for" << hex << c;
+#else
myDebug() << "no match for" << Qt::hex << c;
+#endif
return QChar();
}
}

View file

@ -26300,6 +26300,8 @@ in
prow = callPackage ../applications/networking/cluster/prow { };
tellico = libsForQt5.callPackage ../applications/misc/tellico { };
termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {};
inherit (callPackage ../applications/networking/cluster/terraform { })