gnome2.gtkglext: patch deprecated symbols

This commit is contained in:
Jan Tojnar 2018-04-15 15:03:21 +02:00
parent 3bea518b36
commit d4f97d5fed
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: { stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkglext-1.2.0"; name = "gtkglext-1.2.0";
@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ pangox_compat ]; propagatedBuildInputs = [ pangox_compat ];
patches = [ patches = [
# The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
# `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.
(fetchpatch {
name = "02_fix_gtk-2.20_deprecated_symbols.diff";
url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67;
sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08";
})
# Fix build with glibc ≥ 2.27 # Fix build with glibc ≥ 2.27
(fetchurl { (fetchurl {
url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff;
@ -20,8 +27,6 @@ stdenv.mkDerivation rec {
}) })
]; ];
CPPFLAGS = "-UGTK_DISABLE_DEPRECATED";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://projects.gnome.org/gtkglext/; homepage = https://projects.gnome.org/gtkglext/;
description = "GtkGLExt, an OpenGL extension to GTK+"; description = "GtkGLExt, an OpenGL extension to GTK+";