tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / desktops / deepin / apps / deepin-reader / use-pkg-config.diff
at netboot-syslinux-multiplatform 46 lines 1.6 kB view raw
1diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri 2index 3e04f340..894b0ac7 100755 3--- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri 4+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri 5@@ -20,13 +20,8 @@ DEFINES += USE_SYSTEM_LIBJPEG \ 6 USE_SYSTEM_LIBOPENJPEG2 \ 7 USE_SYSTEM_FREETYPE 8 9-INCLUDEPATH += /usr/include/openjpeg-2.3 \ 10- /usr/include/openjpeg-2.4 \ 11- /usr/include/freetype2 \ 12- /usr/include/freetype2/freetype \ 13- /usr/include/freetype2/freetype/config 14- 15-LIBS += -lopenjp2 -llcms2 -lfreetype 16+CONFIG += link_pkgconfig 17+PKGCONFIG += libopenjp2 lcms2 freetype2 18 19 #QMAKE_CXXFLAGS += "-Wc++11-narrowing" #is_clang 20 #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override" #is_clang Suppress no override warning for overridden functions. 21diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro 22index 196b91d3..bda71ff4 100755 23--- a/3rdparty/deepin-pdfium/src/src.pro 24+++ b/3rdparty/deepin-pdfium/src/src.pro 25@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium 26 27 TEMPLATE = lib 28 29-CONFIG += c++14 30+CONFIG += c++14 link_pkgconfig 31+ 32+PKGCONFIG += chardet 33 34 ###安全漏洞检测 35 #QMAKE_CXX += -g -fsanitize=undefined,address -O2 36@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri) 37 38 INCLUDEPATH += $$PWD/../include 39 40-INCLUDEPATH += /usr/include/chardet 41- 42-LIBS += -lchardet 43- 44 public_headers += \ 45 $$PWD/../include/dpdfglobal.h \ 46 $$PWD/../include/dpdfdoc.h \