Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at 2014-09-26 10:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-25 11:05:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxpanel.new/lxpanel.changes 2014-09-26 11:21:30.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Sep 22 12:46:40 UTC 2014 - [email protected] + +- New upstream version 0.7.1 + * Fixed search for the gtkrc file. + * Fixed search path for configuration - it should be not + compilation time path but paths using $XDG_CONFIG_DIRS. + * Fixed incorrect flag for 'launchbar' plugin which marks him + expandable. + * Fixed dragging of task buttons. + * Corrected using $XDG_MENU_PREFIX to work the same way as + libfm does. + * Fixed using font description, font in gtkrc file was ignored. + * Improved search for hw sensors in /sys/class/hwmon/ hierarchy. + * Improved check for critical temperatures in 'termal' plugin, + now each individual hardware setting (if available) is also + taken into consideration. + * Fixed parsing alias name in 'weather' plugin settings. + * Got rid of all individual plugins/*/Makefile - those rules + more easily can be contained in the plugins/Makefile.am. + Adding a simple plugin basically would mean to add three + lines into that file instead of writing whole Makefile.am. + * Fixed invalid system config path search ("lxpanel" part was + missing). + * Fixed incorrect requirements in the lxpanel.pc file. + * Fixed memory leak in the 'volumealsa' plugin. + * Now 'volumealsa' checks for 'MixerCommand' setting in the + configuration before guessing it. + * Fixed color saving in the configuration. + * Fixed incomplete resources deallocation in 'volumealsa' + plugin. + * Fixed make uninstall (it left plugins installed). + * Fixed monitor number set from GUI. + * Fixed hang on netstatus icon in auto-hidden panel. + * Fixed icon grid compilation with GTK+ < 2.20. + * Fixed compilation without menu-cache. + * Now man pages are included in the GIT and tarball, not just + xml files. + * Fixed incorrect printf arguments in 'netstatus' plugin. +- Removed + lxpanel-0.7.0-fix-crash-after-click-on-empty-part-of-panel.patch +- Added + lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch +- Added lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch + +------------------------------------------------------------------- @@ -78 +123 @@ -Sun Jan 5 11:46:02 UTC 2014 - [email protected] +Sun Jan 5 11:46:02 UTC 2014 - [email protected] Old: ---- lxpanel-0.7.0-fix-crash-after-click-on-empty-part-of-panel.patch lxpanel-0.7.0.tar.xz New: ---- lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch lxpanel-0.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.sR1yIH/_old 2014-09-26 11:21:31.000000000 +0200 +++ /var/tmp/diff_new_pack.sR1yIH/_new 2014-09-26 11:21:31.000000000 +0200 @@ -17,20 +17,20 @@ Name: lxpanel -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Lightweight X11 desktop panel based on fbpanel License: GPL-2.0 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source0: %{name}-%{version}.tar.xz -# http://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=commit;h=d4943c80cded6325284be8b58003fe63dd6e8255 -# Makes LXPanel not to crash when it's clicked on an empty part -Patch0: lxpanel-0.7.0-fix-crash-after-click-on-empty-part-of-panel.patch +# http://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=commit;h=9a762e63dce20d425345947b7ad4f24ec510db27 +Patch0: lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch +# http://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=commit;h=0bfcc6c97fca70de51acf06396578ddd7f03e9b1 +Patch1: lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libiw-devel -BuildRequires: libtool BuildRequires: libfm-gtk-devel BuildRequires: libxml2-devel BuildRequires: pkg-config @@ -41,13 +41,13 @@ BuildRequires: pkgconfig(libmenu-cache) BuildRequires: pkgconfig(libwnck-1.0) Requires: menu-cache +Requires: lxmenu-data Recommends: %{name}-lang Provides: %{name}-plugins >= %{version} Obsoletes: %{name}-plugins < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %lang_package - %description LXPanel is a lightweight X11 desktop panel containing: 1. User-friendly application menu automatically generated from *.desktop files on the system @@ -62,7 +62,6 @@ For example, "lxpanelctl run" will show the Run dialog in lxpanel, and "lxpanelctl menu" will show the application menu. This is useful in key bindings provided by window managers. - %package devel Summary: Devel files for %{name} Group: Development/Libraries/C and C++ @@ -70,29 +69,23 @@ Requires: glib2-devel Requires: menu-cache-devel - %description devel Headers and development %{name} files. - %prep %setup -q %patch0 -p1 - +%patch1 -p1 %build -%configure \ - --enable-man \ - --with-plugins=all +%configure --with-plugins=all make %{?_smp_mflags} V=1 - %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%makeinstall %{?_smp_mflags} %find_lang %{name} %fdupes -s %{buildroot} - %files %defattr(-,root,root,0755) %doc ChangeLog README COPYING @@ -125,8 +118,7 @@ %{_libdir}/%{name}/plugins/monitors.so %{_libdir}/%{name}/plugins/netstat.so %{_libdir}/%{name}/plugins/weather.so -%{_sysconfdir}/xdg/%{name}/* - +%config(noreplace) %{_sysconfdir}/xdg/%{name}/* %files devel %defattr(-,root,root) @@ -134,9 +126,7 @@ %{_includedir}/%{name}/*.h %{_libdir}/pkgconfig/%{name}.pc - %files lang -f %{name}.lang %defattr(-,root,root) - %changelog ++++++ lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch ++++++ >From 9a762e63dce20d425345947b7ad4f24ec510db27 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <[email protected]> Date: Tue, 23 Sep 2014 13:02:09 +0300 Subject: [PATCH] Fix unhiding panel if it becomes empty and height_when_hidden is 0. gtk_widget_show() does not work because it is an empty container ATM. Therefore gtk_widget_queue_resize() should be used as well. --- ChangeLog | 4 ++++ src/panel.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bb099a..fcf7c27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +* Fixed unhiding panel if it becomes empty and height_when_hidden is 0. + +0.7.1 +------------------------------------------------------------------------- * Fixed search for the gtkrc file. * Fixed search path for configuration - it should be not compilation time path but paths using $XDG_CONFIG_DIRS. diff --git a/src/panel.c b/src/panel.c index 57488b3..ee61197 100644 --- a/src/panel.c +++ b/src/panel.c @@ -691,11 +691,13 @@ mouse_watch(LXPanel *panel) gint cx, cy, cw, ch, gap; - cx = p->cx; - cy = p->cy; + cx = p->ax; + cy = p->ay; cw = p->cw; ch = p->ch; + if (cw == 1) cw = 0; + if (ch == 1) ch = 0; /* reduce area which will raise panel so it does not interfere with apps */ if (p->ah_state == AH_STATE_HIDDEN) { gap = MAX(p->height_when_hidden, GAP); @@ -743,10 +745,13 @@ static void ah_state_set(LXPanel *panel, PanelAHState ah_state) case AH_STATE_VISIBLE: gtk_widget_show(GTK_WIDGET(panel)); gtk_widget_show(p->box); + gtk_widget_queue_resize(GTK_WIDGET(panel)); gtk_window_stick(GTK_WINDOW(panel)); p->visible = TRUE; break; case AH_STATE_WAITING: + if (p->hide_timeout) + g_source_remove(p->hide_timeout); p->hide_timeout = g_timeout_add(2 * PERIOD, ah_state_hide_timeout, panel); break; case AH_STATE_HIDDEN: -- 1.7.10.4 ++++++ lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch ++++++ >From 0bfcc6c97fca70de51acf06396578ddd7f03e9b1 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <[email protected]> Date: Wed, 24 Sep 2014 16:51:08 +0300 Subject: [PATCH] [SF#679]X11 library uses unsigned long as cardinal-32 data, not uint32_t. That lead to invalid strut setting after 5cc945e412002531bb349a0443c837393ce57c43 And it might lead to other bugs on 64-bit architectures as well, may be just not reported yet or not reproduced yet. --- plugins/launchtaskbar.c | 2 +- src/ev.c | 4 ++-- src/misc.c | 10 +++++----- src/panel.c | 12 ++++++------ src/private.h | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c index 804c6e5..89c9a0b 100644 --- a/plugins/launchtaskbar.c +++ b/plugins/launchtaskbar.c @@ -2690,7 +2690,7 @@ static void taskbar_button_size_allocate(GtkWidget * btn, GtkAllocation * alloc, /* Send a NET_WM_ICON_GEOMETRY property change on the window. */ - guint32 data[4]; + gulong data[4]; data[0] = x; data[1] = y; data[2] = alloc->width; diff --git a/src/ev.c b/src/ev.c index e4dd66e..bf47fe0 100644 --- a/src/ev.c +++ b/src/ev.c @@ -290,7 +290,7 @@ fb_ev_current_desktop(FbEv *ev) { ENTER; if (ev->current_desktop == -1) { - guint32 *data; + gulong *data; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, XA_CARDINAL, 0); if (data) { @@ -307,7 +307,7 @@ fb_ev_number_of_desktops(FbEv *ev) { ENTER; if (ev->number_of_desktops == -1) { - guint32 *data; + gulong *data; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_NUMBER_OF_DESKTOPS, XA_CARDINAL, 0); if (data) { diff --git a/src/misc.c b/src/misc.c index fb16893..f15961b 100644 --- a/src/misc.c +++ b/src/misc.c @@ -542,7 +542,7 @@ get_xaproperty (Window win, Atom prop, Atom type, int *nitems) ENTER; prop_data = NULL; - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0, 0x7fffffff, False, + if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0, G_MAXLONG, False, type, &type_ret, &format_ret, &items_ret, &after_ret, &prop_data) != Success) { @@ -612,7 +612,7 @@ int get_net_number_of_desktops() { int desknum; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_NUMBER_OF_DESKTOPS, @@ -630,7 +630,7 @@ int get_net_current_desktop () { int desk; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, XA_CARDINAL, 0); @@ -646,7 +646,7 @@ int get_net_wm_desktop(Window win) { int desk = 0; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (win, a_NET_WM_DESKTOP, XA_CARDINAL, 0); @@ -661,7 +661,7 @@ GPid get_net_wm_pid(Window win) { GPid pid = 0; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (win, a_NET_WM_PID, XA_CARDINAL, 0); diff --git a/src/panel.c b/src/panel.c index ee61197..b13a850 100644 --- a/src/panel.c +++ b/src/panel.c @@ -73,7 +73,7 @@ static void lxpanel_finalize(GObject *object) lxpanel_config_save( self ); config_destroy(p->config); - g_free(p->workarea); + XFree(p->workarea); g_free( p->background_file ); g_slist_free( p->system_menus ); @@ -380,7 +380,7 @@ void _panel_set_wm_strut(LXPanel *panel) strut_size = p->height_when_hidden; /* Set up strut value in property format. */ - guint32 desired_strut[12]; + gulong desired_strut[12]; memset(desired_strut, 0, sizeof(desired_strut)); if (p->setstrut) { @@ -541,7 +541,7 @@ panel_event_filter(GdkXEvent *xevent, GdkEvent *event, gpointer not_used) for( l = all_panels; l; l = l->next ) { LXPanel* p = (LXPanel*)l->data; - g_free( p->priv->workarea ); + XFree( p->priv->workarea ); p->priv->workarea = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_WORKAREA, XA_CARDINAL, &p->priv->wa_len); /* print_wmdata(p); */ } @@ -1225,7 +1225,7 @@ panel_start_gui(LXPanel *panel) { Atom state[3]; XWMHints wmhints; - guint32 val; + gulong val; Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); Panel *p = panel->priv; GtkWidget *w = GTK_WIDGET(panel); @@ -1284,9 +1284,9 @@ panel_start_gui(LXPanel *panel) _panel_establish_autohide(panel); /* send it to running wm */ - Xclimsg(p->topxwin, a_NET_WM_DESKTOP, 0xFFFFFFFF, 0, 0, 0, 0); + Xclimsg(p->topxwin, a_NET_WM_DESKTOP, G_MAXULONG, 0, 0, 0, 0); /* and assign it ourself just for case when wm is not running */ - val = 0xFFFFFFFF; + val = G_MAXULONG; XChangeProperty(xdisplay, p->topxwin, a_NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1); diff --git a/src/private.h b/src/private.h index 52f398d..fb909e3 100644 --- a/src/private.h +++ b/src/private.h @@ -113,7 +113,7 @@ struct _Panel { int desknum; int curdesk; - guint32 *workarea; + gulong *workarea; int wa_len; char* background_file; -- 1.7.10.4 ++++++ lxpanel-0.7.0.tar.xz -> lxpanel-0.7.1.tar.xz ++++++ ++++ 31543 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
