frescobaldi: 2.0.16 -> 3.0.0; fix build

3.0.0 works with Python 3 and QT5 (proivded by pyqt5). These fixes are
another step towards #32883 by getting rid of the unused poppler-qt4.

See https://hydra.nixos.org/build/71816154/log
See ticket #36453
This commit is contained in:
Maximilian Bosch 2018-03-31 17:03:17 +02:00
parent 8446cd9c32
commit 545495b132
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
3 changed files with 13 additions and 36 deletions

View file

@ -1,21 +1,22 @@
{ stdenv, fetchurl, pythonPackages, lilypond}:
{ lib, fetchFromGitHub, python3Packages, lilypond }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "frescobaldi-${version}";
version = "2.0.16";
version = "3.0.0";
src = fetchurl {
url = "https://github.com/wbsoft/frescobaldi/releases/download/"
+ "v2.0.16/${name}.tar.gz";
sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
};
propagatedBuildInputs = with pythonPackages; [ lilypond
pyqt4 poppler-qt4 pygame ];
propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ];
patches = [ ./setup.cfg.patch ./python-path.patch ];
# no tests in shipped with upstream
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://frescobaldi.org/;
description = ''Frescobaldi is a LilyPond sheet music text editor'';
longDescription = ''
@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
fonts and keyboard shortcuts
'';
license = licenses.gpl2Plus;
maintainers = [ maintainers.sepi ];
maintainers = with maintainers; [ sepi ma27 ];
platforms = platforms.all;
};
}

View file

@ -1,11 +0,0 @@
diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi
--- frescobaldi-2.0.16/frescobaldi 2014-10-24 11:29:28.705687224 +0200
+++ frescobaldi-2.0.16.new/frescobaldi 2014-10-24 11:31:08.086444793 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import sys
import frescobaldi_app.main
import app
Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app
Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx

View file

@ -1,13 +0,0 @@
Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build
Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app
Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx
diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg
--- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100
+++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200
@@ -1,6 +1,2 @@
-[bdist_wininst]
-bitmap=frescobaldi-wininst.bmp
-install-script=frescobaldi-wininst.py
-
[sdist]
force-manifest=1