Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4ccc19f7d632
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6bd3e4606ea4
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 13, 2021

  1. libunity: unstable-2019-03-19 → unstable-2021-02-01 

    Fix build with latest Vala.
    @jtojnar
    jtojnar committed Apr 13, 2021
    Copy the full SHA
    6bd3e46 View commit details
Showing with 23 additions and 43 deletions.
  1. +13 −9 pkgs/development/libraries/libunity/default.nix
  2. +10 −34 pkgs/development/libraries/libunity/fix-vala.patch
22 changes: 13 additions & 9 deletions pkgs/development/libraries/libunity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchgit
, pkg-config
, glib
@@ -14,16 +15,24 @@

stdenv.mkDerivation {
pname = "libunity";
version = "unstable-2019-03-19";
version = "unstable-2021-02-01";

outputs = [ "out" "dev" "py" ];

# Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/
src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/libunity";
rev = "import/7.1.4+19.04.20190319-0ubuntu1";
sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
rev = "import/7.1.4+19.04.20190319-5";
sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8=";
};

patches = [
# Fix builf with latest Vala
# https://code.launchpad.net/~jtojnar/libunity/libunity
# Did not send upstream because Ubuntu is stuck on Vala 0.48.
./fix-vala.patch
];

nativeBuildInputs = [
autoreconfHook
gobject-introspection
@@ -43,11 +52,6 @@ stdenv.mkDerivation {
libdbusmenu
];

patches = [
# See: https://gitlab.gnome.org/GNOME/vala/issues/766
./fix-vala.patch
];

preConfigure = ''
intltoolize
'';
44 changes: 10 additions & 34 deletions pkgs/development/libraries/libunity/fix-vala.patch
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,12 @@
diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala
--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500
+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400
@@ -51,7 +51,7 @@
*/
public abstract int category_index_for_scope_id (string scope_id);
--- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000
+++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000
@@ -185,7 +185,7 @@
}

- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
{
Object (dbus_path: dbus_path_, id: id_, is_master: true,
merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala
--- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500
+++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400
@@ -61,7 +61,7 @@
internal CategorySet _categories;
internal FilterSet _filters;

- public DeprecatedScopeBase (string dbus_path_, string id_)
+ protected DeprecatedScopeBase (string dbus_path_, string id_)
/* Added to GIcon interface in 2.37 */
- private Variant serialize ()
+ private Variant? serialize ()
{
Object (dbus_path: dbus_path_, id: id_);
}
diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala
--- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500
+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400
@@ -63,7 +63,7 @@
*/
public abstract class GridRenderer: PreviewRenderer
{
- public GridRenderer()
+ protected GridRenderer()
{
Object();
}
Variant? ret = null;
return ret;