Commit 4a6dff8f authored by Weijia Wang's avatar Weijia Wang Committed by Anderson Torres
Browse files

drgeo: drop

parent 411b1527
Loading
Loading
Loading
Loading
+0 −30
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl
, intltool, libtool, pkg-config }:

stdenv.mkDerivation rec {
  pname = "drgeo";
  version = "1.1.0";

  hardeningDisable = [ "format" ];

  src = fetchurl {
    url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz";
    sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
  };
  patches = [ ./struct.patch ];

  nativeBuildInputs = [ pkg-config intltool ];
  buildInputs = [libglade gtk2 guile libxml2
    perl libtool ];

  prebuild = ''
    cp drgeo.desktop.in drgeo.desktop
  '';

  meta = with lib; {
    description = "Interactive geometry program";
    homepage = "https://sourceforge.net/projects/ofset";
    license = licenses.gpl2;
    platforms = platforms.linux;
  };
}
+0 −68
Original line number Diff line number Diff line
-- drgeo-1.1.0/debian/patches/00list
++ drgeo-1.1.0/debian/patches/00list
@ -7 +7 @@

07-fix_ftbfs-gcc-4.5.dpatch
nly in patch2:
nchanged:
-- drgeo-1.1.0.orig/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
++ drgeo-1.1.0/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
@ -0,0 +1,58 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 07-fix_ftbfs-gcc-4.5.dpatch by Fabrice Coutadeur <fabric...@ubuntu.com>
##
## Description: fix FTBFS with gcc 4.5 with undefined reference to
## `drgeoDialogData'
## Author: Petr Gajdos <pgaj...@suse.cz>
## Origin: https://build.opensuse.org/package/files?package=drgeo&project=openSUSE%3A11.3%3AContrib

...@dpatch@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.cc drgeo-1.1.0/geo/drgeo_dialog.cc
--- drgeo-1.1.0~/geo/drgeo_dialog.cc	2003-10-27 10:17:25.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_dialog.cc	2010-11-13 07:26:03.258908003 +0000
@@ -38,12 +38,7 @@
 // Used in the style dialod callback, I know it's ugly, but so easy
 static drgeoFigure *selected_figure;
 
-struct
-{
-  drgeoPoint mouse;
-  drgeoFigure *figure;
-}
-drgeoDialogData;
+DialogData drgeoDialogData;
 
 
 static void drgeo_edit_dialog_cb (GtkWidget * dialog,
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.h drgeo-1.1.0/geo/drgeo_dialog.h
--- drgeo-1.1.0~/geo/drgeo_dialog.h	2003-06-12 22:30:23.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_dialog.h	2010-11-13 07:26:03.258908003 +0000
@@ -34,4 +34,11 @@
 }
 
 #endif				/* __cplusplus */
+
+typedef struct
+{
+  drgeoPoint mouse;
+  drgeoFigure *figure;
+} DialogData;
+
 #endif
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_figure.cc drgeo-1.1.0/geo/drgeo_figure.cc
--- drgeo-1.1.0~/geo/drgeo_figure.cc	2005-07-14 07:30:01.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_figure.cc	2010-11-13 07:26:03.258908003 +0000
@@ -48,12 +48,7 @@
 #include "drgeo_dialog.h"
 #include "traite.h"
 
-extern struct
-{
-  drgeoPoint mouse;
-  drgeoFigure *figure;
-}
-drgeoDialogData;
+extern DialogData drgeoDialogData;
 
 typedef struct drgeoSearchValue
 {
+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ mapAliases ({
  dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16
  dotty = scala_3; # Added 2023-08-20
  dotnet-netcore = dotnet-runtime; # Added 2021-10-07
  drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15
  dtv-scan-tables_linuxtv = dtv-scan-tables;  # Added 2023-03-03
  dtv-scan-tables_tvheadend = dtv-scan-tables;  # Added 2023-03-03
  dylibbundler = macdylibbundler; # Added 2021-04-24
+0 −5
Original line number Diff line number Diff line
@@ -38828,11 +38828,6 @@ with pkgs;
  gama = callPackage ../applications/science/geometry/gama { };
  drgeo = callPackage ../applications/science/geometry/drgeo {
    inherit (gnome2) libglade;
    guile = guile_1_8;
  };
  tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
  tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT