From f0155e8d70f1d78873b491dbbe297ca8fc279727 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 29 Sep 2016 14:36:18 +0200 Subject: pythonPackages.pypoppler: init at 0.12.2 --- .../python-modules/pypoppler-0.39.0.patch | 23 ++++++++++++++++ .../python-modules/pypoppler-poppler.c.patch | 12 +++++++++ pkgs/top-level/python-packages.nix | 31 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/pypoppler-0.39.0.patch create mode 100644 pkgs/development/python-modules/pypoppler-poppler.c.patch diff --git a/pkgs/development/python-modules/pypoppler-0.39.0.patch b/pkgs/development/python-modules/pypoppler-0.39.0.patch new file mode 100644 index 000000000000..b9e02242e003 --- /dev/null +++ b/pkgs/development/python-modules/pypoppler-0.39.0.patch @@ -0,0 +1,23 @@ +diff --git a/poppler.defs b/poppler.defs +index 8b12e03..2b8fc16 100644 +--- a/poppler.defs ++++ b/poppler.defs +@@ -570,18 +570,6 @@ + ) + ) + +-(define-enum Orientation +- (in-module "Poppler") +- (c-name "PopplerOrientation") +- (gtype-id "POPPLER_TYPE_ORIENTATION") +- (values +- '("portrait" "POPPLER_ORIENTATION_PORTRAIT") +- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE") +- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN") +- '("seascape" "POPPLER_ORIENTATION_SEASCAPE") +- ) +-) +- + (define-enum PageTransitionType + (in-module "Poppler") + (c-name "PopplerPageTransitionType") diff --git a/pkgs/development/python-modules/pypoppler-poppler.c.patch b/pkgs/development/python-modules/pypoppler-poppler.c.patch new file mode 100644 index 000000000000..1104097cd3e7 --- /dev/null +++ b/pkgs/development/python-modules/pypoppler-poppler.c.patch @@ -0,0 +1,12 @@ +diff --git a/poppler.c b/poppler.c +index 31b4489..16d0838 100644 +--- a/poppler.c ++++ b/poppler.c +@@ -4501,7 +4501,6 @@ py_poppler_add_constants(PyObject *module, const gchar *strip_prefix) + pyg_enum_add(module, "FormTextType", strip_prefix, POPPLER_TYPE_FORM_TEXT_TYPE); + pyg_enum_add(module, "FormChoiceType", strip_prefix, POPPLER_TYPE_FORM_CHOICE_TYPE); + pyg_enum_add(module, "Error", strip_prefix, POPPLER_TYPE_ERROR); +- pyg_enum_add(module, "Orientation", strip_prefix, POPPLER_TYPE_ORIENTATION); + pyg_enum_add(module, "PageTransitionType", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_TYPE); + pyg_enum_add(module, "PageTransitionAlignment", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT); + pyg_enum_add(module, "PageTransitionDirection", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b941ec875ee..c5cc86b716ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8214,6 +8214,37 @@ in modules // { inherit pythonOlder; }; + pypoppler = buildPythonPackage rec { + name = "pypoppler-${version}"; + version = "0.12.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pypoppler/${name}.tar.gz"; + sha256 = "47e6ac99e5b114b9abf2d1dd1bca06f22c028d025432512989f659142470810f"; + }; + + NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; + buildInputs = [ pkgs.pkgconfig pkgs.poppler.dev ]; + propagatedBuildInputs = with self; [ pycairo pygobject2 ]; + + patches = [ + ../development/python-modules/pypoppler-0.39.0.patch + ../development/python-modules/pypoppler-poppler.c.patch + ]; + + # Not supported. + disabled = isPy3k; + + # No tests in archive + doCheck = false; + + meta = { + homepage = https://code.launchpad.net/~mriedesel/poppler-python/main; + description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies"; + license = licenses.gpl2; + }; + }; + python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; version = "0.1.7"; -- cgit 1.4.1