mirror of
git://slackware.nl/current.git
synced 2025-01-03 23:03:22 +01:00
dbf5c1c439
Moved a few dependencies from vtown into the main tree, updated much of the GNOME stack, and Xfce 4.14 appears in vtown! Thanks much to Robby Workman. Hope everyone had a good day. Enjoy! :-) a/upower-0.99.11-x86_64-1.txz: Upgraded. d/sassc-3.6.1-x86_64-1.txz: Added. d/vala-0.50.2-x86_64-1.txz: Upgraded. l/at-spi2-atk-2.38.0-x86_64-1.txz: Upgraded. l/at-spi2-core-2.38.0-x86_64-1.txz: Upgraded. l/brotli-1.0.9-x86_64-3.txz: Rebuilt. Get rid of unrecognized -R in the pkg-config files. l/dconf-0.38.0-x86_64-1.txz: Upgraded. l/dconf-editor-3.38.2-x86_64-1.txz: Upgraded. l/gcr-3.38.0-x86_64-1.txz: Upgraded. l/gdk-pixbuf2-2.42.0-x86_64-1.txz: Upgraded. l/gdk-pixbuf2-xlib-2.40.2-x86_64-1.txz: Added. l/gjs-1.66.1-x86_64-1.txz: Added. l/glade-3.38.2-x86_64-1.txz: Added. l/glib-networking-2.66.0-x86_64-1.txz: Upgraded. l/glib2-2.66.3-x86_64-1.txz: Upgraded. l/gobject-introspection-1.66.1-x86_64-1.txz: Upgraded. l/gtksourceview3-3.24.11-x86_64-1.txz: Added. l/gvfs-1.46.1-x86_64-1.txz: Upgraded. l/json-glib-1.6.0-x86_64-1.txz: Upgraded. l/librsvg-2.50.2-x86_64-1.txz: Upgraded. l/libsass-3.6.4-x86_64-1.txz: Added. l/libsoup-2.72.0-x86_64-1.txz: Upgraded. l/libwnck3-3.36.0-x86_64-1.txz: Added. l/pango-1.48.0-x86_64-1.txz: Upgraded. l/pygobject3-3.38.0-x86_64-1.txz: Upgraded. l/vte-0.62.1-x86_64-1.txz: Upgraded. testing/packages/vtown/deps/libsass-3.6.4-x86_64-1_vtown_1.txz: Removed. testing/packages/vtown/deps/sassc-3.6.1-x86_64-1_vtown_1.txz: Removed. testing/packages/vtown/deps/upower-0.99.11-x86_64-1_vtown_1.txz: Removed. testing/packages/vtown/xfce/Greybird-3.22.12-noarch-1_vtown_1.txz: Added. testing/packages/vtown/xfce/elementary-xfce-0.15.1-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/exo-0.12.11-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/garcon-0.6.4-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/libxfce4ui-4.14.1-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/libxfce4util-4.14.0-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/mousepad-0.4.2-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/thunar-1.8.16-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/thunar-volman-0.9.5-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/tumbler-0.2.9-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/xfce4-appfinder-4.14.0-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-clipman-plugin-1.6.1-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-dev-tools-4.14.0-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-notifyd-0.6.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-panel-4.14.4-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-panel-profiles-1.0.10-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/xfce4-power-manager-1.6.6-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-pulseaudio-plugin-0.4.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-screensaver-0.1.11-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/xfce4-screenshooter-1.9.7-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-session-4.14.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-settings-4.14.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-systemload-plugin-1.2.3-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/xfce4-taskmanager-1.2.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-terminal-0.8.9.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-weather-plugin-0.10.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-whiskermenu-plugin-2.4.6-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/xfconf-4.14.4-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfdesktop-4.14.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfwm4-4.14.6-x86_64-1_vtown_1.txz: Upgraded.
76 lines
1.9 KiB
Diff
76 lines
1.9 KiB
Diff
From 97185bae75b16bea48d532aa5511417e485b1c06 Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Wed, 17 Jun 2020 10:51:09 +0200
|
|
Subject: [PATCH 1/4] linux: Add support for iPhone XR, XS models
|
|
|
|
Modifying the udev serial to be acceptable as an hyphened UDID, as the
|
|
usbmux stack expects.
|
|
|
|
Closes: #114
|
|
---
|
|
src/linux/up-device-idevice.c | 28 ++++++++++++++++++++++++++--
|
|
1 file changed, 26 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c
|
|
index a808269..d2fa0a1 100644
|
|
--- a/src/linux/up-device-idevice.c
|
|
+++ b/src/linux/up-device-idevice.c
|
|
@@ -203,6 +203,28 @@ out:
|
|
return G_SOURCE_CONTINUE;
|
|
}
|
|
|
|
+static char *
|
|
+get_device_uuid (GUdevDevice *native)
|
|
+{
|
|
+ const char *uuid;
|
|
+ char *retval;
|
|
+
|
|
+ uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
|
|
+ if (uuid == NULL)
|
|
+ return NULL;
|
|
+
|
|
+ if (strlen (uuid) != 24)
|
|
+ return g_strdup (uuid);
|
|
+
|
|
+ /* new style UDID: add hyphen between first 8 and following 16 digits */
|
|
+ retval = g_malloc0 (24 + 1 + 1);
|
|
+ memcpy (&retval[0], &uuid[0], 8);
|
|
+ retval[8] = '-';
|
|
+ memcpy (&retval[9], &uuid[8], 16);
|
|
+
|
|
+ return retval;
|
|
+}
|
|
+
|
|
/**
|
|
* up_device_idevice_coldplug:
|
|
*
|
|
@@ -213,7 +235,7 @@ up_device_idevice_coldplug (UpDevice *device)
|
|
{
|
|
UpDeviceIdevice *idevice = UP_DEVICE_IDEVICE (device);
|
|
GUdevDevice *native;
|
|
- const gchar *uuid;
|
|
+ char *uuid;
|
|
const gchar *model;
|
|
UpDeviceKind kind;
|
|
|
|
@@ -223,7 +245,7 @@ up_device_idevice_coldplug (UpDevice *device)
|
|
return FALSE;
|
|
|
|
/* Get the UUID */
|
|
- uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
|
|
+ uuid = get_device_uuid (native);
|
|
if (uuid == NULL)
|
|
return FALSE;
|
|
|
|
@@ -253,6 +275,8 @@ up_device_idevice_coldplug (UpDevice *device)
|
|
g_source_set_name_by_id (idevice->priv->start_id,
|
|
"[upower] up_device_idevice_start_poll_cb (linux)");
|
|
|
|
+ g_free (uuid);
|
|
+
|
|
return TRUE;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|