mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
gnome2.gtkglextmm: drop
This commit is contained in:
parent
2ff2b89fdf
commit
8a0f255cda
@ -68,8 +68,6 @@ let overridden = set // overrides; set = with overridden; {
|
|||||||
|
|
||||||
gtkglext = callPackage ./platform/gtkglext { };
|
gtkglext = callPackage ./platform/gtkglext { };
|
||||||
|
|
||||||
gtkglextmm = callPackage ./platform/gtkglextmm { };
|
|
||||||
|
|
||||||
#### DESKTOP
|
#### DESKTOP
|
||||||
|
|
||||||
gvfs = gvfs.override { gnome = self; };
|
gvfs = gvfs.override { gnome = self; };
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf
|
|
||||||
, pangox_compat, libXmu
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "gtkglextmm-${minVer}.0";
|
|
||||||
minVer = "1.2";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
|
|
||||||
sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./gdk.patch
|
|
||||||
|
|
||||||
# From debian, fixes build with newer gtk "[...] by switching #includes
|
|
||||||
# around so that the G_DISABLE_DEPRECATED trick in glibmm still works".
|
|
||||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356
|
|
||||||
./fix_ftbfs_gtk_2_36.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [ pangox_compat libXmu ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [pkgconfig];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "C++ wrappers for GtkGLExt";
|
|
||||||
license = stdenv.lib.licenses.lgpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
broken = true;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,121 +0,0 @@
|
|||||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
|
|
||||||
===================================================================
|
|
||||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200
|
|
||||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200
|
|
||||||
@@ -1,15 +1,8 @@
|
|
||||||
-
|
|
||||||
-#include <glib.h>
|
|
||||||
-
|
|
||||||
// Disable the 'const' function attribute of the get_type() functions.
|
|
||||||
// GCC would optimize them out because we don't use the return value.
|
|
||||||
#undef G_GNUC_CONST
|
|
||||||
#define G_GNUC_CONST /* empty */
|
|
||||||
|
|
||||||
-#include <gdkmm/gl/wrap_init.h>
|
|
||||||
-#include <glibmm/error.h>
|
|
||||||
-#include <glibmm/object.h>
|
|
||||||
-
|
|
||||||
// #include the widget headers so that we can call the get_type() static methods:
|
|
||||||
|
|
||||||
#include "tokens.h"
|
|
||||||
@@ -19,6 +12,12 @@
|
|
||||||
#include "pixmap.h"
|
|
||||||
#include "window.h"
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
+
|
|
||||||
+#include <gdkmm/gl/wrap_init.h>
|
|
||||||
+#include <glibmm/error.h>
|
|
||||||
+#include <glibmm/object.h>
|
|
||||||
+
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
|
|
||||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
|
|
||||||
===================================================================
|
|
||||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200
|
|
||||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200
|
|
||||||
@@ -17,10 +17,10 @@
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include <gdk/gdkglquery.h>
|
|
||||||
-
|
|
||||||
#include "query.h"
|
|
||||||
|
|
||||||
+#include <gdk/gdkglquery.h>
|
|
||||||
+
|
|
||||||
namespace Gdk
|
|
||||||
{
|
|
||||||
namespace GL
|
|
||||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
|
|
||||||
===================================================================
|
|
||||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200
|
|
||||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200
|
|
||||||
@@ -17,11 +17,11 @@
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include "pixmapext.h"
|
|
||||||
+
|
|
||||||
#include <gdk/gdkgldrawable.h>
|
|
||||||
#include <gdk/gdkglpixmap.h>
|
|
||||||
|
|
||||||
-#include "pixmapext.h"
|
|
||||||
-
|
|
||||||
namespace Gdk
|
|
||||||
{
|
|
||||||
namespace GL
|
|
||||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
|
|
||||||
===================================================================
|
|
||||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200
|
|
||||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200
|
|
||||||
@@ -17,11 +17,11 @@
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include "windowext.h"
|
|
||||||
+
|
|
||||||
#include <gdk/gdkgldrawable.h>
|
|
||||||
#include <gdk/gdkglwindow.h>
|
|
||||||
|
|
||||||
-#include "windowext.h"
|
|
||||||
-
|
|
||||||
namespace Gdk
|
|
||||||
{
|
|
||||||
namespace GL
|
|
||||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
|
|
||||||
===================================================================
|
|
||||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200
|
|
||||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200
|
|
||||||
@@ -17,10 +17,10 @@
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include <gdk/gdkglfont.h>
|
|
||||||
-
|
|
||||||
#include "font.h"
|
|
||||||
|
|
||||||
+#include <gdk/gdkglfont.h>
|
|
||||||
+
|
|
||||||
namespace Gdk
|
|
||||||
{
|
|
||||||
namespace GL
|
|
||||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
|
|
||||||
===================================================================
|
|
||||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100
|
|
||||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200
|
|
||||||
@@ -19,11 +19,11 @@
|
|
||||||
|
|
||||||
#include <cstdlib>
|
|
||||||
|
|
||||||
-#include <gdk/gdkglinit.h>
|
|
||||||
-
|
|
||||||
#include "wrap_init.h"
|
|
||||||
#include "init.h"
|
|
||||||
|
|
||||||
+#include <gdk/gdkglinit.h>
|
|
||||||
+
|
|
||||||
namespace Gdk
|
|
||||||
{
|
|
||||||
namespace GL
|
|
@ -1,15 +0,0 @@
|
|||||||
# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976
|
|
||||||
# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html
|
|
||||||
--- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300
|
|
||||||
+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300
|
|
||||||
@@ -17,9 +17,8 @@
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include <gtk/gtkglwidget.h>
|
|
||||||
-
|
|
||||||
#include "widget.h"
|
|
||||||
+#include <gtk/gtkglwidget.h>
|
|
||||||
|
|
||||||
namespace Gtk
|
|
||||||
{
|
|
Loading…
Reference in New Issue
Block a user