librepcb-unstable: 2017-12-29 -> 2018-06-28 (#42786)

* Update: 2017-12-29 -> 2018-06-28

* Update libs also to qt5.9

* Add required default font file

* Switch back to default Qt version

2 files changed, 8 insertions, 35 deletions

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index ea0ebd52b3eb..48afb5bf9dc0 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "librepcb-${version}";
-  version = "20171229";
+  version = "20180628";
 
   src = fetchFromGitHub {
     owner = "LibrePCB";
     repo = "LibrePCB";
     fetchSubmodules = true;
-    rev = "4efb06fa42755abc5e606da4669cc17e8de2f8c6";
-    sha256 = "0r33fm1djqpy0dzvnf5gv2dfh5nj2acaxb7w4cn8yxdgrazjf7ak";
+    rev = "68577ecf8f39299ef4d81ff964b01c3908d1f10b";
+    sha256 = "1ca4q8b8fhp19vq5yi55sq6xlsz14ihw3i0h7rq5fw0kigpjldmz";
   };
 
   enableParallelBuilding = true;
@@ -18,11 +18,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
-	# LibrePCB still supports QT below 5.9. But some code lines break the build, so they are removed by this patch so that the software builds.
-  patches = [ ./fix-2017-12.patch ];
-
   qmakeFlags = ["-r"];
 
+  postInstall = ''
+      mkdir -p $out/share/librepcb/fontobene
+      cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
+    '';
+
   meta = with stdenv.lib; {
     description = "A free EDA software to develop printed circuit boards";
     homepage = http://librepcb.org/;
diff --git a/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch b/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch
deleted file mode 100644
index 75fc590ad7fe..000000000000
--- a/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libs/librepcb/common/fileio/serializableobjectlist.h
-+++ b/libs/librepcb/common/fileio/serializableobjectlist.h
-@@ -374,26 +374,6 @@
- } // namespace librepcb
-
- /*****************************************************************************************
-- * Prevent from using SerializableObjectList in a foreach loop because it always would
-- * create a deep copy of the list! You should use C++11 range based for loops instead.
-- ****************************************************************************************/
--
--#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 0))
--#define QFOREACHCONTAINER_TEMPLATE QtPrivate::QForeachContainer
--#else
--#define QFOREACHCONTAINER_TEMPLATE QForeachContainer
--#endif
--
--template <typename T, typename P>
--class QFOREACHCONTAINER_TEMPLATE<librepcb::SerializableObjectList<T, P>> { public:
--    ~QForeachContainer() = delete;
--};
--template <typename T, typename P>
--class QFOREACHCONTAINER_TEMPLATE<const librepcb::SerializableObjectList<T, P>> { public:
--    ~QForeachContainer() = delete;
--};
--
--/*****************************************************************************************
-  *  End of File
-  ****************************************************************************************/
-