Unverified Commit 44686eae authored by K900's avatar K900 Committed by GitHub
Browse files

dee: 1.2.7+17.10.20170616-4ubuntu3 → 1.2.7+17.10.20170616-8build1 (#472445)

parents 40ce44ba 661442fd

pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001

From: Jan Tojnar <jtojnar@gmail.com>

Date: Thu, 7 Oct 2021 21:42:26 +0200

Subject: [PATCH] Fix build with Vala 0.54



Vala codegen now emits constructor methods so we need to skip @new

so that we can use a custom one from our VAPI overrides.



https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8

---

 vapi/Dee-1.0.metadata | 2 ++

 1 file changed, 2 insertions(+)



diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata

index 7e80de0..793ffd8 100644

--- a/vapi/Dee-1.0.metadata

+++ b/vapi/Dee-1.0.metadata

@@ -1,6 +1,8 @@

 GListResultSet skip

 GListResultSetClass skip

 

+Filter

+	.new skip

 FilterModel

 	.filter unowned

 Model

-- 

2.33.0

pkgs/by-name/de/dee/package.nix

+3 −8
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  gtk-doc,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "dee";

  version = "unstable-2017-06-16";
@@ -26,16 +26,11 @@ stdenv.mkDerivation rec { 


  src = fetchgit {

    url = "https://git.launchpad.net/ubuntu/+source/dee";

    rev = "import/1.2.7+17.10.20170616-4ubuntu3";

    sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk";

    rev = "applied/1.2.7+17.10.20170616-8build1";

    hash = "sha256-ttfppqb0t8cOhWaB97uyD9heVZKlBKYF2zD6yRwPyos=";

  };



  patches = [

    "${src}/debian/patches/gtkdocize.patch"

    "${src}/debian/patches/strict-prototype.patch"

    "${src}/debian/patches/vapi-skip-properties.patch"

    ./0001-Fix-build-with-Vala-0.54.patch



    # Fixes glib 2.62 deprecations

    (fetchpatch {

      name = "dee-1.2.7-deprecated-g_type_class_add_private.patch";