diff --git a/srcpkgs/apvlv/patches/cxxflags_from_env.patch b/srcpkgs/apvlv/patches/cxxflags_from_env.patch index abb000d4d2a..912462a00b5 100644 --- a/srcpkgs/apvlv/patches/cxxflags_from_env.patch +++ b/srcpkgs/apvlv/patches/cxxflags_from_env.patch @@ -1,11 +1,11 @@ --- a/src/CMakeLists.txt 2016-09-14 01:48:05.822928918 +0200 +++ b/src/CMakeLists.txt 2016-09-14 01:48:54.906931451 +0200 -@@ -1,7 +1,7 @@ +@@ -3,7 +3,7 @@ ADD_COMPILE_OPTIONS(-std=c++11) IF (WIN32) - ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ELSE (WIN32) -- SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing") -+ SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing ${CMAKE_CXX_FLAGS}") +- SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing") ++ SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing ${CMAKE_CXX_FLAGS}") - OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF) - IF (APVLV_ENABLE_DEBUG) + OPTION(APVLV_ENABLE_DEBUG "If build binary with debug information." OFF) + IF (APVLV_ENABLE_DEBUG) diff --git a/srcpkgs/apvlv/patches/use_dist_manpdf.patch b/srcpkgs/apvlv/patches/use_dist_manpdf.patch new file mode 100644 index 00000000000..2afc26cfb4d --- /dev/null +++ b/srcpkgs/apvlv/patches/use_dist_manpdf.patch @@ -0,0 +1,16 @@ +An up-to-date Startup.pdf is shipped with the dist, so just use that. + +diff -rup CMakeLists.txt.orig CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,10 +76,6 @@ IF (WIN32) + INSTALL(DIRECTORY icons DESTINATION ".") + INSTALL(DIRECTORY ${CMAKE_HOME_DIRECTORY}/win32/poppler-data DESTINATION ".") + ELSE (WIN32) +- ADD_CUSTOM_TARGET(Startup.pdf +- ALL +- COMMAND "man" "-t" "${CMAKE_SOURCE_DIR}/apvlv.1" "|" "ps2pdf" "-" "${CMAKE_SOURCE_DIR}/Startup.pdf" +- DEPENDS apvlv.1) + INSTALL(FILES apvlvrc.example DESTINATION ${SYSCONFDIR} + RENAME apvlvrc) + INSTALL(FILES apvlvrc.example Startup.pdf main_menubar.glade DESTINATION ${DOCDIR}) diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template index 1ecd30c57b0..41c01bfa984 100644 --- a/srcpkgs/apvlv/template +++ b/srcpkgs/apvlv/template @@ -1,16 +1,16 @@ # Template file for 'apvlv' pkgname=apvlv -version=0.2.0 +version=0.5.0 revision=1 build_style=cmake configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes" hostmakedepends="pkg-config" -makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel webkit2gtk-devel ebook-tools-devel" +makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel libwebkit2gtk41-devel ebook-tools-devel" depends="desktop-file-utils" short_desc="Vim-like PDF/DJVU/TXT viewer" maintainer="Orphaned " license="GPL-2.0-only" homepage="http://naihe2010.github.io/apvlv/" distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz" -checksum=a4a2f42a7e42715a21d2356def3ed93c180c6ae41128580addee42835e5374c2 +checksum=4e7f18c19851f48ee00d4b424b5dd9c47887f9459e481d486b76c16998133afb replaces="apvlv-git>=0"