gentoo resync : 30.09.2020

3 files changed, 193 insertions, 5 deletions

diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 8153147e2d7d..2df3a68cc6fb 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,6 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
+AUX gtkglext-1.2.0-no-pangox.patch 5636 BLAKE2B 3c871cb2c37199d10cce761be9658090b630fa4b83bded75db4210f65986f70cc9f7eb4f2689d48f0a6c3d6ca79167532fedaee2baf0022545c8b0a8ba458987 SHA512 ccec3aae5a577cec6fdb7146af4faaa54afd9830942f83c400d7d083d2e53a1f684624d70590a53cc0e54d6fd1de90f13d7926fdee03b49bbec5f365f05214ee
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1533 BLAKE2B 824e5814537b06fff7d44d0068448b00af03a043ccc1e58933193d8086178a7a1c060f64bdf3f2aafa8b0810dc2bd4bb5e36bd8cf3b1384d90be877a82c45a9c SHA512 f3909ca1c5cb2f8ad1623eea9ede9e025f5c19fc207bbedef888041b751fbe1e61cc1b17e9b1a0c8314fc1061022e1b7e73d3cbcf00b00eb49145a4c17a59c63
+EBUILD gtkglext-1.2.0-r5.ebuild 1617 BLAKE2B 46c83bb703b76e40389c64634234dc606f3bf4960583fa6dcc3d80b113869b4281f81c2ac3a3b8947baec16f52d768da927be0db4c8054990e69a94fdff6ea45 SHA512 dcb297a87c4bc7b79df57692d2709d058d779642fc9ae406709204eb3ea2d2cf1c6395d15fe240e40365d8f9fcf9e2dee379bf504d2ccea07eaac77ce17323ff
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
new file mode 100644
index 000000000000..1a0799959be6
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
@@ -0,0 +1,184 @@
+diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
+--- gtkglext-1.2.0/configure.in.nopangox	2006-02-04 22:17:19.000000000 -0500
++++ gtkglext-1.2.0/configure.in	2020-07-13 15:52:42.616448758 -0400
+@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2
+ m4_define([pango_pkg], [pango])
+ m4_define([pango_required_version], [1.0.0])
+ 
+-# Pangox
+-m4_define([pangox_pkg], [pangox])
+-m4_define([pangox_required_version], [1.0.0])
+-
+ # PangoFT2
+ m4_define([pangoft2_pkg], [pangoft2])
+ m4_define([pangoft2_required_version], [1.0.0])
+@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [
+ gtk_pkg >= gtk_required_version \
+ gdk_pkg >= gdk_required_version \
+ pango_pkg >= pango_required_version \
+-pangox_pkg >= pangox_required_version \
+ gmodule_pkg >= gmodule_required_version \
+ ])
+ 
+@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+diff -up gtkglext-1.2.0/configure.nopangox gtkglext-1.2.0/configure
+--- gtkglext-1.2.0/configure.nopangox	2006-02-04 22:17:47.000000000 -0500
++++ gtkglext-1.2.0/configure	2020-07-13 15:52:42.619448711 -0400
+@@ -19880,14 +19880,12 @@ if test -n "$PKG_CONFIG"; then
+ gtk+-2.0 >= 2.0.0 \\
+ gdk-2.0 >= 2.0.0 \\
+ pango >= 1.0.0 \\
+-pangox >= 1.0.0 \\
+ gmodule-2.0 >= 2.0.0 \\
+ \"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ") 2>&5
+   ac_status=$?
+@@ -19897,7 +19895,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " 2>/dev/null`
+ else
+@@ -19916,14 +19913,12 @@ if test -n "$PKG_CONFIG"; then
+ gtk+-2.0 >= 2.0.0 \\
+ gdk-2.0 >= 2.0.0 \\
+ pango >= 1.0.0 \\
+-pangox >= 1.0.0 \\
+ gmodule-2.0 >= 2.0.0 \\
+ \"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ") 2>&5
+   ac_status=$?
+@@ -19933,7 +19928,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " 2>/dev/null`
+ else
+@@ -19958,7 +19952,6 @@ fi
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+         else
+@@ -19966,7 +19959,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+         fi
+@@ -19977,7 +19969,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) were not met:
+ 
+@@ -19994,7 +19985,6 @@ echo "$as_me: error: Package requirement
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) were not met:
+ 
+@@ -25420,7 +25410,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
++GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c
+--- gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox	2004-02-20 04:38:14.000000000 -0500
++++ gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c	2020-07-13 15:55:19.720973082 -0400
+@@ -18,7 +18,8 @@
+ 
+ #include <string.h>
+ 
+-#include <pango/pangox.h>
++//#include <pango/pangox.h>
++#include <pango/pangocairo.h>
+ 
+ #include "gdkglx.h"
+ #include "gdkglprivate-x11.h"
+@@ -77,9 +78,9 @@ gdk_gl_font_use_pango_font_common (Pango
+ {
+   PangoFont *font = NULL;
+   gchar *charset = NULL;
+-  PangoXSubfont subfont_id;
++  //PangoXSubfont subfont_id;
+   gchar *xlfd = NULL;
+-  PangoXFontCache *font_cache;
++  //PangoXFontCache *font_cache;
+   XFontStruct *fs;
+ 
+   GDK_GL_NOTE_FUNC_PRIVATE ();
+@@ -91,6 +92,7 @@ gdk_gl_font_use_pango_font_common (Pango
+       goto FAIL;
+     }
+ 
++  /*
+   charset = gdk_gl_font_charset_for_locale ();
+   if (!pango_x_find_first_subfont (font, &charset, 1, &subfont_id))
+     {
+@@ -114,6 +116,7 @@ gdk_gl_font_use_pango_font_common (Pango
+   glXUseXFont (fs->fid, first, count, list_base);
+ 
+   pango_x_font_cache_unload (font_cache, fs);
++  */
+ 
+  FAIL:
+ 
+@@ -149,11 +152,7 @@ gdk_gl_font_use_pango_font (const PangoF
+ 
+   GDK_GL_NOTE_FUNC ();
+ 
+-#ifdef GDKGLEXT_MULTIHEAD_SUPPORT
+-  font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+-#else  /* GDKGLEXT_MULTIHEAD_SUPPORT */
+-  font_map = pango_x_font_map_for_display (gdk_x11_get_default_xdisplay ());
+-#endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
++  font_map = pango_cairo_font_map_get_default ();
+ 
+   return gdk_gl_font_use_pango_font_common (font_map, font_desc,
+                                             first, count, list_base);
+@@ -187,7 +186,7 @@ gdk_gl_font_use_pango_font_for_display (
+ 
+   GDK_GL_NOTE_FUNC ();
+ 
+-  font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (display));
++  font_map = pango_cairo_font_map_get_default ();
+ 
+   return gdk_gl_font_use_pango_font_common (font_map, font_desc,
+                                             first, count, list_base);
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild
index b8b0a33c60ab..ff4f55ef3255 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit autotools gnome2 multilib-minimal
 
 DESCRIPTION="GL extensions for Gtk+ 2.0"
@@ -10,14 +11,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
@@ -35,7 +35,10 @@ src_prepare() {
 
 	# Ancient configure.in with broken multilib gl detection (bug #543050)
 	# Backport some configure updates from upstream git master to fix
-	eapply "${FILESDIR}/${P}-gl-configure.patch"
+	eapply "${FILESDIR}"/${P}-gl-configure.patch
+
+	# Drop pangox-compat dep with patch from Fedora, bugs #698950, #706344
+	eapply "${FILESDIR}"/${P}-no-pangox.patch
 
 	mv configure.{in,ac} || die "mv failed"
 	eautoreconf
@@ -54,6 +57,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	local DOCS="AUTHORS ChangeLog* NEWS README TODO"
+	local DOCS=( AUTHORS ChangeLog{,.pre-1-0} NEWS README TODO )
 	einstalldocs
 }