gentoo resync : 22.05.2021

4 files changed, 69 insertions, 5 deletions

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index cd6afebae4c5..2dcf2e977301 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,10 +1,12 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 AUX 40.0-avoid-changing-soname.patch 2136 BLAKE2B 3e9c25711ab9e5e83f3e9407fb03f8259c6bc035e384d1394319df987584cbd71dfe2970a503d0d7939ec4f7744bae498466a34512a35e1b4c1f2e783f621eaf SHA512 c723fce354f0a034f2ad4846d4b9f637f4985a03bdb7caef348328c74ab9488ef3d2f2204583248e35e0d8a27456b7327ac2e8e0ca14e0ab92e8db25e0197dda
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
+AUX 40.1-build-Fix-t1lib-detection.patch 1017 BLAKE2B fbb53e5c0a0da025b0410af62ae7251d369106c39c22ca5af58854c637a9f59119b96c63e0c76c64e918385f66ec37a9bda4808a2b3a5ddae5640d57e62304d7 SHA512 f77640a39fdc6c4e6aeea312380c0b922395b938557e04d718e29e55a6f0bd7cab8efc738668051f4f45183e68298911234bc35af82f0eb3d79e681ec20712c4
+AUX 40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch 1207 BLAKE2B ebcf5f7fe0419ce853c492699b97cc17b0df17c2d86f66ccadd4aef7e08e324a79d358a81c7148b73efc6a4788eeac128532665b9f8abb41a65908771c051219 SHA512 4816954209c20debecc6d6ca20650ac0bb06979d4b0e8d7fc63bda5445372f405fabc6accf44f0c62fad37070dada8cbb157f615e093f7ec894dccabf6069a4d
 DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
 DIST evince-40.0.tar.xz 2928668 BLAKE2B 852c532b595f50e849893670b536b5b8c25f0407a719cbe659faa3f72b51f43a0471c3df9197fa5bd11735c14e0779d8cf28a88cd79aabec4dffa797443b9819 SHA512 995693e4a6e1a3bb31e1d4f3538dc53519102a5a6afa58ba61454a1e2ca582df26bd368876210fce6fab8ff4e218305644fa7a7a88c99e1a1ca5bda8d8f1ece2
 DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
 EBUILD evince-3.36.10.ebuild 3083 BLAKE2B ff940dcedd304464ba5cb06451aa14a1c8943d45f616532e93eeca3b5f6399ff9f6949c676473646f9c4f5d863086dc1388800077022afde3497feb5bd09027e SHA512 58b7f5b0013c9fb6af17e9782dc5b9738412c5bb6c63e744ec66018e4a25dc5b997d5bd75b9e165b4df0f1eed781ea310a8005c1116e11b23f5abca5d92e01a9
 EBUILD evince-40.0.ebuild 3281 BLAKE2B 5fee649a184d6340a05f80503d4737f5a4b58f6aed88b805324a988c4bba0177a909a42fcc0d6f8cc8f6f488edbd2f75f43909968a343de60e6b2f02158ec2ef SHA512 9d2a0a6eba4cfb68a07d5ccfcac21dceb42799fc3b921f67358685d5d86b1281d68615ca820993b5d9567c4111e9befd55d03e06007f4b09e59ffcd65dd292fa
