Place built-in poppler libs into evince libs folder rather than /usr/lib

5 files changed, 47 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51ffc713f44f..d1a660515cea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -53,9 +53,9 @@ pkgbase = evince-lcd-standalone
 	source = 03-cairo-backend-for-poppler-qt5.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 65c35d86787021cccee99082ad15cb06e0e865384f9a05aa3523a8aec1229af6
+	sha256sums = 73c0fb71877633cefc37b13bcd7896263dc63b91fe13fa97c2c240292a2bc338
+	sha256sums = c554b9411764ffcad7a91e22f78a594ca9851e631c70ec15a2b0d52bada0573c
 
 pkgname = evince-lcd-standalone
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..34ed9f3da2cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/evince
+/pkg
+/src
+*.tar.xz
diff --git a/02-subpixel-rendering-for-poppler-and-glib.patch b/02-subpixel-rendering-for-poppler-and-glib.patch
index 77dd40fb220d..c82281872681 100644
--- a/02-subpixel-rendering-for-poppler-and-glib.patch
+++ b/02-subpixel-rendering-for-poppler-and-glib.patch
@@ -2,6 +2,8 @@ From: Jeffrey Feng <galago1992@gmail.com>
 Subject: [PATCH 2/3] subpixel rendering for poppler and poppler-glib
 ---
 diff -rup a/ b/|diffstat
+ CMakeLists.txt             |    1 
+ glib/CMakeLists.txt        |    1 
  glib/demo/render.c         |   25 +++++++++++++++++---
  glib/poppler-page.cc       |   10 ++++++++
  glib/poppler-page.h        |    1 
@@ -11,9 +13,31 @@ diff -rup a/ b/|diffstat
  poppler/Gfx.h              |    3 ++
  poppler/Page.cc            |   14 +++++++++++
  poppler/Page.h             |    3 ++
- 9 files changed, 129 insertions(+), 6 deletions(-)
+ 11 files changed, 131 insertions(+), 6 deletions(-)
  
