mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 13:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/gtkglext: fix build break by modifying local variable name conflict

Browse Source
This commit is contained in:
Mike Sullivan 2018-05-11 19:34:13 +00:00 committed by Natanael Copa
parent 270c161fba
commit 7151ceb892
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/gtkglext/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=gtkglext pkgname=gtkglext
pkgver=1.2.0 pkgver=1.2.0
pkgrel=11 pkgrel=12
pkgdesc="GTK+ OpenGL Extension" pkgdesc="GTK+ OpenGL Extension"
url="https://projects.gnome.org/gtkglext/" url="https://projects.gnome.org/gtkglext/"
arch="all" arch="all"
@ -14,6 +14,7 @@ makedepends="$depends_dev"
install= install=
subpackages="$pkgname-dev $pkgname-doc" subpackages="$pkgname-dev $pkgname-doc"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
gtkglext-local-parm.patch
gtkglext-deprecated.patch" gtkglext-deprecated.patch"
_builddir="$srcdir/$pkgname-$pkgver" _builddir="$srcdir/$pkgname-$pkgver"
@ -44,4 +45,5 @@ package() {
} }
sha512sums="464203531698703d47dfb0746663f10c889f48542dd5d7a6e3dd6c6a197de4089628e2d39601d3ccbe3436ee396260eaa1f09220ecf04ba12891939209a7dc50 gtkglext-1.2.0.tar.gz sha512sums="464203531698703d47dfb0746663f10c889f48542dd5d7a6e3dd6c6a197de4089628e2d39601d3ccbe3436ee396260eaa1f09220ecf04ba12891939209a7dc50 gtkglext-1.2.0.tar.gz
da398ad6782c540f3494f5bebb566e338a0a7ccb171453b1b9f9dc2e387d965f73cfd4ead8b63ab6a009e150e20f76f0b2ddc3636a8af241fa1a0aadeb650d67 gtkglext-local-parm.patch
bca7526f014a1ebd1453fd295a02f43e29729232e732ade8e361d718e3005433a112ca5367a366ebd31c4d52cf8aa6c360fe3e315b85182e7fe5185dd163618f gtkglext-deprecated.patch" bca7526f014a1ebd1453fd295a02f43e29729232e732ade8e361d718e3005433a112ca5367a366ebd31c4d52cf8aa6c360fe3e315b85182e7fe5185dd163618f gtkglext-deprecated.patch"

20
main/gtkglext/gtkglext-local-parm.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/gdk/gdkglshapes.c
+++ b/gdk/gdkglshapes.c
@@ -544,7 +544,7 @@
{-Z, -X, 0}
};
-static int index[20][3] =
+static int loc_index[20][3] =
{
{0, 4, 1},
{0, 9, 4},
@@ -574,7 +574,7 @@
int i;
for (i = 19; i >= 0; i--) {
- drawtriangle(i, idata, index, shadeType);
+ drawtriangle(i, idata, loc_index, shadeType);
}
}