Commit 3fc16c4068d3eeeb16a19893507ceb58ae4d0671

Authored by Silvan Calarco
1 parent ad148ef769
Exists in master

Makefile.defs: recent fixes

Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff

... ... @@ -19,6 +19,8 @@
19 19 /usr/bin/chfn = util-linux
20 20 /usr/bin/chsh = util-linux
21 21  
  22 +/usr/bin/python3 = python3 python33
  23 +
22 24 #xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia
23 25  
24 26 ifneq ($(ARCH),arm)
... ... @@ -284,7 +286,7 @@
284 286 libswscale.so.4[][64bit] = libswscale-ffmpeg
285 287 libswscale.so.4[LIBSWSCALE_4][64bit] = libswscale-ffmpeg
286 288 libpoppler-qt4.so.4[][64bit] = libpoppler-qt4
287   -libpoppler-cpp.so.0[][64bit] = libpoppler
  289 +libpoppler-cpp.so.0[][64bit] = libpoppler-cpp
288 290 libpoppler-glib.so.8[][64bit] = libpoppler-glib
289 291 libpoppler-qt5.so.1[][64bit] = libpoppler-qt5
290 292 else
... ... @@ -360,7 +362,7 @@
360 362 libswscale.so.4 = libswscale-ffmpeg
361 363 libswscale.so.4[LIBSWSCALE_4] = libswscale-ffmpeg
362 364 libpoppler-qt4.so.4 = libpoppler-qt4
363   -libpoppler-cpp.so.0 = libpoppler
  365 +libpoppler-cpp.so.0 = libpoppler-cpp
364 366 libpoppler-glib.so.8 = libpoppler-glib
365 367 libboost_python-mt.so.1.65.1 = python-boost
366 368 libpoppler-qt5.so.1 = libpoppler-qt5
... ... @@ -467,6 +469,8 @@
467 469  
468 470 packagekitgui = kpackagekit
469 471 firewallgui = kcm_ufw
  472 +
  473 +pkgconfig[libffi] := libffi-devel
470 474  
471 475 ifeq ($(ARCH),x86_64)
472 476 libexpect5.44.1.15.so[][64bit] = expect