Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at 2017-11-07 10:02:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxpanel (Old) and /work/SRC/openSUSE:Factory/.lxpanel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxpanel" Tue Nov 7 10:02:19 2017 rev:43 rq:539259 version:0.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/lxpanel/lxpanel.changes 2017-01-12 15:56:45.127731224 +0100 +++ /work/SRC/openSUSE:Factory/.lxpanel.new/lxpanel.changes 2017-11-07 10:03:08.583102970 +0100 @@ -1,0 +2,12 @@ +Wed Nov 01 13:54:13 UTC 2017 - [email protected] + +- Update to 0.9.3 + * Finally fixed battery calculations, it missed Power so left time was always at zero. + * Fixed task window raising on drop file on it (was broken since 0.9.0). + +- Added lxpanel-0.9.3-panel_config.patch + * Fix rpmlint warning +- Added lxpanel-0.9.3-default_config.patch + * Fix rpmlint warning + +------------------------------------------------------------------- Old: ---- lxpanel-0.9.2.tar.xz New: ---- lxpanel-0.9.3-default_config.patch lxpanel-0.9.3-panel_config.patch lxpanel-0.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.txWeBJ/_old 2017-11-07 10:03:09.223079751 +0100 +++ /var/tmp/diff_new_pack.txWeBJ/_new 2017-11-07 10:03:09.223079751 +0100 @@ -17,13 +17,15 @@ Name: lxpanel -Version: 0.9.2 +Version: 0.9.3 Release: 0 Summary: Lightweight X11 desktop panel based on fbpanel License: GPL-2.0 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source0: https://sourceforge.net/projects/lxde/files/LXPanel%20%28desktop%20panel%29/LXPanel%200.9.x/%{name}-%{version}.tar.xz +Patch0: lxpanel-0.9.3-default_config.patch +Patch1: lxpanel-0.9.3-panel_config.patch BuildRequires: autoconf BuildRequires: fdupes BuildRequires: intltool @@ -81,6 +83,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # autoconf ++++++ lxpanel-0.9.3-default_config.patch ++++++ --- lxpanel-0.9.3/data/default/config.orig 2014-09-22 14:00:03.000000000 +0400 +++ lxpanel-0.9.3/data/default/config 2017-11-02 09:57:19.265014000 +0300 @@ -0,0 +1,1 @@ +[Command] \ No newline at end of file ++++++ lxpanel-0.9.3-panel_config.patch ++++++ --- lxpanel-0.9.3/data/two_panels/config.orig 2014-02-15 22:37:13.000000000 +0400 +++ lxpanel-0.9.3/data/two_panels/config 2017-11-02 09:57:19.265014000 +0300 @@ -0,0 +1,1 @@ +[Command] \ No newline at end of file ++++++ lxpanel-0.9.2.tar.xz -> lxpanel-0.9.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/ChangeLog new/lxpanel-0.9.3/ChangeLog --- old/lxpanel-0.9.2/ChangeLog 2016-12-24 16:22:36.000000000 +0100 +++ new/lxpanel-0.9.3/ChangeLog 2017-01-20 22:40:02.000000000 +0100 @@ -1,3 +1,9 @@ +0.9.3 +------------------------------------------------------------------------- +* Finally fixed battery calculations, it missed Power so left time was + always at zero. +* Fixed task window raising on drop file on it (was broken since 0.9.0). + 0.9.2 ------------------------------------------------------------------------- * Fixed battery selection if battery detached but another is available. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/configure new/lxpanel-0.9.3/configure --- old/lxpanel-0.9.2/configure 2016-12-24 16:23:57.000000000 +0100 +++ new/lxpanel-0.9.3/configure 2017-01-20 22:40:12.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lxpanel 0.9.2. +# Generated by GNU Autoconf 2.69 for lxpanel 0.9.3. # # Report bugs to <http://lxde.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='lxpanel' PACKAGE_TARNAME='lxpanel' -PACKAGE_VERSION='0.9.2' -PACKAGE_STRING='lxpanel 0.9.2' +PACKAGE_VERSION='0.9.3' +PACKAGE_STRING='lxpanel 0.9.3' PACKAGE_BUGREPORT='http://lxde.org/' PACKAGE_URL='' @@ -1426,7 +1426,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lxpanel 0.9.2 to adapt to many kinds of systems. +\`configure' configures lxpanel 0.9.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lxpanel 0.9.2:";; + short | recursive ) echo "Configuration of lxpanel 0.9.3:";; esac cat <<\_ACEOF @@ -1651,7 +1651,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lxpanel configure 0.9.2 +lxpanel configure 0.9.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2020,7 +2020,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lxpanel $as_me 0.9.2, which was +It was created by lxpanel $as_me 0.9.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2883,7 +2883,7 @@ # Define the identity of the package. PACKAGE='lxpanel' - VERSION='0.9.2' + VERSION='0.9.3' cat >>confdefs.h <<_ACEOF @@ -15695,7 +15695,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lxpanel $as_me 0.9.2, which was +This file was extended by lxpanel $as_me 0.9.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15761,7 +15761,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lxpanel config.status 0.9.2 +lxpanel config.status 0.9.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/configure.ac new/lxpanel-0.9.3/configure.ac --- old/lxpanel-0.9.2/configure.ac 2016-12-24 16:22:36.000000000 +0100 +++ new/lxpanel-0.9.3/configure.ac 2017-01-20 22:40:02.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(lxpanel, 0.9.2, http://lxde.org/) +AC_INIT(lxpanel, 0.9.3, http://lxde.org/) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/plugins/batt/batt_sys.c new/lxpanel-0.9.3/plugins/batt/batt_sys.c --- old/lxpanel-0.9.2/plugins/batt/batt_sys.c 2016-12-24 16:22:36.000000000 +0100 +++ new/lxpanel-0.9.3/plugins/batt/batt_sys.c 2017-01-20 22:34:34.000000000 +0100 @@ -4,7 +4,7 @@ * Copyright 2009 Juergen Hötzel <[email protected]> * 2015 Henry Gebhardt <[email protected]> * 2015 Stanislav Kozina, Ersin <[email protected]> - * 2016 Andriy Grytsenko <[email protected]> + * 2016-2017 Andriy Grytsenko <[email protected]> * * Parts shameless stolen and glibified from acpi package * Copyright (C) 2001 Grahame Bowland <[email protected]> @@ -266,13 +266,17 @@ if (b->percentage > 100) b->percentage = 100; - if (b->current_now == -1) { + if (b->power_now < -1) + b->power_now = - b->power_now; + if (b->current_now == -1 && b->power_now == -1) { //b->poststr = "rate information unavailable"; b->seconds = -1; } else if (!strcasecmp(b->state, "charging")) { if (b->current_now > MIN_PRESENT_RATE) { b->seconds = 3600 * (b->charge_full - b->charge_now) / b->current_now; //b->poststr = " until charged"; + } else if (b->power_now > 0) { + b->seconds = 3600 * (b->energy_full - b->energy_now) / b->power_now; } else { //b->poststr = "charging at zero rate - will never fully charge."; b->seconds = -1; @@ -281,6 +285,8 @@ if (b->current_now > MIN_PRESENT_RATE) { b->seconds = 3600 * b->charge_now / b->current_now; //b->poststr = " remaining"; + } else if (b->power_now > 0) { + b->seconds = 3600 * b->energy_now / b->power_now; } else { //b->poststr = "discharging at zero rate - will never fully discharge."; b->seconds = -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/plugins/launchtaskbar.c new/lxpanel-0.9.3/plugins/launchtaskbar.c --- old/lxpanel-0.9.2/plugins/launchtaskbar.c 2016-11-19 19:28:43.000000000 +0100 +++ new/lxpanel-0.9.3/plugins/launchtaskbar.c 2017-01-20 22:40:02.000000000 +0100 @@ -121,6 +121,7 @@ int current_desktop; /* Current desktop, from NET_WM_CURRENT_DESKTOP */ guint dnd_delay_timer; /* Timer for drag and drop delay */ gboolean dnd_task_moving; /* User is currently moving a task button */ + GtkWidget *dnd_delay_task; /* Task button to raise on drag timeout */ int icon_size; /* Size of task icons */ gboolean grouped_tasks; /* User preference: windows from same task are grouped onto a single button */ TaskShowFlags flags; /* User preferences flags */ @@ -1200,6 +1201,15 @@ if (ltbp->path) fm_path_unref(ltbp->path); #endif + + /* DND delay handler */ + if (ltbp->dnd_delay_timer != 0) + { + g_source_remove(ltbp->dnd_delay_timer); + ltbp->dnd_delay_timer = 0; + } + if (ltbp->dnd_delay_task) + g_object_remove_weak_pointer(G_OBJECT(ltbp->dnd_delay_task), (gpointer *)<bp->dnd_delay_task); } /* Plugin destructor. */ @@ -2030,11 +2040,10 @@ /* Handler for "drag-motion" timeout. */ static gboolean taskbar_button_drag_motion_timeout(LaunchTaskBarPlugin * tb) { - //guint time; if (g_source_is_destroyed(g_main_current_source())) return FALSE; - //time = gtk_get_current_event_time(); - //task_raise_window(tk, ((time != 0) ? time : CurrentTime)); // ??? + + task_button_raise_window(PANEL_TASK_BUTTON(tb->dnd_delay_task), CurrentTime); tb->dnd_delay_timer = 0; return FALSE; } @@ -2054,6 +2063,14 @@ if (tb->dnd_delay_timer == 0) tb->dnd_delay_timer = g_timeout_add(DRAG_ACTIVE_DELAY, (GSourceFunc) taskbar_button_drag_motion_timeout, tb); + if (tb->dnd_delay_task != widget) + { + if (tb->dnd_delay_task) + g_object_remove_weak_pointer(G_OBJECT(tb->dnd_delay_task), (gpointer *)&tb->dnd_delay_task); + tb->dnd_delay_task = widget; + g_object_add_weak_pointer(G_OBJECT(widget), (gpointer *)&tb->dnd_delay_task); + } + gdk_drag_status(drag_context, 0, time); } return TRUE; @@ -2062,8 +2079,15 @@ /* Handler for "drag-drop" event from taskbar button. */ static gboolean taskbar_button_drag_drop(GtkWidget * widget, GdkDragContext * drag_context, gint x, gint y, guint time, LaunchTaskBarPlugin * tb) { - tb->dnd_task_moving = FALSE; GtkWidget * drag_source = gtk_drag_get_source_widget(drag_context); + + tb->dnd_task_moving = FALSE; + /* Cancel the timer if set. */ + if (tb->dnd_delay_timer != 0) + { + g_source_remove(tb->dnd_delay_timer); + tb->dnd_delay_timer = 0; + } if (drag_source != NULL && gtk_widget_get_parent(drag_source) == gtk_widget_get_parent(widget)) { if (drag_source != widget) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/plugins/task-button.c new/lxpanel-0.9.3/plugins/task-button.c --- old/lxpanel-0.9.2/plugins/task-button.c 2016-12-24 16:22:36.000000000 +0100 +++ new/lxpanel-0.9.3/plugins/task-button.c 2017-01-20 22:40:02.000000000 +0100 @@ -1970,3 +1970,12 @@ } g_object_set_data(G_OBJECT(parent), "task-button-current", NULL); } + +/* request for a minimized window to raise */ +void task_button_raise_window(TaskButton *button, guint32 time) +{ + if (!PANEL_IS_TASK_BUTTON(button)) + return; + if (button->details) + task_raise_window(button, button->details->data, time); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/plugins/task-button.h new/lxpanel-0.9.3/plugins/task-button.h --- old/lxpanel-0.9.2/plugins/task-button.h 2016-11-19 19:28:43.000000000 +0100 +++ new/lxpanel-0.9.3/plugins/task-button.h 2017-01-20 22:40:02.000000000 +0100 @@ -85,6 +85,8 @@ gboolean task_button_merge(TaskButton *button, TaskButton *sibling); /* single-instance-menu management, should be called on button parent widget */ void task_button_reset_menu(GtkWidget *parent); +/* request for a minimized window to raise */ +void task_button_raise_window(TaskButton *button, guint32 time); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/po/fr.po new/lxpanel-0.9.3/po/fr.po --- old/lxpanel-0.9.2/po/fr.po 2016-11-21 21:16:59.000000000 +0100 +++ new/lxpanel-0.9.3/po/fr.po 2017-01-20 22:38:52.000000000 +0100 @@ -8,15 +8,15 @@ "Project-Id-Version: lxpanel r839\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-24 21:15+0300\n" -"PO-Revision-Date: 2015-03-23 23:50+0000\n" -"Last-Translator: Jerome Leclanche <[email protected]>\n" +"PO-Revision-Date: 2017-01-06 14:31+0100\n" +"Last-Translator: Yvan Masson <[email protected]>\n" "Language-Team: GNOME French Team <[email protected]>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.7.0-alpha1\n" +"X-Generator: Poedit 1.8.11\n" "X-POOTLE-MTIME: 1427154620.000000\n" "X-Pootle-Path: /fr/lxpanel/po/fr.po\n" "X-Pootle-Revision: 40\n" @@ -84,16 +84,19 @@ #. TRANSLATORS: Replace this string with your names, one name per line. #: ../src/panel.c:1346 msgid "translator-credits" -msgstr "Cilyan Olowen <[email protected]>Julius22" +msgstr "" +"Cilyan Olowen <[email protected]>\n" +"Julius22\n" +"Jerome Leclanche <[email protected]>\n" +"Yvan Masson <[email protected]>" #: ../src/panel.c:1351 msgid "LXPanel" msgstr "LXPanel" #: ../src/panel.c:1369 -#, fuzzy msgid "Copyright (C) 2008-2016" -msgstr "Copyright (C) 2008-2014" +msgstr "Copyright (C) 2008-2016" #: ../src/panel.c:1370 msgid "Desktop panel for LXDE project" @@ -1034,6 +1037,8 @@ #: ../plugins/volumealsa/volumealsa.c:245 msgid "ALSA (or pulseaudio) had a problem. Please check the lxpanel logs." msgstr "" +"ALSA (ou pulseaudio) a rencontré un problème. Veuillez consulter les " +"journaux de lxpanel." #: ../plugins/volumealsa/volumealsa.c:680 msgid "" @@ -1051,19 +1056,19 @@ #. Just to have these translated #: ../plugins/volumealsa/volumealsa.c:1293 msgid "Line" -msgstr "" +msgstr "Ligne" #: ../plugins/volumealsa/volumealsa.c:1293 msgid "LineOut" -msgstr "" +msgstr "Sortie ligne" #: ../plugins/volumealsa/volumealsa.c:1293 msgid "Front" -msgstr "" +msgstr "Façade" #: ../plugins/volumealsa/volumealsa.c:1293 msgid "Surround" -msgstr "" +msgstr "Surround" #: ../plugins/volumealsa/volumealsa.c:1293 msgid "Speaker+LO" @@ -1071,69 +1076,66 @@ #: ../plugins/volumealsa/volumealsa.c:1332 msgid "default" -msgstr "" +msgstr "par défaut" #. desc, index #: ../plugins/volumealsa/volumealsa.c:1391 msgid "Master" -msgstr "" +msgstr "Master" #: ../plugins/volumealsa/volumealsa.c:1395 msgid "PCM" -msgstr "" +msgstr "PCM" #: ../plugins/volumealsa/volumealsa.c:1399 msgid "Headphone" -msgstr "" +msgstr "Écouteurs" #: ../plugins/volumealsa/volumealsa.c:1420 msgid "Click for Volume Slider" -msgstr "" +msgstr "Clic pour le curseur de volume" #: ../plugins/volumealsa/volumealsa.c:1424 msgid "Click for Toggle Mute" -msgstr "" +msgstr "Clic pour basculer la sourdine" #: ../plugins/volumealsa/volumealsa.c:1428 msgid "Click for Open Mixer" -msgstr "" +msgstr "Clic pour ouvrir la console de mixage" #. setup hotkeys #: ../plugins/volumealsa/volumealsa.c:1432 msgid "Hotkey for Volume Up" -msgstr "" +msgstr "Raccourci pour augmenter le volume" #: ../plugins/volumealsa/volumealsa.c:1434 msgid "Hotkey for Volume Down" -msgstr "" +msgstr "Raccourci pour baisser le volume" #: ../plugins/volumealsa/volumealsa.c:1436 msgid "Hotkey for Volume Mute" -msgstr "" +msgstr "Raccourci pour la sourdine" #: ../plugins/volumealsa/volumealsa.c:1493 -#, fuzzy msgid "Audio Card" -msgstr "Son et vidéo" +msgstr "Carte son" #: ../plugins/volumealsa/volumealsa.c:1496 msgid "Channel to Operate" -msgstr "" +msgstr "Canal à commander" #: ../plugins/volumealsa/volumealsa.c:1504 msgid "Command to Open Mixer" -msgstr "" +msgstr "Commande pour ouvrir la console de mixage" #: ../plugins/volumealsa/volumealsa.c:1519 -#, fuzzy msgid "Launch Mixer" -msgstr "Lanceurs" +msgstr "Ouvrir la console de mixage" #: ../plugins/volumealsa/volumealsa.c:1531 #: ../plugins/volumealsa/volumealsa.c:1552 -#, fuzzy msgid "Display and control volume" -msgstr "Afficher et contrôler le volume pour ALSA" +msgstr "Afficher et contrôler le volume" #: ../plugins/netstat/netstat.c:183 msgid "<Hidden Access Point>" @@ -1748,9 +1750,8 @@ msgstr "Afficher les informations supplémentaires" #: ../plugins/batt/batt.c:705 -#, fuzzy msgid "Number of battery to monitor" -msgstr "Interface à surveiller" +msgstr "Numéro de la batterie à surveiller" #: ../plugins/batt/batt.c:715 msgid "Display battery status using ACPI" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxpanel-0.9.2/src/panel.h new/lxpanel-0.9.3/src/panel.h --- old/lxpanel-0.9.2/src/panel.h 2016-12-24 16:24:03.000000000 +0100 +++ new/lxpanel-0.9.3/src/panel.h 2017-01-20 22:40:17.000000000 +0100 @@ -43,7 +43,7 @@ #define LXPANEL_CHECK_VERSION(_a,_b,_c) \ (0 > _a || \ (0 == _a && 9 > _b) || \ - (0 == _a && 9 == _b && 2 >= _c)) + (0 == _a && 9 == _b && 3 >= _c)) #define LX_TYPE_PANEL (lxpanel_get_type())
