push sheeet

pkgs/development/libraries/goocanvas/2.x.nix

@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  pkg-config,
+  gettext,
+  gtk-doc,
+  gobject-introspection,
+  python3,
+  gtk3,
+  cairo,
+  glib,
+  gnome,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "goocanvas";
+  version = "2.0.4";
+
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goocanvas/2.0/goocanvas-${version}.tar.xz";
+    sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    gtk-doc
+    python3
+    gobject-introspection
+  ];
+  buildInputs = [
+    gtk3
+    cairo
+    glib
+  ];
+
+  # add fedora patch to fix gcc-14 build
+  # https://src.fedoraproject.org/rpms/goocanvas2/tree/main
+  patches = [
+    (fetchpatch {
+      name = "goocanvas-2.0.4-Fix-building-with-GCC-14.patch";
+      hash = "sha256-9uqqC1uKZF9TDz5dfDTKSRCmjEiuvqkLnZ9w6U+q2TI=";
+      url = "https://src.fedoraproject.org/rpms/goocanvas2/raw/e799612a277262a0c6bd03db10a6ee9ca7871b9c/f/goocanvas-2.0.4-Fix-building-with-GCC-14.patch";
+    })
+  ];
+
+  configureFlags = [
+    "--disable-python"
+  ];
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      attrPath = "goocanvas${lib.versions.major version}";
+      packageName = "goocanvas";
+      versionPolicy = "odd-unstable";
+      freeze = true;
+    };
+  };
+
+  meta = with lib; {
+    description = "Canvas widget for GTK based on the the Cairo 2D library";
+    homepage = "https://gitlab.gnome.org/Archive/goocanvas";
+    license = licenses.lgpl2;
+    maintainers = [ ];
+    platforms = platforms.unix;
+  };
+}

pkgs/development/libraries/goocanvas/3.x.nix

@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  pkg-config,
+  gettext,
+  gobject-introspection,
+  gtk-doc,
+  python3,
+  cairo,
+  gtk3,
+  glib,
+  gnome,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "goocanvas";
+  version = "3.0.0";
+
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor finalAttrs.version}/goocanvas-${finalAttrs.version}.tar.xz";
+    sha256 = "06j05g2lmwvklmv51xsb7gm7rszcarhm01sal41jfp0qzrbpa2k7";
+  };
+
+  patches = [
+    # This broke due to the introduction of anubis
+    /*
+      (fetchpatch {
+        url = "https://gitlab.gnome.org/Archive/goocanvas/-/commit/d025d0eeae1c5266063bdc1476dbdff121bcfa57.patch";
+        hash = "sha256-9uqqC1uKZF9TDz5dfDTKSRCmjEiuvqkLnZ9w6U+q2TI=";
+      })
+    */
+    ./gcc14-fix.patch
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    gobject-introspection
+    gtk-doc
+    python3
+  ];
+
+  buildInputs = [
+    cairo
+    gtk3
+    glib
+  ];
+
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      attrPath = "${finalAttrs.pname}${lib.versions.major finalAttrs.version}";
+      packageName = finalAttrs.pname;
+      versionPolicy = "odd-unstable";
+    };
+  };
+
+  meta = {
+    description = "Canvas widget for GTK based on the the Cairo 2D library";
+    homepage = "https://gitlab.gnome.org/Archive/goocanvas";
+    license = lib.licenses.lgpl2Plus; # The license contains the "or later" clause
+    maintainers = with lib.maintainers; [
+      bobby285271
+      pandapip1
+    ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/development/libraries/goocanvas/default.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gtk2,
+  cairo,
+  glib,
+  pkg-config,
+  gnome,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "goocanvas";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor finalAttrs.version}/goocanvas-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-HAcu+IVnytJB+0rd7ibpvZZ0GxUD/3NtHBUvpthlcR4=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    gtk2
+    cairo
+    glib
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "goocanvas";
+      versionPolicy = "odd-unstable";
+      freeze = true;
+    };
+  };
+
+  meta = with lib; {
+    description = "Canvas widget for GTK based on the the Cairo 2D library";
+    homepage = "https://gitlab.gnome.org/Archive/goocanvas";
+    license = licenses.lgpl2;
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/development/libraries/goocanvas/gcc14-fix.patch

@@ -0,0 +1,36 @@
+From d025d0eeae1c5266063bdc1476dbdff121bcfa57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 31 Jan 2024 17:44:59 +0100
+Subject: [PATCH] Fix building with GCC 14
+
+GCC 14 becomes stricter regarging pointer types:
+
+goocanvasitemsimple.c: In function 'goo_canvas_item_simple_set_model':
+goocanvasitemsimple.c:1539:15: error: assignment to 'GooCanvasItemModelSimple *' {aka 'struct _GooCanvasItemModelSimple *'} from incompatible pointer type 'GooCanvasItemModel *' {aka 'struct _GooCanvasItemModel *'} [-Wincompatible-pointer-types]
+ 1539 |   item->model = g_object_ref (model);
+      |               ^
+make[3]: *** [Makefile:595: goocanvasitemsimple.lo] Error 1
+
+It looks like missing a pointer cast.
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=2261209>
+---
+ src/goocanvasitemsimple.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/goocanvasitemsimple.c b/src/goocanvasitemsimple.c
+index 19b3424..28edc77 100644
+--- a/src/goocanvasitemsimple.c
++++ b/src/goocanvasitemsimple.c
+@@ -1536,7 +1536,7 @@ goo_canvas_item_simple_set_model (GooCanvasItemSimple  *item,
+   goo_canvas_item_simple_free_data (item->simple_data);
+   g_slice_free (GooCanvasItemSimpleData, item->simple_data);
+ 
+-  item->model = g_object_ref (model);
++  item->model = (GooCanvasItemModelSimple *) g_object_ref (model);
+   item->simple_data = &item->model->simple_data;
+ 
+   if (accessibility_enabled)
+-- 
+GitLab
+