From 497f2284c18a9248e27c5893ee636db919c70391 Mon Sep 17 00:00:00 2001 From: khorben Date: Sun, 23 Aug 2015 16:16:37 +0000 Subject: Package DeforaOS Panel 0.3.2 This release brings: - updated API and ABI for applets - internal refactoring - more documentation - spanish translation - new applet, "brightness" - new tool for gathering desktop preferences, settings(1) - fewer dependencies ("player" applet moved away) This release will be completed with the packaging of the DeforaOS Integration project, where the "player" applet can now be found. This release also renames the applet "main" to "menu"; this may break existing configuration settings. This release does not fix the usability issues suspected with the "wpa_supplicant" applet and corresponding wifibrowser(1) tool. A memory leak is also among the known issues. --- x11/deforaos-panel/Makefile | 11 ++---- x11/deforaos-panel/PLIST | 12 ++++-- x11/deforaos-panel/buildlink3.mk | 6 +-- x11/deforaos-panel/distinfo | 14 ++----- x11/deforaos-panel/patches/patch-data_pkgconfig.sh | 20 ---------- .../patches/patch-src_applets_main.c | 16 -------- .../patches/patch-src_applets_memory.c | 22 ----------- .../patches/patch-src_applets_swap.c | 12 ------ .../patches/patch-src_applets_volume.c | 15 -------- x11/deforaos-panel/patches/patch-src_panel.c | 43 ---------------------- 10 files changed, 20 insertions(+), 151 deletions(-) delete mode 100644 x11/deforaos-panel/patches/patch-data_pkgconfig.sh delete mode 100644 x11/deforaos-panel/patches/patch-src_applets_main.c delete mode 100644 x11/deforaos-panel/patches/patch-src_applets_memory.c delete mode 100644 x11/deforaos-panel/patches/patch-src_applets_swap.c delete mode 100644 x11/deforaos-panel/patches/patch-src_applets_volume.c delete mode 100644 x11/deforaos-panel/patches/patch-src_panel.c (limited to 'x11') diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile index e903f326a66..b3cce3942f2 100644 --- a/x11/deforaos-panel/Makefile +++ b/x11/deforaos-panel/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2015/08/09 15:17:43 khorben Exp $ +# $NetBSD: Makefile,v 1.18 2015/08/23 16:16:37 khorben Exp $ # -DISTNAME= Panel-0.3.1 -PKGNAME= deforaos-panel-0.3.1 -PKGREVISION= 2 +DISTNAME= Panel-0.3.2 +PKGNAME= deforaos-panel-0.3.2 CATEGORIES= x11 -MASTER_SITES= http://www.defora.org/os/download/download/4338/ +MASTER_SITES= http://www.defora.org/os/download/download/4358/ MAINTAINER= khorben@defora.org HOMEPAGE= http://www.defora.org/ @@ -54,6 +53,4 @@ post-install: .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/deforaos-libdesktop/buildlink3.mk" -.include "../../sysutils/deforaos-browser/buildlink3.mk" -.include "../../multimedia/deforaos-player/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/deforaos-panel/PLIST b/x11/deforaos-panel/PLIST index 005eabff021..d5696ac2eb9 100644 --- a/x11/deforaos-panel/PLIST +++ b/x11/deforaos-panel/PLIST @@ -1,14 +1,19 @@ -@comment $NetBSD: PLIST,v 1.3 2014/10/24 18:21:06 khorben Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/08/23 16:16:37 khorben Exp $ bin/panel bin/panel-embed bin/panel-message bin/panel-notify bin/panelctl bin/run +bin/settings bin/wifibrowser include/Desktop/Panel.h +include/Desktop/Panel/applet.h +include/Desktop/Panel/panel.h +include/Desktop/Panel/window.h lib/Panel/applets/battery.so lib/Panel/applets/bluetooth.so +lib/Panel/applets/brightness.so lib/Panel/applets/clock.so lib/Panel/applets/close.so lib/Panel/applets/cpu.so @@ -19,13 +24,12 @@ lib/Panel/applets/gps.so lib/Panel/applets/gsm.so lib/Panel/applets/lock.so lib/Panel/applets/logout.so -lib/Panel/applets/main.so lib/Panel/applets/memory.so +lib/Panel/applets/menu.so lib/Panel/applets/mixer.so lib/Panel/applets/network.so lib/Panel/applets/pager.so lib/Panel/applets/phone.so -lib/Panel/applets/player.so lib/Panel/applets/rotate.so lib/Panel/applets/separator.so lib/Panel/applets/spacer.so @@ -55,6 +59,7 @@ man/man1/panel.1 man/man1/panelctl.1 man/man1/wifibrowser.1 share/applications/deforaos-panel-settings.desktop +share/applications/deforaos-settings.desktop share/applications/deforaos-wifibrowser.desktop share/icons/hicolor/16x16/apps/panel-applet-bluetooth.png share/icons/hicolor/16x16/apps/panel-applet-desktop.png @@ -74,4 +79,5 @@ share/icons/hicolor/48x48/apps/panel-applet-bluetooth.png share/icons/hicolor/48x48/apps/panel-applet-desktop.png share/icons/hicolor/48x48/apps/panel-settings.png share/icons/hicolor/scalable/apps/panel-applet-bluetooth.svg +share/locale/es/LC_MESSAGES/Panel.mo share/locale/fr/LC_MESSAGES/Panel.mo diff --git a/x11/deforaos-panel/buildlink3.mk b/x11/deforaos-panel/buildlink3.mk index bdd505a246e..3ba8da902ba 100644 --- a/x11/deforaos-panel/buildlink3.mk +++ b/x11/deforaos-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:03 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/08/23 16:16:37 khorben Exp $ # BUILDLINK_TREE+= deforaos-panel @@ -6,8 +6,8 @@ BUILDLINK_TREE+= deforaos-panel .if !defined(DEFORAOS_PANEL_BUILDLINK3_MK) DEFORAOS_PANEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.deforaos-panel+= deforaos-panel>=0.2.12 -BUILDLINK_ABI_DEPENDS.deforaos-panel?= deforaos-panel>=0.3.1nb2 +BUILDLINK_API_DEPENDS.deforaos-panel+= deforaos-panel>=0.3.2 +BUILDLINK_ABI_DEPENDS.deforaos-panel?= deforaos-panel>=0.3.2 BUILDLINK_PKGSRCDIR.deforaos-panel?= ../../x11/deforaos-panel .include "../../devel/deforaos-libsystem/buildlink3.mk" diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo index 657349584c1..bc84b274773 100644 --- a/x11/deforaos-panel/distinfo +++ b/x11/deforaos-panel/distinfo @@ -1,12 +1,6 @@ -$NetBSD: distinfo,v 1.7 2014/10/25 10:36:24 khorben Exp $ +$NetBSD: distinfo,v 1.8 2015/08/23 16:16:37 khorben Exp $ -SHA1 (Panel-0.3.1.tar.gz) = 0a2d9d424b8b316d8a6db087c8cb2dddaaa47347 -RMD160 (Panel-0.3.1.tar.gz) = 3e2fe1e8f1cf2a4c27cdf355bf5c00685d5ada9a -Size (Panel-0.3.1.tar.gz) = 133677 bytes -SHA1 (patch-data_pkgconfig.sh) = 7c40652087c604cff593a320e97259c453633c74 -SHA1 (patch-src_applets_main.c) = 2dcc2b6394116406a1c2a23b22ba0feb56c85ecd -SHA1 (patch-src_applets_memory.c) = 858dc9f03fa32e01d3d02d49d13742cda7b0193e -SHA1 (patch-src_applets_swap.c) = 75599dd9b7aed08895c542376d2a6b7883a91f7f -SHA1 (patch-src_applets_volume.c) = 10a4dfe01b6576a7f39a344ddd669725666d72a7 -SHA1 (patch-src_panel.c) = 9423e1a6c3535be8d90a40c9b2f70a5cbff2ac78 +SHA1 (Panel-0.3.2.tar.gz) = bfcb5d33b94e2cfa3abd94450b75a7976abc2fac +RMD160 (Panel-0.3.2.tar.gz) = 6877ffb5386e98babf29a092658a3bcbdcfa1b9a +Size (Panel-0.3.2.tar.gz) = 141549 bytes SHA1 (patch-tools_Makefile) = 642887110b585cd6b78d0cf43acc4f826b1abcae diff --git a/x11/deforaos-panel/patches/patch-data_pkgconfig.sh b/x11/deforaos-panel/patches/patch-data_pkgconfig.sh deleted file mode 100644 index 42c49b15bd0..00000000000 --- a/x11/deforaos-panel/patches/patch-data_pkgconfig.sh +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-data_pkgconfig.sh,v 1.2 2014/10/24 18:21:06 khorben Exp $ - -Use correct rpath flag on SunOS. - ---- data/pkgconfig.sh.orig 2014-04-23 15:37:45.000000000 +0000 -+++ data/pkgconfig.sh -@@ -129,9 +129,12 @@ while [ $# -gt 0 ]; do - if [ "$PREFIX" != "/usr" ]; then - RPATH="-Wl,-rpath-link,\${libdir} -Wl,-rpath,\${libdir}" - case $(uname -s) in -- Darwin|SunOS) -+ Darwin) - RPATH="-Wl,-rpath,\${libdir}" - ;; -+ SunOS) -+ RPATH="-Wl,-R\${libdir}" -+ ;; - esac - fi - diff --git a/x11/deforaos-panel/patches/patch-src_applets_main.c b/x11/deforaos-panel/patches/patch-src_applets_main.c deleted file mode 100644 index 66ca59c2a1f..00000000000 --- a/x11/deforaos-panel/patches/patch-src_applets_main.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_applets_main.c,v 1.3 2014/10/24 23:43:17 khorben Exp $ - -Need fcntl.h for open() on SunOS. - ---- src/applets/main.c.orig 2014-10-23 17:34:42.000000000 +0000 -+++ src/applets/main.c -@@ -16,6 +16,9 @@ - - - #include -+#if defined(__sun) -+# include -+#endif - #include - #include - #include diff --git a/x11/deforaos-panel/patches/patch-src_applets_memory.c b/x11/deforaos-panel/patches/patch-src_applets_memory.c deleted file mode 100644 index b08e21ac432..00000000000 --- a/x11/deforaos-panel/patches/patch-src_applets_memory.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_applets_memory.c,v 1.2 2014/10/24 18:21:06 khorben Exp $ - ---- src/applets/memory.c.orig 2014-06-27 11:22:53.000000000 +0000 -+++ src/applets/memory.c -@@ -21,12 +21,13 @@ - #include - #if defined(__linux__) - # include --#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__FreeBSD__) -+# include -+# include -+# include -+#elif defined(__NetBSD__) - # include - # include --# if defined(__FreeBSD__) --# include --# endif - #endif - #include - #include "Panel.h" diff --git a/x11/deforaos-panel/patches/patch-src_applets_swap.c b/x11/deforaos-panel/patches/patch-src_applets_swap.c deleted file mode 100644 index d1280b9d878..00000000000 --- a/x11/deforaos-panel/patches/patch-src_applets_swap.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_applets_swap.c,v 1.1 2013/01/15 15:34:12 joerg Exp $ - ---- src/applets/swap.c.orig 2013-01-15 13:22:55.000000000 +0000 -+++ src/applets/swap.c -@@ -23,6 +23,7 @@ - # include - #elif defined(__NetBSD__) - # include -+# include - #endif - #include - #include "Panel.h" diff --git a/x11/deforaos-panel/patches/patch-src_applets_volume.c b/x11/deforaos-panel/patches/patch-src_applets_volume.c deleted file mode 100644 index 7dc640ec055..00000000000 --- a/x11/deforaos-panel/patches/patch-src_applets_volume.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_applets_volume.c,v 1.1 2014/03/21 14:38:01 jperkin Exp $ - -Fix SunOS includes. - ---- src/applets/volume.c.orig 2013-02-04 22:23:50.000000000 +0000 -+++ src/applets/volume.c -@@ -19,7 +19,7 @@ - - - #include --#if defined(__NetBSD__) || defined(__sun__) -+#if defined(__NetBSD__) - # include - #elif defined(__linux__) - # include diff --git a/x11/deforaos-panel/patches/patch-src_panel.c b/x11/deforaos-panel/patches/patch-src_panel.c deleted file mode 100644 index ae18cd8d955..00000000000 --- a/x11/deforaos-panel/patches/patch-src_panel.c +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-src_panel.c,v 1.1 2014/10/25 10:36:24 khorben Exp $ - -Fix for Gtk+ 2.24 - ---- src/panel.c.orig 2014-10-23 09:38:39.000000000 +0000 -+++ src/panel.c -@@ -768,7 +768,7 @@ static GtkWidget * _preferences_window_p - for(i = 0; i < sizeof(titles) / sizeof(*titles); i++) - { - #if GTK_CHECK_VERSION(2, 24, 0) -- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _(titles[i])); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), _(titles[i])); - #else - gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _(titles[i])); - #endif -@@ -782,11 +782,11 @@ static GtkWidget * _preferences_window_p - FALSE, TRUE, 0); - gtk_widget_set_no_show_all(panel->pr_panels[i].enabled, TRUE); - /* size */ --#if GTK_CHECK_VERSION(3, 0, 0) -+#if GTK_CHECK_VERSION(2, 24, 0) - panel->pr_panels[i].size = gtk_combo_box_text_new(); -- gtk_combo_box_text_append( -+ gtk_combo_box_text_append_text( - GTK_COMBO_BOX_TEXT(panel->pr_panels[i].size), -- NULL, _("Default")); -+ _("Default")); - #else - panel->pr_panels[i].size = gtk_combo_box_new_text(); - gtk_combo_box_append_text( -@@ -796,9 +796,9 @@ static GtkWidget * _preferences_window_p - for(j = 0; j < sizeof(_panel_sizes) / sizeof(*_panel_sizes); - j++) - { --#if GTK_CHECK_VERSION(3, 0, 0) -- gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT( -- panel->pr_panels[i].size), NULL, -+#if GTK_CHECK_VERSION(2, 24, 0) -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT( -+ panel->pr_panels[i].size), - _(_panel_sizes[j].alias)); - #else - gtk_combo_box_append_text( -- cgit v1.2.3