--- fbpanel/.config/rules.mk.orig 2016-10-13 14:11:45.368759200 +0200
+++ fbpanel/.config/rules.mk 2016-10-13 14:13:38.562077400 +0200
@@ -205,10 +205,23 @@
endef
+ifeq (enabled,$(STATIC_BUILD))
+define lib_rules
+all : lib$(1).a
+CLEANLIST += lib$(1).a
+
+
+$(foreach s,$($(1)_src),\
+ $(eval $(call objng_rules,$(s),$(call src2base,$(s)),$(1))))
+
+lib$(1).a : $($(1)_obj)
+ $(call summary,AR ,$$@)
+ $Q$(AR) rcs $$@ $$^
+endef
+else
define lib_rules
all : lib$(1).so
CLEANLIST += lib$(1).so
-$(eval $(1)_cflags += -fPIC)
$(foreach s,$($(1)_src),\
$(eval $(call objng_rules,$(s),$(call src2base,$(s)),$(1))))
@@ -223,7 +236,7 @@
$Qinstall -D -m 755 -T lib$(1).so $(DESTDIR)$(LIBDIR)/lib$(1).so
endif
endef
-
+endif
define ar_rules
all : lib$(1).a
--- fbpanel/CYGWIN-PATCHES/fbpanel-7.0.README.orig 2016-10-13 14:13:38.649086100 +0200
+++ fbpanel/CYGWIN-PATCHES/fbpanel-7.0.README 2016-10-13 14:24:22.099424700 +0200
@@ -0,0 +1,202 @@
+fbpanel
+------------------------------------------
+fbpanel is a lightweight, NETWM compliant desktop panel.
+It works with any NETWM compliant window manager
+
+Runtime requirements:
+ cygwin
+ libgtk2.0_0
+ libcairo2
+ libEGL1
+ libexpat1
+ libX11xcb1
+ libxcb1
+ libXau6
+ libXdmcp6
+ libgcc1
+ libfontconfig1
+ libfreetype6
+ libbz2_1
+ libpng16
+ zlib0
+ libGL1
+ libglapi0
+ libX11_6
+ libxcbglx0
+ libXext6
+ libpixman1_0
+ libxcbrender0
+ libxcbshm0
+ libXrender1
+ libgdk_pixbuf2.0_0
+ libglib2.0_0
+ libiconv2
+ libintl8
+ libpcre1
+ libglib2.0_0
+ libffi6
+ libpango1.0_0
+ libthai0
+ libdatrie1
+ libpango1.0_0
+ libharfbuzz0
+ libgraphite2_3
+ libstdc++6
+ libXcomposite1
+ libXcursor1
+ libXfixes3
+ libXdamage1
+ libXi6
+ libXinerama1
+ libXrandr2
+ libatk1.0_0
+
+Build requirements:
+ all the runtime + corresponding devel
+
+Canonical homepage:
+ http://aanatoly.github.io/fbpanel/
+
+Canonical download:
+ git clone -b "7.0" https://github.com/aanatoly/fbpanel
+
+------------------------------------
+
+Build instructions:
+ unpack fbpanel-7.0-EL-3.tar.bz2
+ if you use setup to install this src package, it will be
+ unpacked under /usr/src automatically
+ cd /usr/src/fbpanel-7.0
+
+Then look below 'Port Notes'
+
+-------------------------------------------
+
+Files included in the binary distro:
+
+------------------
+
+ /usr
+ ├── bin
+ │  └── fbpanel.exe
+ ├── libexec
+ │  └── fbpanel
+ │  ├── make_profile
+ │  └── xlogout
+ └── share
+ ├── doc
+ │  └── Cygwin
+ │  └── fbpanel-7.0.README
+ ├── fbpanel
+ │  ├── default
+ │  ├── images
+ │  │  ├── battery_0.png
+ │  │  ├── battery_1.png
+ │  │  ├── battery_2.png
+ │  │  ├── battery_3.png
+ │  │  ├── battery_4.png
+ │  │  ├── battery_5.png
+ │  │  ├── battery_6.png
+ │  │  ├── battery_7.png
+ │  │  ├── battery_8.png
+ │  │  ├── battery_charging_0.png
+ │  │  ├── battery_charging_1.png
+ │  │  ├── battery_charging_2.png
+ │  │  ├── battery_charging_3.png
+ │  │  ├── battery_charging_4.png
+ │  │  ├── battery_charging_5.png
+ │  │  ├── battery_charging_6.png
+ │  │  ├── battery_charging_7.png
+ │  │  ├── battery_charging_8.png
+ │  │  ├── battery_na.png
+ │  │  ├── dclock_glyphs.png
+ │  │  ├── default.xpm
+ │  │  ├── gnome-session-halt.png
+ │  │  ├── gnome-session-reboot.png
+ │  │  └── logo.png
+ │  ├── multiwindow
+ │  └── pager
+ ├── locale
+ │  └── fr
+ │  └── LC_MESSAGES
+ │  └── fbpanel.mo
+ └── man
+ └── man1
+ └── fbpanel.1
+
+Port Notes:
+
+* Configure step:
+./configure STATIC_BUILD=enabled --prefix=/usr --locale=/usr/share/locale --datadir=/usr/share/fbpanel --sysconfdir=/etc/X11 --mandir=/usr/share/man/man1 --project_version 7.0 --no-sound
+
+* Compile step:
+ make CC="gcc -O4 -march=native"
+* Problems:
+ dynamic plugins not working for the moment (and would need some changes).
+ some plugins are not working: volume, net,...
+ provided script xlogout is too much linux and not working on Cygwin.
+ patch created for managing these problems
+* Install/packaging step:
+ make install DESTDIR=/tmp/fbpanel
+ /usr/bin/install -c -d /tmp/fbpanel/usr/share/locale/fr/LC_MESSAGES
+ /usr/bin/install -c -m 644 po/fr_FR.UTF-8.po /tmp/fbpanel/usr/share/locale/fr/LC_MESSAGES/fbpanel.mo
+ /usr/bin/install -c -d /tmp/fbpanel/usr/share/doc/Cygwin
+ /usr/bin/install -c -m 644 CYGWIN-PATCHES/fbpanel-7.0.README /tmp/fbpanel/usr/share/doc/Cygwin/fbpanel-7.0.README
+
+----- version 7.0-EL-3 -----
+Rebuilt after new git clone
+git rev-parse --short HEAD: 478754b
+
+----- version 7.0-EL-2 -----
+Rebuilt (change in mandir configuration)
+
+----- version 7.0-EL-1 -----
+Upstream 7.0
+
+----- version 6.1-EL-1 -----
+Upstream 6.1
+Added intl in the sources + po subdir (Makefile.in still not perfect!) and fr.po.
+Added the man file in the make install targets
+Some corrections for install when enable-static_build is set.
+
+----- version 4.12-EL-2 -----
+Changed install scheme for new Xorg version (no more in /usr/X11R6)
+
+----- version 4.12-EL-1 -----
+Upstream 4.12
+Adapted previous patch
+
+----- version 4.3-EL-2 -----
+Added i18n and french po file
+Modified Makefiles to deal with DESTDIR
+
+----- version 4.3-EL-1 -----
+Updated for fbpanel-4.3 (that took in account all my changes)
+Small correction still to be done in Makefile for STATIC_PLUGINS
+Finaly added the cpu plugin for cygwin + modifications to have
+a static cpu plugin + a cpu configuration file.
+
+----- version 4.2-EL-1 -----
+Updated for fbpanel-4.2
+Still did a lot of changes to have working Makefile with STATIC option
+and try to add CYGWIN specific stuff
+Modified deskno plugin again to have bold numbers
+
+----- version 4.1-EL-1 -----
+Updated for fbpanel-4.1 (everything is in the allready applied patch file):
+- cygwin ifdefs
+- corrected deskno plugin and its integration in static fbpanel
+
+----- version 3.17-EL-1 -----
+Updated for fbpanel-3.17: lots of changes mainly trying to get
+the plugin system working (see the included patch file)
+ - all Makefiles
+ - dll suffix
+ - (gave up with the plugins)
+Added this README file
+
+----- version 3.12-EL-1 -----
+First port of fbpanel
+
+Cygwin port maintained by: Eric LASSAUGE <lassauge@users.sourceforge.net>
+ http://lassauge.free.fr/cygwin/
--- fbpanel/data/config/default.in.orig 2016-10-13 14:11:45.471769500 +0200
+++ fbpanel/data/config/default.in 2016-10-13 14:13:38.676088800 +0200
@@ -313,9 +313,9 @@
}
}
-plugin {
- type = volume
-}
+#plugin {
+# type = volume
+#}
#plugin {
# type = battery
@@ -369,7 +369,7 @@
Plugin {
type = icons
config {
- DefaultIcon = %%datadir%%/fbpanel/images/default.xpm
+ DefaultIcon = @datadir@/images/default.xpm
application {
icon = gnome-terminal
ClassName = XTerm
--- fbpanel/data/config/Makefile.orig 2016-10-13 14:11:45.465768900 +0200
+++ fbpanel/data/config/Makefile 2016-10-13 14:13:38.716092800 +0200
@@ -2,7 +2,7 @@
TOPDIR := ../..
-TEXT = default pager
+TEXT = default pager multiwindow
all : $(TEXT)
CLEANLIST += $(TEXT)
--- fbpanel/data/config/multiwindow.in.orig 2016-10-13 14:13:38.751096300 +0200
+++ fbpanel/data/config/multiwindow.in 2016-10-13 14:13:38.746095800 +0200
@@ -0,0 +1,58 @@
+# http://fbpanel.sourceforge.net/docs.html#config
+
+# Default settings are commented out
+Global {
+ Edge = top
+ Allign = left
+ WidthType = request
+# HeightType = pixel
+# Height = 26
+# Margin = 0
+# SetDockType = true
+# SetPartialStrut = true
+# Transparent = false
+ TintColor = #363B3B
+# Alpha = 127
+# Autohide = false
+ RoundCorners = false
+# RoundCornersRadius = 7
+# Layer = above
+ SetLayer = true
+# MaxElemHeight = 200
+}
+
+plugin {
+ type = menu
+# expand = false
+# padding = 0
+ config {
+ icon = X
+ systemmenu {
+ }
+ separator {
+ }
+ item {
+ name = Cygwin Terminal
+ icon = utilities-terminal
+ action = mintty
+ }
+ item {
+ name = Exit Cygwin/X
+ icon = application-exit
+ action = @libexecdir@/xlogout
+ }
+ }
+}
+plugin {
+ type = tray
+ expand = true
+ padding = 2
+}
+plugin {
+ type = icons
+# expand = false
+# padding = 0
+ config {
+ DefaultIcon = X
+ }
+}
--- fbpanel/exec/make_profile.in.orig 2016-10-13 14:11:45.705792900 +0200
+++ fbpanel/exec/make_profile.in 2016-10-13 14:13:38.786099800 +0200
@@ -47,24 +47,26 @@
[ -r "$spdir/$1" ] || return 1
local browser terminal filer
- for browser in x-www-browser firefox opera; do
+ for browser in x-www-browser firefox opera midori epiphany; do
if which $browser 2> /dev/null > /dev/null; then
opt="$opt -e s/x-www-browser/$browser/"
break
fi
done
- for terminal in x-terminal urxvt gnome-terminal; do
+ for terminal in x-terminal urxvt lxterminal xfce4-terminal roxterm mate-terminal gnome-terminal xterm; do
if which $terminal 2> /dev/null > /dev/null; then
opt="$opt -e s/x-terminal/$terminal/"
break
fi
done
- for filer in x-file-manager thunar pcmanfm rox; do
+ for filer in x-file-manager thunar pcmanfm caja nautilus rox; do
if which $filer 2> /dev/null > /dev/null; then
opt="$opt -e s/x-file-manager/$filer/"
break
fi
done
+ # in case none of the above are present (although xterm should be)
+ [ -n "$opt" ] || opt="-e s/x/x/"
sed $opt < "$spdir/$1" > "$npdir/$2"
echo "Using $spdir/$1 as template"
}
--- fbpanel/exec/xlogout.orig 2016-10-13 14:11:45.710793400 +0200
+++ fbpanel/exec/xlogout 2016-10-13 14:13:38.859107100 +0200
@@ -15,7 +15,7 @@
echo "XPID=$XPID"
# get pid of xdm (or gdm, kdm, etc). usually it's parent of X
-XDMPID=`ps -o ppid --pid=$XPID | awk '{if (FNR != 1) print $1}'`
+XDMPID=`procps -o ppid --pid=$XPID | awk '{if (FNR != 1) print $1}'`
echo "XDMPID=$XDMPID"
# recursivly find child of xdm that was started in home dir -
@@ -25,7 +25,7 @@
rm -f $PF
while [ $# != 0 ]; do
- ps --no-headers -o pid --ppid=$1 >> $PF
+ procps --no-headers -o pid --ppid=$1 >> $PF
shift
done
for pid in `< $PF`; do
@@ -44,6 +44,6 @@
[ -z "$SPID" ] && exit 1
echo "Session start up script"
-ps -o uid,pid,ppid,sess,cmd --pid $SPID
+procps -o uid,pid,ppid,sess,cmd --pid $SPID
kill -SIGTERM -$SPID $SPID
--- fbpanel/Makefile.orig 2016-10-13 14:11:45.416764000 +0200
+++ fbpanel/Makefile 2016-10-13 14:13:38.889110100 +0200
@@ -4,8 +4,8 @@
SUBDIRS := data \
exec \
- panel \
plugins \
+ panel \
po \
scripts
--- fbpanel/panel/Makefile.orig 2016-10-13 14:11:45.738796200 +0200
+++ fbpanel/panel/Makefile 2016-10-13 14:13:38.919113100 +0200
@@ -1,6 +1,7 @@
## miniconf makefiles ## 1.1 ##
TOPDIR := ..
+include $(TOPDIR)/config.mk
fbpanel_src = bg.c \
ev.c \
@@ -15,7 +16,11 @@
run.c \
xconf.c
fbpanel_cflags = $(GTK2_CFLAGS) $(GMODULE2_CFLAGS) $(X11_CFLAGS)
+ifeq (enabled,$(STATIC_BUILD))
+fbpanel_obj = $(wildcard $(TOPDIR)/plugins/*/*.o)
+endif
fbpanel_libs = $(GTK2_LIBS) $(GMODULE2_LIBS) $(X11_LIBS) -lm
fbpanel_type = bin
include $(TOPDIR)/.config/rules.mk
+
--- fbpanel/panel/run.c.orig 2016-10-13 14:11:45.849807300 +0200
+++ fbpanel/panel/run.c 2016-10-13 14:13:38.950116200 +0200
@@ -1,3 +1,4 @@
+#include <errno.h>
#include "run.h"
#include "dbg.h"
@@ -7,6 +8,7 @@
GError *error = NULL;
ENTER;
+ errno = 0;
if (!cmd)
RET();
@@ -18,6 +20,7 @@
"%s", error->message);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
+fprintf(stderr,"fbpanel: %s\n",error->message);
g_error_free(error);
}
RET();
--- fbpanel/panel/xconf.c.orig 2016-10-13 14:11:45.862808600 +0200
+++ fbpanel/panel/xconf.c 2016-10-13 14:13:38.982119400 +0200
@@ -275,10 +275,10 @@
}
s->t[0] = s->str;
- for (tmp = s->str; isalnum(*tmp); tmp++);
- for (tmp2 = tmp; isspace(*tmp2); tmp2++);
+ for (tmp = s->str; isalnum((guchar)*tmp); tmp++);
+ for (tmp2 = tmp; isspace((guchar)*tmp2); tmp2++);
if (*tmp2 == '=') {
- for (++tmp2; isspace(*tmp2); tmp2++);
+ for (++tmp2; isspace((guchar)*tmp2); tmp2++);
s->t[1] = tmp2;
*tmp = 0;
s->type = LINE_VAR;
--- fbpanel/plugins/battery/battery.c.orig 2016-10-13 14:11:45.913813700 +0200
+++ fbpanel/plugins/battery/battery.c 2016-10-13 14:13:39.017122900 +0200
@@ -53,12 +53,15 @@
#if defined __linux__
#include "os_linux.c"
+#elif defined __CYGWIN__
+#include "os_cygwin.c"
#else
-static void
+static gboolean
battery_update_os(battery_priv *c)
{
c->exist = FALSE;
+ RET(FALSE);
}
#endif
@@ -79,7 +82,7 @@
} else {
i = batt_na;
gtk_widget_set_tooltip_markup(((plugin_instance *)c)->pwid,
- "Runing on AC\nNo battery found");
+ "Running on AC\nNo battery found");
}
k->set_icons(&c->meter, i);
k->set_level(&c->meter, c->level);
--- fbpanel/plugins/battery/os_cygwin.c.orig 2016-10-13 14:13:39.063127500 +0200
+++ fbpanel/plugins/battery/os_cygwin.c 2016-10-13 14:13:39.057126900 +0200
@@ -0,0 +1,19 @@
+#define WIN32_LEAN_AND_MEAN
+#include <X11/Xwindows.h>
+
+static gboolean
+battery_update_os(battery_priv *c)
+{
+ gboolean ret;
+ SYSTEM_POWER_STATUS sps;
+
+ ENTER;
+ c->exist = FALSE;
+ ret = GetSystemPowerStatus(&sps);
+ if (!ret || (sps.BatteryFlag >= 128) || (sps.BatteryLifePercent == 255))
+ RET(FALSE);
+ c->exist = TRUE;
+ c->level = sps.BatteryLifePercent;
+ c->charging = (sps.BatteryFlag & 8);
+ RET(TRUE);
+}
--- fbpanel/plugins/cpu/cpu.c.orig 2016-10-13 14:11:45.984820800 +0200
+++ fbpanel/plugins/cpu/cpu.c 2016-10-13 14:13:39.084129600 +0200
@@ -36,7 +36,7 @@
static void cpu_destructor(plugin_instance *p);
-#if defined __linux__
+#if defined __linux__ || defined __CYGWIN__
static int
cpu_get_load_real(struct cpu_stat *cpu)
{
--- fbpanel/plugins/dclock/dclock.c.orig 2016-10-13 14:11:46.007823100 +0200
+++ fbpanel/plugins/dclock/dclock.c 2016-10-13 14:13:39.118133000 +0200
@@ -138,7 +138,7 @@
for (tmp = output; *tmp; tmp++)
{
DBGE("%c", *tmp);
- if (isdigit(*tmp))
+ if (isdigit((unsigned char)*tmp))
{
i = *tmp - '0';
gdk_pixbuf_copy_area(dc->glyphs, i * 20, 0,
@@ -274,14 +274,18 @@
{
gchar *color_str;
dclock_priv *dc;
+ GError *lerror = NULL;
//int width;
ENTER;
DBG("dclock: use 'tclock' plugin for text version of a time and date\n");
dc = (dclock_priv *) p;
- dc->glyphs = gdk_pixbuf_new_from_file(IMGPREFIX "/dclock_glyphs.png", NULL);
+ dc->glyphs = gdk_pixbuf_new_from_file(IMGPREFIX "/dclock_glyphs.png", &lerror);
if (!dc->glyphs)
+ {
+ ERR("dclock: %s\n",lerror->message);
RET(0);
+ }
dc->cfmt = NULL;
dc->tfmt = TOOLTIP_FMT;
--- fbpanel/plugins/mem/mem.c.orig 2016-10-13 14:11:46.169839300 +0200
+++ fbpanel/plugins/mem/mem.c 2016-10-13 14:13:39.155136700 +0200
@@ -48,7 +48,7 @@
static stats_t stats;
-#if defined __linux__
+#if defined __linux__ || defined __CYGWIN__
#undef MT_ADD
#define MT_ADD(x) MT_ ## x,
enum {
--- fbpanel/plugins/mem2/mem2.c.orig 2016-10-13 14:11:46.211843500 +0200
+++ fbpanel/plugins/mem2/mem2.c 2016-10-13 14:13:39.188140000 +0200
@@ -114,7 +114,7 @@
static int
mem_usage()
{
-
+ RET(FALSE);;
}
#endif
--- fbpanel/plugins/menu/system_menu.c.orig 2016-10-13 14:11:46.299852300 +0200
+++ fbpanel/plugins/menu/system_menu.c 2016-10-13 14:13:39.223143500 +0200
@@ -2,6 +2,7 @@
#include <glib.h>
#include <glib/gstdio.h>
+#include <stdlib.h> /* for realloc */
#include <string.h>
#include <time.h>
@@ -82,9 +83,54 @@
/* ignore program arguments */
while ((dot = strchr(action, '%'))) {
- if (dot[1] != '\0')
+ static char buf1[4096], buf2[4096];
+ switch (dot[1]) {
+ case '\0':
+ break;
+ case 'c':
+ {
+ strncpy (buf1, action, dot - action);
+ buf1[dot - action] = '\0';
+ if (dot[2]) {
+ strncpy (buf2, dot + 2, strlen (action) - strlen (buf1) - 2);
+ buf2[strlen (action) - strlen (buf1) - 2] = '\0';
+ } else
+ buf2[0] = '\0';
+ action = (char *) realloc (action, strlen (buf1) + strlen (buf2) + strlen (name) + 3);
+ sprintf (action, "%s\"%s\"%s", buf1, name, buf2);
+ }
+ break;
+ case 'k':
+ {
+ strncpy (buf1, action, dot - action);
+ buf1[dot - action] = '\0';
+ if (dot[2]) {
+ strncpy (buf2, dot + 2, strlen (action) - strlen (buf1) - 2);
+ buf2[strlen (action) - strlen (buf1) - 2] = '\0';
+ } else
+ buf2[0] = '\0';
+ action = (char *) realloc (action, strlen (buf1) + strlen (buf2) + strlen (file) + 3);
+ sprintf (action, "%s\"%s\"%s", buf1, file, buf2);
+ }
+ break;
+ case 'i':
+ if (icon) {
+ strncpy (buf1, action, dot - action);
+ buf1[dot - action] = '\0';
+ if (dot[2]) {
+ strncpy (buf2, dot + 2, strlen (action) - strlen (buf1) - 2);
+ buf2[strlen (action) - strlen (buf1) - 2] = '\0';
+ } else
+ buf2[0] = '\0';
+ action = (char *) realloc (action, strlen (buf1) + strlen (buf2) + strlen (icon) + 10);
+ sprintf (action, "%s--icon \"%s\"%s", buf1, icon, buf2);
+ break;
+ }
+ /* else fallthrough */
+ default:
dot[0] = dot[1] = ' ';
}
+ }
DBG("action: %s\n", action);
/* if icon is NOT an absolute path but has an extention,
* e.g. firefox.png, then drop an extenstion to allow to load it
--- fbpanel/plugins/net/net.c.orig 2016-10-13 14:11:46.363858700 +0200
+++ fbpanel/plugins/net/net.c 2016-10-13 14:13:39.261147300 +0200
@@ -137,6 +137,15 @@
net->rx = ifmd.ifmd_data.ifi_ibytes;
return 0;
}
+#else
+/* For cygwin check http://gael.roualland.free.fr/ifstat/ */
+
+#define init_net_stats(x)
+static int
+net_get_load_real(net_priv *c, struct net_stat *net)
+{
+ return -1;
+}
#endif
--- fbpanel/plugins/volume/volume.c.orig 2016-10-13 14:11:46.749897300 +0200
+++ fbpanel/plugins/volume/volume.c 2016-10-13 14:13:39.329154100 +0200
@@ -9,9 +9,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#if defined __linux__
-#include <linux/soundcard.h>
-#endif
+#include <sys/soundcard.h>
//#define DEBUGPRN
#include "dbg.h"
--- fbpanel/po/fr_FR.UTF-8.po.orig 2016-10-13 14:11:46.842906600 +0200
+++ fbpanel/po/fr_FR.UTF-8.po 2016-10-13 14:13:39.361157300 +0200
@@ -1,16 +1,16 @@
# French translations for fbpanel package.
# Copyright (C) 2010 THE fbpanel'S COPYRIGHT HOLDER
# This file is distributed under the same license as the fbpanel package.
-# Automatically generated, 2010.
+# Automatically generated, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: fbpanel 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-30 02:07+0200\n"
-"PO-Revision-Date: 2010-09-30 02:07+0200\n"
-"Last-Translator: Automaticaly generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2016-01-18 16:51+0100\n"
+"PO-Revision-Date: 2016-01-18 17:01+0100\n"
+"Last-Translator: Eric Lassauge <lassauge <AT> users <DOT> sourceforge <DOT> net>\n"
+"Language-Team: French\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@
#: panel/gconf_panel.c:69
msgid "Color settings"
-msgstr "Couleur"
+msgstr "Couleurs"
#: panel/gconf_panel.c:79
msgid "Round corners"
@@ -39,7 +39,7 @@
#: panel/gconf_panel.c:87 panel/gconf_panel.c:101 panel/misc.c:89
msgid "pixels"
-msgstr ""
+msgstr "pixels"
#: panel/gconf_panel.c:93
msgid "Autohide"
@@ -98,10 +98,14 @@
msgstr "Alignement"
#: panel/gconf_panel.c:241
-msgid "Margin"
-msgstr "Marge"
+msgid "X Margin"
+msgstr "Marge X"
+
+#: panel/gconf_panel.c:246
+msgid "Y Margin"
+msgstr "Marge Y"
-#: panel/gconf_panel.c:285
+#: panel/gconf_panel.c:290
#, c-format
msgid ""
"You're using '<b>%s</b>' profile, stored at\n"
@@ -110,17 +114,18 @@
"Vous utilisez le profil '<b>%s</b>', situé dans\n"
"<tt>%s</tt>"
-#: panel/gconf_panel.c:388
+#: panel/gconf_panel.c:393
msgid "Panel"
-msgstr ""
+msgstr "Panel"
-#: panel/gconf_panel.c:393
+#: panel/gconf_panel.c:398
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
-#: panel/gconf_panel.c:398
+#: panel/gconf_panel.c:403
msgid "Profile"
msgstr "Profil"
+
#: panel/misc.c:75 panel/misc.c:81
msgid "left"
msgstr "gauche"
@@ -146,13 +151,12 @@
msgstr "dynamique"
#: panel/misc.c:90
-#, c-format
msgid "% of screen"
msgstr "% de l'écran"
#: panel/misc.c:94
msgid "pixel"
-msgstr ""
+msgstr "pixel"
#: panel/misc.c:109
msgid "above"
@@ -162,55 +166,62 @@
msgid "below"
msgstr "en-dessous"
-#: panel/panel.c:464
+#: panel/panel.c:478
msgid "translator-credits"
-msgstr "Calimero <calimeroteknik@users.sf.net>"
+msgstr "Eric Lassauge, lassauge <AT> users <DOT> sourceforge <DOT> net"
-#: plugins/menu/system_menu.c:24
+#: plugins/menu/system_menu.c:25
msgid "Audio & Video"
msgstr "Audio & Vidéo"
-#: plugins/menu/system_menu.c:25
+#: plugins/menu/system_menu.c:26
msgid "Education"
msgstr "Éducation"
-#: plugins/menu/system_menu.c:26
+#: plugins/menu/system_menu.c:27
msgid "Game"
msgstr "Jeux"
-#: plugins/menu/system_menu.c:27
+#: plugins/menu/system_menu.c:28
msgid "Graphics"
msgstr "Graphisme"
-#: plugins/menu/system_menu.c:28
+#: plugins/menu/system_menu.c:29
msgid "Network"
msgstr "Réseau"
-#: plugins/menu/system_menu.c:29
+#: plugins/menu/system_menu.c:30
msgid "Office"
msgstr "Bureautique"
-#: plugins/menu/system_menu.c:30
+#: plugins/menu/system_menu.c:31
msgid "Settings"
msgstr "Paramètres"
-#: plugins/menu/system_menu.c:31
+#: plugins/menu/system_menu.c:32
msgid "System"
msgstr "Système"
-#: plugins/menu/system_menu.c:32
+#: plugins/menu/system_menu.c:33
msgid "Utilities"
msgstr "Utilitaires"
-#: plugins/menu/system_menu.c:33
+#: plugins/menu/system_menu.c:34
msgid "Development"
msgstr "Développement"
-#: plugins/taskbar/taskbar.c:1267
+#: plugins/taskbar/taskbar.c:1304
msgid "Raise"
msgstr "Restaurer"
-#: plugins/taskbar/taskbar.c:1274
+#: plugins/taskbar/taskbar.c:1312
msgid "Iconify"
msgstr "Icônifier"
+#: plugins/taskbar/taskbar.c:1332
+msgid "All workspaces"
+msgstr "Tous les bureaux"
+
+#: plugins/taskbar/taskbar.c:1339
+msgid "Move to workspace"
+msgstr "Déplacer au bureau"
--- fbpanel/po/ru_RU.UTF-8.po.orig 2016-10-13 14:11:46.862908600 +0200
+++ fbpanel/po/ru_RU.UTF-8.po 2016-10-13 14:13:39.401161300 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fbpanel 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-30 02:02+0200\n"
+"POT-Creation-Date: 2016-01-18 16:51+0100\n"
"PO-Revision-Date: 2010-09-30 02:02+0200\n"
"Last-Translator: Automaticaly generated\n"
"Language-Team: none\n"
@@ -99,10 +99,16 @@
msgstr "Выравнивание"
#: panel/gconf_panel.c:241
-msgid "Margin"
+#, fuzzy
+msgid "X Margin"
msgstr "ОтÑтуп"
-#: panel/gconf_panel.c:285
+#: panel/gconf_panel.c:246
+#, fuzzy
+msgid "Y Margin"
+msgstr "ОтÑтуп"
+
+#: panel/gconf_panel.c:290
#, c-format
msgid ""
"You're using '<b>%s</b>' profile, stored at\n"
@@ -111,15 +117,15 @@
"Ð’Ñ‹ иÑпользуете профиль '<b>%s</b>', хранÑшийÑÑ Ð² \n"
"<tt>%s</tt>"
-#: panel/gconf_panel.c:388
+#: panel/gconf_panel.c:393
msgid "Panel"
msgstr "Панель"
-#: panel/gconf_panel.c:393
+#: panel/gconf_panel.c:398
msgid "Plugins"
msgstr "Плагины"
-#: panel/gconf_panel.c:398
+#: panel/gconf_panel.c:403
msgid "Profile"
msgstr "Профиль"
@@ -164,55 +170,62 @@
msgid "below"
msgstr "под"
-#: panel/panel.c:464
+#: panel/panel.c:478
msgid "translator-credits"
-msgstr ""
-"Anatoly Asviyan <aanatoly@users.sf.net>"
+msgstr "Anatoly Asviyan <aanatoly@users.sf.net>"
-#: plugins/menu/system_menu.c:24
+#: plugins/menu/system_menu.c:25
msgid "Audio & Video"
msgstr "Мультимедиа"
-#: plugins/menu/system_menu.c:25
+#: plugins/menu/system_menu.c:26
msgid "Education"
msgstr "Образование"
-#: plugins/menu/system_menu.c:26
+#: plugins/menu/system_menu.c:27
msgid "Game"
msgstr "Игры"
-#: plugins/menu/system_menu.c:27
+#: plugins/menu/system_menu.c:28
msgid "Graphics"
msgstr "Графика"
-#: plugins/menu/system_menu.c:28
+#: plugins/menu/system_menu.c:29
msgid "Network"
msgstr "Интернет"
-#: plugins/menu/system_menu.c:29
+#: plugins/menu/system_menu.c:30
msgid "Office"
msgstr "ОфиÑ"
-#: plugins/menu/system_menu.c:30
+#: plugins/menu/system_menu.c:31
msgid "Settings"
msgstr "ÐаÑтройки"
-#: plugins/menu/system_menu.c:31
+#: plugins/menu/system_menu.c:32
msgid "System"
msgstr "СиÑтема"
-#: plugins/menu/system_menu.c:32
+#: plugins/menu/system_menu.c:33
msgid "Utilities"
msgstr "Утилиты"
-#: plugins/menu/system_menu.c:33
+#: plugins/menu/system_menu.c:34
msgid "Development"
msgstr "Разработка"
-#: plugins/taskbar/taskbar.c:1267
+#: plugins/taskbar/taskbar.c:1304
msgid "Raise"
msgstr "Развернуть"
-#: plugins/taskbar/taskbar.c:1274
+#: plugins/taskbar/taskbar.c:1312
msgid "Iconify"
msgstr "Свернуть"
+
+#: plugins/taskbar/taskbar.c:1332
+msgid "All workspaces"
+msgstr ""
+
+#: plugins/taskbar/taskbar.c:1339
+msgid "Move to workspace"
+msgstr ""
--- fbpanel/scripts/custom.sh.orig 2016-10-13 14:11:46.905912900 +0200
+++ fbpanel/scripts/custom.sh 2016-10-13 14:13:39.463167500 +0200
@@ -11,7 +11,7 @@
# if you want libdir's default value to be '$eprefix/lib', add it after prefix
add_var package "package name, e.g fbpanel or mplayer" fbpanel
-add_var version "package version, e.g 6.2 or 1.4.5-alpha2" 6.2
+add_var version "package version, e.g 6.2 or 1.4.5-alpha2" 7.0
# Custom
add_feature dependency "disable dependency tracking" disabled
@@ -22,9 +22,9 @@
add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
-add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
+add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags'
add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'
add_var gmodule_libs "gmodule libs" '`scripts/rfs-pkg-config --libs gmodule-2.0`'
-add_feature static_build "build all pluginis into main binary" disabled
+add_feature static_build "build all pluginis into main binary" enabled
--- fbpanel/scripts/install_locale.sh.in.orig 2016-10-13 14:11:46.951917500 +0200
+++ fbpanel/scripts/install_locale.sh.in 2016-10-13 14:13:39.577178900 +0200
@@ -4,7 +4,7 @@
mkdir $dir
cp $1.mo $dir
cd $dir
-mv $1.mo %%package%%.mo
+mv $1.mo @project_name@.mo
# Create name for destination dir.
# Locale has format LL_CC.ENC. (LL - language, CC - country, ENC - encoding)
@@ -18,7 +18,7 @@
LC="${lang}_${country}"
fi
-install=%%topdir%%/scripts/install.sh
-${install} 755 %%localedir%%/$LC/LC_MESSAGES 644 %%package%%.mo
+install=@topdir@/scripts/install.sh
+${install} 755 @localedir@/$LC/LC_MESSAGES 644 @project_name@.mo
rm -rf $dir
--- fbpanel/scripts/install_locale.sh.orig 2016-10-13 14:11:46.942916600 +0200
+++ fbpanel/scripts/install_locale.sh 2016-10-13 14:13:39.498171000 +0200
@@ -18,7 +18,8 @@
LC="${lang}_${country}"
fi
-install=/home/aanatoly/src/fbpanel/trunk/scripts/install.sh
-${install} 755 /home/aanatoly/.local/share/locale/$LC/LC_MESSAGES 644 fbpanel.mo
+install=@topdir@/scripts/install.sh
+${install} 755 /usr/share/locale/$LC/LC_MESSAGES 644 fbpanel.mo
rm -rf $dir
+