Date: Mon, 2 Jan 2017 15:07:34 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430365 - in head/x11/deforaos-panel: . files Message-ID: <201701021507.v02F7Yh3044001@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Mon Jan 2 15:07:34 2017 New Revision: 430365 URL: https://svnweb.freebsd.org/changeset/ports/430365 Log: Update to 0.3.6 Approved by: jadawin (mentor) Differential Revision: https://reviews.freebsd.org/D8992 Added: head/x11/deforaos-panel/files/ head/x11/deforaos-panel/files/patch-doc-Makefile (contents, props changed) head/x11/deforaos-panel/files/patch-src-applets-bluetooth (contents, props changed) head/x11/deforaos-panel/files/patch-src-applets-swap (contents, props changed) Modified: head/x11/deforaos-panel/Makefile head/x11/deforaos-panel/distinfo head/x11/deforaos-panel/pkg-plist Modified: head/x11/deforaos-panel/Makefile ============================================================================== --- head/x11/deforaos-panel/Makefile Mon Jan 2 15:04:02 2017 (r430364) +++ head/x11/deforaos-panel/Makefile Mon Jan 2 15:07:34 2017 (r430365) @@ -2,45 +2,58 @@ # $FreeBSD$ PORTNAME= deforaos-panel -PORTVERSION= 0.3.1 +PORTVERSION= 0.3.6 PORTREVISION= 1 CATEGORIES= x11 -MASTER_SITES= http://www.defora.org/os/download/download/4338/ +MASTER_SITES= http://www.defora.org/os/download/download/4417/ DISTNAME= Panel-${PORTVERSION} MAINTAINER= olivier@FreeBSD.org COMMENT= DeforaOS desktop panel LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2016-11-01 - -LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ - libDesktop.so:x11/deforaos-libdesktop -BUILD_DEPENDS= browser:x11-fm/deforaos-browser \ - ${LOCALBASE}/include/Desktop/Keyboard.h:x11/deforaos-keyboard \ - ${LOCALBASE}/include/Desktop/Player.h:multimedia/deforaos-player \ - xsltproc:textproc/libxslt \ - docbook-xsl>=0:textproc/docbook-xsl -RUN_DEPENDS= keyboard:x11/deforaos-keyboard \ - ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \ +LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \ + libSystem.so:devel/deforaos-libsystem \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 +BUILD_DEPENDS= browser:x11-fm/deforaos-browser +RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ sudo:security/sudo -USE_GNOME= gtk20 -USES= gettext pkgconfig +USE_GNOME= gtk20 cairo +USES= pkgconfig +USE_XORG= x11 INSTALLS_ICONS= yes MAKE_ARGS+= PREFIX=${PREFIX} USE_LDCONFIG= yes -MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man +MAKE_ENV= MANDIR=${STAGEDIR}${MANPREFIX}/man + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|data doc include|data include|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|include po src|include src|' \ + ${WRKSRC}/Makefile post-patch: ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ ${WRKSRC}/data/pkgconfig.sh ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \ ${WRKSRC}/src/panel.c + ${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/tools/Makefile \ + ${WRKSRC}/src/Makefile \ + ${WRKSRC}/tests/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \ Modified: head/x11/deforaos-panel/distinfo ============================================================================== --- head/x11/deforaos-panel/distinfo Mon Jan 2 15:04:02 2017 (r430364) +++ head/x11/deforaos-panel/distinfo Mon Jan 2 15:07:34 2017 (r430365) @@ -1,2 +1,3 @@ -SHA256 (Panel-0.3.1.tar.gz) = 374cfbb67d2c0282603df12a071a3dcee05e130e79e07782e9f176d888e5636a -SIZE (Panel-0.3.1.tar.gz) = 133677 +TIMESTAMP = 1483369528 +SHA256 (Panel-0.3.6.tar.gz) = 00739939fbb14e0df478f026624649eff8cab64a81e067721fa4f75713896241 +SIZE (Panel-0.3.6.tar.gz) = 146129 Added: head/x11/deforaos-panel/files/patch-doc-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/deforaos-panel/files/patch-doc-Makefile Mon Jan 2 15:07:34 2017 (r430365) @@ -0,0 +1,56 @@ +--- doc/Makefile.orig 2016-03-01 23:07:41.429960000 +0100 ++++ doc/Makefile 2016-03-01 23:08:45.782008000 +0100 +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)panel.1 $(OBJDIR)panel.html $(OBJDIR)panelctl.1 $(OBJDIR)panelctl.html $(OBJDIR)panel-embed.1 $(OBJDIR)panel-embed.html $(OBJDIR)panel-message.1 $(OBJDIR)panel-message.html $(OBJDIR)panel-notify.1 $(OBJDIR)panel-notify.html $(OBJDIR)wifibrowser.1 $(OBJDIR)wifibrowser.html ++TARGETS = $(OBJDIR)panel.1 $(OBJDIR)panelctl.1 $(OBJDIR)panel-embed.1 $(OBJDIR)panel-message.1 $(OBJDIR)panel-notify.1 $(OBJDIR)wifibrowser.1 + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -49,47 +49,29 @@ + clean: + $(RM) -- $(panel.1_OBJS) $(panel.html_OBJS) $(panelctl.1_OBJS) $(panelctl.html_OBJS) $(panel-embed.1_OBJS) $(panel-embed.html_OBJS) $(panel-message.1_OBJS) $(panel-message.html_OBJS) $(panel-notify.1_OBJS) $(panel-notify.html_OBJS) $(wifibrowser.1_OBJS) $(wifibrowser.html_OBJS) + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panelctl.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panelctl.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-embed.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-embed.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-message.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-message.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-notify.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-notify.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)wifibrowser.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)wifibrowser.html" + + distclean: clean + $(RM) -- $(TARGETS) + + install: $(TARGETS) + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panelctl.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panelctl.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-embed.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-embed.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-message.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-message.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-notify.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-notify.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)wifibrowser.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)wifibrowser.html" + + uninstall: + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panelctl.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panelctl.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-embed.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-embed.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-message.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-message.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-notify.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-notify.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "wifibrowser.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "wifibrowser.html" + + .PHONY: all clean distclean install uninstall Added: head/x11/deforaos-panel/files/patch-src-applets-bluetooth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/deforaos-panel/files/patch-src-applets-bluetooth Mon Jan 2 15:07:34 2017 (r430365) @@ -0,0 +1,18 @@ +--- src/applets/bluetooth.c.orig 2016-03-02 00:18:48.529828000 +0100 ++++ src/applets/bluetooth.c 2016-03-02 00:19:04.332171000 +0100 +@@ -21,14 +21,12 @@ + # include <bluetooth.h> + # include <unistd.h> + # include <stdio.h> +-# include <string.h> +-# include <errno.h> + #elif defined(__linux__) + # include <fcntl.h> + # include <unistd.h> ++#endif + # include <string.h> + # include <errno.h> +-#endif + #include <stdlib.h> + #include <libintl.h> + #include <System.h> Added: head/x11/deforaos-panel/files/patch-src-applets-swap ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/deforaos-panel/files/patch-src-applets-swap Mon Jan 2 15:07:34 2017 (r430365) @@ -0,0 +1,50 @@ +--- src/applets/swap.c.orig 2015-10-24 01:33:21.000000000 +0200 ++++ src/applets/swap.c 2016-03-02 09:10:06.697330000 +0100 +@@ -19,9 +19,15 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#if defined(__linux__) ++#if defined(__FreeBSD__) ++# include <sys/types.h> ++# include <sys/sysctl.h> ++# include <sys/vmmeter.h> ++# include <vm/vm_param.h> ++#elif defined(__linux__) + # include <sys/sysinfo.h> + #elif defined(__NetBSD__) ++# include <sys/param.h> + # include <sys/sysctl.h> + # include <uvm/uvm_extern.h> + #endif +@@ -128,7 +134,20 @@ + /* swap_on_timeout */ + static gboolean _swap_on_timeout(gpointer data) + { +-#if defined(__linux__) ++#if defined(__FreeBSD__) ++ Swap * swap = data; ++ int mib[] = { CTL_VM, VM_TOTAL }; ++ struct vmtotal t; ++ size_t size = sizeof(t); ++ gdouble value; ++ ++ if(sysctl(mib, 2, &t, &size, NULL, 0) < 0) ++ return TRUE; ++ value = t.t_rm; ++ value /= t.t_vm; ++ _swap_set(swap, value); ++ return TRUE; ++#elif defined(__linux__) + Swap * swap = data; + struct sysinfo sy; + gdouble value; +@@ -157,7 +176,7 @@ + Swap * swap = data; + + /* FIXME not supported */ +- swap->source = 0; ++ swap->timeout = 0; + return FALSE; + #endif + } Modified: head/x11/deforaos-panel/pkg-plist ============================================================================== --- head/x11/deforaos-panel/pkg-plist Mon Jan 2 15:04:02 2017 (r430364) +++ head/x11/deforaos-panel/pkg-plist Mon Jan 2 15:07:34 2017 (r430365) @@ -4,13 +4,18 @@ 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/libPanel.a lib/libPanel.so lib/libPanel.so.0 lib/libPanel.so.0.0 lib/Panel/applets/battery.so +lib/Panel/applets/brightness.so lib/Panel/applets/bluetooth.so lib/Panel/applets/clock.so lib/Panel/applets/close.so @@ -22,13 +27,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 @@ -41,13 +45,14 @@ lib/Panel/applets/user.so lib/Panel/applets/volume.so lib/Panel/applets/wpa_supplicant.so libdata/pkgconfig/Panel.pc -man/man1/panel-embed.1.gz -man/man1/panel-message.1.gz -man/man1/panel-notify.1.gz -man/man1/panel.1.gz -man/man1/panelctl.1.gz -man/man1/wifibrowser.1.gz +%%PORTDOCS%%man/man1/panel-embed.1.gz +%%PORTDOCS%%man/man1/panel-message.1.gz +%%PORTDOCS%%man/man1/panel-notify.1.gz +%%PORTDOCS%%man/man1/panel.1.gz +%%PORTDOCS%%man/man1/panelctl.1.gz +%%PORTDOCS%%man/man1/wifibrowser.1.gz 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 @@ -67,10 +72,5 @@ share/icons/hicolor/48x48/apps/panel-app 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/fr/LC_MESSAGES/Panel.mo -share/man/html1/panel-embed.html -share/man/html1/panel-message.html -share/man/html1/panel-notify.html -share/man/html1/panel.html -share/man/html1/panelctl.html -share/man/html1/wifibrowser.html +%%NLS%%share/locale/fr/LC_MESSAGES/Panel.mo +%%NLS%%share/locale/es/LC_MESSAGES/Panel.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701021507.v02F7Yh3044001>