rpms/libunity
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 7.1.4_19.04.20190319 [release 7.1.4_19.04.20190319-1mamba;Sun Mar 16 2025]

Browse Source
This commit is contained in:
Silvan Calarco
2025-03-16 15:54:15 +01:00
parent b3993b51db
commit 33e5b8dda8
3 changed files with 95 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libunity-7.1.4_19.04.20190319-vala-0.53.patch Normal file
View File

@@ -0,0 +1,22 @@
--- libunity-7.1.4/protocol/protocol-icon.vala.debug 2019-03-19 19:17:56.000000000 +0900
+++ libunity-7.1.4/protocol/protocol-icon.vala 2021-09-13 22:11:06.634930969 +0900
@@ -185,7 +185,7 @@ public class AnnotatedIcon : Object, GLi
}
/* Added to GIcon interface in 2.37 */
- private Variant serialize ()
+ private Variant? serialize ()
{
Variant? ret = null;
return ret;
--- libunity-7.1.4/src/unity-scope-channel.vala.debug 2019-03-19 19:18:05.000000000 +0900
+++ libunity-7.1.4/src/unity-scope-channel.vala 2021-09-13 22:16:25.440323188 +0900
@@ -312,7 +312,7 @@ internal class ScopeChannel : Object
DBusSignalFlags.NONE, this.owner_changed);
}
- private void owner_changed (DBusConnection con, string sender_name,
+ private void owner_changed (DBusConnection con, string? sender_name,
string obj_path, string ifc_name,
string sig_name, Variant parameters)
{

54
libunity-7.1.4_19.04.20190319-vala-0.56.18.patch Normal file
View File

@@ -0,0 +1,54 @@
From ef769be7116a5b9cef0f972fb54faed6b75f7dc3 Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Mon, 23 Sep 2019 21:07:57 +1000
Subject: [PATCH] Fix FTB with recent vala requiring non-public abstract class
ctors
---
src/unity-aggregator-scope.vala | 2 +-
src/unity-deprecated-scope.vala | 2 +-
tools/preview-renderer.vala | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/unity-aggregator-scope.vala b/src/unity-aggregator-scope.vala
index 6664d48..5886e88 100644
--- a/src/unity-aggregator-scope.vala
+++ b/src/unity-aggregator-scope.vala
@@ -51,7 +51,7 @@ public abstract class AggregatorScope : DeprecatedScopeBase
*/
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 --git a/src/unity-deprecated-scope.vala b/src/unity-deprecated-scope.vala
index 4fc5355..47d8cc8 100644
--- a/src/unity-deprecated-scope.vala
+++ b/src/unity-deprecated-scope.vala
@@ -61,7 +61,7 @@ public abstract class DeprecatedScopeBase : GLib.Object
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 --git a/tools/preview-renderer.vala b/tools/preview-renderer.vala
index ed59321..bb0aaf2 100644
--- a/tools/preview-renderer.vala
+++ b/tools/preview-renderer.vala
@@ -63,7 +63,7 @@ namespace Unity.Tester {
*/
public abstract class GridRenderer: PreviewRenderer
{
- public GridRenderer()
+ protected GridRenderer()
{
Object();
}
--
2.20.1

55
libunity.spec
View File

@@ -1,5 +1,6 @@
%define pkgver %(echo %version | tr _ +)
Name: libunity
Version: 7.1.4_16.10.20160516
Version: 7.1.4_19.04.20190319
Release: 1mamba
Summary: A library for instrumenting and integrating with all aspects of the Unity shell
Group: System/Libraries
@@ -7,38 +8,26 @@ Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://launchpad.net/libunity
Source: https://launchpad.net/ubuntu/+archive/primary/+files/libunity_7.1.4+16.10.20160516.orig.tar.gz
Source: https://launchpad.net/ubuntu/+archive/primary/+files/libunity_%{pkgver}.orig.tar.gz
Patch0: libunity-7.1.4_19.04.20190319-vala-0.53.patch
Patch1: libunity-7.1.4_19.04.20190319-vala-0.56.18.patch
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libatk-devel
BuildRequires: libblkid-devel
BuildRequires: libbzip2-devel
BuildRequires: libat-spi2-core-devel
BuildRequires: libcairo-devel
BuildRequires: libdbusmenu-devel
BuildRequires: libdee-devel
BuildRequires: libexpat-devel
BuildRequires: libffi-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel
BuildRequires: libgraphite2-devel
BuildRequires: libgtk-devel
BuildRequires: libgtk3-devel
BuildRequires: libharfbuzz-devel
BuildRequires: libicu-devel
BuildRequires: libmount-devel
BuildRequires: liblttng-ust-devel
BuildRequires: libpango-devel
BuildRequires: libpcre-devel
BuildRequires: libpng-devel
BuildRequires: libpython-devel
BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: libthai-devel
BuildRequires: libuuid-devel
BuildRequires: libpython311-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libicu-devel >= 77.1
%description
LibUnity is a library for instrumenting and integrating with all aspects of the Unity shell.
@@ -61,13 +50,13 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description tools
This package contains utility applications for %{name}.
%debug_package
%prep
%setup -q -c %{name}-%{version}
%patch 0 -p1 -b .vala-0.53
%patch 1 -p1 -b .vala-0.56.18
./autogen.sh
%build
./autogen.sh
%configure
%make
@@ -75,24 +64,18 @@ This package contains utility applications for %{name}.
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
%find_lang %{name} || touch %{name}.lang
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%files
%defattr(-,root,root)
%{_libdir}/libunity.so.*
%{_libdir}/libunity-extras.so.*
%{_libdir}/libunity/libunity-protocol-private.so.*
%{_libdir}/girepository-1.0/Unity-7.0.typelib
%{_libdir}/girepository-1.0/UnityExtras-7.0.typelib
%{python27_sitearch}/gi/overrides/Unity.py
%{python27_sitearch}/gi/overrides/Unity.pyc
%{python27_sitearch}/gi/overrides/Unity.pyo
%{python3_sitearch}/gi/overrides/Unity.py
%{python3_sitearch}/gi/overrides/__pycache__/Unity.cpython-*.pyc
%doc AUTHORS COPYING
%files devel
@@ -100,13 +83,10 @@ This package contains utility applications for %{name}.
%dir %{_includedir}/unity/unity
%{_includedir}/unity/unity/*.h
%{_libdir}/libunity-extras.a
%{_libdir}/libunity-extras.la
%{_libdir}/libunity-extras.so
%{_libdir}/libunity.a
%{_libdir}/libunity.la
%{_libdir}/libunity.so
%{_libdir}/libunity/libunity-protocol-private.a
%{_libdir}/libunity/libunity-protocol-private.la
%{_libdir}/libunity/libunity-protocol-private.so
%{_libdir}/pkgconfig/unity-extras.pc
%{_libdir}/pkgconfig/unity-protocol-private.pc
@@ -127,5 +107,8 @@ This package contains utility applications for %{name}.
%{_datadir}/unity/*
%changelog
* Sun Mar 16 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 7.1.4_19.04.20190319-1mamba
- update to 7.1.4_19.04.20190319
* Mon Oct 30 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 7.1.4_16.10.20160516-1mamba
- package created using the webbuild interface