Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at 2015-11-22 10:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxpanel (Old) and /work/SRC/openSUSE:Factory/.lxpanel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxpanel" Changes: -------- --- /work/SRC/openSUSE:Factory/lxpanel/lxpanel.changes 2015-05-11 19:49:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxpanel.new/lxpanel.changes 2015-11-22 10:59:57.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Oct 31 12:29:24 UTC 2015 - t...@gmx.com + +- Added lxpanel-0.8.1-Fix-lxpanel.pc-dependencies.patch +- Added lxpanel-0.8.1-Fix-taskbar-plugin-crash.patch + * Fixes SF#758 +- Added lxpanel-0.8.1-Fix-incorrect-panel-geometry-initialization.patch + * Fixes SF#753 +- Added lxpanel-0.8.1-Fix-crash-with-invalid-size-of-icon.patch +- Added lxpanel-0.8.1-Do-not-load-indicators-in-the-constructor.patch + * Prevents loading indicators twice + +------------------------------------------------------------------- New: ---- lxpanel-0.8.1-Do-not-load-indicators-in-the-constructor.patch lxpanel-0.8.1-Fix-crash-with-invalid-size-of-icon.patch lxpanel-0.8.1-Fix-incorrect-panel-geometry-initialization.patch lxpanel-0.8.1-Fix-lxpanel.pc-dependencies.patch lxpanel-0.8.1-Fix-taskbar-plugin-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.cA2EUl/_old 2015-11-22 10:59:58.000000000 +0100 +++ /var/tmp/diff_new_pack.cA2EUl/_new 2015-11-22 10:59:58.000000000 +0100 @@ -24,12 +24,20 @@ Group: System/GUI/LXDE Url: http://www.lxde.org/ Source0: %{name}-%{version}.tar.xz +Patch1: %{name}-0.8.1-Fix-lxpanel.pc-dependencies.patch +Patch2: %{name}-0.8.1-Fix-taskbar-plugin-crash.patch +Patch3: %{name}-0.8.1-Fix-incorrect-panel-geometry-initialization.patch +Patch4: %{name}-0.8.1-Fix-crash-with-invalid-size-of-icon.patch +# [PATCH] indicators plugin : don't load indicators in the constructor, +# already done in configuration functions. It may load the indicators twice +Patch5: %{name}-0.8.1-Do-not-load-indicators-in-the-constructor.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libiw-devel BuildRequires: libfm-gtk-devel BuildRequires: libxml2-devel BuildRequires: pkg-config +BuildRequires: autoconf BuildRequires: update-desktop-files BuildRequires: wireless-tools BuildRequires: pkgconfig(alsa) @@ -80,8 +88,14 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build +# autoconf %configure --with-plugins=all make %{?_smp_mflags} V=1 ++++++ lxpanel-0.8.1-Do-not-load-indicators-in-the-constructor.patch ++++++ >From 6d9f23a8b862d3b90f994ff305267706ab7593eb Mon Sep 17 00:00:00 2001 From: Julien Lavergne <julien.laver...@gmail.com> Date: Tue, 20 Oct 2015 17:19:28 +0200 Subject: [PATCH] indicators plugin : don't load indicators in the constructor, already done in configuration functions. It may load the indicators twice. --- plugins/indicator/indicator.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/indicator/indicator.c b/plugins/indicator/indicator.c index c19d384..e4477cf 100644 --- a/plugins/indicator/indicator.c +++ b/plugins/indicator/indicator.c @@ -791,9 +791,6 @@ static GtkWidget *indicator_constructor(LXPanel *panel, config_setting_t *settin gtk_container_set_border_width(GTK_CONTAINER(indicator->menubar), 0); - /* load 'em */ - indicator_load_modules(panel, p); - return p; } -- 2.1.4 ++++++ lxpanel-0.8.1-Fix-crash-with-invalid-size-of-icon.patch ++++++ >From bd6533554418767438eee066c3d76efe54fc1c64 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <and...@rep.kiev.ua> Date: Tue, 13 Oct 2015 19:54:56 +0300 Subject: [PATCH] Fix crash with invalid size of icon in _NET_WM_ICON property. Reported by Lutz Fischer <fischerlut...@yahoo.com> in Debian BTS, bug #801319 --- ChangeLog | 1 + plugins/launchtaskbar.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26ba3b6..64a67e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ * Fixed crash in taskbar plugin after number of desktops was updated. * Fixed incorrect panel geometry initialization. +* Fixed crash with invalid size of icon in _NET_WM_ICON property. 0.8.1 ------------------------------------------------------------------------- diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c index 2a4cf82..8ad7ea1 100644 --- a/plugins/launchtaskbar.c +++ b/plugins/launchtaskbar.c @@ -2075,8 +2075,9 @@ static GdkPixbuf * get_wm_icon(Window task_win, guint required_width, gulong size = w * h; pdata += 2; - /* Bounds check the icon. */ - if (pdata + size > pdata_end) + /* Bounds check the icon. Also check for invalid width and height, + see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801319 */ + if (size == 0 || w > 1024 || h > 1024 || pdata + size > pdata_end) break; /* Rare special case: the desired size is the same as icon size. */ -- 2.1.4 ++++++ lxpanel-0.8.1-Fix-incorrect-panel-geometry-initialization.patch ++++++ >From 7129a2f9be9cfd97476bc6d06969183e4d7ed6a4 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <and...@rep.kiev.ua> Date: Mon, 15 Jun 2015 18:27:10 +0300 Subject: [PATCH] [SF#753] Fix incorrect panel geometry initialization. The [panel].inialized is used to follow GUI initialization, it cannot be used to check if configure was called first time, panel reconfigure just have to skip resetting the value if orientation wasn't changed - that can be applied for both cases where it changed: - the panel is new one with vertical orientation; - the panel orientation was changed in the configuration dialog; and in all cases where it doesn't: - the panel is new one with horisontal orientation (use default values); - the panel orientation was not changed; - the panel geometry was initialized from config. --- ChangeLog | 1 + src/panel.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bef51b8..26ba3b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ * Fixed crash in taskbar plugin after number of desktops was updated. +* Fixed incorrect panel geometry initialization. 0.8.1 ------------------------------------------------------------------------- diff --git a/src/panel.c b/src/panel.c index 940a919..4b03fcf 100644 --- a/src/panel.c +++ b/src/panel.c @@ -1629,6 +1629,12 @@ void panel_set_panel_configuration_changed(Panel *p) _panel_set_panel_configuration_changed(p->topgwin); } +static inline void _update_orientation(Panel *p) +{ + p->orientation = (p->edge == EDGE_TOP || p->edge == EDGE_BOTTOM) + ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL; +} + static gboolean _panel_idle_reconfigure(gpointer widget) { LXPanel *panel; @@ -1642,15 +1648,13 @@ static gboolean _panel_idle_reconfigure(gpointer widget) panel = LXPANEL(widget); p = panel->priv; previous_orientation = p->orientation; - p->orientation = (p->edge == EDGE_TOP || p->edge == EDGE_BOTTOM) - ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL; + _update_orientation(p); /* either first run or orientation was changed */ - if (!p->initialized || previous_orientation != p->orientation) + if (previous_orientation != p->orientation) { panel_adjust_geometry_terminology(p); - if (p->initialized) - p->height = ((p->orientation == GTK_ORIENTATION_HORIZONTAL) ? PANEL_HEIGHT_DEFAULT : PANEL_WIDTH_DEFAULT); + p->height = ((p->orientation == GTK_ORIENTATION_HORIZONTAL) ? PANEL_HEIGHT_DEFAULT : PANEL_WIDTH_DEFAULT); if (p->height_control != NULL) gtk_spin_button_set_value(GTK_SPIN_BUTTON(p->height_control), p->height); if ((p->widthtype == WIDTH_PIXEL) && (p->width_control != NULL)) @@ -1775,6 +1779,7 @@ panel_parse_global(Panel *p, config_setting_t *cfg) p->background_file = g_strdup(str); config_setting_lookup_int(cfg, "iconsize", &p->icon_size); + _update_orientation(p); panel_normalize_configuration(p); return 1; -- 2.1.4 ++++++ lxpanel-0.8.1-Fix-lxpanel.pc-dependencies.patch ++++++ >From f73b9bdf229b38994e4e19e32af427034650a9b6 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <and...@rep.kiev.ua> Date: Sat, 6 Jun 2015 21:55:02 +0300 Subject: [PATCH] Fix lxpanel.pc dependencies - it should depend on gtk+-2.0, not just glib. --- TODO | 1 + lxpanel.pc.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 1675b4c..ea4445a 100644 --- a/TODO +++ b/TODO @@ -18,3 +18,4 @@ * merge 'volume' into 'volumealsa' to have the same interface * support custom timezone in the 'dclock' * decide 'netstat' vs 'netstatus' +* optional libnotify support (useful for battery and volume plugins) diff --git a/lxpanel.pc.in b/lxpanel.pc.in index db34490..be761a6 100644 --- a/lxpanel.pc.in +++ b/lxpanel.pc.in @@ -6,6 +6,6 @@ pluginsdir=${pkglibdir}/plugins Name: lxpanel Description: A lightweight X11 desktop panel -Requires: glib-2.0 libfm +Requires: gtk+-2.0 libfm >= 1.2.0 Version: @VERSION@ Libs: -L${pkglibdir} -llxpanel -- 2.1.4 ++++++ lxpanel-0.8.1-Fix-taskbar-plugin-crash.patch ++++++ >From 4d922895addf81586308bffaea9ff7e0106eba48 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <and...@rep.kiev.ua> Date: Mon, 15 Jun 2015 14:54:48 +0300 Subject: [PATCH] [SF#758] Fix crash in taskbar plugin after number of desktops was updated. The pointer to invalid menu item was not reset, what's a shame. --- ChangeLog | 2 ++ plugins/launchtaskbar.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1390eac..bef51b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +* Fixed crash in taskbar plugin after number of desktops was updated. + 0.8.1 ------------------------------------------------------------------------- * Improved OSS headers detection a bit. diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c index 062e149..a1b4fb9 100644 --- a/plugins/launchtaskbar.c +++ b/plugins/launchtaskbar.c @@ -3348,6 +3348,8 @@ static void taskbar_make_menu(LaunchTaskBarPlugin * tb) /* Deallocate old menu if present. */ if (tb->menu != NULL) gtk_widget_destroy(tb->menu); + /* The pointer to menu became invalid, reset it now. */ + tb->workspace_menu0 = NULL; /* Allocate menu. */ GtkWidget * menu = gtk_menu_new(); -- 2.1.4