-EBUILD evince-40.1.ebuild 3237 BLAKE2B 7d9d95e411fadc2e13e198e70570ebad650ab1d8de08de3845cb733398a47d95235b6ef0b0fd237e0358e3b253565f6bd239917134e5e047120a2edb4ac4bd61 SHA512 cfd61d25977419401c8599b1fbefab1f233e7cebc06e990053fedcd93884f2151385598b8e29676884c35d1b5314a052700389d1c120e843e904934a91354fab
+EBUILD evince-40.1-r1.ebuild 3249 BLAKE2B b1e36874d8b377115f3cd47ba7637a0b23a67a7fc1b6f891ed7eaa99b791ca9f83284eb03928f06148be973f1998ff753955329aac3b8116c5bb18292e9272d8 SHA512 13ad543727c48e37a5601df1f039c677f47cf88be0fa3b0346c8878c5ac08eff4f2667c8a590f1e3362cd2a7af43fc2ecbad23e87d17aa2b94c10520ddec6e92
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-40.1.ebuild b/app-text/evince/evince-40.1-r1.ebuild
index 05e5b8fd667b..34dc2484fd95 100644
--- a/app-text/evince/evince-40.1.ebuild
+++ b/app-text/evince/evince-40.1-r1.ebuild
@@ -66,6 +66,8 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PV}-build-Fix-t1lib-detection.patch
+	"${FILESDIR}"/${PV}-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
 	"${FILESDIR}"/40.0-internal-synctex.patch
 )
 
@@ -75,9 +77,6 @@ src_prepare() {
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859
 	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
 	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-
-	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
-	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
 }
 
 src_configure() {
@@ -85,7 +84,7 @@ src_configure() {
 		-Dplatform=gnome
 
 		-Dviewer=true
-		-Dpreviewer=false
+		-Dpreviewer=true
 		-Dthumbnailer=true
 		$(meson_use nsplugin browser_plugin)
 		$(meson_use nautilus)
diff --git a/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch b/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch
new file mode 100644
index 000000000000..5e46649e2536
--- /dev/null
+++ b/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch
@@ -0,0 +1,30 @@
+From bb3c826f134c47c505ad4fd93b1c97f67da5350c Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 12 Apr 2021 23:47:14 -0400
+Subject: [PATCH] build: Fix t1lib detection
+
+Without this, Meson always fails to detect t1lib. Autotools looked for
+the correct function name. See the check at the time of removal in
+commit b27189bb ("build: Remove autotools")
+
+Fixes: d69158ec ("build: Port to Meson build system")
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index abee124d..0d7fd4d4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -365,7 +365,7 @@ if enable_dvi
+   endforeach
+ 
+   t1_dep = cc.find_library('t1', required: get_option('t1lib'))
+-  enable_t1lib = t1_dep.found() and cc.has_function('T1_initLib', dependencies: t1_dep)
++  enable_t1lib = t1_dep.found() and cc.has_function('T1_InitLib', dependencies: t1_dep)
+   config_h.set('WITH_TYPE1_FONTS', enable_t1lib)
+ 
+   backends += {'dvi': mime_types_list.get('dvi')}
+-- 
+2.26.3
+
diff --git a/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch b/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
new file mode 100644
index 000000000000..bfc650947d44
--- /dev/null
+++ b/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
@@ -0,0 +1,33 @@
+From 4a94fad803f5041b44477f0a2933cb447d81d82f Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 14 Apr 2021 02:15:40 +0000
+Subject: [PATCH] previewer: Fix build regression when gtk_unix_print is
+ disabled
+
+Restore guard around ev_previewer_window_print because
+that function requires GTKUNIXPRINT_ENABLED, without the
+guard, makes the gtk_unix_print unusable.
+
+In the commit 65bfd21c ("previewer: Use GtkHeaderBar in print preview"), the GTKUNIXPRINT_ENABLED preprocessor guard around
+the usage of ev_previewer_window_print was lost.
+---
+ previewer/ev-previewer-window.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
+index 6678aa75..7d3bd394 100644
+--- a/previewer/ev-previewer-window.c
++++ b/previewer/ev-previewer-window.c
+@@ -263,7 +263,9 @@ ev_previewer_window_print (GSimpleAction *action,
+ #endif
+ 
+ static const GActionEntry actions[] = {
++#if GTKUNIXPRINT_ENABLED
+ 	{ "print", ev_previewer_window_print },
++#endif
+ 	{ "go-previous-page", ev_previewer_window_previous_page },
+ 	{ "go-next-page", ev_previewer_window_next_page },
+ 	{ "select-page", ev_previewer_window_focus_page_selector },
+-- 
+2.26.3
+