Merge pull request #8058 from Rmys/master

gtkglext rebuild
This commit is contained in:
Rmys
2020-03-06 19:24:23 +03:00
committed by GitHub
2 changed files with 43 additions and 0 deletions
@@ -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
+9
View File
@@ -14,6 +14,7 @@
<Description>GtkGLExt is an OpenGL extension to GTK+ 2.0 or later</Description>
<Archive sha1sum="d84c9472af3438fbce84189613e5370b97d9d1e7" type="tarbz2">mirrors://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>python3-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>freeglut-devel</Dependency>
<Dependency>mesa-devel</Dependency>
@@ -32,6 +33,7 @@
<Patch>support-pango.diff</Patch>
<Patch level="1">01_fix_fontcache_nullderef.dpatch</Patch>
<Patch level="1">gtkglext-1.2.0-bz677457.diff</Patch>
<Patch level="1">gtkglext-gcc8.patch</Patch>
</Patches>
</Source>
@@ -79,6 +81,13 @@
</Package>
<History>
<Update release="3">
<Date>2020-03-06</Date>
<Version>1.2.0</Version>
<Comment>Rebuild New T.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2018-09-07</Date>
<Version>1.2.0</Version>