gentoo auto-resync : 03:05:2023 - 23:26:49

4 files changed, 118 insertions, 0 deletions

diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index e048379e584d..a87c7c8b47af 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,5 +1,8 @@
 AUX apvlv-0.4.0-cmake-cxxflags.patch 378 BLAKE2B 44063fd090374654067c6f1b43d9d392fb0a6739ae1e44271796c97a39962e229b6ba597b29ec7a0e5b30501af3c62f5a7c0fcc3ed093985e4b253ed33a39efc SHA512 d52d7b7f4500c3094de521e8eee368d6b50dd858d78fa830067ea2fe7cb446f66850d57ab70e6f51281d7a86ac531c0ed89425480d1c5e371631f1fbcff23fd3
+AUX apvlv-0.4.0-icon-r1.patch 270 BLAKE2B 330b19b80f1ada52e7f34c17ec1d332050b3ee72e9d0f6ccc246df810eb24b184f53b82ef3f179242564d18847493f487e42e04c3723c689eb31c2a95fe35b7d SHA512 3bb507141d0ea192b7d7fd39d41efe3d8093fe58996425f9db2b4bd5c5eceb4afdff26f51c3d0921b073113a0380c1d8c6521ac76598d02697d399bc22cc4615
 AUX apvlv-0.4.0-icon.patch 258 BLAKE2B 440dfe9904c4ac79408c90c5930e7b6ffc26fdd084ac4320fd945679f69c5333ffc4120991658d045d1e4525421f973d7dce020814b641397b54a0706f510475 SHA512 039204036fdf6b8a26451ca7d4b5d7d2e6b28bac8df5d97876a3b3dcb1e5b24e1f030864cac41b7a4776ea7999dffa9053bdd0632baf2d43054474c28e9a9b3d
+AUX apvlv-0.4.0-webkitgtk4.1.patch 1477 BLAKE2B 228b713af3f2caa2110d8e95eeb9e098ad801291002968fae3cc4546c1f009d2e888050b626e00edd395ffd7e6119172e18180b1081cacf8d03a13ede9904930 SHA512 c9c803f89bda5334ebba444d01307815f3144627074d0e21099fed486e02bc60313e3459f30e01654d56ee913d6759dba4fece0c62ba1c30571cd932290f8e90
 DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
 EBUILD apvlv-0.4.0-r1.ebuild 1125 BLAKE2B aec2471b52af93c8435d3e3949e85687ccc030f2af562a9eba78e488646eb25e0d743d72b0f3acadbd67298edb736b1c52c6da49d158d14b140cfdd5ba8f7439 SHA512 1a9edbe4ffecec6f68d6a574b14a5e09cfa694c5b5785debfbae4c60edd7408d7eaa03ee9bf2db7d7ac9fce9a3e89b1457fb78efb728d0c5b8fd4079079994c5
+EBUILD apvlv-0.4.0-r2.ebuild 1317 BLAKE2B 514016264e3cb18fdf875957d496c7d8a004766f8780d133358c060e91f6012a52f29c026c66043ad1237b3088187affffbe35a8802971c6e0708a0bc1ea5df0 SHA512 9e551c11b65ec6e4bae8228319d35f82592f9515b2d91015155a1cef92ccdd4b44823e40395a0f38cec2b8efadf5af94ee20f0ea30c6592456b03bfe356fa872
 MISC metadata.xml 543 BLAKE2B 6e61516bb251d76663ce79b5c55ba6b7ea8fc6c3b1f0bd9ba4524e7b61e9f79d271599395daaeafa90ff2a44ad6755bf1185aa29adc0462bf65d4bdc9129e502 SHA512 c8822ce8ddfec1223794ac415517f17e46b06eb19207a52457b5362076342364fb85cd1873c0b39642f65bc2640eb752fb793df1d26a66140dd8026f81b8ea90
diff --git a/app-text/apvlv/apvlv-0.4.0-r2.ebuild b/app-text/apvlv/apvlv-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..afd75022a0c5
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.4.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake desktop
+
+DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
+HOMEPAGE="https://github.com/naihe2010/apvlv/"
+SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug djvu"
+
+RDEPEND="
+	app-text/ebook-tools
+	>=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/webkit-gtk:4.1=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	djvu? ( app-text/djvu )
+"
+
+DEPEND="${RDEPEND}
+	app-text/ghostscript-gpl
+	media-libs/freetype
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-cxxflags.patch
+	"${FILESDIR}"/${P}-icon-r1.patch
+	# https://github.com/naihe2010/apvlv/commit/39f783103e99b954991183cea2b5ccbd9add2a1a
+	"${FILESDIR}"/${P}-webkitgtk4.1.patch
+)
+src_prepare() {
+	cmake_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DAPVLV_WITH_DJVU=$(usex djvu)
+		-DAPVLV_ENABLE_DEBUG=$(usex debug)
+		-DAPVLV_WITH_TXT=ON
+		-DDOCDIR="/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+src_install() {
+	cmake_src_install
+	# https://github.com/naihe2010/apvlv/issues/84
+	newicon -s 32 icons/pdf.png x-office-document.png
+}
diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch b/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch
new file mode 100644
index 000000000000..e5cb3526f318
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch
@@ -0,0 +1,10 @@
+--- a/apvlv.desktop
++++ b/apvlv.desktop
+@@ -2,6 +2,7 @@
+ Version=1.0
+ Type=Application
+ Name=apvlv
++Icon=x-office-document
+ Comment=A minimalistic document viewer
+ Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+ Comment[fr]=Un visionneur de document minimaliste
diff --git a/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch b/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch
new file mode 100644
index 000000000000..4501184d365c
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch
@@ -0,0 +1,45 @@
+From 39f783103e99b954991183cea2b5ccbd9add2a1a Mon Sep 17 00:00:00 2001
+From: Alberto Garcia <berto@igalia.com>
+Date: Wed, 16 Nov 2022 10:05:42 +0100
+Subject: [PATCH] Use the WebKitGTK 4.1 API builds when available
+
+These use soup3 instead of soup2 internally but the API is the same.
+---
+ src/CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 457f576..cd12d9b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -18,14 +18,20 @@ FIND_PACKAGE(PkgConfig)
+ PKG_CHECK_MODULES(FREETYPE2 freetype2 REQUIRED)
+ PKG_CHECK_MODULES(GTK gtk+-3.0)
+ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
+-PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED)
++PKG_CHECK_MODULES(LIBXML libxml-2.0 REQUIRED)
++PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.1)
++if (NOT WEBKIT_FOUND)
++  PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED)
++endif()
+ INCLUDE_DIRECTORIES(${FREETYPE2_INCLUDE_DIRS}
+         ${GTK_INCLUDE_DIRS}
+         ${GLIB2_INCLUDE_DIRS}
++        ${LIBXML_INCLUDE_DIRS}
+         ${WEBKIT_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${FREETYPE2_LIBRARY_DIRS}
+         ${GTK_LIBRARY_DIRS}
+         ${GLIB2_LIBRARY_DIRS}
++        ${LIBXML_LIBRARY_DIRS}
+         ${WEBKIT_LIBRARY_DIRS})
+ 
+ IF (WIN32)
+@@ -116,7 +122,7 @@ TARGET_LINK_LIBRARIES(apvlv
+         ${GTHREAD2_LIBRARIES}
+         ${WEBKIT_LIBRARIES}
+         "-lepub"
+-        "-lxml2"
++        ${LIBXML_LIBRARIES}
+         ${APVLV_REQ_LIBRARIES})
+ 
+ IF (WIN32)