Page MenuHomeSolus
Files F11049844

D11732.diff
No OneTemporary
Actions

D11732.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -4,8 +4,8 @@
libXi.so.6
libXss.so.1
libaccountsservice.so.0
-libappindicator3.so.1
libatk-1.0.so.0
+libayatana-appindicator3.so.1
libc.so.6
libcairo-gobject.so.2
libcairo.so.2
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -1,68 +1,3 @@
-UNKNOWN:mate_bg_changes_with_time
-UNKNOWN:mate_bg_create_frame_thumbnail
-UNKNOWN:mate_bg_create_thumbnail
-UNKNOWN:mate_bg_get_image_size
-UNKNOWN:mate_bg_has_multiple_sizes
-UNKNOWN:mate_bg_new
-UNKNOWN:mate_bg_set_color
-UNKNOWN:mate_bg_set_filename
-UNKNOWN:mate_bg_set_placement
-UNKNOWN:mate_desktop_gtk_style_get_dark_color
-UNKNOWN:mate_desktop_item_get_boolean
-UNKNOWN:mate_desktop_item_get_entry_type
-UNKNOWN:mate_desktop_item_get_localestring
-UNKNOWN:mate_desktop_item_get_location
-UNKNOWN:mate_desktop_item_get_string
-UNKNOWN:mate_desktop_item_launch
-UNKNOWN:mate_desktop_item_new_from_basename
-UNKNOWN:mate_desktop_item_new_from_file
-UNKNOWN:mate_desktop_item_new_from_uri
-UNKNOWN:mate_desktop_item_ref
-UNKNOWN:mate_desktop_item_set_entry_type
-UNKNOWN:mate_desktop_item_unref
-UNKNOWN:mate_desktop_thumbnail_factory_create_failed_thumbnail
-UNKNOWN:mate_desktop_thumbnail_factory_generate_thumbnail
-UNKNOWN:mate_desktop_thumbnail_factory_lookup
-UNKNOWN:mate_desktop_thumbnail_factory_new
-UNKNOWN:mate_desktop_thumbnail_factory_save_thumbnail
-UNKNOWN:mate_gdk_spawn_command_line_on_screen
-UNKNOWN:mate_get_country_from_code
-UNKNOWN:mate_gsettings_schema_exists
-UNKNOWN:mate_rr_config_applicable
-UNKNOWN:mate_rr_config_get_clone
-UNKNOWN:mate_rr_config_get_intended_filename
-UNKNOWN:mate_rr_config_get_outputs
-UNKNOWN:mate_rr_config_new_current
-UNKNOWN:mate_rr_config_sanitize
-UNKNOWN:mate_rr_config_save
-UNKNOWN:mate_rr_config_set_clone
-UNKNOWN:mate_rr_labeler_get_rgba_for_output
-UNKNOWN:mate_rr_labeler_hide
-UNKNOWN:mate_rr_labeler_new
-UNKNOWN:mate_rr_mode_get_freq
-UNKNOWN:mate_rr_mode_get_height
-UNKNOWN:mate_rr_mode_get_width
-UNKNOWN:mate_rr_output_info_get_display_name
-UNKNOWN:mate_rr_output_info_get_geometry
-UNKNOWN:mate_rr_output_info_get_name
-UNKNOWN:mate_rr_output_info_get_preferred_height
-UNKNOWN:mate_rr_output_info_get_preferred_width
-UNKNOWN:mate_rr_output_info_get_primary
-UNKNOWN:mate_rr_output_info_get_refresh_rate
-UNKNOWN:mate_rr_output_info_get_rotation
-UNKNOWN:mate_rr_output_info_is_active
-UNKNOWN:mate_rr_output_info_is_connected
-UNKNOWN:mate_rr_output_info_set_active
-UNKNOWN:mate_rr_output_info_set_geometry
-UNKNOWN:mate_rr_output_info_set_primary
-UNKNOWN:mate_rr_output_info_set_refresh_rate
-UNKNOWN:mate_rr_output_info_set_rotation
-UNKNOWN:mate_rr_output_list_modes
-UNKNOWN:mate_rr_screen_get_output_by_name
-UNKNOWN:mate_rr_screen_get_ranges
-UNKNOWN:mate_rr_screen_list_clone_modes
-UNKNOWN:mate_rr_screen_new
-UNKNOWN:mate_rr_screen_refresh
UNKNOWN:matekbd_desktop_config_init
UNKNOWN:matekbd_desktop_config_load_from_gsettings
UNKNOWN:matekbd_desktop_config_term
@@ -85,17 +20,6 @@
UNKNOWN:matekbd_keyboard_drawing_set_keyboard
UNKNOWN:matekbd_preview_load_position
UNKNOWN:matekbd_preview_save_position
-UNKNOWN:matemenu_tree_directory_get_name
-UNKNOWN:matemenu_tree_directory_iter
-UNKNOWN:matemenu_tree_entry_get_desktop_file_path
-UNKNOWN:matemenu_tree_get_root_directory
-UNKNOWN:matemenu_tree_item_unref
-UNKNOWN:matemenu_tree_iter_get_directory
-UNKNOWN:matemenu_tree_iter_get_entry
-UNKNOWN:matemenu_tree_iter_next
-UNKNOWN:matemenu_tree_iter_unref
-UNKNOWN:matemenu_tree_load_sync
-UNKNOWN:matemenu_tree_new
UNKNOWN:meta_preview_get_clip_region
UNKNOWN:meta_preview_get_type
UNKNOWN:meta_preview_new
@@ -104,6 +28,24 @@
UNKNOWN:meta_preview_set_title
UNKNOWN:meta_theme_free
UNKNOWN:meta_theme_load
+UNKNOWN:xkl_config_item_new
+UNKNOWN:xkl_config_rec_get_from_server
+UNKNOWN:xkl_config_rec_new
+UNKNOWN:xkl_config_registry_find_model
+UNKNOWN:xkl_config_registry_foreach_country
+UNKNOWN:xkl_config_registry_foreach_country_variant
+UNKNOWN:xkl_config_registry_foreach_language
+UNKNOWN:xkl_config_registry_foreach_language_variant
+UNKNOWN:xkl_config_registry_foreach_model
+UNKNOWN:xkl_config_registry_foreach_option
+UNKNOWN:xkl_config_registry_foreach_option_group
+UNKNOWN:xkl_config_registry_get_instance
+UNKNOWN:xkl_config_registry_load
+UNKNOWN:xkl_engine_get_backend_name
+UNKNOWN:xkl_engine_get_instance
+UNKNOWN:xkl_engine_get_max_num_groups
+UNKNOWN:xkl_xkb_config_native_cleanup
+UNKNOWN:xkl_xkb_config_native_prepare
libX11.so.6:XDisplayKeycodes
libX11.so.6:XFree
libX11.so.6:XFreeModifiermap
@@ -133,12 +75,12 @@
libaccountsservice.so.0:act_user_manager_get_default
libaccountsservice.so.0:act_user_manager_get_user
libaccountsservice.so.0:act_user_set_icon_file
-libappindicator3.so.1:app_indicator_new_with_path
-libappindicator3.so.1:app_indicator_set_attention_icon
-libappindicator3.so.1:app_indicator_set_menu
-libappindicator3.so.1:app_indicator_set_status
libatk-1.0.so.0:atk_object_set_description
libatk-1.0.so.0:atk_object_set_name
+libayatana-appindicator3.so.1:app_indicator_new_with_path
+libayatana-appindicator3.so.1:app_indicator_set_attention_icon
+libayatana-appindicator3.so.1:app_indicator_set_menu
+libayatana-appindicator3.so.1:app_indicator_set_status
libc.so.6:__isoc99_sscanf
libc.so.6:__libc_start_main
libc.so.6:__sprintf_chk
@@ -1425,6 +1367,82 @@
libm.so.6:pow
libm.so.6:sqrt
libm.so.6:tan
+libmate-desktop-2.so.17:mate_bg_changes_with_time
+libmate-desktop-2.so.17:mate_bg_create_frame_thumbnail
+libmate-desktop-2.so.17:mate_bg_create_thumbnail
+libmate-desktop-2.so.17:mate_bg_get_image_size
+libmate-desktop-2.so.17:mate_bg_has_multiple_sizes
+libmate-desktop-2.so.17:mate_bg_new
+libmate-desktop-2.so.17:mate_bg_set_color
+libmate-desktop-2.so.17:mate_bg_set_filename
+libmate-desktop-2.so.17:mate_bg_set_placement
+libmate-desktop-2.so.17:mate_desktop_gtk_style_get_dark_color
+libmate-desktop-2.so.17:mate_desktop_item_get_boolean
+libmate-desktop-2.so.17:mate_desktop_item_get_entry_type
+libmate-desktop-2.so.17:mate_desktop_item_get_localestring
+libmate-desktop-2.so.17:mate_desktop_item_get_location
+libmate-desktop-2.so.17:mate_desktop_item_get_string
+libmate-desktop-2.so.17:mate_desktop_item_launch
+libmate-desktop-2.so.17:mate_desktop_item_new_from_basename
+libmate-desktop-2.so.17:mate_desktop_item_new_from_file
+libmate-desktop-2.so.17:mate_desktop_item_new_from_uri
+libmate-desktop-2.so.17:mate_desktop_item_ref
+libmate-desktop-2.so.17:mate_desktop_item_set_entry_type
+libmate-desktop-2.so.17:mate_desktop_item_unref
+libmate-desktop-2.so.17:mate_desktop_thumbnail_factory_create_failed_thumbnail
+libmate-desktop-2.so.17:mate_desktop_thumbnail_factory_generate_thumbnail
+libmate-desktop-2.so.17:mate_desktop_thumbnail_factory_lookup
+libmate-desktop-2.so.17:mate_desktop_thumbnail_factory_new
+libmate-desktop-2.so.17:mate_desktop_thumbnail_factory_save_thumbnail
+libmate-desktop-2.so.17:mate_gdk_spawn_command_line_on_screen
+libmate-desktop-2.so.17:mate_get_country_from_code
+libmate-desktop-2.so.17:mate_gsettings_schema_exists
+libmate-desktop-2.so.17:mate_rr_config_applicable
+libmate-desktop-2.so.17:mate_rr_config_get_clone
+libmate-desktop-2.so.17:mate_rr_config_get_intended_filename
+libmate-desktop-2.so.17:mate_rr_config_get_outputs
+libmate-desktop-2.so.17:mate_rr_config_new_current
+libmate-desktop-2.so.17:mate_rr_config_sanitize
+libmate-desktop-2.so.17:mate_rr_config_save
+libmate-desktop-2.so.17:mate_rr_config_set_clone
+libmate-desktop-2.so.17:mate_rr_labeler_get_rgba_for_output
+libmate-desktop-2.so.17:mate_rr_labeler_hide
+libmate-desktop-2.so.17:mate_rr_labeler_new
+libmate-desktop-2.so.17:mate_rr_mode_get_freq
+libmate-desktop-2.so.17:mate_rr_mode_get_height
+libmate-desktop-2.so.17:mate_rr_mode_get_width
+libmate-desktop-2.so.17:mate_rr_output_info_get_display_name
+libmate-desktop-2.so.17:mate_rr_output_info_get_geometry
+libmate-desktop-2.so.17:mate_rr_output_info_get_name
+libmate-desktop-2.so.17:mate_rr_output_info_get_preferred_height
+libmate-desktop-2.so.17:mate_rr_output_info_get_preferred_width
+libmate-desktop-2.so.17:mate_rr_output_info_get_primary
+libmate-desktop-2.so.17:mate_rr_output_info_get_refresh_rate
+libmate-desktop-2.so.17:mate_rr_output_info_get_rotation
+libmate-desktop-2.so.17:mate_rr_output_info_is_active
+libmate-desktop-2.so.17:mate_rr_output_info_is_connected
+libmate-desktop-2.so.17:mate_rr_output_info_set_active
+libmate-desktop-2.so.17:mate_rr_output_info_set_geometry
+libmate-desktop-2.so.17:mate_rr_output_info_set_primary
+libmate-desktop-2.so.17:mate_rr_output_info_set_refresh_rate
+libmate-desktop-2.so.17:mate_rr_output_info_set_rotation
+libmate-desktop-2.so.17:mate_rr_output_list_modes
+libmate-desktop-2.so.17:mate_rr_screen_get_output_by_name
+libmate-desktop-2.so.17:mate_rr_screen_get_ranges
+libmate-desktop-2.so.17:mate_rr_screen_list_clone_modes
+libmate-desktop-2.so.17:mate_rr_screen_new
+libmate-desktop-2.so.17:mate_rr_screen_refresh
+libmate-menu.so.2:matemenu_tree_directory_get_name
+libmate-menu.so.2:matemenu_tree_directory_iter
+libmate-menu.so.2:matemenu_tree_entry_get_desktop_file_path
+libmate-menu.so.2:matemenu_tree_get_root_directory
+libmate-menu.so.2:matemenu_tree_item_unref
+libmate-menu.so.2:matemenu_tree_iter_get_directory
+libmate-menu.so.2:matemenu_tree_iter_get_entry
+libmate-menu.so.2:matemenu_tree_iter_next
+libmate-menu.so.2:matemenu_tree_iter_unref
+libmate-menu.so.2:matemenu_tree_load_sync
+libmate-menu.so.2:matemenu_tree_new
libpango-1.0.so.0:pango_font_description_free
libpango-1.0.so.0:pango_font_description_from_string
libpango-1.0.so.0:pango_language_from_string
@@ -1444,24 +1462,6 @@
libpthread.so.0:open
libpthread.so.0:read
libpthread.so.0:write
-libxklavier.so.16:xkl_config_item_new
-libxklavier.so.16:xkl_config_rec_get_from_server
-libxklavier.so.16:xkl_config_rec_new
-libxklavier.so.16:xkl_config_registry_find_model
-libxklavier.so.16:xkl_config_registry_foreach_country
-libxklavier.so.16:xkl_config_registry_foreach_country_variant
-libxklavier.so.16:xkl_config_registry_foreach_language
-libxklavier.so.16:xkl_config_registry_foreach_language_variant
-libxklavier.so.16:xkl_config_registry_foreach_model
-libxklavier.so.16:xkl_config_registry_foreach_option
-libxklavier.so.16:xkl_config_registry_foreach_option_group
-libxklavier.so.16:xkl_config_registry_get_instance
-libxklavier.so.16:xkl_config_registry_load
-libxklavier.so.16:xkl_engine_get_backend_name
-libxklavier.so.16:xkl_engine_get_instance
-libxklavier.so.16:xkl_engine_get_max_num_groups
-libxklavier.so.16:xkl_xkb_config_native_cleanup
-libxklavier.so.16:xkl_xkb_config_native_prepare
libxml2.so.2:xmlChildElementCount
libxml2.so.2:xmlCreateIntSubset
libxml2.so.2:xmlDocGetRootElement
diff --git a/files/0001-Use-libayatana-appindicator.patch b/files/0001-Use-libayatana-appindicator.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Use-libayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From 5599b91b6937065ff9355b78f48f66bf02725352 Mon Sep 17 00:00:00 2001
+From: Fabio Forni <livingsilver94.solus@redaril.me>
+Date: Mon, 23 Aug 2021 23:17:00 +0200
+Subject: [PATCH] Use libayatana-appindicator
+
+---
+ configure | 2 +-
+ configure.ac | 2 +-
+ typing-break/drwright.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index b70cbf2..73c2b04 100755
+--- a/configure
++++ b/configure
+@@ -17003,7 +17003,7 @@ else
+ fi
+
+
+-APPINDICATOR_PKG=appindicator3-0.1
++APPINDICATOR_PKG=ayatana-appindicator3-0.1
+
+ # Check whether --enable-appindicator was given.
+ if test "${enable_appindicator+set}" = set; then :
+diff --git a/configure.ac b/configure.ac
+index d9c72eb..b95cb08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,7 +85,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
+ AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
+
+ dnl app indicator
+-APPINDICATOR_PKG=appindicator3-0.1
++APPINDICATOR_PKG=ayatana-appindicator3-0.1
+
+ AC_ARG_ENABLE(appindicator,
+ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
+diff --git a/typing-break/drwright.c b/typing-break/drwright.c
+index b43cc63..e3c5874 100644
+--- a/typing-break/drwright.c
++++ b/typing-break/drwright.c
+@@ -31,7 +31,7 @@
+ #include <gio/gio.h>
+
+ #ifdef HAVE_APP_INDICATOR
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif /* HAVE_APP_INDICATOR */
+
+ #define MATE_DESKTOP_USE_UNSTABLE_API
+--
+2.32.0
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : mate-control-center
version : 1.26.0
-release : 33
+release : 34
source :
- https://github.com/mate-desktop/mate-control-center/releases/download/v1.26.0/mate-control-center-1.26.0.tar.xz : 286714ea778f6540fe74ef00aaf504c47141518d26ab224994f4a1af36b0134a
license : GPL-2.0-or-later
@@ -10,7 +10,7 @@
MATE Desktop Control Center
builddeps :
- pkgconfig(accountsservice)
- - pkgconfig(appindicator3-0.1)
+ - pkgconfig(ayatana-appindicator3-0.1)
- pkgconfig(libcanberra-gtk3)
- pkgconfig(libmarco-private)
- pkgconfig(libmatekbd)
@@ -23,6 +23,7 @@
- itstool
setup : |
%patch -p1 < $pkgfiles/0001-Fix-passwd-path.patch
+ %patch -p1 < $pkgfiles/0001-Use-libayatana-appindicator.patch
%configure --disable-update-mimedb
build : |
%make
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>mate-control-center</Name>
<Packager>
- <Name>Pierre-Yves</Name>
- <Email>pyu@riseup.net</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>desktop.mate</PartOf>
@@ -2054,7 +2054,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="33">mate-control-center</Dependency>
+ <Dependency release="34">mate-control-center</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/libmate-slab/app-resizer.h</Path>
@@ -2086,12 +2086,12 @@
</Files>
</Package>
<History>
- <Update release="33">
- <Date>2021-08-07</Date>
+ <Update release="34">
+ <Date>2021-08-23</Date>
<Version>1.26.0</Version>
<Comment>Packaging update</Comment>
- <Name>Pierre-Yves</Name>
- <Email>pyu@riseup.net</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 6:30 PM (2 h, 25 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5823864
Default Alt Text
D11732.diff (14 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.