swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

libunity: fix build with latest vala

Browse source 
See: https://gitlab.gnome.org/GNOME/vala/issues/766
This commit is contained in:
worldofpeace 2019-09-21 17:27:36 -04:00 committed by Jan Tojnar
parent e7b7d75825
commit 752ebe1078
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/libunity/default.nix
View file

@ -43,6 +43,11 @@ stdenv.mkDerivation {
libdbusmenu
];
patches = [
# See: https://gitlab.gnome.org/GNOME/vala/issues/766
./fix-vala.patch
];
preConfigure = ''
intltoolize
'';

36
pkgs/development/libraries/libunity/fix-vala.patch Normal file
View file

@ -0,0 +1,36 @@
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);
- 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
+++ 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();
}