From 9ecf63ff503c9049634322faadf6b93ee25c222c Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Mon, 26 Mar 2018 18:54:58 +0100 Subject: [PATCH] debian/patches: Drop 0002_fix_cpufreq_applet_spacing.patch. Applied upstream. --- .../0002_fix_cpufreq_applet_spacing.patch | 33 ------------------- debian/patches/series | 1 - 2 files changed, 34 deletions(-) delete mode 100644 debian/patches/0002_fix_cpufreq_applet_spacing.patch diff --git a/debian/patches/0002_fix_cpufreq_applet_spacing.patch b/debian/patches/0002_fix_cpufreq_applet_spacing.patch deleted file mode 100644 index 94e6031..0000000 --- a/debian/patches/0002_fix_cpufreq_applet_spacing.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ea40c35e823914cd5721ad7af436cb9e69736d2d Mon Sep 17 00:00:00 2001 -From: Victor Kareh -Date: Tue, 20 Mar 2018 07:18:44 -0400 -Subject: [PATCH] Fix cpufreq applet spacing on HiDPI displays - ---- - cpufreq/src/cpufreq-applet.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c -index 4f60202..c667eda 100644 ---- a/cpufreq/src/cpufreq-applet.c -+++ b/cpufreq/src/cpufreq-applet.c -@@ -372,8 +372,10 @@ cpufreq_applet_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint - CPUFreqApplet *applet; - gint labels_width = 0; - gint width; -+ gint scale; - - applet = CPUFREQ_APPLET (widget); -+ scale = gtk_widget_get_scale_factor (widget); - - if (applet->orient == MATE_PANEL_APPLET_ORIENT_LEFT || - applet->orient == MATE_PANEL_APPLET_ORIENT_RIGHT) -@@ -401,7 +403,7 @@ cpufreq_applet_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint - width = labels_width; - } - -- *minimum_width = *natural_width = width; -+ *minimum_width = *natural_width = width / scale; - } - - static void diff --git a/debian/patches/series b/debian/patches/series index 2d47123..6692119 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0002_fix_cpufreq_applet_spacing.patch 1000-fix-build-on-linux-4.7-or-newer.patch