diff options
| -rw-r--r-- | .SRCINFO | 70 | ||||
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | 01-okular-subpixel-rendering-by-poppler.patch | 67 | ||||
| -rw-r--r-- | PKGBUILD | 73 |
4 files changed, 15 insertions, 204 deletions
@@ -1,70 +1,8 @@ pkgbase = okular-lcd-standalone - pkgdesc = Document viewer (PDF, Postscript, djvu, etc.) with built-in LCD subpixel rendering - pkgver = 19.04.0 + pkgdesc = metapackage - migrate to okular + pkgver = 20.0.0 pkgrel = 1 - url = https://kde.org/applications/graphics/okular/ - arch = x86_64 - groups = kde-applications - groups = kdegraphics - license = GPL - license = LGPL - license = FDL - makedepends = extra-cmake-modules - makedepends = ebook-tools - makedepends = kdegraphics-mobipocket - makedepends = kdoctools - makedepends = khtml - makedepends = chmlib - makedepends = discount - makedepends = git - makedepends = qt4 - makedepends = qt5-base - makedepends = icu - makedepends = gtk2 - makedepends = python2 - makedepends = libjpeg - makedepends = gcc-libs - makedepends = cairo - makedepends = fontconfig - makedepends = pkgconfig - makedepends = lcms2 - makedepends = gobject-introspection - depends = djvulibre - depends = libspectre - depends = libkexiv2 - depends = qca - depends = kpty - depends = kactivities - depends = threadweaver - depends = kjs - depends = kparts - depends = purpose - depends = discount - depends = phonon-qt5 - optdepends = ebook-tools: mobi and epub support - optdepends = kdegraphics-mobipocket: mobi support - optdepends = kirigami2: mobile UI - optdepends = libzip: CHM support - optdepends = khtml: CHM support - optdepends = chmlib: CHM support - optdepends = calligra: ODT and ODP support - optdepends = unrar: Comic Book Archive support - optdepends = unarchiver: Comic Book Archive support (alternative) - provides = okular - conflicts = kdegraphics-okular - conflicts = okular - conflicts = okular-git - replaces = kdegraphics-okular - replaces = okular - replaces = okular-git - source = https://download.kde.org/stable/applications/19.04.0/src/okular-19.04.0.tar.xz - source = https://poppler.freedesktop.org/poppler-0.76.0.tar.xz - source = git+https://github.com/jonathanffon/poppler-lcd-patch.git - source = 01-okular-subpixel-rendering-by-poppler.patch - sha256sums = 1947b394dfd8da9c7cc4234e308e2476ffa44dc58542d246eafc8397d8991b6e - sha256sums = 370f5fcfe2bbf0c76fc394d338cd72ed7f2044b67f4eb4b115eb074ccfc70d63 - sha256sums = SKIP - sha256sums = 7d9c083519cb6239b8cde57413ec02f6d48afd6c692757fef6feeb9498fcb787 + arch = any pkgname = okular-lcd-standalone - + depends = okular diff --git a/.gitignore b/.gitignore index 198750ed322f..018a3de08144 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -okular/ -src/ -pkg/ -*.tar.xz - +* +!PKGBUILD +!.SRCINFO +!.gitignore diff --git a/01-okular-subpixel-rendering-by-poppler.patch b/01-okular-subpixel-rendering-by-poppler.patch deleted file mode 100644 index 24de94cf2be8..000000000000 --- a/01-okular-subpixel-rendering-by-poppler.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Jeffrey Feng <galago1992@gmail.com> -Subject: okular LCD subpixel rendering by poppler ---- - CMakeLists.txt | 9 +++++---- - generators/poppler/CMakeLists.txt | 9 +++++++-- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff -ru a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-04-27 09:12:24.161327890 +0800 -+++ b/CMakeLists.txt 2019-04-27 09:39:31.871255641 +0800 -@@ -113,10 +113,9 @@ - find_package(ZLIB REQUIRED) - - # This is here instead of in generators since we use if(Poppler_Qt5_FOUND) in autotests/ --find_package(Poppler "0.12.1" COMPONENTS Qt5) --set_package_properties("Poppler" PROPERTIES -- TYPE RECOMMENDED -- PURPOSE "Support for PDF files in okular.") -+# Use standalone subpixel-patched poppler-0.76 for PDF files.") -+set(Poppler_Qt5_FOUND 1) -+set(Poppler_VERSION "0.76.0") - - add_definitions(-DQT_USE_FAST_OPERATOR_PLUS) - add_definitions(-DTRANSLATION_DOMAIN="okular") -@@ -140,6 +139,8 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov") - endif() -+# Always link to standalone patched poppler library -+STRING(REGEX REPLACE "--as-needed" "--no-as-needed" CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS}) - - add_subdirectory( ui ) - add_subdirectory( shell ) -diff -ru a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt ---- a/generators/poppler/CMakeLists.txt 2019-04-27 09:47:44.217900447 +0800 -+++ b/generators/poppler/CMakeLists.txt 2019-04-27 10:51:48.444707284 +0800 -@@ -19,7 +19,7 @@ - set (HAVE_POPPLER_0_37 1) - endif() - --set(CMAKE_REQUIRED_LIBRARIES Poppler::Qt5 Qt5::Core Qt5::Gui) -+set(CMAKE_REQUIRED_LIBRARIES Qt5::Core Qt5::Gui) - - check_cxx_source_compiles(" - #include <poppler-qt5.h> -@@ -142,6 +142,8 @@ - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -+ ${POPPLER_LIB_DIR}/../include/poppler -+ ${POPPLER_LIB_DIR}/../include/poppler/qt5 - ) - - ########### next target ############### -@@ -161,7 +163,10 @@ - - okular_add_generator(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS}) - --target_link_libraries(okularGenerator_poppler okularcore KF5::I18n KF5::Completion Poppler::Qt5 Qt5::Xml) -+set(POPPLER_LIB ${POPPLER_LIB_DIR}/libpoppler.so) -+set(POPPLER_QT5_LIB ${POPPLER_LIB_DIR}/libpoppler-qt5.so) -+set_target_properties(okularGenerator_poppler PROPERTIES INSTALL_RPATH ${POPPLER_LIB_RPATH}) -+target_link_libraries(okularGenerator_poppler okularcore KF5::I18n KF5::Completion ${POPPLER_QT5_LIB} ${POPPLER_LIB} Qt5::Xml) - - ########### install files ############### - install( FILES okularPoppler.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - @@ -1,71 +1,12 @@ -# Maintainer: Jeffrey Feng <galago1992@gmail.com> +# Maintainer: -pkgname=okular-lcd-standalone -_pkgname=okular-$pkgver -pkgver=19.04.0 +_newpkg='okular' +pkgname='okular-lcd-standalone' +pkgver=20.0.0 pkgrel=1 -pkgdesc='Document viewer (PDF, Postscript, djvu, etc.) with built-in LCD subpixel rendering' -arch=(x86_64) -url="https://kde.org/applications/graphics/okular/" -license=(GPL LGPL FDL) -groups=(kde-applications kdegraphics) -depends=(djvulibre libspectre libkexiv2 qca kpty kactivities threadweaver kjs kparts purpose discount phonon-qt5) -makedepends=(extra-cmake-modules ebook-tools kdegraphics-mobipocket kdoctools khtml chmlib discount git qt4 - qt5-base icu gtk2 python2 libjpeg gcc-libs cairo fontconfig pkgconfig lcms2 gobject-introspection) -optdepends=('ebook-tools: mobi and epub support' - 'kdegraphics-mobipocket: mobi support' 'kirigami2: mobile UI' 'libzip: CHM support' - 'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support' - 'unrar: Comic Book Archive support' 'unarchiver: Comic Book Archive support (alternative)') -conflicts=(kdegraphics-okular okular okular-git) -provides=(okular) -replaces=(kdegraphics-okular okular okular-git) -source=("https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz" - "https://poppler.freedesktop.org/poppler-0.76.0.tar.xz" - "git+https://github.com/jonathanffon/poppler-lcd-patch.git" - 01-okular-subpixel-rendering-by-poppler.patch) -sha256sums=('1947b394dfd8da9c7cc4234e308e2476ffa44dc58542d246eafc8397d8991b6e' - '370f5fcfe2bbf0c76fc394d338cd72ed7f2044b67f4eb4b115eb074ccfc70d63' - 'SKIP' - '7d9c083519cb6239b8cde57413ec02f6d48afd6c692757fef6feeb9498fcb787') - -build() { - # patch okular - cd $srcdir/okular-$pkgver - patch -Np1<../01-okular-subpixel-rendering-by-poppler.patch - #patch poppler - cd $srcdir/poppler-0.76.0 - for patch in `ls ../poppler-lcd-patch/*.patch`; do - patch -p1<$patch - done - - # build poppler - cd $srcdir - mkdir -p pbuild&&cd $_ - cmake ../poppler-0.76.0 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$srcdir/usr/local \ - -DCMAKE_INSTALL_LIBDIR=$srcdir/usr/local/lib \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF -DBUILD_QT4_TESTS=OFF \ - -DBUILD_QT5_TESTS=OFF -DBUILD_CPP_TESTS=OFF - make install - - # build okular - cd $srcdir - mkdir -p build&&cd $_ - cmake ../okular-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF \ - -DPOPPLER_LIB_DIR=$srcdir/usr/local/lib \ - -DPOPPLER_LIB_RPATH=/usr/lib/qt/plugins/okular/poppler-lcd - make -} +pkgdesc="metapackage - migrate to $_newpkg" +arch=('any') package() { - cd build - make DESTDIR="$pkgdir" install - libdir=$pkgdir/usr/lib/qt/plugins/okular/poppler-lcd - mkdir -p $libdir - cp "$srcdir/usr/local/lib/libpoppler"{-qt5.so.1,.so.87} $libdir + depends=("$_newpkg") } |