From 0e7f8e9c0dd3f7291633df1a88821836b455e104 Mon Sep 17 00:00:00 2001 From: Joey Riches Date: Thu, 14 Dec 2023 22:29:25 +0000 Subject: [PATCH] mate-user-admin: Update to 1.7.0 **Summary** - No summarized changelog provided. - Make usable from xfce settings, ref #305. --- packages/m/mate-user-admin/abi_used_symbols | 33 +------------------ ...001-data-Rename-to-just-User-Manager.patch | 26 +++++++++++++++ .../files/xfce-user-settings.desktop | 14 ++++++++ packages/m/mate-user-admin/package.yml | 12 +++++-- packages/m/mate-user-admin/pspec_x86_64.xml | 18 +++++----- .../files/60-solusxfce.conf | 9 ----- 6 files changed, 60 insertions(+), 52 deletions(-) create mode 100644 packages/m/mate-user-admin/files/0001-data-Rename-to-just-User-Manager.patch create mode 100644 packages/m/mate-user-admin/files/xfce-user-settings.desktop delete mode 100644 packages/x/xfce4-desktop-branding/files/60-solusxfce.conf diff --git a/packages/m/mate-user-admin/abi_used_symbols b/packages/m/mate-user-admin/abi_used_symbols index 334d5567c8c2..b09035fb514a 100644 --- a/packages/m/mate-user-admin/abi_used_symbols +++ b/packages/m/mate-user-admin/abi_used_symbols @@ -111,13 +111,11 @@ libgio-2.0.so.0:g_file_new_for_path libgio-2.0.so.0:g_file_new_for_uri libgio-2.0.so.0:g_file_query_info libgio-2.0.so.0:g_io_error_quark -libgio-2.0.so.0:g_list_model_get_type libgio-2.0.so.0:g_list_store_append libgio-2.0.so.0:g_list_store_new libgio-2.0.so.0:g_permission_acquire_async libgio-2.0.so.0:g_permission_acquire_finish libgio-2.0.so.0:g_permission_get_allowed -libgio-2.0.so.0:g_permission_get_type libgio-2.0.so.0:g_settings_get_boolean libgio-2.0.so.0:g_settings_new libgio-2.0.so.0:g_unix_output_stream_new @@ -163,6 +161,7 @@ libglib-2.0.so.0:g_key_file_load_from_file libglib-2.0.so.0:g_key_file_new libglib-2.0.so.0:g_list_free libglib-2.0.so.0:g_log +libglib-2.0.so.0:g_malloc libglib-2.0.so.0:g_mkstemp libglib-2.0.so.0:g_once_init_enter libglib-2.0.so.0:g_once_init_leave @@ -223,8 +222,6 @@ libgobject-2.0.so.0:g_signal_handlers_unblock_matched libgobject-2.0.so.0:g_signal_new libgobject-2.0.so.0:g_signal_stop_emission_by_name libgobject-2.0.so.0:g_type_add_instance_private -libgobject-2.0.so.0:g_type_check_class_cast -libgobject-2.0.so.0:g_type_check_instance_cast libgobject-2.0.so.0:g_type_check_instance_is_a libgobject-2.0.so.0:g_type_class_adjust_private_offset libgobject-2.0.so.0:g_type_class_peek_parent @@ -246,33 +243,27 @@ libgroup-service.so.1:gas_group_manager_no_service libgroup-service.so.1:gas_group_remove_user_group libgroup-service.so.1:gas_group_user_is_group libgtk-3.so.0:gtk_bin_get_child -libgtk-3.so.0:gtk_bin_get_type -libgtk-3.so.0:gtk_box_get_type libgtk-3.so.0:gtk_box_new libgtk-3.so.0:gtk_box_pack_start libgtk-3.so.0:gtk_box_reorder_child libgtk-3.so.0:gtk_box_set_homogeneous -libgtk-3.so.0:gtk_button_get_type libgtk-3.so.0:gtk_button_new libgtk-3.so.0:gtk_button_new_with_label libgtk-3.so.0:gtk_button_new_with_mnemonic libgtk-3.so.0:gtk_button_set_image libgtk-3.so.0:gtk_button_set_label libgtk-3.so.0:gtk_button_set_use_underline -libgtk-3.so.0:gtk_cell_layout_get_type libgtk-3.so.0:gtk_cell_layout_pack_start libgtk-3.so.0:gtk_cell_layout_set_attributes libgtk-3.so.0:gtk_cell_renderer_pixbuf_new libgtk-3.so.0:gtk_cell_renderer_text_new libgtk-3.so.0:gtk_cell_renderer_toggle_new libgtk-3.so.0:gtk_combo_box_get_active -libgtk-3.so.0:gtk_combo_box_get_type libgtk-3.so.0:gtk_combo_box_new_with_model libgtk-3.so.0:gtk_combo_box_set_active libgtk-3.so.0:gtk_container_add libgtk-3.so.0:gtk_container_foreach libgtk-3.so.0:gtk_container_get_children -libgtk-3.so.0:gtk_container_get_type libgtk-3.so.0:gtk_container_remove libgtk-3.so.0:gtk_container_set_border_width libgtk-3.so.0:gtk_dialog_add_action_widget @@ -285,7 +276,6 @@ libgtk-3.so.0:gtk_dialog_set_default_response libgtk-3.so.0:gtk_dialog_set_response_sensitive libgtk-3.so.0:gtk_drawing_area_get_type libgtk-3.so.0:gtk_entry_get_text -libgtk-3.so.0:gtk_entry_get_type libgtk-3.so.0:gtk_entry_new libgtk-3.so.0:gtk_entry_set_icon_from_icon_name libgtk-3.so.0:gtk_entry_set_icon_tooltip_text @@ -295,7 +285,6 @@ libgtk-3.so.0:gtk_entry_set_visibility libgtk-3.so.0:gtk_file_chooser_dialog_new libgtk-3.so.0:gtk_file_chooser_get_filename libgtk-3.so.0:gtk_file_chooser_get_preview_widget -libgtk-3.so.0:gtk_file_chooser_get_type libgtk-3.so.0:gtk_file_chooser_get_uri libgtk-3.so.0:gtk_file_chooser_set_current_folder libgtk-3.so.0:gtk_file_chooser_set_filter @@ -304,11 +293,9 @@ libgtk-3.so.0:gtk_file_chooser_set_preview_widget_active libgtk-3.so.0:gtk_file_chooser_set_use_preview_label libgtk-3.so.0:gtk_file_filter_add_pixbuf_formats libgtk-3.so.0:gtk_file_filter_new -libgtk-3.so.0:gtk_fixed_get_type libgtk-3.so.0:gtk_fixed_new libgtk-3.so.0:gtk_fixed_put libgtk-3.so.0:gtk_flow_box_bind_model -libgtk-3.so.0:gtk_flow_box_get_type libgtk-3.so.0:gtk_flow_box_new libgtk-3.so.0:gtk_flow_box_selected_foreach libgtk-3.so.0:gtk_flow_box_set_activate_on_single_click @@ -322,14 +309,12 @@ libgtk-3.so.0:gtk_grid_new libgtk-3.so.0:gtk_grid_set_column_homogeneous libgtk-3.so.0:gtk_grid_set_column_spacing libgtk-3.so.0:gtk_grid_set_row_spacing -libgtk-3.so.0:gtk_header_bar_get_type libgtk-3.so.0:gtk_header_bar_new libgtk-3.so.0:gtk_header_bar_pack_start libgtk-3.so.0:gtk_header_bar_set_has_subtitle libgtk-3.so.0:gtk_header_bar_set_show_close_button libgtk-3.so.0:gtk_header_bar_set_subtitle libgtk-3.so.0:gtk_header_bar_set_title -libgtk-3.so.0:gtk_image_get_type libgtk-3.so.0:gtk_image_new libgtk-3.so.0:gtk_image_new_from_icon_name libgtk-3.so.0:gtk_image_new_from_pixbuf @@ -337,19 +322,16 @@ libgtk-3.so.0:gtk_image_set_from_icon_name libgtk-3.so.0:gtk_image_set_from_pixbuf libgtk-3.so.0:gtk_image_set_pixel_size libgtk-3.so.0:gtk_init -libgtk-3.so.0:gtk_label_get_type libgtk-3.so.0:gtk_label_new libgtk-3.so.0:gtk_label_set_ellipsize libgtk-3.so.0:gtk_label_set_markup libgtk-3.so.0:gtk_label_set_max_width_chars -libgtk-3.so.0:gtk_level_bar_get_type libgtk-3.so.0:gtk_level_bar_new libgtk-3.so.0:gtk_level_bar_set_max_value libgtk-3.so.0:gtk_level_bar_set_min_value libgtk-3.so.0:gtk_level_bar_set_mode libgtk-3.so.0:gtk_level_bar_set_value libgtk-3.so.0:gtk_list_box_get_row_at_index -libgtk-3.so.0:gtk_list_box_get_type libgtk-3.so.0:gtk_list_box_insert libgtk-3.so.0:gtk_list_box_invalidate_filter libgtk-3.so.0:gtk_list_box_new @@ -366,19 +348,15 @@ libgtk-3.so.0:gtk_list_box_set_selection_mode libgtk-3.so.0:gtk_list_box_set_sort_func libgtk-3.so.0:gtk_list_store_append libgtk-3.so.0:gtk_list_store_clear -libgtk-3.so.0:gtk_list_store_get_type libgtk-3.so.0:gtk_list_store_new libgtk-3.so.0:gtk_list_store_set -libgtk-3.so.0:gtk_lock_button_get_type libgtk-3.so.0:gtk_lock_button_new libgtk-3.so.0:gtk_lock_button_set_permission libgtk-3.so.0:gtk_main libgtk-3.so.0:gtk_main_quit libgtk-3.so.0:gtk_message_dialog_format_secondary_markup -libgtk-3.so.0:gtk_message_dialog_get_type libgtk-3.so.0:gtk_message_dialog_new libgtk-3.so.0:gtk_notebook_append_page -libgtk-3.so.0:gtk_notebook_get_type libgtk-3.so.0:gtk_notebook_new libgtk-3.so.0:gtk_notebook_set_tab_pos libgtk-3.so.0:gtk_popover_get_type @@ -387,42 +365,34 @@ libgtk-3.so.0:gtk_popover_popdown libgtk-3.so.0:gtk_popover_popup libgtk-3.so.0:gtk_popover_set_position libgtk-3.so.0:gtk_radio_button_get_group -libgtk-3.so.0:gtk_radio_button_get_type libgtk-3.so.0:gtk_radio_button_new_with_label -libgtk-3.so.0:gtk_scrolled_window_get_type libgtk-3.so.0:gtk_scrolled_window_new libgtk-3.so.0:gtk_scrolled_window_set_policy libgtk-3.so.0:gtk_scrolled_window_set_shadow_type libgtk-3.so.0:gtk_search_bar_connect_entry -libgtk-3.so.0:gtk_search_bar_get_type libgtk-3.so.0:gtk_search_bar_new libgtk-3.so.0:gtk_search_bar_set_search_mode libgtk-3.so.0:gtk_search_bar_set_show_close_button libgtk-3.so.0:gtk_search_entry_new libgtk-3.so.0:gtk_separator_new libgtk-3.so.0:gtk_style_context_add_class -libgtk-3.so.0:gtk_switch_get_type libgtk-3.so.0:gtk_switch_new libgtk-3.so.0:gtk_switch_set_state -libgtk-3.so.0:gtk_toggle_button_get_type libgtk-3.so.0:gtk_toggle_button_set_active libgtk-3.so.0:gtk_tree_model_foreach libgtk-3.so.0:gtk_tree_model_get libgtk-3.so.0:gtk_tree_model_get_iter -libgtk-3.so.0:gtk_tree_model_get_type libgtk-3.so.0:gtk_tree_path_free libgtk-3.so.0:gtk_tree_path_new_from_string libgtk-3.so.0:gtk_tree_selection_get_selected libgtk-3.so.0:gtk_tree_selection_select_iter libgtk-3.so.0:gtk_tree_view_append_column -libgtk-3.so.0:gtk_tree_view_column_get_type libgtk-3.so.0:gtk_tree_view_column_new_with_attributes libgtk-3.so.0:gtk_tree_view_column_set_fixed_width libgtk-3.so.0:gtk_tree_view_column_set_sizing libgtk-3.so.0:gtk_tree_view_column_set_sort_column_id libgtk-3.so.0:gtk_tree_view_get_model libgtk-3.so.0:gtk_tree_view_get_selection -libgtk-3.so.0:gtk_tree_view_get_type libgtk-3.so.0:gtk_tree_view_new_with_model libgtk-3.so.0:gtk_tree_view_set_search_column libgtk-3.so.0:gtk_widget_activate @@ -432,7 +402,6 @@ libgtk-3.so.0:gtk_widget_get_allocation libgtk-3.so.0:gtk_widget_get_display libgtk-3.so.0:gtk_widget_get_style_context libgtk-3.so.0:gtk_widget_get_toplevel -libgtk-3.so.0:gtk_widget_get_type libgtk-3.so.0:gtk_widget_get_visible libgtk-3.so.0:gtk_widget_get_window libgtk-3.so.0:gtk_widget_grab_default diff --git a/packages/m/mate-user-admin/files/0001-data-Rename-to-just-User-Manager.patch b/packages/m/mate-user-admin/files/0001-data-Rename-to-just-User-Manager.patch new file mode 100644 index 000000000000..c1a400929edc --- /dev/null +++ b/packages/m/mate-user-admin/files/0001-data-Rename-to-just-User-Manager.patch @@ -0,0 +1,26 @@ +From 9344269f5b940c65fd8701afff4b820ecb033e24 Mon Sep 17 00:00:00 2001 +From: Joey Riches +Date: Thu, 14 Dec 2023 22:13:44 +0000 +Subject: [PATCH 1/1] data: Rename to just "User Manager" + +As this ulitity is used on XFCE as well as MATE. +--- + data/mate-user-admin.desktop.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/mate-user-admin.desktop.in b/data/mate-user-admin.desktop.in +index 41cd8f6..2131613 100644 +--- a/data/mate-user-admin.desktop.in ++++ b/data/mate-user-admin.desktop.in +@@ -1,6 +1,6 @@ + [Desktop Entry] +-Name=MATE User Manager +-Name[ca]=Gestor d'usuaris de MATE ++Name=User Manager ++Name[ca]=Gestor d'usuaris + Name[zh_CN]=用户管理 + Comment=Manage User + Comment[ca]=Gestioneu els usuaris +-- +2.43.0 + diff --git a/packages/m/mate-user-admin/files/xfce-user-settings.desktop b/packages/m/mate-user-admin/files/xfce-user-settings.desktop new file mode 100644 index 000000000000..ad4752e8b671 --- /dev/null +++ b/packages/m/mate-user-admin/files/xfce-user-settings.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Name=Users and Groups +Comment=Configure users and groups +Keywords=settings;users;groups;admin;login; +Exec=users-admin +Icon=config-users +Terminal=false +Type=Application +Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; +StartupNotify=true +OnlyShowIn=XFCE; +X-XfcePluggable=true +X-XfceHelpPage=users diff --git a/packages/m/mate-user-admin/package.yml b/packages/m/mate-user-admin/package.yml index 57d87e55a956..71dba7937f28 100644 --- a/packages/m/mate-user-admin/package.yml +++ b/packages/m/mate-user-admin/package.yml @@ -1,8 +1,9 @@ name : mate-user-admin -version : 1.6.0 -release : 6 +version : 1.7.0 +release : 7 source : - - git|https://github.com/zhuyaliang/user-admin : 4eb966b2cd9dd0f42a1fb9086eecbbc95b79a8b0 + - https://github.com/zhuyaliang/user-admin/archive/refs/tags/v1.7.0.tar.gz : b4eb0783b382ed9405c76b765148d105dd113e20f66e61ad63d6fb7de7cafe1d +homepage : https://github.com/zhuyaliang/user-admin license : GPL-3.0-or-later component : desktop.mate summary : Users & groups management tool for the MATE desktop environment @@ -18,8 +19,13 @@ setup : | # Set our own defaults cp $pkgfiles/nuconfig data/mate-user-admin/ + %patch -p1 -i $pkgfiles/0001-data-Rename-to-just-User-Manager.patch + %meson_configure build : | %ninja_build install : | %ninja_install + + # Make launchable from xfce settings manager + install -Dm00644 $pkgfiles/xfce-user-settings.desktop $installdir/usr/share/applications/xfce-user-settings.desktop diff --git a/packages/m/mate-user-admin/pspec_x86_64.xml b/packages/m/mate-user-admin/pspec_x86_64.xml index 4646dde3a801..4a38c31a387e 100644 --- a/packages/m/mate-user-admin/pspec_x86_64.xml +++ b/packages/m/mate-user-admin/pspec_x86_64.xml @@ -1,16 +1,17 @@ mate-user-admin + https://github.com/zhuyaliang/user-admin - Thomas Staudinger - Staudi.Kaos@gmail.com + Joey Riches + josephriches@gmail.com GPL-3.0-or-later desktop.mate Users & groups management tool for the MATE desktop environment Users & groups management tool for the MATE desktop environment. - https://getsol.us/sources/README.Solus + https://sources.getsol.us/README.Solus mate-user-admin @@ -22,6 +23,7 @@ /etc/mate-user-admin/nuconfig /usr/bin/mate-user-admin /usr/share/applications/mate-user-admin.desktop + /usr/share/applications/xfce-user-settings.desktop /usr/share/icons/hicolor/16x16/apps/user-admin.png /usr/share/icons/hicolor/22x22/apps/user-admin.png /usr/share/icons/hicolor/24x24/apps/user-admin.png @@ -158,12 +160,12 @@ - - 2022-11-27 - 1.6.0 + + 2023-12-14 + 1.7.0 Packaging update - Thomas Staudinger - Staudi.Kaos@gmail.com + Joey Riches + josephriches@gmail.com \ No newline at end of file diff --git a/packages/x/xfce4-desktop-branding/files/60-solusxfce.conf b/packages/x/xfce4-desktop-branding/files/60-solusxfce.conf deleted file mode 100644 index 1691cfac075c..000000000000 --- a/packages/x/xfce4-desktop-branding/files/60-solusxfce.conf +++ /dev/null @@ -1,9 +0,0 @@ -[Seat:*] -user-session=solus-xfce -session-wrapper=/usr/bin/lightdm-wrapper -autologin-user=live -autologin-user-timeout=0 - -[SeatDefaults] -autologin-user=live -autologin-user-timeout=0 \ No newline at end of file