pyrox.dev / nixpkgs
lol
fork atom

diffpdf: move to using qt5

Patch is used by Gentoo, Debian, etc.

Will Dietz 2286c9b3 b9f3d49e

+28 -22
unified split
+11 -5
pkgs/applications/misc/diffpdf/default.nix
··· 1 - { stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }: 1 + { stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "2.1.3"; ··· 9 9 sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566"; 10 10 }; 11 11 12 - patches = [ ./fix_path_poppler_qt4.patch ]; 12 + patches = [ 13 + (fetchpatch { 14 + url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch; 15 + sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg"; 16 + }) 17 + ./fix_path_poppler_qt5.patch 18 + ]; 13 19 14 - buildInputs = [ qt4 poppler_qt4 ]; 15 - nativeBuildInputs = [ qmake4Hook ]; 20 + nativeBuildInputs = [ qmake qttools ]; 21 + buildInputs = [ qtbase poppler_qt5 ]; 16 22 17 23 preConfigure = '' 18 - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev} 24 + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} 19 25 lrelease diffpdf.pro 20 26 ''; 21 27
-16
pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch
··· 1 - diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro 2 - --- diffpdf-2.1.3/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200 3 - +++ diffpdf-2.1.3-new/diffpdf.pro 2015-07-07 23:13:36.445572148 +0200 4 - @@ -47,9 +47,9 @@ 5 - INCLUDEPATH += /c/poppler_lib/include/poppler/qt4 6 - LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin 7 - } else { 8 - - exists(/usr/include/poppler/qt4) { 9 - - INCLUDEPATH += /usr/include/poppler/cpp 10 - - INCLUDEPATH += /usr/include/poppler/qt4 11 - + exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) { 12 - + INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp 13 - + INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4 14 - } else { 15 - INCLUDEPATH += /usr/local/include/poppler/cpp 16 - INCLUDEPATH += /usr/local/include/poppler/qt4
+16
pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
··· 1 + diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro 2 + --- diffpdf-2.1.3/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200 3 + +++ diffpdf-2.1.3-new/diffpdf.pro 2015-07-07 23:13:36.445572148 +0200 4 + @@ -47,9 +47,9 @@ 5 + INCLUDEPATH += /c/poppler_lib/include/poppler/qt5 6 + LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin 7 + } else { 8 + - exists(/usr/include/poppler/qt5) { 9 + - INCLUDEPATH += /usr/include/poppler/cpp 10 + - INCLUDEPATH += /usr/include/poppler/qt5 11 + + exists(@@NIX_POPPLER_QT5@@/include/poppler/qt5) { 12 + + INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/cpp 13 + + INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/qt5 14 + } else { 15 + INCLUDEPATH += /usr/local/include/poppler/cpp 16 + INCLUDEPATH += /usr/local/include/poppler/qt5
+1 -1
pkgs/top-level/all-packages.nix
··· 16442 16442 16443 16443 mupdf = callPackage ../applications/misc/mupdf { }; 16444 16444 16445 - diffpdf = callPackage ../applications/misc/diffpdf { }; 16445 + diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; 16446 16446 16447 16447 mlocate = callPackage ../tools/misc/mlocate { }; 16448 16448