diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2019-09-19 23:46:33 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2019-09-19 23:46:33 +0000 |
| commit | e69e6941cc0f1dab5aefa920fb26c0f26941f258 (patch) | |
| tree | e3316902afbb4318b0439dc574f0496749ecfdc3 /sysutils | |
| parent | 1e85daf0f563c93a39304c113d346f778baccbd8 (diff) | |
| download | ports-e69e6941cc0f1dab5aefa920fb26c0f26941f258.tar.gz ports-e69e6941cc0f1dab5aefa920fb26c0f26941f258.zip | |
Welcome XFCE 4.14 to the FreeBSD ports tree
- This XFCE release uses almost exclusively gtk3, so the USES=xfce
now defaults to gtk3
- Make x11-themes/gtk-xfce-engine an optional dependency(disabled
by default), it only supports gtk2, so would leave miost of this
XFCE version unthemed.
- Add Greybird as an optional and enabled dependency as a modern
theme supporting both GTK versions and all other XFCE parts
- The xfce4-vala port is deprecated and removed. The VALA bindings
are available in the library ports using the GIR and VAPI options
(on by default)
- Fixed various missing library and portlint warnings (portmgr fixit
blanket)
- Default Display Manager changed to lightdm (Thanks to woodsb02
for help)
- Add x11/xfce4-screensaver as an optional dependency to the
xfce4-goodies (enabled by default)
- Remove dependency on x11-fm/thunar-vfs and deprecate the port.
It is EOL upstream and the functionality is included in thunar
itself
Update:
- Added back sysutils/xfce4-places-plugin, updated to 1.8.1
- archivers/thunar-archive-plugin to 0.4.0
- audio/thunar-media-tags-plugin to 0.3.0
- audio/xfce4-mpc-plugin to 0.5.2
- audio/xfce4-pulseaudio-plugin to 0.4.2
- deskutils/xfce4-tumbler to 0.2.7
- devel/thunar-vcs-plugin to 0.2.0 [1]
- devel/xfce4-dev-tools to 4.14.0
- misc/xfce4-appfinder to 4.14.0
- misc/xfce4-weather-plugin to 0.10.0
- multimedia/xfce4-parole to 1.0.4
- sysutils/gigolo to 0.5.0
- sysutils/xfce4-battery-plugin to 1.1.3
- sysutils/xfce4-fsguard-plugin to 1.1.1
- sysutils/xfce4-netload-plugin to 1.3.2
- sysutils/xfce4-power-manage to 1.6.5
- sysutils/xfce4-settings 4.14.1
- sysutils/xfce4-systemload-plugin to 1.2.3
- sysutils/xfce4-wavelan-plugin to 0.6.1
- www/xfce4-smartbookmark-plugin to 0.5.1
- x11-clocks/xfce4-datetime-plugin to 0.8.0
- Added new xfce4-stopwatch-plugin, version 0.3.1
- x11-clocks/xfce4-timer-out-plugin to 1.0.3
- x11-fm/thunar to 1.8.9
- x11-wm/xfce4-desktop to 4.14.1
- x11-wm/xfce4-panel to 4.14.0
- x11-wm/xfce4-session to 4.14.0
- x11-wm/xfce4-wm to 4.14.0
- x11/libexo to 0.12.8
- x11/libxfce4menu to 4.14.1
- x11/libxfce4util to 4.14.0
- x11/xfce4-conf to 4.14.1
- x11/xfce4-dashboard to 0.7.5
- x11/xfce4-screensaver to 0.1.8
- x11/xfce4-screenshooter-plugin to 1.9.6
- x11/xfce4-verve-plugin to 2.0.0
Thanks to: Olivier Duchateau <duchateau.olivier@gmail.com>
PR: 240236
Exp-run by: antoine
Tested by: sbruno
Approved by: sergey.dyatko@gmail.com (maintainer timeout via
email), portmgr (fixit blanket, port breaks with
new Thunar if not updated) [1]
Differential Revision: https://reviews.freebsd.org/D21278
Notes
Notes:
svn path=/head/; revision=512378
Diffstat (limited to 'sysutils')
39 files changed, 251 insertions, 618 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 8b67aee08800..083883b38dc0 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1518,6 +1518,7 @@ SUBDIR += xfce4-kbdleds-plugin SUBDIR += xfce4-mount-plugin SUBDIR += xfce4-netload-plugin + SUBDIR += xfce4-places-plugin SUBDIR += xfce4-power-manager SUBDIR += xfce4-settings SUBDIR += xfce4-systemload-plugin diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile index 814b902d00b1..5080a173b281 100644 --- a/sysutils/garcon/Makefile +++ b/sysutils/garcon/Makefile @@ -3,6 +3,7 @@ PORTNAME= garcon PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -18,7 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= gettext-tools gmake gnome libtool pathfix pkgconfig \ - tar:bzip2 xfce:gtk3 + tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 gtk30 intltool USE_XFCE= libmenu USE_LDCONFIG= yes diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile index 18a4f3ed6f32..871d12e9908c 100644 --- a/sysutils/gigolo/Makefile +++ b/sysutils/gigolo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gigolo -PORTVERSION= 0.4.91 +PORTVERSION= 0.5.0 CATEGORIES= sysutils MASTER_SITES= XFCE/apps @@ -16,8 +16,8 @@ ONLY_FOR_ARCHS_REASON= Does not compile BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser -USES= fuse gettext-tools gmake pkgconfig tar:bzip2 xfce:gtk3 -USE_GNOME= cairo gdkpixbuf2 gtk30 gvfs intlhack +USES= fuse gettext-tools gmake pkgconfig tar:bzip2 xfce xorg +USE_GNOME= cairo gdkpixbuf2 gtk30 gvfs intltool USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/sysutils/gigolo/distinfo b/sysutils/gigolo/distinfo index 3931d2f5dc20..db170e5d23ac 100644 --- a/sysutils/gigolo/distinfo +++ b/sysutils/gigolo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551778875 -SHA256 (gigolo-0.4.91.tar.bz2) = 8917dc2f4f74645b79262512e5b91936c7e6f962646057d99d4b4f4e7fd70ae6 -SIZE (gigolo-0.4.91.tar.bz2) = 248666 +TIMESTAMP = 1565689522 +SHA256 (gigolo-0.5.0.tar.bz2) = 97a301aff012a143d0b99e7ecbb27084d3872aa203a74745e8357aab3a1880dc +SIZE (gigolo-0.5.0.tar.bz2) = 246473 diff --git a/sysutils/gigolo/pkg-plist b/sysutils/gigolo/pkg-plist index 9fa88d121991..aab0deb72522 100644 --- a/sysutils/gigolo/pkg-plist +++ b/sysutils/gigolo/pkg-plist @@ -22,7 +22,9 @@ share/applications/gigolo.desktop %%NLS%%share/locale/he/LC_MESSAGES/gigolo.mo %%NLS%%share/locale/hr/LC_MESSAGES/gigolo.mo %%NLS%%share/locale/hu/LC_MESSAGES/gigolo.mo +%%NLS%%share/locale/hy_AM/LC_MESSAGES/gigolo.mo %%NLS%%share/locale/id/LC_MESSAGES/gigolo.mo +%%NLS%%share/locale/ie/LC_MESSAGES/gigolo.mo %%NLS%%share/locale/is/LC_MESSAGES/gigolo.mo %%NLS%%share/locale/it/LC_MESSAGES/gigolo.mo %%NLS%%share/locale/ja/LC_MESSAGES/gigolo.mo diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile index 1a8e7bca497e..c4c75d2ddd70 100644 --- a/sysutils/xfburn/Makefile +++ b/sysutils/xfburn/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -22,8 +22,8 @@ RUN_DEPENDS= cdrdao:sysutils/cdrdao \ ${LOCALBASE}/include/libisofs/libisofs.h:devel/libisofs USES= desktop-file-utils gettext-tools gmake gnome pkgconfig \ - tar:bzip2 xfce -USE_GNOME= cairo glib20 gtk20 intlhack intltool + tar:bzip2 xfce:gtk2 +USE_GNOME= cairo glib20 gtk20 intltool USE_XFCE= libexo GNU_CONFIGURE= yes diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile index c723de90aff3..061470434e1f 100644 --- a/sysutils/xfce4-battery-plugin/Makefile +++ b/sysutils/xfce4-battery-plugin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-battery-plugin -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -15,7 +15,7 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 USES= alias gettext-tools gmake gnome libtool pkgconfig \ - tar:bzip2 xfce:gtk3 + tar:bzip2 xfce USE_GNOME= cairo gtk30 glib20 intltool USE_XFCE= panel USE_LDCONFIG= yes diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo index c07b2dcacb1a..d2388f121534 100644 --- a/sysutils/xfce4-battery-plugin/distinfo +++ b/sysutils/xfce4-battery-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547414549 -SHA256 (xfce4/xfce4-battery-plugin-1.1.2.tar.bz2) = d601349fa9a979dae99ace39b24d99b97f62b80f42ac5dea5a99e5af3e88d7db -SIZE (xfce4/xfce4-battery-plugin-1.1.2.tar.bz2) = 464077 +TIMESTAMP = 1565693839 +SHA256 (xfce4/xfce4-battery-plugin-1.1.3.tar.bz2) = 12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3 +SIZE (xfce4/xfce4-battery-plugin-1.1.3.tar.bz2) = 431118 diff --git a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c b/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c deleted file mode 100644 index d14d1feeb565..000000000000 --- a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c +++ /dev/null @@ -1,38 +0,0 @@ ---- panel-plugin/libacpi.c.orig 2018-12-31 22:14:28 UTC -+++ panel-plugin/libacpi.c -@@ -100,7 +100,7 @@ oidfmt(int *oid, int len, char *fmt, u_int *kind) - j = sizeof(buf); - i = sysctl(qoid, len + 2, buf, &j, 0, 0); - if (i) -- err(1, "sysctl fmt %d %d %d", i, j, errno); -+ err(1, "sysctl fmt %d %zu %d", i, j, errno); - - if (kind) - *kind = *(u_int *)buf; -@@ -129,7 +129,7 @@ get_var(int *oid, int nlen) - j = sizeof(name); - i = sysctl(qoid, nlen + 2, name, &j, 0, 0); - if (i || !j) -- err(1, "sysctl name %d %d %d", i, j, errno); -+ err(1, "sysctl name %d %zu %d", i, j, errno); - - sep = "="; - -@@ -145,7 +145,7 @@ get_var(int *oid, int nlen) - return (1); - - val[len] = '\0'; -- fmt = buf; -+ fmt = (char *)buf; - oidfmt(oid, nlen, fmt, &kind); - p = val; - switch (*fmt) { -@@ -170,7 +170,7 @@ get_var(int *oid, int nlen) - return (retval); - default: - printf("%s%s", name, sep); -- printf("Format:%s Length:%d Dump:0x", fmt, len); -+ printf("Format:%s Length:%zu Dump:0x", fmt, len); - while (len-- && (p < val + 16)) - printf("%02x", *p++); - if (len > 16) diff --git a/sysutils/xfce4-battery-plugin/pkg-plist b/sysutils/xfce4-battery-plugin/pkg-plist index 375f1bfd584b..566ba2c452e9 100644 --- a/sysutils/xfce4-battery-plugin/pkg-plist +++ b/sysutils/xfce4-battery-plugin/pkg-plist @@ -59,6 +59,7 @@ share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg %%NLS%%share/locale/he/LC_MESSAGES/xfce4-battery-plugin.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-battery-plugin.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-battery-plugin.mo +%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-battery-plugin.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-battery-plugin.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-battery-plugin.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-battery-plugin.mo diff --git a/sysutils/xfce4-bsdcpufreq-plugin/Makefile b/sysutils/xfce4-bsdcpufreq-plugin/Makefile index 49b0015ab101..375f358f3f19 100644 --- a/sysutils/xfce4-bsdcpufreq-plugin/Makefile +++ b/sysutils/xfce4-bsdcpufreq-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-bsdcpufreq-plugin PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils xfce MAINTAINER= riggs@FreeBSD.org @@ -13,7 +13,10 @@ COMMENT= Displays the current CPU clock frequency in the panel LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= pkgconfig xfce +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +USES= pkgconfig xfce:gtk2 USE_XFCE= panel USE_GNOME= cairo gdkpixbuf2 gtk20 diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile index 8c3b4fa95bf1..4bcef1cbc8bc 100644 --- a/sysutils/xfce4-cpugraph-plugin/Makefile +++ b/sysutils/xfce4-cpugraph-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-cpugraph-plugin PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -12,11 +13,8 @@ COMMENT= Graphical representation of the CPU load LICENSE= GPLv2 -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 - USES= gettext-tools gmake gnome libtool pkgconfig \ - tar:bzip2 xfce:gtk3 + tar:bzip2 xfce USE_CSTD= c99 USE_GNOME= cairo gtk30 intltool USE_XFCE= panel diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile index 897173617eae..fedf25baf033 100644 --- a/sysutils/xfce4-diskperf-plugin/Makefile +++ b/sysutils/xfce4-diskperf-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-diskperf-plugin PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -13,12 +14,13 @@ COMMENT= Graphical representation of the disk IO LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= gettext-tools gnome gmake libtool pkgconfig tar:bzip2 xfce:gtk3 +USES= gettext-tools gnome gmake libtool pkgconfig tar:bzip2 xfce +USE_GNOME= cairo gtk30 intltool +USE_XFCE= panel + GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USE_GNOME= gtk30 intltool cairo -USE_XFCE= panel LIBS+= -ldevstat diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile index db4444274756..eed525a24c0e 100644 --- a/sysutils/xfce4-fsguard-plugin/Makefile +++ b/sysutils/xfce4-fsguard-plugin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-fsguard-plugin -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -13,7 +13,8 @@ COMMENT= Panel plugin which displays free space of mountpoint # COPYING file is wrong compared to license header LICENSE= BSD2CLAUSE -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \ + xfce xorg USE_GNOME= cairo gtk30 intltool USE_XFCE= panel USE_XORG= x11 diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo index 4127caf3d206..ccad4de21393 100644 --- a/sysutils/xfce4-fsguard-plugin/distinfo +++ b/sysutils/xfce4-fsguard-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488101299 -SHA256 (xfce4/xfce4-fsguard-plugin-1.1.0.tar.bz2) = 6b038322b49d29625219e6a54497085b8f834b9c1fd15282ce286a6529d7c445 -SIZE (xfce4/xfce4-fsguard-plugin-1.1.0.tar.bz2) = 360463 +TIMESTAMP = 1565692437 +SHA256 (xfce4/xfce4-fsguard-plugin-1.1.1.tar.bz2) = d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516 +SIZE (xfce4/xfce4-fsguard-plugin-1.1.1.tar.bz2) = 367902 diff --git a/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c b/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c deleted file mode 100644 index 77586f71c9b3..000000000000 --- a/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c +++ /dev/null @@ -1,148 +0,0 @@ ---- panel-plugin/fsguard.c.orig 2016-10-29 06:43:10 UTC -+++ panel-plugin/fsguard.c -@@ -70,6 +70,7 @@ typedef struct - XfcePanelPlugin *plugin; - gboolean seen; - gint icon_id; -+ gchar *css_class; - gint timeout; - guint limit_warning; - guint limit_urgent; -@@ -135,6 +136,7 @@ fsguard_set_icon (FsGuard *fsguard, gint - if (id == fsguard->icon_id) - return; - -+ DBG ("icon id: new=%d, cur=%d", id, fsguard->icon_id); - fsguard->icon_id = id; - size = xfce_panel_plugin_get_size (fsguard->plugin); - size /= xfce_panel_plugin_get_nrows (fsguard->plugin); -@@ -177,7 +179,7 @@ fsguard_refresh_icon (FsGuard *fsguard) - } - - static void --fsguard_refresh_monitor (FsGuard *fsguard) -+fsguard_refresh_monitor_color (FsGuard *fsguard, gchar *css_class) - { - GdkRGBA color; - -@@ -197,23 +199,15 @@ fsguard_refresh_monitor (FsGuard *fsguar - } - - #if GTK_CHECK_VERSION (3, 16, 0) -- GtkCssProvider *css_provider; --#if GTK_CHECK_VERSION (3, 20, 0) -- gchar * css = g_strdup_printf("progressbar trough { min-width: 4px; min-height: 4px; } \ -- progressbar progress { min-width: 4px; min-height: 4px; \ -- background-color: %s; background-image: none; }", --#else -- gchar * css = g_strdup_printf(".progressbar { background-color: %s; background-image: none; }", --#endif -- gdk_rgba_to_string(&color)); -- /* Setup Gtk style */ -- css_provider = gtk_css_provider_new (); -- gtk_css_provider_load_from_data (css_provider, css, strlen(css), NULL); -- gtk_style_context_add_provider ( -- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))), -- GTK_STYLE_PROVIDER (css_provider), -- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -- g_free(css); -+ DBG("removing class %s, adding %s", fsguard->css_class, css_class); -+ gtk_style_context_remove_class ( -+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))), -+ fsguard->css_class); -+ gtk_style_context_add_class ( -+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))), -+ css_class); -+ g_free(fsguard->css_class); -+ fsguard->css_class = g_strdup(css_class); - #else - gtk_widget_override_background_color (GTK_WIDGET (fsguard->progress_bar), - GTK_STATE_PRELIGHT, -@@ -270,6 +264,7 @@ fsguard_check_fs (FsGuard *fsguard) - float totalblocks = 0; - long blocksize = 0; - int err; -+ gchar *css_class = "normal"; - gchar msg_size[100], msg_total_size[100], msg[100]; - gint icon_id = ICON_INSENSITIVE; - static struct statfs fsd; -@@ -285,10 +280,13 @@ fsguard_check_fs (FsGuard *fsguard) - - if (freespace > (total * fsguard->limit_warning / 100)) { - icon_id = ICON_NORMAL; -+ css_class = "normal"; - } else if (freespace > (total * fsguard->limit_urgent / 100) && freespace <= (total * fsguard->limit_warning / 100)) { - icon_id = ICON_WARNING; -+ css_class = "warning"; - } else { - icon_id = ICON_URGENT; -+ css_class = "urgent"; - } - } - g_snprintf (msg, sizeof (msg), -@@ -316,7 +314,8 @@ fsguard_check_fs (FsGuard *fsguard) - if (fsguard->show_progress_bar) { - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(fsguard->progress_bar), - (total > 0 ) ? 1.0 - (freespace / total) : 0.0); -- fsguard_refresh_monitor (fsguard); -+ if (icon_id != fsguard->icon_id) -+ fsguard_refresh_monitor_color (fsguard, css_class); - } - - gtk_widget_set_tooltip_text(fsguard->ebox, msg); -@@ -347,6 +346,7 @@ fsguard_read_config (FsGuard *fsguard) - fsguard->name = g_strdup (""); - fsguard->show_name = FALSE; - fsguard->path = g_strdup ("/"); -+ fsguard->css_class = g_strdup ("normal"); - fsguard->show_size = TRUE; - fsguard->show_progress_bar = TRUE; - fsguard->hide_button = FALSE; -@@ -406,6 +406,9 @@ fsguard_write_config (XfcePanelPlugin *p - static FsGuard * - fsguard_new (XfcePanelPlugin *plugin) - { -+#if GTK_CHECK_VERSION (3, 16, 0) -+ GtkCssProvider *css_provider; -+#endif - FsGuard *fsguard = g_new0(FsGuard, 1); - - fsguard->plugin = plugin; -@@ -429,6 +432,37 @@ fsguard_new (XfcePanelPlugin *plugin) - fsguard->icon_panel = gtk_image_new (); - - fsguard->progress_bar = gtk_progress_bar_new (); -+#if GTK_CHECK_VERSION (3, 16, 0) -+ css_provider = gtk_css_provider_new (); -+#if GTK_CHECK_VERSION (3, 20, 0) -+ gtk_css_provider_load_from_data (css_provider, "\ -+ progressbar.horizontal trough { min-height: 4px; }\ -+ progressbar.horizontal progress { min-height: 4px; }\ -+ progressbar.vertical trough { min-width: 4px; }\ -+ progressbar.vertical progress { min-width: 4px; }\ -+ .normal progress { background-color: " COLOR_NORMAL " ; background-image: none; }\ -+ .warning progress { background-color: " COLOR_WARNING " ; background-image: none; }\ -+ .urgent progress { background-color: " COLOR_URGENT " ; background-image: none; }", -+ -1, NULL); -+#else -+ gtk_css_provider_load_from_data (css_provider, "\ -+ .progressbar.horizontal trough { min-height: 4px; }\ -+ .progressbar.horizontal progress { min-height: 4px; }\ -+ .progressbar.vertical trough { min-width: 4px; }\ -+ .progressbar.vertical progress { min-width: 4px; }\ -+ .normal progress { background-color: " COLOR_NORMAL " ; background-image: none; }\ -+ .warning progress { background-color: " COLOR_WARNING " ; background-image: none; }\ -+ .urgent progress { background-color: " COLOR_URGENT " ; background-image: none; }", -+ -1, NULL); -+#endif -+ gtk_style_context_add_provider ( -+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))), -+ GTK_STYLE_PROVIDER (css_provider), -+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ gtk_style_context_add_class ( -+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))), -+ fsguard->css_class); -+#endif - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(fsguard->progress_bar), 0.0); - gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR(fsguard->progress_bar), (orientation == GTK_ORIENTATION_HORIZONTAL)); - gtk_orientable_set_orientation (GTK_ORIENTABLE(fsguard->progress_bar), !orientation); diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist index f2bc7bf27cb1..1bc13d39c70d 100644 --- a/sysutils/xfce4-fsguard-plugin/pkg-plist +++ b/sysutils/xfce4-fsguard-plugin/pkg-plist @@ -22,6 +22,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-warning.svg share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/be/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-fsguard-plugin.mo @@ -39,6 +40,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-fsguard-plugin.mo diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile index 427b7e28c1c0..840b8df09a39 100644 --- a/sysutils/xfce4-genmon-plugin/Makefile +++ b/sysutils/xfce4-genmon-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-genmon-plugin PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -13,7 +14,7 @@ COMMENT= Generic Monitor Xfce4 panel plugin LICENSE= LGPL21 USES= gettext-tools gmake gnome libtool pkgconfig \ - tar:bzip2 xfce:gtk3 + tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool USE_XFCE= panel diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile index ab3142c89dde..a94a832785fc 100644 --- a/sysutils/xfce4-mount-plugin/Makefile +++ b/sysutils/xfce4-mount-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-mount-plugin PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -12,10 +13,7 @@ COMMENT= Mount and umount utility for the Xfce4 panel LICENSE= GPLv2 -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 - -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce USE_GNOME= cairo gtk30 intltool USE_LDCONFIG= yes USE_XFCE= panel diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile index 37cf5b7c5886..71fd984f2b11 100644 --- a/sysutils/xfce4-netload-plugin/Makefile +++ b/sysutils/xfce4-netload-plugin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-netload-plugin -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -13,7 +13,7 @@ COMMENT= Network Load plugin for Xfce4 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce USE_GNOME= cairo gtk30 intltool USE_XFCE= panel diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo index c2065e4804f2..f9dae0007e9a 100644 --- a/sysutils/xfce4-netload-plugin/distinfo +++ b/sysutils/xfce4-netload-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488042852 -SHA256 (xfce4/xfce4-netload-plugin-1.3.1.tar.bz2) = 99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c -SIZE (xfce4/xfce4-netload-plugin-1.3.1.tar.bz2) = 367844 +TIMESTAMP = 1565692965 +SHA256 (xfce4/xfce4-netload-plugin-1.3.2.tar.bz2) = 22e40425cfe1e07b01fe275b1afddc7c788af34d9c2c7e2842166963cb41215d +SIZE (xfce4/xfce4-netload-plugin-1.3.2.tar.bz2) = 380571 diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist index fd383b5adbb2..99de613f32a1 100644 --- a/sysutils/xfce4-netload-plugin/pkg-plist +++ b/sysutils/xfce4-netload-plugin/pkg-plist @@ -4,6 +4,7 @@ share/icons/hicolor/48x48/apps/xfce4-netload-plugin.png share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-netload-plugin.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-netload-plugin.mo +%%NLS%%share/locale/be/LC_MESSAGES/xfce4-netload-plugin.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-netload-plugin.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-netload-plugin.mo diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile new file mode 100644 index 000000000000..af497e83cfec --- /dev/null +++ b/sysutils/xfce4-places-plugin/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= xfce4-places-plugin +PORTVERSION= 1.8.1 +CATEGORIES= sysutils xfce +MASTER_SITES= XFCE/panel-plugins +DIST_SUBDIR= xfce4 + +MAINTAINER= xfce@FreeBSD.org +COMMENT= File browser launcher for Xfce4 panel plugin + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libnotify.so:devel/libnotify + +USES= gettext-tools gmake gnome libtool pkgconfig \ + tar:bzip2 xfce xorg +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool +USE_XFCE= panel thunar +USE_XORG= ice sm x11 + +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip + +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +NLS_USES= gettext-runtime + +.include <bsd.port.mk> diff --git a/sysutils/xfce4-places-plugin/distinfo b/sysutils/xfce4-places-plugin/distinfo new file mode 100644 index 000000000000..469f0c52de0c --- /dev/null +++ b/sysutils/xfce4-places-plugin/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565600951 +SHA256 (xfce4/xfce4-places-plugin-1.8.1.tar.bz2) = f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2 +SIZE (xfce4/xfce4-places-plugin-1.8.1.tar.bz2) = 380906 diff --git a/sysutils/xfce4-places-plugin/pkg-descr b/sysutils/xfce4-places-plugin/pkg-descr new file mode 100644 index 000000000000..181b4f392f60 --- /dev/null +++ b/sysutils/xfce4-places-plugin/pkg-descr @@ -0,0 +1,9 @@ +The xfce4-places-plugin brings much of the functionality of the GNOME Places +menu to Xfce. The plugin looks a lot like a launcher with multiple items in a +menu. The main "launcher" button opens up Thunar at the user's home directory. +The arrow button opens up a menu with two sections: system- and user-defined +locations. The system-defined locations are consistent with Thunar (including +their icons). For user-defined bookmarks, the ~/.gtk-bookmarks file is being +read in order to share bookmarks with Thunar, Nautilus, the GNOME Panel, etc. + +WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin diff --git a/sysutils/xfce4-places-plugin/pkg-plist b/sysutils/xfce4-places-plugin/pkg-plist new file mode 100644 index 000000000000..69b8ad294f08 --- /dev/null +++ b/sysutils/xfce4-places-plugin/pkg-plist @@ -0,0 +1,57 @@ +bin/xfce4-popup-places +lib/xfce4/panel/plugins/libplaces.so +%%NLS%%share/locale/am/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/be/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/da/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/de/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/el/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/es/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/et/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/he/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/id/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/is/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/it/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-places-plugin.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-places-plugin.mo +share/xfce4/panel/plugins/places.desktop diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index 5a41b2db9f34..0791e84305ee 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-power-manager -PORTVERSION= 1.6.4 +PORTVERSION= 1.6.5 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -13,13 +13,11 @@ COMMENT= Power manager for the Xfce Desktop LICENSE= GPLv2 LIB_DEPENDS= libnotify.so:devel/libnotify \ - libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib \ - libpolkit-gobject-1.so:sysutils/polkit \ libupower-glib.so:sysutils/upower -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 -USE_GNOME= cairo glib20 gtk30 intlhack intltool +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \ + xfce xorg +USE_GNOME= cairo glib20 gtk30 intltool USE_XFCE= panel USE_XORG= ice sm xrandr x11 xext xtst xscrnsaver diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo index 6d2b38844896..a4e189f394c9 100644 --- a/sysutils/xfce4-power-manager/distinfo +++ b/sysutils/xfce4-power-manager/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564324793 -SHA256 (xfce4/xfce4-power-manager-1.6.4.tar.bz2) = 078df808e68f745769b4c34a4719cfe289d4bf89ca2cd4ed4680f2551a00039e -SIZE (xfce4/xfce4-power-manager-1.6.4.tar.bz2) = 1216948 +TIMESTAMP = 1565601450 +SHA256 (xfce4/xfce4-power-manager-1.6.5.tar.bz2) = 10adb67899b181ca5fc577fc9bb7a698fb94e42073585f7e2be642c7db127a74 +SIZE (xfce4/xfce4-power-manager-1.6.5.tar.bz2) = 1205473 diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index 0be50f9f96d7..b62cc51b55e4 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-settings -PORTVERSION= 4.12.4 -PORTREVISION= 3 +PORTVERSION= 4.14.1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -14,23 +13,22 @@ COMMENT= Xfce 4 settings application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib \ +LIB_DEPENDS= libcolord.so:graphics/colord \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ libxklavier.so:x11/libxklavier -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce -USE_GNOME= cairo glib20 gtk20 intlhack intltool -USE_XFCE= garcon libexo +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \ + xfce xorg +USE_GNOME= cairo glib20 gtk30 intltool +USE_XFCE= garcon libexo xfconf USE_XORG= xorgproto x11 xcursor xi xrandr GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-debug=yes \ - --disable-xorg-libinput +CONFIGURE_ARGS= --disable-xorg-libinput \ + --enable-pluggable-dialogs INSTALLS_ICONS= yes -PORTSCOUT= limit:^4\.12\. +PORTSCOUT= limitw:1,even OPTIONS_DEFINE= NOTIFY NLS UPOWER OPTIONS_DEFAULT= NOTIFY @@ -47,11 +45,14 @@ NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify UPOWER_CONFIGURE_ENABLE= upower-glib UPOWER_LIB_DEPENDS= libupower-glib.so:sysutils/upower +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug=yes +.endif + post-patch: @${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \ ${WRKSRC}/dialogs/appearance-settings/main.c - @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|; \ - s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \ + @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|' \ ${WRKSRC}/xfsettingsd/xsettings.xml .include <bsd.port.mk> diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo index e327ce54351c..5ebb563dbe5e 100644 --- a/sysutils/xfce4-settings/distinfo +++ b/sysutils/xfce4-settings/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529575306 -SHA256 (xfce4/xfce4-settings-4.12.4.tar.bz2) = e2a04cad48bf9e951409d0c841829fa3b4ce632cd799082ef82d0506618b6f9b -SIZE (xfce4/xfce4-settings-4.12.4.tar.bz2) = 1036773 +TIMESTAMP = 1566458209 +SHA256 (xfce4/xfce4-settings-4.14.1.tar.bz2) = e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a +SIZE (xfce4/xfce4-settings-4.14.1.tar.bz2) = 1187352 diff --git a/sysutils/xfce4-settings/pkg-message b/sysutils/xfce4-settings/pkg-message new file mode 100644 index 000000000000..23391e2cb09c --- /dev/null +++ b/sysutils/xfce4-settings/pkg-message @@ -0,0 +1,30 @@ +[ +{ + type: upgrade + maximum_version: "4.14.0" + message: <<EOD +Since XFCE 4.14 was updated to use gtk3 it is suggested to move to +a gtk3 compliant theme. + +By default XFCE is installed "unthemed", but the Greybird theme is +installed by the metaport. + +The icon theme installed and configured by default is Adwaita. Other +icon themes are available in the ports tree under the x11-themes +category. + +To switch to the greybird theme you can: + +Launch 'xfce4-appearance-settings', also available in the applications +menu, under settings/appearence, and go to the 'Style' tab to select +the greybird theme. + +Then go to 'Window Manager' or launch 'xfwm4-settings' and select the +greybird theme. + +Or launch these command in a shell: + xfconf-query -c xsettings -p /Net/ThemeName -t string -s "Greybird" + xfconf-query -c xfwm4 -p /general/theme -t string -s "Greybird" +EOD +} +] diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist index 50f6ce92b33a..b9950f876a3a 100644 --- a/sysutils/xfce4-settings/pkg-plist +++ b/sysutils/xfce4-settings/pkg-plist @@ -1,5 +1,6 @@ bin/xfce4-accessibility-settings bin/xfce4-appearance-settings +bin/xfce4-color-settings bin/xfce4-display-settings bin/xfce4-find-cursor bin/xfce4-keyboard-settings @@ -9,21 +10,28 @@ bin/xfce4-settings-editor bin/xfce4-settings-manager bin/xfsettingsd etc/xdg/autostart/xfsettingsd.desktop -etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml etc/xdg/menus/xfce-settings-manager.menu +etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml lib/xfce4/settings/appearance-install-theme share/applications/xfce-display-settings.desktop share/applications/xfce-keyboard-settings.desktop -share/applications/xfce4-mime-settings.desktop share/applications/xfce-mouse-settings.desktop share/applications/xfce-settings-manager.desktop share/applications/xfce-ui-settings.desktop share/applications/xfce4-accessibility-settings.desktop +share/applications/xfce4-color-settings.desktop +share/applications/xfce4-mime-settings.desktop share/applications/xfce4-settings-editor.desktop share/icons/hicolor/128x128/devices/xfce-display-extend.png share/icons/hicolor/128x128/devices/xfce-display-external.png share/icons/hicolor/128x128/devices/xfce-display-internal.png share/icons/hicolor/128x128/devices/xfce-display-mirror.png +share/icons/hicolor/128x128/devices/xfce-display-profile.png +share/icons/hicolor/24x24/apps/xfce4-color-settings.png +share/icons/hicolor/48x48/apps/xfce4-color-settings.png +share/icons/hicolor/64x64/apps/xfce4-color-settings.png +share/icons/hicolor/scalable/apps/xfce4-color-settings.svg +%%NLS%%share/locale/am/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/be/LC_MESSAGES/xfce4-settings.mo @@ -35,6 +43,7 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png %%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo @@ -44,7 +53,9 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png %%NLS%%share/locale/he/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo @@ -59,13 +70,14 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo -%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-settings.mo @@ -73,8 +85,8 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo -%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile index a15cb530591f..025d6b72e533 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-systemload-plugin -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -13,7 +12,7 @@ COMMENT= System Load plugin for Xfce4 panel LICENSE= BSD2CLAUSE -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool USE_XFCE= panel diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo index 6781fc9cc325..2f4da0385065 100644 --- a/sysutils/xfce4-systemload-plugin/distinfo +++ b/sysutils/xfce4-systemload-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543513700 -SHA256 (xfce4/xfce4-systemload-plugin-1.2.2.tar.bz2) = 3c67dfeb042eaea5aca440de9c6b3ecf99be0fbaa1cf7fdf9e6528233b46c99e -SIZE (xfce4/xfce4-systemload-plugin-1.2.2.tar.bz2) = 344197 +TIMESTAMP = 1565692810 +SHA256 (xfce4/xfce4-systemload-plugin-1.2.3.tar.bz2) = 052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775 +SIZE (xfce4/xfce4-systemload-plugin-1.2.3.tar.bz2) = 349074 diff --git a/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog b/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog deleted file mode 100644 index 51fcdaadcbed..000000000000 --- a/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog +++ /dev/null @@ -1,31 +0,0 @@ -From b35286b81e2b6166338008cb9330cf54b0d82250 Mon Sep 17 00:00:00 2001 -From: Landry Breuil <landry@xfce.org> -Date: Mon, 10 Dec 2018 09:57:58 +0100 -Subject: Fix a crash when opening the properties dialog - -introduced in dd5397b3, crash witnessed on OpenBSD and FreeBSD - better setting -the mnemonic widget when the widget has been created. ---- - panel-plugin/systemload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c -index 089b704..ee11297 100644 ---- panel-plugin/systemload.c.orig 2018-11-29 16:44:33 UTC -+++ panel-plugin/systemload.c -@@ -806,7 +806,6 @@ static void new_monitor_setting(t_global_monitor *glob - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_widget_set_margin_start (label, 12); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); - gtk_grid_attach (GTK_GRID(subgrid), label, 0, 0, 1, 1); - - /* Entry for the optional monitor label */ -@@ -822,6 +821,7 @@ static void new_monitor_setting(t_global_monitor *glob - - /* Colorbutton to set the progressbar color */ - button = gtk_color_button_new_with_rgba(colorvar); -+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); - gtk_widget_set_halign(button, GTK_ALIGN_START); - g_object_set_data(G_OBJECT(button), "colorvar", colorvar); - g_signal_connect(G_OBJECT(button), "color-set", diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile index fc2fd698e9a6..3682e0944a78 100644 --- a/sysutils/xfce4-wavelan-plugin/Makefile +++ b/sysutils/xfce4-wavelan-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-wavelan-plugin -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.6.1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -13,7 +12,7 @@ COMMENT= Displays various information about a WaveLAN device LICENSE= BSD3CLAUSE -USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 +USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool USE_XFCE= panel diff --git a/sysutils/xfce4-wavelan-plugin/distinfo b/sysutils/xfce4-wavelan-plugin/distinfo index 94049a17a828..9bc1d512481b 100644 --- a/sysutils/xfce4-wavelan-plugin/distinfo +++ b/sysutils/xfce4-wavelan-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488044086 -SHA256 (xfce4/xfce4-wavelan-plugin-0.6.0.tar.bz2) = 4d5bd6654cfd077f3432b08d296f7bd052e765e51b77c629886a9542f4e5ecdc -SIZE (xfce4/xfce4-wavelan-plugin-0.6.0.tar.bz2) = 303220 +TIMESTAMP = 1565693099 +SHA256 (xfce4/xfce4-wavelan-plugin-0.6.1.tar.bz2) = f41f81ea063ae3c7d7904e1ee647a6b5efafc7436f47caed662ee417038eed17 +SIZE (xfce4/xfce4-wavelan-plugin-0.6.1.tar.bz2) = 328287 diff --git a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c index cc269cb51079..2362c4b1c06a 100644 --- a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c +++ b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c @@ -1,79 +1,30 @@ ---- panel-plugin/wavelan.c.orig 2016-10-29 06:46:02 UTC +--- panel-plugin/wavelan.c.orig 2019-08-13 10:29:17 UTC +++ panel-plugin/wavelan.c -@@ -64,6 +64,9 @@ typedef struct - GtkWidget *image; - GtkWidget *signal; - GtkWidget *tooltip_text; -+#if GTK_CHECK_VERSION (3, 16, 0) -+ GtkCssProvider *css_provider; -+#endif - - XfcePanelPlugin *plugin; - -@@ -77,7 +80,6 @@ wavelan_set_state(t_wavelan *wavelan, gint state) - { - GdkRGBA color; - #if GTK_CHECK_VERSION (3, 16, 0) -- GtkCssProvider *css_provider; - gchar *css; - #endif - -@@ -99,11 +101,11 @@ wavelan_set_state(t_wavelan *wavelan, gint state) - - if (wavelan->signal_colors) { - /* set color */ -- if (state > 70) -+ if (state > 75) - gdk_rgba_parse(&color, signal_color_strong); -- else if (state > 55) -+ else if (state > 50) - gdk_rgba_parse(&color, signal_color_good); -- else if (state > 40) -+ else if (state > 25) - gdk_rgba_parse(&color, signal_color_weak); - else - gdk_rgba_parse(&color, signal_color_bad); -@@ -118,12 +120,7 @@ wavelan_set_state(t_wavelan *wavelan, gint state) - #endif - gdk_rgba_to_string(&color)); - /* Setup Gtk style */ -- css_provider = gtk_css_provider_new (); -- gtk_css_provider_load_from_data (css_provider, css, strlen(css), NULL); -- gtk_style_context_add_provider ( -- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))), -- GTK_STYLE_PROVIDER (css_provider), -- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ gtk_css_provider_load_from_data (wavelan->css_provider, css, strlen(css), NULL); - g_free(css); - #else - gtk_widget_override_background_color(GTK_WIDGET(wavelan->signal), -@@ -183,7 +180,15 @@ wavelan_timer(gpointer data) - } - } - else { -- wavelan_set_state(wavelan, stats.ws_quality); -+ /* -+ * Usual formula is: qual = 4 * (signal - noise) -+ * where noise is typically about -96dBm, but we don't have -+ * the actual noise value here, so approximate one. -+ */ -+ if (strcmp(stats.ws_qunit, "dBm") == 0) -+ wavelan_set_state(wavelan, 4 * (stats.ws_quality - (-96))); -+ else -+ wavelan_set_state(wavelan, stats.ws_quality); +@@ -108,11 +108,11 @@ wavelan_set_state(t_wavelan *wavelan, gint state) - if (strlen(stats.ws_netname) > 0) - /* Translators: net_name: quality quality_unit at rate Mb/s*/ -@@ -338,6 +343,13 @@ wavelan_new(XfcePanelPlugin *plugin) + if (wavelan->signal_colors) { + /* set color */ +- if (state > 70) ++ if (state > 75) + gdk_rgba_parse(&color, signal_color_strong); +- else if (state > 55) ++ else if (state > 50) + gdk_rgba_parse(&color, signal_color_good); +- else if (state > 40) ++ else if (state > 25) + gdk_rgba_parse(&color, signal_color_weak); + else + gdk_rgba_parse(&color, signal_color_bad); +@@ -357,11 +357,13 @@ wavelan_new(XfcePanelPlugin *plugin) /* setup progressbar */ wavelan->signal = gtk_progress_bar_new(); +#if GTK_CHECK_VERSION (3, 16, 0) -+ wavelan->css_provider = gtk_css_provider_new (); -+ gtk_style_context_add_provider ( -+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))), -+ GTK_STYLE_PROVIDER (wavelan->css_provider), -+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + wavelan->css_provider = gtk_css_provider_new (); + gtk_style_context_add_provider ( + GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))), + GTK_STYLE_PROVIDER (wavelan->css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); +#endif wavelan->image = GTK_WIDGET(xfce_panel_image_new_from_source("network-wireless")); diff --git a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c deleted file mode 100644 index 1b2017b8f955..000000000000 --- a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c +++ /dev/null @@ -1,251 +0,0 @@ ---- panel-plugin/wi_bsd.c.orig 2016-05-01 15:53:40 UTC -+++ panel-plugin/wi_bsd.c -@@ -3,6 +3,8 @@ - * (OpenBSD support) - * 2008 Pietro Cerutti <gahr@gahr.ch> - * (FreeBSD > 700000 adaptation) -+ * 2014 J.R. Oldroyd <fbsd@opal.com> -+ * (Enhance FreeBSD support) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -26,14 +28,9 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if !defined(__FreeBSD_kernel__) && defined(__FreeBSD__) --#define __FreeBSD_kernel__ __FreeBSD__ --#endif --#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version) --#define __FreeBSD_kernel_version __FreeBSD_version --#endif -+#include <sys/param.h> - --#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD_kernel_kernel__) || defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) - - #include <sys/types.h> - #include <sys/cdefs.h> -@@ -44,20 +41,14 @@ - - #include <net/if.h> - #include <net/if_media.h> --#ifdef __FreeBSD_kernel__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include <netinet/in.h> - #include <netinet/if_ether.h> - #include <sys/endian.h> --#if __FreeBSD_kernel_version >= 700000 - #include <sys/types.h> - #include <sys/sysctl.h> - #include <net80211/ieee80211_ioctl.h> - #else --#include <net/if_var.h> --#include <net/ethernet.h> --#include <dev/wi/if_wavelan_ieee.h> --#endif --#else - #ifdef __NetBSD__ - #include <net80211/ieee80211.h> - #include <net80211/ieee80211_ioctl.h> -@@ -107,14 +98,10 @@ struct wi_device - }; - - static int _wi_carrier(const struct wi_device *); --#if defined(__FreeBSD_kernel__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - static int _wi_vendor(const struct wi_device *, char *, size_t); --#if __FreeBSD_kernel_version > 700000 - static int _wi_getval(const struct wi_device *, struct ieee80211req_scan_result *); --#else --static int _wi_getval(const struct wi_device *, struct wi_req *); - #endif --#endif - static int _wi_netname(const struct wi_device *, char *, size_t); - static int _wi_quality(const struct wi_device *, int *); - static int _wi_rate(const struct wi_device *, int *); -@@ -164,7 +151,7 @@ wi_query(struct wi_device *device, struct wi_stats *st - strlcpy(stats->ws_qunit, "dBm", 4); - #endif - /* check vendor (independent of carrier state) */ --#if defined(__FreeBSD_kernel__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK) - return(result); - #endif -@@ -305,12 +292,10 @@ _wi_rate(const struct wi_device *device, int *rate) - } - #endif - --/* seems only FreeBSD supports this operation */ --#if defined(__FreeBSD_kernel__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - static int - _wi_vendor(const struct wi_device *device, char *buffer, size_t len) - { --#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000 - /* - * We use sysctl to get a device description - */ -@@ -327,59 +312,30 @@ _wi_vendor(const struct wi_device *device, char *buffe - dev_number = (int)strtol(c, NULL, 10); - *c = '\0'; - -+ /* -+ * Also, wlan doesn't present dev.wlan.N.%desc, need to use -+ * underlying driver name, instead: dev.ath.0.%desc, so we -+ * need to get the parent's name. -+ */ -+ if(strcmp(dev_name, "wlan") == 0) { -+ snprintf(mib, sizeof(mib), "net.%s.%d.%%parent", dev_name, dev_number); -+ if(sysctlbyname(mib, dev_name, &len, NULL, 0) == -1) -+ return (WI_NOSUCHDEV); -+ -+ c = dev_name; -+ while(!isdigit(*c)) c++; -+ dev_number = (int)strtol(c, NULL, 10); -+ *c = '\0'; -+ len = WI_MAXSTRLEN; -+ } -+ - snprintf(mib, sizeof(mib), "dev.%s.%d.%%desc", dev_name, dev_number); - if(sysctlbyname(mib, buffer, &len, NULL, 0) == -1) - return (WI_NOSUCHDEV); --#else --#define WI_RID_STA_IDENTITY_LUCENT 0x1 --#define WI_RID_STA_IDENTITY_PRISMII 0x2 --#define WI_RID_STA_IDENTITY_SAMSUNG 0x3 --#define WI_RID_STA_IDENTITY_DLINK 0x6 -- const char* vendor = "Unknown"; -- struct wi_req wr; -- int result; - -- bzero((void*)&wr, sizeof(wr)); -- wr.wi_len = WI_MAX_DATALEN; -- wr.wi_type = WI_RID_STA_IDENTITY; -- -- if ((result = _wi_getval(device, &wr)) != WI_OK){ -- /* For the Atheros, IDENTITY does not work. */ -- if (strcmp(device->interface, "ath") != 0) -- return(result); -- } -- else if (wr.wi_len < 4) -- return(WI_NOSUCHDEV); -- -- switch (wr.wi_val[1]) { -- case WI_RID_STA_IDENTITY_LUCENT: -- vendor = "Lucent"; -- break; -- -- case WI_RID_STA_IDENTITY_PRISMII: -- vendor = "generic PRISM II"; -- break; -- -- case WI_RID_STA_IDENTITY_SAMSUNG: -- vendor = "Samsung"; -- break; -- case WI_RID_STA_IDENTITY_DLINK: -- vendor = "D-Link"; -- break; -- } -- -- snprintf(buffer, len, "%s (ID %d, version %d.%d)", vendor, -- wr.wi_val[0], wr.wi_val[2], wr.wi_val[3]); --#endif -- - return(WI_OK); - } --#endif /* wi_vendor */ - --/* NetBSD and FreeBSD 6.x uses old wi_* API */ --#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) --/* FreeBSD 7.x use its own new iee80211 API */ --#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000 - static int - _wi_getval(const struct wi_device *device, struct ieee80211req_scan_result *scan) - { -@@ -404,7 +360,9 @@ _wi_getval(const struct wi_device *device, struct ieee - - return(WI_OK); - } --#else -+#endif -+ -+#if defined(__NetBSD__) - static int - _wi_getval(const struct wi_device *device, struct wi_req *wr) - { -@@ -420,10 +378,11 @@ _wi_getval(const struct wi_device *device, struct wi_r - return(WI_OK); - } - #endif -+ - static int - _wi_netname(const struct wi_device *device, char *buffer, size_t len) - { --#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000 -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct ieee80211req ireq; - - memset(&ireq, 0, sizeof(ireq)); -@@ -434,7 +393,7 @@ _wi_netname(const struct wi_device *device, char *buff - ireq.i_len = len; - if (ioctl(device->socket, SIOCG80211, &ireq) < 0) - return WI_NOSUCHDEV; --#else -+#elif defined(__NetBSD__) - struct wi_req wr; - int result; - -@@ -454,7 +413,7 @@ _wi_netname(const struct wi_device *device, char *buff - static int - _wi_quality(const struct wi_device *device, int *quality) - { --#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000 -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct ieee80211req_scan_result req; - int result; - bzero(&req, sizeof(req)); -@@ -462,8 +421,16 @@ _wi_quality(const struct wi_device *device, int *quali - if((result = _wi_getval(device, &req)) != WI_OK) - return (result); - -- *quality = req.isr_rssi; --#else -+ /* -+ * FreeBSD's wlan stats: -+ * signal (in dBm) = rssi * 2 + noise; -+ * quality_bars = 4 * (signal - noise); -+ * or -+ * quality_bars = rssi * 8; -+ * but, per wi_query(), above, we need to return strength in dBm, so... -+ */ -+ *quality = req.isr_rssi * 2 + req.isr_noise; -+#elif defined(__NetBSD__) - struct wi_req wr; - int result; - -@@ -486,7 +453,7 @@ _wi_quality(const struct wi_device *device, int *quali - static int - _wi_rate(const struct wi_device *device, int *rate) - { --#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000 -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct ieee80211req_scan_result req; - int result, i, high; - bzero(&req, sizeof(req)); -@@ -499,7 +466,7 @@ _wi_rate(const struct wi_device *device, int *rate) - high = req.isr_rates[i] & IEEE80211_RATE_VAL; - - *rate = high / 2; --#else -+#elif defined(__NetBSD__) - struct wi_req wr; - int result; - -@@ -516,5 +483,4 @@ _wi_rate(const struct wi_device *device, int *rate) - return(WI_OK); - } - --#endif /* defined(__NetBSD__) || defined(__FreeBSD_kernel__) */ - #endif |