- diff -rup a/glib/demo/render.c b/glib/demo/render.c
+diff -rup a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt    2016-04-29 06:13:57.000000000 +0800
++++ b/CMakeLists.txt    2018-05-22 23:05:18.907662448 +0800
+@@ -501,6 +501,7 @@ add_library(poppler STATIC ${poppler_SRC
+ else(MSVC)
+ add_library(poppler SHARED ${poppler_SRCS})
+ endif(MSVC)
++set_target_properties(poppler PROPERTIES OUTPUT_NAME "poppler-lcd")
+ set_target_properties(poppler PROPERTIES VERSION 60.0.0 SOVERSION 60)
+ target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
+ install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
+diff -rup a/glib/CMakeLists.txt b/glib/CMakeLists.txt
+--- a/glib/CMakeLists.txt       2015-05-15 02:23:07.000000000 +0800
++++ b/glib/CMakeLists.txt       2018-05-22 23:06:31.313659479 +0800
+@@ -81,6 +81,7 @@ set(poppler_glib_generated_SRCS
+   ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
+ )
+ add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
++set_target_properties(poppler-glib PROPERTIES OUTPUT_NAME "poppler-glib-lcd")
+ set_target_properties(poppler-glib PROPERTIES VERSION 8.7.0 SOVERSION 8)
+ target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
+ if(HAVE_PTHREAD)
+diff -rup a/glib/demo/render.c b/glib/demo/render.c
 --- a/glib/demo/render.c	2014-02-09 23:10:30.000000000 +0800
 +++ b/glib/demo/render.c	2018-05-18 21:21:13.000000000 +0800
 @@ -82,12 +82,14 @@ pgd_render_start (GtkButton     *button,
diff --git a/03-cairo-backend-for-poppler-qt5.patch b/03-cairo-backend-for-poppler-qt5.patch
index 8e422f5949c9..0bcfbd1a9a4b 100644
--- a/03-cairo-backend-for-poppler-qt5.patch
+++ b/03-cairo-backend-for-poppler-qt5.patch
@@ -3,13 +3,13 @@ Subject: [PATCH 3/3] cairo backend for poppler-qt5
 ---
 diff -rup a/qt5 b/qt5|diffstat
  demos/viewer.cpp        |    6 ++-
- src/CMakeLists.txt      |   14 +++++++
+ src/CMakeLists.txt      |   15 +++++++
  src/poppler-document.cc |    3 +
  src/poppler-page.cc     |   83 +++++++++++++++++++++++++++++++++++++++++++++++-
  src/poppler-private.cc  |    2 -
  src/poppler-qt5.h       |    3 +
  tests/CMakeLists.txt    |    4 ++
- 7 files changed, 111 insertions(+), 4 deletions(-)
+ 7 files changed, 112 insertions(+), 4 deletions(-)
 
 diff -rup a/qt5/demos/viewer.cpp b/qt5/demos/viewer.cpp
 --- a/qt5/demos/viewer.cpp	2014-02-09 23:10:33.000000000 +0800
@@ -47,7 +47,7 @@ diff -rup a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
  
  set(poppler_qt5_SRCS
    poppler-annotation.cc
-@@ -29,9 +33,19 @@ set(poppler_qt5_SRCS
+@@ -29,9 +33,20 @@ set(poppler_qt5_SRCS
    poppler-media.cc
    ArthurOutputDev.cc
  )
@@ -59,6 +59,7 @@ diff -rup a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
 +  )
 +endif(HAVE_CAIRO)
  add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
++set_target_properties(poppler-qt5 PROPERTIES OUTPUT_NAME "poppler-qt5-lcd")
  set_target_properties(poppler-qt5 PROPERTIES VERSION 1.6.0 SOVERSION 1)
  target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
 +if (HAVE_CAIRO)
diff --git a/PKGBUILD b/PKGBUILD
index fe1b9702810a..6ee48dc591d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,9 +29,9 @@ source=("git+https://git.gnome.org/browse/evince#commit=$_commit"
         03-cairo-backend-for-poppler-qt5.patch)
 sha256sums=('SKIP'
             'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+            '65c35d86787021cccee99082ad15cb06e0e865384f9a05aa3523a8aec1229af6'
+            '73c0fb71877633cefc37b13bcd7896263dc63b91fe13fa97c2c240292a2bc338'
+            'c554b9411764ffcad7a91e22f78a594ca9851e631c70ec15a2b0d52bada0573c')
 
 pkgver() {
   cd $_pkgname
@@ -59,16 +59,17 @@ build() {
   # rename shared libraries to resolve conflicts with existing poppler installation.
   cd $srcdir/usr/local/lib
   rm `find . -type l`
-  mv libpoppler.so.60.0.0 libpoppler.so.60
-  mv libpoppler-glib.so.8.7.0 libpoppler-glib.so.87
+  mv libpoppler-lcd.so.60.0.0 libpoppler-lcd.so.60
+  mv libpoppler-glib-lcd.so.8.7.0 libpoppler-glib-lcd.so.8
   
   # patch evince and build
   cd $srcdir/$_pkgname
   patch -Np1<../01-evince-subpixel-rendering-by-poppler.patch
+  sed -i 's#$(BACKEND_LIBTOOL_FLAGS)#& -Wl,-rpath -Wl,/usr/lib/evince/poppler-lcd#' ./backend/pdf/Makefile.am
 
   BROWSER_PLUGIN_DIR=/usr/lib/epiphany/plugins \
   POPPLER_CFLAGS="-I$srcdir/usr/local/include/poppler/glib -I$srcdir/usr/local/include/poppler `pkg-config --cflags glib-2.0 gobject-2.0 cairo libxml-2.0`" \
-  POPPLER_LIBS="-L$srcdir/usr/local/lib -l:libpoppler-glib.so.87 -l:libpoppler.so.60 `pkg-config --libs glib-2.0 gobject-2.0 cairo libxml-2.0`" \
+  POPPLER_LIBS="-L$srcdir/usr/local/lib -l:libpoppler-glib-lcd.so.8 -l:libpoppler-lcd.so.60 `pkg-config --libs glib-2.0 gobject-2.0 cairo libxml-2.0`" \
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib/$_pkgname \
     --disable-static \
@@ -91,6 +92,7 @@ build() {
 package() {
   cd $_pkgname
   make DESTDIR="$pkgdir" install
-  libdir=$pkgdir/usr/lib
-  cp $srcdir/usr/local/lib/{libpoppler-glib.so.87,libpoppler.so.60} $libdir
+  libdir=$pkgdir/usr/lib/evince/poppler-lcd
+  mkdir -p $libdir
+  cp $srcdir/usr/local/lib/{libpoppler-glib-lcd.so.8,libpoppler-lcd.so.60} $libdir
 }