JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix build with latest Vala.
This commit is contained in:
Jan Tojnar 2021-04-14 00:50:52 +02:00
parent bf9c36fb62
commit 804b04e1bc
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/libunity/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchgit , fetchgit
, pkg-config , pkg-config
, glib , glib
@ -14,16 +15,24 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libunity"; pname = "libunity";
version = "unstable-2019-03-19"; version = "unstable-2021-02-01";
outputs = [ "out" "dev" "py" ]; outputs = [ "out" "dev" "py" ];
# Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/
src = fetchgit { src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/libunity"; url = "https://git.launchpad.net/ubuntu/+source/libunity";
rev = "import/7.1.4+19.04.20190319-0ubuntu1"; rev = "import/7.1.4+19.04.20190319-5";
sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; 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 = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
gobject-introspection gobject-introspection
@ -43,11 +52,6 @@ stdenv.mkDerivation {
libdbusmenu libdbusmenu
]; ];
patches = [
# See: https://gitlab.gnome.org/GNOME/vala/issues/766
./fix-vala.patch
];
preConfigure = '' preConfigure = ''
intltoolize intltoolize
''; '';

44
pkgs/development/libraries/libunity/fix-vala.patch
View File

@ -1,36 +1,12 @@
diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala --- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000
--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 +++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000
+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 @@ -185,7 +185,7 @@
@@ -51,7 +51,7 @@
*/
public abstract int category_index_for_scope_id (string scope_id);
- 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_)
{
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 /* Added to GIcon interface in 2.37 */
+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 - private Variant serialize ()
@@ -63,7 +63,7 @@ + private Variant? serialize ()
*/
public abstract class GridRenderer: PreviewRenderer
{ {
- public GridRenderer() Variant? ret = null;
+ protected GridRenderer() return ret;
{
Object();
}