git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112548 from helsinki-systems/upd/podofo

podofo: 0.9.6 -> 0.9.7

commitdd65c8b2a7c936f2456c4d2c7a2dc6789bc3f177 authorajs124 <ajs124@users.noreply.github.com> dateWed 10 Feb 2021, 19:04 (6 years ago) parent3e3d5e755bce00
3 files changed+12−14
pkgs/applications/office/scribus/unstable.nix+7 pkgs/development/libraries/podofo/default.nix+4−13 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/office/scribus/unstable.nix+7
@@ -43,6 +43,13 @@ mkDerivation rec {
4343 sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
4444 };
4545
46+ patches = [
47+ (fetchpatch { # fix build with podofo 0.9.7
48+ url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch";
49+ sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c";
50+ })
51+ ];
52+
4653 nativeBuildInputs = [
4754 cmake
4855 pkg-config
pkgs/development/libraries/podofo/default.nix+4−13
@@ -1,25 +1,16 @@
11{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
2−, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch
2+, openssl, libpng, lua5, pkg-config, libidn, expat
33}:
44
55stdenv.mkDerivation rec {
6− version = "0.9.6";
6+ version = "0.9.7";
77 pname = "podofo";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
11− sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
11+ sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw";
1212 };
1313
14− patches = [
15− # https://sourceforge.net/p/podofo/tickets/24/
16− (fetchpatch {
17− url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch";
18− extraPrefix = "";
19− sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb";
20− })
21− ];
22−
2314 outputs = [ "out" "dev" "lib" ];
2415
2516 nativeBuildInputs = [ cmake pkg-config ];
@@ -41,6 +32,6 @@ stdenv.mkDerivation rec {
4132 homepage = "http://podofo.sourceforge.net";
4233 description = "A library to work with the PDF file format";
4334 platforms = platforms.all;
44− license = with licenses; [ gpl2 lgpl2 ];
35+ license = with licenses; [ gpl2Plus lgpl2Plus ];
4536 };
4637}
pkgs/top-level/all-packages.nix+1−1
@@ -16196,7 +16196,7 @@ in
1619616196
1619716197 poco = callPackage ../development/libraries/poco { };
1619816198
16199− podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
16199+ podofo = callPackage ../development/libraries/podofo { };
1620016200
1620116201 polkit = callPackage ../development/libraries/polkit { };
1620216202