rpms
/
gtkglext
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BR: gcc.

Browse Source 
Add 0002-GCC-8-fixes.patch (Fix F28FTBFS).
Rebase patches.
Modernize spec.
epel9
Ralf Corsépius 7 years ago
parent 3182cb5b7e
commit 03e6580923
4 changed files with 71 additions and 1914 deletions
Show Stats Download Patch File Download Diff File

41
gtkglext-1.2.0-bz677457.diff → 0001-gtkglext-1.2.0-bz677457.patch
Unescape View File

@ -1,6 +1,16 @@
diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c From 9511ba9c3772c2415ae6501f6d977bc4ba057c55 Mon Sep 17 00:00:00 2001
--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 10:38:36.000000000 +0100 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
+++ gtkglext-1.2.0/gtk/gtkglwidget.c 2011-02-16 19:06:48.383730534 +0100 Date: Thu, 15 Mar 2018 15:50:29 +0100
Subject: [PATCH 1/2] gtkglext-1.2.0-bz677457
---
gtk/gtkglwidget.c | 48 ++++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
index ecb41ef..7381739 100644
--- a/gtk/gtkglwidget.c
+++ b/gtk/gtkglwidget.c
@@ -16,7 +16,9 @@ @@ -16,7 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/ */
@ -12,7 +22,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
#include "gtkglprivate.h" #include "gtkglprivate.h"
#include "gtkglwidget.h" #include "gtkglwidget.h"
@@ -68,6 +70,7 @@ @@ -68,6 +70,7 @@ static void
gtk_gl_widget_realize (GtkWidget *widget, gtk_gl_widget_realize (GtkWidget *widget,
GLWidgetPrivate *private) GLWidgetPrivate *private)
{ {
@ -20,7 +30,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
GdkGLWindow *glwindow; GdkGLWindow *glwindow;
GTK_GL_NOTE_FUNC_PRIVATE (); GTK_GL_NOTE_FUNC_PRIVATE ();
@@ -77,9 +80,10 @@ @@ -77,9 +80,10 @@ gtk_gl_widget_realize (GtkWidget *widget,
* handlers. * handlers.
*/ */
@ -33,7 +43,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
private->glconfig, private->glconfig,
NULL); NULL);
if (glwindow == NULL) if (glwindow == NULL)
@@ -127,9 +131,9 @@ @@ -127,9 +131,9 @@ gtk_gl_widget_size_allocate (GtkWidget *widget,
* Synchronize OpenGL and window resizing request streams. * Synchronize OpenGL and window resizing request streams.
*/ */
@ -45,7 +55,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
gdk_gl_drawable_wait_gdk (gldrawable); gdk_gl_drawable_wait_gdk (gldrawable);
} }
} }
@@ -146,7 +150,7 @@ @@ -146,7 +150,7 @@ gtk_gl_widget_unrealize (GtkWidget *widget,
if (private->glcontext != NULL) if (private->glcontext != NULL)
{ {
@ -54,7 +64,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
private->glcontext = NULL; private->glcontext = NULL;
} }
@@ -154,8 +158,8 @@ @@ -154,8 +158,8 @@ gtk_gl_widget_unrealize (GtkWidget *widget,
* Remove OpenGL-capability from widget->window. * Remove OpenGL-capability from widget->window.
*/ */
@ -65,7 +75,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
private->is_realized = FALSE; private->is_realized = FALSE;
} }
@@ -174,7 +178,7 @@ @@ -174,7 +178,7 @@ gtk_gl_widget_parent_set (GtkWidget *widget,
*/ */
toplevel = gtk_widget_get_toplevel (widget); toplevel = gtk_widget_get_toplevel (widget);
@ -74,7 +84,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
{ {
GTK_GL_NOTE (MISC, GTK_GL_NOTE (MISC,
g_message (" - Install colormap to the top-level window.")); g_message (" - Install colormap to the top-level window."));
@@ -188,23 +192,27 @@ @@ -188,23 +192,27 @@ gtk_gl_widget_style_set (GtkWidget *widget,
GtkStyle *previous_style, GtkStyle *previous_style,
gpointer user_data) gpointer user_data)
{ {
@ -106,7 +116,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
} }
} }
@@ -250,8 +258,8 @@ @@ -250,8 +258,8 @@ gtk_widget_set_gl_capability (GtkWidget *widget,
GTK_GL_NOTE_FUNC (); GTK_GL_NOTE_FUNC ();
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
@ -117,7 +127,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
/* /*
@@ -432,9 +440,9 @@ @@ -432,9 +440,9 @@ gtk_widget_create_gl_context (GtkWidget *widget,
GTK_GL_NOTE_FUNC (); GTK_GL_NOTE_FUNC ();
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
@ -129,7 +139,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
if (gldrawable == NULL) if (gldrawable == NULL)
return NULL; return NULL;
@@ -474,7 +482,7 @@ @@ -474,7 +482,7 @@ gtk_widget_get_gl_context (GtkWidget *widget)
GLWidgetPrivate *private; GLWidgetPrivate *private;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
@ -138,7 +148,7 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
if (private == NULL) if (private == NULL)
@@ -501,7 +509,7 @@ @@ -501,7 +509,7 @@ GdkGLWindow *
gtk_widget_get_gl_window (GtkWidget *widget) gtk_widget_get_gl_window (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
@ -148,3 +158,6 @@ diff -Naur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.
- return gdk_window_get_gl_window (widget->window); - return gdk_window_get_gl_window (widget->window);
+ return gdk_window_get_gl_window (gtk_widget_get_window (widget)); + return gdk_window_get_gl_window (gtk_widget_get_window (widget));
} }
--
2.14.3

34
0002-GCC-8-fixes.patch
Unescape View File

@ -0,0 +1,34 @@
From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Thu, 15 Mar 2018 15:56:20 +0100
Subject: [PATCH 2/2] GCC-8 fixes.
---
gdk/gdkglshapes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
index f72abba..9d1197f 100644
--- a/gdk/gdkglshapes.c
+++ b/gdk/gdkglshapes.c
@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
{-Z, -X, 0}
};
-static int index[20][3] =
+static int iindex[20][3] =
{
{0, 4, 1},
{0, 9, 4},
@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
int i;
for (i = 19; i >= 0; i--) {
- drawtriangle(i, idata, index, shadeType);
+ drawtriangle(i, idata, iindex, shadeType);
}
}
--
2.14.3

1893
gtkglext-1.2.0-config.diff
View File

File diff suppressed because it is too large Load Diff

17
gtkglext.spec
Unescape View File

@ -3,17 +3,16 @@
Summary: OpenGL Extension to GTK Summary: OpenGL Extension to GTK
Name: gtkglext Name: gtkglext
Version: 1.2.0 Version: 1.2.0
Release: 31%{?dist} Release: 32%{?dist}
License: LGPLv2+ or GPLv2+ License: LGPLv2+ or GPLv2+
Group: System Environment/Libraries
URL: http://gtkglext.sourceforge.net/ URL: http://gtkglext.sourceforge.net/
Source0: ftp://ftp.gnome.org/pub/gnome/sources/gtkglext/1.2/gtkglext-%{version}.tar.bz2 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gtkglext/1.2/gtkglext-%{version}.tar.bz2
# Upstream changes, addressing BZ 677457 # Upstream changes, addressing BZ 677457
Patch0: gtkglext-1.2.0-bz677457.diff Patch0: 0001-gtkglext-1.2.0-bz677457.patch
# config.{sub,guess} from automake-1.13.4, addressing BZ 925512 Patch1: 0002-GCC-8-fixes.patch
Patch1: gtkglext-1.2.0-config.diff
BuildRequires: gcc
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: libGLU-devel BuildRequires: libGLU-devel
BuildRequires: libGL-devel BuildRequires: libGL-devel
@ -33,7 +32,6 @@ make GTK+ widgets OpenGL-capable.
%package libs %package libs
Summary: OpenGL Extension to GTK Summary: OpenGL Extension to GTK
Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
%description libs %description libs
@ -43,7 +41,6 @@ make GTK+ widgets OpenGL-capable.
%package devel %package devel
Summary: Development tools for GTK-based OpenGL applications Summary: Development tools for GTK-based OpenGL applications
Group: Development/Libraries
License: LGPLv2+ License: LGPLv2+
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -93,6 +90,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%doc %{_datadir}/gtk-doc/html/* %doc %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Thu Mar 15 2018 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.2.0-32
- BR: gcc-c.
- Add 0002-GCC-8-fixes.patch (Fix F28FTBFS).
- Rebase patches.
- Modernize spec.
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-31 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Write Preview
Loading…
Cancel
Save