From 263713fa27e11597789ebee1b43fc14c9248402b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 23 Jul 2020 09:30:19 +0200 Subject: [PATCH] patch out pangox support to get this building again. --- gtkglext-1.2.0-no-pangox.patch | 184 +++++++++++++++++++++++++++++++++ gtkglext.spec | 10 +- 2 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 gtkglext-1.2.0-no-pangox.patch diff --git a/gtkglext-1.2.0-no-pangox.patch b/gtkglext-1.2.0-no-pangox.patch new file mode 100644 index 0000000..1a07999 --- /dev/null +++ b/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 + +-#include ++//#include ++#include + + #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/gtkglext.spec b/gtkglext.spec index e7979df..09e4495 100644 --- a/gtkglext.spec +++ b/gtkglext.spec @@ -3,7 +3,7 @@ Summary: OpenGL Extension to GTK Name: gtkglext Version: 1.2.0 -Release: 36%{?dist} +Release: 37%{?dist} License: LGPLv2+ or GPLv2+ URL: http://gtkglext.sourceforge.net/ @@ -11,6 +11,8 @@ Source0: ftp://ftp.gnome.org/pub/gnome/sources/gtkglext/1.2/gtkglext-%{version}. # Upstream changes, addressing BZ 677457 Patch0: 0001-gtkglext-1.2.0-bz677457.patch Patch1: 0002-GCC-8-fixes.patch +# HACK: Disable pangox features +Patch2: gtkglext-1.2.0-no-pangox.patch BuildRequires: gcc BuildRequires: gtk2-devel @@ -20,7 +22,7 @@ BuildRequires: libGL-devel BuildRequires: libXmu-devel # The configure script checks for X11/Intrinsic.h BuildRequires: libXt-devel -BuildRequires: pangox-compat-devel +# BuildRequires: pangox-compat-devel Requires(postun): /sbin/ldconfig Requires(post): /sbin/ldconfig @@ -57,6 +59,7 @@ and developer docs for GtkGLExt. %setup -q -n gtkglext-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .nopangox %build %configure --disable-gtk-doc --disable-static @@ -90,6 +93,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %doc %{_datadir}/gtk-doc/html/* %changelog +* Mon Jul 13 2020 Tom Callaway - 1.2.0-37 +- patch out pangox support to get this building again. + * Wed Jan 29 2020 Fedora Release Engineering - 1.2.0-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild