podofo: refactor version naming, drop 0.9, make scribus use up-to-date podofo, join config into one, use lib.cmakeBool, nixpkgs-vet (#518091)
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
optipng,
|
||||
piper-tts,
|
||||
pkg-config,
|
||||
podofo_0_10,
|
||||
podofo0,
|
||||
poppler-utils,
|
||||
python314Packages,
|
||||
qt6,
|
||||
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libuchardet
|
||||
libusb1
|
||||
onnxruntime
|
||||
podofo_0_10
|
||||
podofo0
|
||||
poppler-utils
|
||||
qt6.qtbase
|
||||
qt6.qtwayland
|
||||
@@ -170,8 +170,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
MAGICK_LIB = "${lib.getLib imagemagick}/lib";
|
||||
FC_INC_DIR = "${lib.getDev fontconfig}/include/fontconfig";
|
||||
FC_LIB_DIR = "${lib.getLib fontconfig}/lib";
|
||||
PODOFO_INC_DIR = "${lib.getDev podofo_0_10}/include/podofo";
|
||||
PODOFO_LIB_DIR = "${lib.getLib podofo_0_10}/lib";
|
||||
PODOFO_INC_DIR = "${lib.getDev podofo0}/include/podofo";
|
||||
PODOFO_LIB_DIR = "${lib.getLib podofo0}/lib";
|
||||
XDG_DATA_HOME = "${placeholder "out"}/share";
|
||||
XDG_UTILS_INSTALL_MODE = "user";
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
libxml2,
|
||||
openssl,
|
||||
pcsclite,
|
||||
podofo_0_10,
|
||||
podofo0,
|
||||
ghostscript,
|
||||
}:
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
cryptopp
|
||||
fontconfig
|
||||
podofo_0_10
|
||||
podofo0
|
||||
openssl
|
||||
pcsclite
|
||||
curl
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pkg-config,
|
||||
libuuid,
|
||||
sane-backends,
|
||||
podofo_0_10,
|
||||
podofo0,
|
||||
libjpeg,
|
||||
djvulibre,
|
||||
libxmlxx3,
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
libzip
|
||||
libuuid
|
||||
sane-backends
|
||||
podofo_0_10
|
||||
podofo0
|
||||
libjpeg
|
||||
djvulibre
|
||||
tesseract
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
ninja,
|
||||
opencascade-occt_7_6,
|
||||
pkg-config,
|
||||
podofo_0_10,
|
||||
podofo0,
|
||||
sqlite,
|
||||
}:
|
||||
let
|
||||
@@ -51,7 +51,7 @@ rec {
|
||||
librsvg
|
||||
libuuid
|
||||
opencascade-occt
|
||||
podofo_0_10
|
||||
podofo0
|
||||
sqlite
|
||||
];
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
kdePackages,
|
||||
taglib,
|
||||
exiv2,
|
||||
podofo_0_10,
|
||||
podofo0,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = with kdePackages; [
|
||||
exiv2
|
||||
podofo_0_10
|
||||
podofo0
|
||||
kio
|
||||
kxmlgui
|
||||
qtbase
|
||||
|
||||
@@ -47,13 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
(lib.cmakeBool "PODOFO_BUILD_STATIC" stdenv.hostPlatform.isStatic)
|
||||
(lib.cmakeBool "CMAKE_BUILD_WITH_INSTALL_NAME_DIR" true)
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/podofo/podofo";
|
||||
description = "Library to work with the PDF file format";
|
||||
changelog = "https://github.com/podofo/podofo/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
platforms = lib.platforms.all;
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
podofo,
|
||||
libidn,
|
||||
}:
|
||||
podofo.overrideAttrs (prevAttrs: {
|
||||
version = "0.10.6";
|
||||
src = prevAttrs.src.override {
|
||||
hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI=";
|
||||
};
|
||||
buildInputs = prevAttrs.buildInputs ++ [ libidn ];
|
||||
})
|
||||
@@ -1,68 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libidn,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
libxml2,
|
||||
openssl,
|
||||
pkg-config,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podofo";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podofo";
|
||||
repo = "podofo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
freetype
|
||||
libidn
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libxml2
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/podofo/podofo";
|
||||
description = "Library to work with the PDF file format";
|
||||
platforms = lib.platforms.all;
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
lgpl2Plus
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
kuflierl
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -1,82 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
zlib,
|
||||
freetype,
|
||||
libjpeg,
|
||||
libtiff,
|
||||
fontconfig,
|
||||
openssl,
|
||||
libpng,
|
||||
lua5,
|
||||
pkg-config,
|
||||
libidn,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.9.8";
|
||||
pname = "podofo";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podofo";
|
||||
repo = "podofo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"lib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
freetype
|
||||
libjpeg
|
||||
libtiff
|
||||
fontconfig
|
||||
openssl
|
||||
libpng
|
||||
libidn
|
||||
lua5
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPODOFO_BUILD_SHARED=ON"
|
||||
"-DPODOFO_BUILD_STATIC=OFF"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Use GNU directories to fix multiple outputs
|
||||
failNoMatches='t yes; b no; :yes h; :no p; $ {x; /./{x;q}; q1}'
|
||||
sed -ni src/podofo/CMakeLists.txt \
|
||||
-e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches"
|
||||
sed -ni src/podofo/libpodofo.pc.in \
|
||||
-e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches"
|
||||
|
||||
substituteInPlace {src/podofo/,./}CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://podofo.sourceforge.net";
|
||||
description = "Library to work with the PDF file format";
|
||||
platforms = lib.platforms.all;
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
lgpl2Plus
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
kuflierl
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -29,7 +29,7 @@
|
||||
libzmf,
|
||||
pixman,
|
||||
pkg-config,
|
||||
podofo_0_10,
|
||||
podofo,
|
||||
poppler,
|
||||
poppler_data,
|
||||
python3,
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxml2
|
||||
libzmf
|
||||
pixman
|
||||
podofo_0_10
|
||||
podofo
|
||||
poppler
|
||||
poppler_data
|
||||
(python3.withPackages (
|
||||
|
||||
@@ -1733,7 +1733,10 @@ mapAliases {
|
||||
pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
|
||||
poac = throw "'poac' has been renamed to/replaced by 'cabinpkg'"; # Converted to throw 2025-10-27
|
||||
pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27
|
||||
podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27
|
||||
podofo010 = throw "'podofo010' has been renamed to 'podofo0'"; # Converted to throw 2025-10-27
|
||||
podofo_0_9 = throw "'podofo_0_9' has been deprecated, it may be replaced by 'podofo0'"; # Added 2026-05-08
|
||||
podofo_0_10 = warnAlias "'podofo_0_10' has been renamed to 'podofo0'" podofo0; # Added 2026-05-08
|
||||
podofo_1_0 = throw "'podofo_1_0' has been deprecated in favour of 'podofo'"; # Added 2026-05-08
|
||||
polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
|
||||
polonium = throw "'polonium' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01
|
||||
polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
|
||||
|
||||
@@ -7012,8 +7012,6 @@ with pkgs;
|
||||
|
||||
place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
|
||||
|
||||
podofo = podofo_1_0;
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
|
||||
|
||||
poppler_gi = lowPrio (
|
||||
|
||||
Reference in New Issue
Block a user