Unverified Commit bfdd7b19 authored by Igor Rzegocki's avatar Igor Rzegocki
Browse files

gdome2: remove gdome2

parent 7c325321
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
On gcc-10 -fno-common is the default which forbids miltiple definitions.
--- a/libgdome/xpath/gdome-xpath-xpnsresolv.h
+++ b/libgdome/xpath/gdome-xpath-xpnsresolv.h
@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXPathNSResolver *self, GdomeException *exc
 void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc);
 GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc);
 
-const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab;
+extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab;
 
 #endif /* GDOME_XPNSRESOLV_FILE */
+0 −52
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchurl,
  pkg-config,
  glib,
  libxml2,
  gtk-doc,
}:

let
  pname = "gdome2";
  version = "0.8.1";
in

stdenv.mkDerivation {
  name = "${pname}-${version}";

  src = fetchurl {
    url = "http://gdome2.cs.unibo.it/tarball/${pname}-${version}.tar.gz";
    sha256 = "0hyms5s3hziajp3qbwdwqjc2xcyhb783damqg8wxjpwfxyi81fzl";
  };

  hardeningDisable = [ "format" ];

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    glib
    libxml2
    gtk-doc
  ];
  propagatedBuildInputs = [
    glib
    libxml2
  ];
  patches = [
    ./xml-document.patch
    ./fno-common.patch
  ];

  meta = with lib; {
    homepage = "http://gdome2.cs.unibo.it/";
    description = "DOM C library developed for the Gnome project";
    mainProgram = "gdome-config";
    license = licenses.lgpl21Plus;
    maintainers = with maintainers; [
      prikhi
      roconnor
    ];
    platforms = platforms.linux;
  };
}
+0 −11
Original line number Diff line number Diff line
--- a/libgdome/gdomecore/gdome-xml-documentt.c	2003-07-13 14:47:54.000000000 +0400
+++ b/libgdome/gdomecore/gdome-xml-documentt.c	2013-07-02 14:09:18.304613703 +0400
@@ -342,7 +342,7 @@
 	}
 	xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL);
 	xmlOutputBufferFlush(out_buff);
-	ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use);
+	ret = g_strndup (xmlBufContent(out_buff), xmlBufUse(out_buff));
 	(void)xmlOutputBufferClose(out_buff);

 	return gdome_xml_str_mkref_own (ret);
+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@
  cairomm,
  dbus,
  dbus-glib,
  gdome2,
  gst_all_1,
  libsigcxx,
  boost,
@@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
    cairomm
    dbus
    dbus-glib
    gdome2
    gst_all_1.gstreamer
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ mapAliases {
  gcj = gcj6; # Added 2024-09-13
  gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
  gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
  gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
  geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead.";
  gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
  gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11