Merge pull request #112548 from helsinki-systems/upd/podofo

podofo: 0.9.6 -> 0.9.7
This commit is contained in:
ajs124 2021-02-10 19:04:02 +01:00 committed by GitHub
commit dd65c8b2a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions

View File

@ -43,6 +43,13 @@ mkDerivation rec {
sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
};
patches = [
(fetchpatch { # fix build with podofo 0.9.7
url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch";
sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c";
})
];
nativeBuildInputs = [
cmake
pkg-config

View File

@ -1,25 +1,16 @@
{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch
, openssl, libpng, lua5, pkg-config, libidn, expat
}:
stdenv.mkDerivation rec {
version = "0.9.6";
version = "0.9.7";
pname = "podofo";
src = fetchurl {
url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw";
};
patches = [
# https://sourceforge.net/p/podofo/tickets/24/
(fetchpatch {
url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch";
extraPrefix = "";
sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb";
})
];
outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ cmake pkg-config ];
@ -41,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "http://podofo.sourceforge.net";
description = "A library to work with the PDF file format";
platforms = platforms.all;
license = with licenses; [ gpl2 lgpl2 ];
license = with licenses; [ gpl2Plus lgpl2Plus ];
};
}

View File

@ -16196,7 +16196,7 @@ in
poco = callPackage ../development/libraries/poco { };
podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
podofo = callPackage ../development/libraries/podofo { };
polkit = callPackage ../development/libraries/polkit { };