CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update-notifier: remove ubuntu-advantage-notifier daemon services.

Browse source
This commit is contained in:
Ark74 2023-04-06 11:55:15 -06:00
parent 6b15a032dd
commit 352d2703f0
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
helpers/make-update-notifier
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2012-2023 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2012-2023 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=8 VERSION=9
COMPONENT=main COMPONENT=main
. ./config . ./config
@ -70,7 +71,7 @@ cat << EOF | patch -p1
--- a/src/update-notifier.c 2023-01-20 13:50:39.000000000 -0500 --- a/src/update-notifier.c 2023-01-20 13:50:39.000000000 -0500
+++ b/src/update-notifier.c 2023-02-07 11:08:58.883996715 -0500 +++ b/src/update-notifier.c 2023-02-07 11:08:58.883996715 -0500
@@ -168,7 +168,13 @@ @@ -168,7 +168,13 @@
// normal launch // normal launch
context = gdk_display_get_app_launch_context (gdk_display_get_default ()); context = gdk_display_get_app_launch_context (gdk_display_get_default ());
- guint32 timestamp = gdk_x11_get_server_time (gtk_widget_get_window (w)); - guint32 timestamp = gdk_x11_get_server_time (gtk_widget_get_window (w));
@ -81,8 +82,8 @@ cat << EOF | patch -p1
+ else + else
+#endif +#endif
+ timestamp = (guint32) (g_get_monotonic_time () / 1000); + timestamp = (guint32) (g_get_monotonic_time () / 1000);
appinfo = g_app_info_create_from_commandline(cmd, appinfo = g_app_info_create_from_commandline(cmd,
cmd, cmd,
G_APP_INFO_CREATE_NONE, G_APP_INFO_CREATE_NONE,
EOF EOF
@ -94,10 +95,10 @@ cat << EOF | patch -p1
ubuntu-release-upgrader-gtk, ubuntu-release-upgrader-gtk,
gnome-shell <!s390x> | notification-daemon <!s390x>, gnome-shell <!s390x> | notification-daemon <!s390x>,
policykit-1 policykit-1
-Recommends: apport-gtk (>=2.8-0ubuntu3), -Recommends: apport-gtk (>=2.8-0ubuntu3),
- python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), - python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12),
+Recommends: python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), +Recommends: python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12),
software-properties-gtk, software-properties-gtk,
- python3-aptdaemon, - python3-aptdaemon,
- whoopsie (>= 0.2.77) - whoopsie (>= 0.2.77)
+ python3-aptdaemon + python3-aptdaemon
@ -106,6 +107,24 @@ cat << EOF | patch -p1
available. available.
EOF EOF
# Removal daemons from ubuntu-advantage
truncate -s 0 data/ubuntu-advantage-notification.desktop.in
sed -i '/ubuntu-advantage-notification/d' debian/update-notifier.install
sed -i '/ubuntu-advantage-notification.desktop.in.h/,+2d' po/*.po po/*.pot
# Remove ubuntu-advantage services
cat << EOF >> debian/postrm
# Remove previosly installed ubuntu-advantage-notification
rm -rf /usr/lib/update-notifier/ubuntu-advantage-notification && \
rm -rf /etc/xdg/autostart/ubuntu-advantage-notification.desktop
#DEBHELPER#
EOF
# Force removal of old services on previous version.
sed -i '/Description: Daemon/i Breaks: update-notifier-common (<= 3.192.54.6+11.0trisquel8)' debian/control
sed -i '/Suggests: policykit-1/i Breaks: update-notifier-common (<= 3.192.54.6+11.0trisquel8)' debian/control
changelog "Disabled hp-firmware handling and ubuntu-drivers" changelog "Disabled hp-firmware handling and ubuntu-drivers"
compile compile