From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AD9715814C for ; Sat, 7 Oct 2023 22:20:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67BFE2BC017; Sat, 7 Oct 2023 22:20:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FA292BC017 for ; Sat, 7 Oct 2023 22:20:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A951335C67 for ; Sat, 7 Oct 2023 22:20:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B1BA931 for ; Sat, 7 Oct 2023 22:20:28 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1696717180.fc20ff50946d9d2ee544d86de5edcbac9ed43b80.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/files/, x11-libs/gtkglext/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild X-VCS-Directories: x11-libs/gtkglext/files/ x11-libs/gtkglext/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: fc20ff50946d9d2ee544d86de5edcbac9ed43b80 X-VCS-Branch: master Date: Sat, 7 Oct 2023 22:20:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dc887e37-e3d7-4f6b-b1d4-3ddf999d99b5 X-Archives-Hash: 68a8fc57ac61a85355504528f62aa4e9 commit: fc20ff50946d9d2ee544d86de5edcbac9ed43b80 Author: David Seifert gentoo org> AuthorDate: Sat Oct 7 22:19:40 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Oct 7 22:19:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc20ff50 x11-libs/gtkglext: update EAPI 6 -> 8 Signed-off-by: David Seifert gentoo.org> .../gtkglext/files/gtkglext-1.2.0-no-pangox.patch | 118 +++------------------ ...xt-1.2.0-r5.ebuild => gtkglext-1.2.0-r6.ebuild} | 30 +++--- 2 files changed, 25 insertions(+), 123 deletions(-) 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 index 1a0799959be6..f1d282d6cde5 100644 --- a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch +++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch @@ -1,7 +1,6 @@ -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 +--- a/configure.in ++++ b/configure.in +@@ -59,10 +59,6 @@ m4_define([pango_pkg], [pango]) m4_define([pango_required_version], [1.0.0]) @@ -12,7 +11,7 @@ diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in # PangoFT2 m4_define([pangoft2_pkg], [pangoft2]) m4_define([pangoft2_required_version], [1.0.0]) -@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [ +@@ -350,7 +346,6 @@ gtk_pkg >= gtk_required_version \ gdk_pkg >= gdk_required_version \ pango_pkg >= pango_required_version \ @@ -20,108 +19,17 @@ diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in gmodule_pkg >= gmodule_required_version \ ]) -@@ -794,7 +789,7 @@ LIBS="$save_LIBS" +@@ -570,7 +565,7 @@ # 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_EXTRA_LIBS="$GL_LIBS $GLU_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 +--- a/gdk/x11/gdkglfont-x11.c ++++ b/gdk/x11/gdkglfont-x11.c @@ -18,7 +18,8 @@ #include @@ -132,7 +40,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/ #include "gdkglx.h" #include "gdkglprivate-x11.h" -@@ -77,9 +78,9 @@ gdk_gl_font_use_pango_font_common (Pango +@@ -77,9 +78,9 @@ { PangoFont *font = NULL; gchar *charset = NULL; @@ -144,7 +52,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/ XFontStruct *fs; GDK_GL_NOTE_FUNC_PRIVATE (); -@@ -91,6 +92,7 @@ gdk_gl_font_use_pango_font_common (Pango +@@ -91,6 +92,7 @@ goto FAIL; } @@ -152,7 +60,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/ 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 +@@ -114,6 +116,7 @@ glXUseXFont (fs->fid, first, count, list_base); pango_x_font_cache_unload (font_cache, fs); @@ -160,7 +68,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/ FAIL: -@@ -149,11 +152,7 @@ gdk_gl_font_use_pango_font (const PangoF +@@ -149,11 +152,7 @@ GDK_GL_NOTE_FUNC (); @@ -173,7 +81,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/ 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 ( +@@ -187,7 +186,7 @@ GDK_GL_NOTE_FUNC (); diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild similarity index 75% rename from x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild rename to x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild index ff4f55ef3255..ab2a5140f426 100644 --- a/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild +++ b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools gnome2 multilib-minimal +GNOME2_EAUTORECONF=yes +inherit gnome2 multilib-minimal DESCRIPTION="GL extensions for Gtk+ 2.0" HOMEPAGE="http://gtkglext.sourceforge.net/" @@ -12,7 +13,6 @@ 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" -IUSE="" RDEPEND=" >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] @@ -23,33 +23,27 @@ RDEPEND=" >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils >=sys-devel/autoconf-archive-2014.02.28 virtual/pkgconfig " -src_prepare() { +PATCHES=( # Fix build issues with gcc patch from Fedora, bug #649718 - eapply "${FILESDIR}"/${P}-gcc8-fixes.patch + "${FILESDIR}"/${P}-gcc8-fixes.patch # 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 + "${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 - - gnome2_src_prepare -} + "${FILESDIR}"/${P}-no-pangox.patch +) multilib_src_configure() { - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static + ECONF_SOURCE="${S}" gnome2_src_configure } multilib_src_install() {