svn commit: r362794 - in head/x11/lxpanel: . files
Guido Falsi
madpilot at FreeBSD.org
Thu Jul 24 13:12:37 UTC 2014
Author: madpilot
Date: Thu Jul 24 13:12:35 2014
New Revision: 362794
URL: http://svnweb.freebsd.org/changeset/ports/362794
QAT: https://qat.redports.org/buildarchive/r362794/
Log:
- Update to 0.6.2
- Add devel/libsysinfo to LIB_DEPENDS
- Add x11/xmessage to RUN_DEPENDS
- Add netstatus, volumeasla, thermal, cpu, cpufreq,
monitors and wnckpager plugins to CONFIGURE_ARGS
- Add cpufreq, netstatus and thermal plugin patches
- Add batt plugin patch
- Remove -Wno-return-type from CFLAGS
- Change ALSA_RUN_DEPENDS to ALSA_LIB_DEPENDS
PR: 190362
Submitted by: Horia Racoviceanu <horia at racoviceanu.com> (maintainer)
Added:
head/x11/lxpanel/files/
head/x11/lxpanel/files/patch-src__plugins__batt__Makefile.in (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__batt__batt.c (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.h (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__cpufreq__cpufreq.c (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__netstatus__netstatus-sysdeps.c (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__thermal__Makefile.in (contents, props changed)
head/x11/lxpanel/files/patch-src__plugins__thermal__thermal.c (contents, props changed)
head/x11/lxpanel/files/pkg-message.in (contents, props changed)
Modified:
head/x11/lxpanel/Makefile
head/x11/lxpanel/distinfo
head/x11/lxpanel/pkg-plist
Modified: head/x11/lxpanel/Makefile
==============================================================================
--- head/x11/lxpanel/Makefile Thu Jul 24 12:59:11 2014 (r362793)
+++ head/x11/lxpanel/Makefile Thu Jul 24 13:12:35 2014 (r362794)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lxpanel
-PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTVERSION= 0.6.2
CATEGORIES= x11
MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}/
@@ -13,38 +12,97 @@ COMMENT= Lightweight X11 desktop panel
LICENSE= GPLv2 MIT
LICENSE_COMB= dual
-LIB_DEPENDS= libmenu-cache.so:${PORTSDIR}/x11/menu-cache
-RUN_DEPENDS= ${LOCALBASE}/share/desktop-directories/lxde-audio-video.directory:${PORTSDIR}/x11/lxmenu-data
+LIB_DEPENDS= libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
+ libsysinfo.so:${PORTSDIR}/devel/libsysinfo
+RUN_DEPENDS= ${LOCALBASE}/share/desktop-directories/lxde-audio-video.directory:${PORTSDIR}/x11/lxmenu-data \
+ xmessage:${PORTSDIR}/x11/xmessage
+USE_AUTOTOOLS= automake:env
+USE_CSTD= gnu89
+USE_GNOME= gtk20 libwnck
+USE_XORG= x11 xmu
+USES= gmake pathfix pkgconfig
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --prefix="${PREFIX}" \
+ --with-plugins=netstatus,volume,volumealsa,deskno,batt,kbled,xkb,thermal,cpu,cpufreq,monitors,wnckpager \
+ --with-x \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${WRKSRC}
+
+SUB_FILES= pkg-message
PORTDOCS= AUTHORS README
-OPTIONS_DEFINE= ALSA DOCS NLS
+OPTIONS_DEFINE= ALSA DOCS NLS
OPTIONS_SUB= yes
-ALSA_RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-f10-alsa-lib
+ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
ALSA_CONFIGURE_ENABLE= alsa
-
+NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
-USE_XORG= x11 xmu
-USE_GNOME= gtk20 libwnck
-USES= gmake pathfix pkgconfig
-GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:env
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --with-plugins=volume,deskno,kbled,xkb,batt \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CFLAGS+= -I${WRKSRC} -Wno-return-type
-USE_CSTD= gnu89
-
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MALSA}
+PLIST_SUB+= VOLUME="@comment "
+.else
+PLIST_SUB+= VOLUME=""
+.endif
+
post-patch:
+ @${REINPLACE_CMD} -e '/g_thread_create/ \
+ s|.*| g_thread_new("tf", (GThreadFunc)thread_func,\
+ thread_data);|' \
+ ${WRKSRC}/src/gtk-run.c
+ @${REINPLACE_CMD} -e '/g_thread_init/d' \
+ ${WRKSRC}/src/panel.c
+ @${REINPLACE_CMD} -e 's|structure_size :|.structure_size =|; \
+ s|structure_version :|.structure_version =|' \
+ ${WRKSRC}/src/plugin.h
+ @${REINPLACE_CMD} -e 's| type *:| .type =|; \
+ s| name *:| .name =|; \
+ s| version *:| .version =|; \
+ s| description *:| .description =|; \
+ s| constructor *:| .constructor =|; \
+ s| destructor *:| .destructor =|; \
+ s| config *:| .config =|; \
+ s| save *:| .save =|; \
+ s| panel_configuration_changed *:| \
+ .panel_configuration_changed =|; \
+ s| fname:| .fname =|; \
+ s| count:| .count =|; \
+ s| expand_available :| .expand_available =|; \
+ s| expand_default :| .expand_default =|; \
+ s| one_per_system :| .one_per_system =|; \
+ s| not_unloadable :| .not_unloadable =|' \
+ ${WRKSRC}/src/plugins/batt/batt.c \
+ ${WRKSRC}/src/plugins/cpu*/cpu*.c \
+ ${WRKSRC}/src/plugins/deskno/deskno.c \
+ ${WRKSRC}/src/plugins/kbled/kbled.c \
+ ${WRKSRC}/src/plugins/monitors/monitors.c \
+ ${WRKSRC}/src/plugins/netstatus/netstatus.c \
+ ${WRKSRC}/src/plugins/thermal/thermal.c \
+ ${WRKSRC}/src/plugins/wnckpager/wnckpager.c \
+ ${WRKSRC}/src/plugins/xkb/xkb-plugin.c \
+ ${WRKSRC}/src/plugins/volume*/volume*.c \
+ ${WRKSRC}/src/plugins/*.c
+ @${REINPLACE_CMD} -e '/gdk_color_parse(b/ s|;||; \
+ /gdk_color_parse(b/{p;s/.*/ ;/;}' \
+ ${WRKSRC}/src/plugins/batt/batt.c
+ @${REINPLACE_CMD} -e 's|/sys|/compat/linux&|' \
+ ${WRKSRC}/src/plugins/batt/batt_sys.h
+ @${REINPLACE_CMD} -e 's|/proc|/compat/linux&|' \
+ ${WRKSRC}/src/plugins/cpu/cpu.c \
+ ${WRKSRC}/src/plugins/monitors/monitors.c \
+ ${WRKSRC}/src/plugins/thermal/thermal.c
+ @${REINPLACE_CMD} -e 's|%lld|%lu|g; s|bytes >=|bytes >|' \
+ ${WRKSRC}/src/plugins/netstatus/netstatus-dialog.c
+ @${REINPLACE_CMD} -e '/NETSTATUS_ERROR, code/ s|error_message|"%s", &|' \
+ ${WRKSRC}/src/plugins/netstatus/netstatus-iface.c
+ @${REINPLACE_CMD} -e '611s/signal_strength)/*&/' \
+ ${WRKSRC}/src/plugins/netstatus/netstatus-sysdeps.c
@${REINPLACE_CMD} -e 's|linux|sys|' \
${WRKSRC}/src/plugins/volume/volume-impl.c
- @${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
- ${WRKSRC}/po/Makefile.in.in
.if ! ${PORT_OPTIONS:MNLS}
@${REINPLACE_CMD} -e 's|po man|man|' \
@@ -52,10 +110,16 @@ post-patch:
.endif
post-install:
-.for l in volume xkb deskno batt kbled
+.for l in netstatus deskno batt kbled xkb thermal cpu cpufreq monitors wnckpager
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/${l}.so
.endfor
+.if ${PORT_OPTIONS:MALSA}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/volumealsa.so
+.else
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/volume.so
+.endif
+
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
Modified: head/x11/lxpanel/distinfo
==============================================================================
--- head/x11/lxpanel/distinfo Thu Jul 24 12:59:11 2014 (r362793)
+++ head/x11/lxpanel/distinfo Thu Jul 24 13:12:35 2014 (r362794)
@@ -1,2 +1,2 @@
-SHA256 (lxpanel-0.6.1.tar.gz) = a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb
-SIZE (lxpanel-0.6.1.tar.gz) = 2094946
+SHA256 (lxpanel-0.6.2.tar.gz) = f9ba6d0b825f7b99de045c3371738792bf9f3604af66bef4d98d783461c60a48
+SIZE (lxpanel-0.6.2.tar.gz) = 2086833
Added: head/x11/lxpanel/files/patch-src__plugins__batt__Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/lxpanel/files/patch-src__plugins__batt__Makefile.in Thu Jul 24 13:12:35 2014 (r362794)
@@ -0,0 +1,266 @@
+--- ./src/plugins/batt/Makefile.in.orig 2014-05-09 09:31:24.000000000 -0400
++++ ./src/plugins/batt/Makefile.in 2014-05-27 18:13:52.000000000 -0400
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.12.6 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -15,51 +15,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
+-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+-am__make_running_with_option = \
+- case $${target_option-} in \
+- ?) ;; \
+- *) echo "am__make_running_with_option: internal error: invalid" \
+- "target option '$${target_option-}' specified" >&2; \
+- exit 1;; \
+- esac; \
+- has_opt=no; \
+- sane_makeflags=$$MAKEFLAGS; \
+- if $(am__is_gnu_make); then \
+- sane_makeflags=$$MFLAGS; \
+- else \
++am__make_dryrun = \
++ { \
++ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+- bs=\\; \
+- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+- esac; \
+- fi; \
+- skip_next=no; \
+- strip_trailopt () \
+- { \
+- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+- }; \
+- for flg in $$sane_makeflags; do \
+- test $$skip_next = yes && { skip_next=no; continue; }; \
+- case $$flg in \
+- *=*|--*) continue;; \
+- -*I) strip_trailopt 'I'; skip_next=yes;; \
+- -*I?*) strip_trailopt 'I';; \
+- -*O) strip_trailopt 'O'; skip_next=yes;; \
+- -*O?*) strip_trailopt 'O';; \
+- -*l) strip_trailopt 'l'; skip_next=yes;; \
+- -*l?*) strip_trailopt 'l';; \
+- -[dEDm]) skip_next=yes;; \
+- -[JT]) skip_next=yes;; \
+- esac; \
+- case $$flg in \
+- *$$target_option*) has_opt=yes; break;; \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
+ esac; \
+- done; \
+- test $$has_opt = yes
+-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -79,21 +51,14 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = src/plugins/batt
+-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+- $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++ $(top_srcdir)/depcomp
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -178,23 +143,6 @@
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+-# Read a list of newline-separated strings from the standard input,
+-# and print each of them once, without duplicates. Input order is
+-# *not* preserved.
+-am__uniquify_input = $(AWK) '\
+- BEGIN { nonempty = 0; } \
+- { items[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in items) print i; }; } \
+-'
+-# Make sure the list of sources is unique. This is necessary because,
+-# e.g., the same source file might be shared among _SOURCES variables
+-# for different programs/libraries.
+-am__define_uniq_tagged_files = \
+- list='$(am__tagged_files)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -255,15 +203,11 @@
+ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+-LIBICONV = @LIBICONV@
+-LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+-LTLIBICONV = @LTLIBICONV@
+-LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ LXPANEL_MODULE = @LXPANEL_MODULE@
+ MAKEINFO = @MAKEINFO@
+@@ -423,7 +367,6 @@
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+-
+ install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
+@@ -458,7 +401,6 @@
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+-
+ batt.la: $(batt_la_OBJECTS) $(batt_la_DEPENDENCIES) $(EXTRA_batt_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(batt_la_LINK) -rpath $(moduledir) $(batt_la_OBJECTS) $(batt_la_LIBADD) $(LIBS)
+
+@@ -476,14 +418,14 @@
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -512,15 +454,26 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-ID: $(am__tagged_files)
+- $(am__define_uniq_tagged_files); mkid -fID $$unique
+-tags: tags-am
+-TAGS: tags
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++tags: TAGS
+
+-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+- $(am__define_uniq_tagged_files); \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+@@ -532,11 +485,15 @@
+ $$unique; \
+ fi; \
+ fi
+-ctags: ctags-am
+-
+-CTAGS: ctags
+-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+- $(am__define_uniq_tagged_files); \
++ctags: CTAGS
++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+@@ -545,10 +502,9 @@
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+-cscopelist: cscopelist-am
+
+-cscopelist-am: $(am__tagged_files)
+- list='$(am__tagged_files)'; \
++cscopelist: $(HEADERS) $(SOURCES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+@@ -704,9 +660,9 @@
+
+ .MAKE: install-am install-strip
+
+-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
+- ctags-am distclean distclean-compile distclean-generic \
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-moduleLTLIBRARIES cscopelist ctags \
++ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+@@ -716,7 +672,7 @@
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-moduleLTLIBRARIES
+
+
Added: head/x11/lxpanel/files/patch-src__plugins__batt__batt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/lxpanel/files/patch-src__plugins__batt__batt.c Thu Jul 24 13:12:35 2014 (r362794)
@@ -0,0 +1,171 @@
+--- ./src/plugins/batt/batt.c.orig 2014-05-09 09:15:04.000000000 -0400
++++ ./src/plugins/batt/batt.c 2014-05-27 18:13:59.000000000 -0400
+@@ -68,7 +68,7 @@
+ cairo_surface_t *pixmap;
+ GtkWidget *drawingArea;
+ int orientation;
+- unsigned int alarmTime,
++ unsigned int alarmPercentage,
+ border,
+ height,
+ length,
+@@ -118,7 +118,6 @@
+ char tooltip[ 256 ];
+ battery *b = lx_b->b;
+ /* unit: mW */
+- int rate;
+ gboolean isCharging;
+
+ if (! lx_b->pixmap )
+@@ -127,26 +126,28 @@
+ cr = cairo_create(lx_b->pixmap);
+ cairo_set_line_width (cr, 1.0);
+
+- /* draw background */
+- gdk_cairo_set_source_color(cr, &lx_b->background);
+- cairo_rectangle(cr, 0, 0, lx_b->width, lx_b->height);
+- cairo_fill(cr);
+-
+ /* no battery is found */
+- if( b == NULL )
++ if( b == NULL || b->percentage < 0 )
+ {
+ gtk_widget_set_tooltip_text( lx_b->drawingArea, _("No batteries found") );
+- goto update_done;
++ gdk_cairo_set_source_color(cr, &lx_b->background);
++ cairo_rectangle(cr, 0, 0, lx_b->width, lx_b->height);
++ cairo_fill(cr);
++ return;
+ }
+
++ /* draw background */
++ gdk_cairo_set_source_color(cr, &lx_b->background);
++ cairo_rectangle(cr, 0, 0, lx_b->width, lx_b->height);
++ cairo_fill(cr);
++
+ /* fixme: only one battery supported */
+
+- rate = lx_b->b->current_now;
+ isCharging = battery_is_charging ( b );
+
+ /* Consider running the alarm command */
+- if ( !isCharging && rate > 0 &&
+- ( ( battery_get_remaining( b ) / 60 ) < lx_b->alarmTime ) )
++ if ( !isCharging &&
++ ( ( b->percentage ) < lx_b->alarmPercentage ) )
+ {
+ /* Shrug this should be done using glibs process functions */
+ /* Alarms should not run concurrently; determine whether an alarm is
+@@ -176,7 +177,7 @@
+ int left_seconds = b->seconds - 3600 * hours;
+ int minutes = left_seconds / 60;
+ snprintf(tooltip, 256,
+- _("Battery: %d%% charged, %d:%02d until full"),
++ _("Battery: %d%% charged"),
+ lx_b->b->percentage,
+ hours,
+ minutes );
+@@ -187,10 +188,10 @@
+ int left_seconds = b->seconds - 3600 * hours;
+ int minutes = left_seconds / 60;
+ snprintf(tooltip, 256,
+- _("Battery: %d%% charged, %d:%02d left"),
++ _("Battery: %d%% charged, %d:%02dh left"),
+ lx_b->b->percentage,
+- hours,
+- minutes );
++ hours,
++ minutes);
+ } else {
+ snprintf(tooltip, 256,
+ _("Battery: %d%% charged"),
+@@ -236,8 +237,6 @@
+ cairo_fill(cr);
+
+ }
+-
+-update_done:
+ if( repaint )
+ gtk_widget_queue_draw( lx_b->drawingArea );
+
+@@ -247,19 +246,12 @@
+
+ /* This callback is called every 3 seconds */
+ static int update_timout(lx_battery *lx_b) {
+- battery *bat;
+ GDK_THREADS_ENTER();
+ lx_b->state_elapsed_time++;
+ lx_b->info_elapsed_time++;
+
+- bat = battery_update( lx_b->b );
+- if (bat == NULL)
+- {
+- battery_free(lx_b->b);
+-
+- /* maybe in the mean time a battery has been inserted. */
+- lx_b->b = battery_get();
+- }
++ /* check the batteries every 3 seconds */
++ battery_update( lx_b->b );
+
+ update_display( lx_b, TRUE );
+
+@@ -346,6 +338,10 @@
+ /* get available battery */
+ lx_b->b = battery_get ();
+
++ /* no battery available */
++ if ( lx_b->b == NULL )
++ goto error;
++
+ p->pwid = gtk_event_box_new();
+ GTK_WIDGET_SET_FLAGS( p->pwid, GTK_NO_WINDOW );
+ gtk_container_set_border_width( GTK_CONTAINER(p->pwid), 1 );
+@@ -380,7 +376,7 @@
+ = lx_b->dischargingColor1 = lx_b->dischargingColor2 = NULL;
+
+ /* Set default values for integers */
+- lx_b->alarmTime = 5;
++ lx_b->alarmPercentage = 10;
+ lx_b->requestedBorder = 1;
+
+ line s;
+@@ -409,8 +405,8 @@
+ lx_b->dischargingColor1 = g_strdup(s.t[1]);
+ else if (!g_ascii_strcasecmp(s.t[0], "DischargingColor2"))
+ lx_b->dischargingColor2 = g_strdup(s.t[1]);
+- else if (!g_ascii_strcasecmp(s.t[0], "AlarmTime"))
+- lx_b->alarmTime = atoi(s.t[1]);
++ else if (!g_ascii_strcasecmp(s.t[0], "AlarmPercentage"))
++ lx_b->alarmPercentage = atoi(s.t[1]);
+ else if (!g_ascii_strcasecmp(s.t[0], "BorderWidth"))
+ lx_b->requestedBorder = atoi(s.t[1]);
+ else if (!g_ascii_strcasecmp(s.t[0], "Size")) {
+@@ -477,9 +473,6 @@
+
+ lx_battery *b = (lx_battery *) p->priv;
+
+- if (b->b != NULL)
+- battery_free(b->b);
+-
+ if (b->pixmap)
+ cairo_surface_destroy(b->pixmap);
+
+@@ -562,7 +555,7 @@
+ _("Hide if there is no battery"), &b->hide_if_no_battery, CONF_TYPE_BOOL,
+ #endif
+ _("Alarm command"), &b->alarmCommand, CONF_TYPE_STR,
+- _("Alarm time (minutes left)"), &b->alarmTime, CONF_TYPE_INT,
++ _("Alarm percentage (percentage left)"), &b->alarmPercentage, CONF_TYPE_INT,
+ _("Background color"), &b->backgroundColor, CONF_TYPE_STR,
+ _("Charging color 1"), &b->chargingColor1, CONF_TYPE_STR,
+ _("Charging color 2"), &b->chargingColor2, CONF_TYPE_STR,
+@@ -582,7 +575,7 @@
+
+ lxpanel_put_bool(fp, "HideIfNoBattery",lx_b->hide_if_no_battery);
+ lxpanel_put_str(fp, "AlarmCommand", lx_b->alarmCommand);
+- lxpanel_put_int(fp, "AlarmTime", lx_b->alarmTime);
++ lxpanel_put_int(fp, "AlarmPercentage", lx_b->alarmPercentage);
+ lxpanel_put_str(fp, "BackgroundColor", lx_b->backgroundColor);
+ lxpanel_put_int(fp, "BorderWidth", lx_b->requestedBorder);
+ lxpanel_put_str(fp, "ChargingColor1", lx_b->chargingColor1);
Added: head/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c Thu Jul 24 13:12:35 2014 (r362794)
@@ -0,0 +1,304 @@
+--- ./src/plugins/batt/batt_sys.c.orig 2014-05-09 09:15:04.000000000 -0400
++++ ./src/plugins/batt/batt_sys.c 2014-05-27 18:14:06.000000000 -0400
+@@ -39,26 +39,10 @@
+ static int battery_num = 1;
+ battery * b = g_new0 ( battery, 1 );
+ b->type_battery = TRUE;
+- b->capacity_unit = "mAh";
+- b->energy_full = -1;
+- b->charge_full = -1;
+- b->voltage_now = -1;
+- b->energy_full_design = -1;
+- b->charge_full_design = -1;
+- b->energy_now = -1;
+- b->charge_now = -1;
+- b->current_now = -1;
+- b->power_now = -1;
+ b->state = NULL;
+- b->battery_num = battery_num;
+- b->seconds = -1;
+- b->percentage = -1;
+- b->poststr = NULL;
+- battery_num++;
+ return b;
+ }
+
+-
+ static gchar* parse_info_file(battery *b, char *sys_file)
+ {
+ char *buf = NULL;
+@@ -97,7 +81,7 @@
+ return parse_info_file(b, sys_file);
+ }
+
+-void battery_print(battery *b, int show_capacity)
++void battery_print(battery *b)
+ {
+ if ( b->type_battery )
+ {
+@@ -110,215 +94,65 @@
+ int seconds = b->seconds - 3600 * hours;
+ int minutes = seconds / 60;
+ seconds -= 60 * minutes;
+- printf(", %02d:%02d:%02d%s", hours, minutes, seconds,
+- b->poststr);
++ printf(", %02d:%02d:%02d", hours, minutes, seconds);
+ } else if (b->poststr != NULL) {
+ printf(", %s", b->poststr);
+ }
+
+ printf("\n");
+
+- if (show_capacity && b->charge_full_design > 0) {
+- int percentage = -1;
+- int charge_full = -1;
+- if (b->charge_full <= 100) {
+- /* some broken systems just give a percentage here */
+- percentage = b->charge_full;
+- charge_full = percentage * b->charge_full_design / 100;
+- } else {
+- percentage = b->charge_full * 100 / b->charge_full_design;
+- charge_full = b->charge_full;
+- }
+- if (percentage > 100)
+- percentage = 100;
+-
+- printf ("%s %d: design capacity %d %s, "
+- "last full capacity %d %s = %d%%\n",
+- BATTERY_DESC, b->battery_num - 1, b->charge_full_design,
+- b->capacity_unit, charge_full, b->capacity_unit,
+- percentage);
+- }
+ }
+ }
+ }
+
+
+-static gboolean battery_inserted(gchar* path)
+-{
+- if (path == NULL)
+- return FALSE;
+-
+- GString *dirname = g_string_new(ACPI_PATH_SYS_POWER_SUPPY);
+- GDir *dir;
+-
+- g_string_append_printf (dirname, "/%s/", path);
+- dir = g_dir_open(dirname->str, 0, NULL);
+- if (dir)
+- g_dir_close(dir);
+- g_string_free(dirname, TRUE);
+-
+- return dir ? TRUE : FALSE;
+-}
+-
+-
+-battery* battery_update(battery *b)
++void battery_update(battery *b)
+ {
+- gchar *gctmp;
+-
+- if (b == NULL)
+- return NULL;
+-
+- if (!battery_inserted(b->path))
+- return NULL;
+-
+- /* read from sysfs */
+- b->charge_now = get_gint_from_infofile(b, "charge_now");
+- b->energy_now = get_gint_from_infofile(b, "energy_now");
+-
+- b->current_now = get_gint_from_infofile(b, "current_now");
+- b->power_now = get_gint_from_infofile(b, "power_now");
+- /* FIXME: Some battery drivers report -1000 when the discharge rate is
+- * unavailable. Others use negative values when discharging. Best we can do
+- * is to treat -1 as an error, and take the absolute value otherwise.
+- * Ideally the kernel would not export the sysfs file when the value is not
+- * available. */
+- if (b->current_now < -1)
+- b->current_now = - b->current_now;
+- if (b->power_now < -1)
+- b->power_now = - b->power_now;
+-
+- b->charge_full = get_gint_from_infofile(b, "charge_full");
+- b->energy_full = get_gint_from_infofile(b, "energy_full");
+-
+- b->charge_full_design = get_gint_from_infofile(b, "charge_full_design");
+- b->energy_full_design = get_gint_from_infofile(b, "energy_full_design");
+-
+- b->voltage_now = get_gint_from_infofile(b, "voltage_now");
+-
+- gctmp = get_gchar_from_infofile(b, "type");
+- b->type_battery = gctmp ? (strcasecmp(gctmp, "battery") == 0) : TRUE;
+-
+- b->state = get_gchar_from_infofile(b, "status");
+- if (!b->state)
+- b->state = get_gchar_from_infofile(b, "state");
+- if (!b->state) {
+- if (b->charge_now != -1 || b->energy_now != -1
+- || b->charge_full != -1 || b->energy_full != -1)
+- b->state = "available";
+- else
+- b->state = "unavailable";
+- }
+-
+-
+- /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */
+-
+- if (b->energy_full != -1 && b->charge_full == -1) {
+- if (b->voltage_now != -1 && b->voltage_now != 0) {
+- b->charge_full = b->energy_full * 1000 / b->voltage_now;
+- } else {
+- b->charge_full = b->energy_full;
+- b->capacity_unit = "mWh";
+- }
+- }
+-
+- if (b->energy_full_design != -1 && b->charge_full_design == -1) {
+- if (b->voltage_now != -1 && b->voltage_now != 0) {
+- b->charge_full_design = b->energy_full_design * 1000 / b->voltage_now;
+- } else {
+- b->charge_full_design = b->energy_full_design;
+- b->capacity_unit = "mWh";
+- }
+- }
+-
+- if (b->energy_now != -1 && b->charge_now == -1) {
+- if (b->voltage_now != -1 && b->voltage_now != 0) {
+- b->charge_now = b->energy_now * 1000 / b->voltage_now;
+- if (b->current_now != -1)
+- b->current_now = b->current_now * 1000 / b->voltage_now;
+- } else {
+- b->charge_now = b->energy_now;
+- }
+- }
+-
+- if (b->power_now != -1 && b->current_now == -1) {
+- if (b->voltage_now != -1 && b->voltage_now != 0)
+- b->current_now = b->power_now * 1000 / b->voltage_now;
+- }
+-
+-
+- if (b->charge_full < MIN_CAPACITY)
+- b->percentage = 0;
+- else {
+- int promille = (b->charge_now * 1000) / b->charge_full;
+- b->percentage = (promille + 5) / 10; /* round properly */
+- }
+- if (b->percentage > 100)
+- b->percentage = 100;
++ char sstmp[ 100 ];
++ int c, state;
++ size_t intlen = sizeof c;
+
++ snprintf(sstmp, sizeof(sstmp), "hw.acpi.battery.life");
++ sysctlbyname(sstmp, &c, &intlen, NULL, 0);
++ b->percentage = c;
++
++ snprintf(sstmp, sizeof(sstmp), "hw.acpi.battery.state");
++ sysctlbyname(sstmp, &state, &intlen, NULL, 0);
+
+- if (b->current_now == -1) {
+- b->poststr = "rate information unavailable";
+- b->seconds = -1;
+- } else if (!strcasecmp(b->state, "charging")) {
+- if (b->current_now > MIN_PRESENT_RATE) {
+- b->seconds = 3600 * (b->charge_full - b->charge_now) / b->current_now;
+- b->poststr = " until charged";
+- } else {
+- b->poststr = "charging at zero rate - will never fully charge.";
+- b->seconds = -1;
+- }
+- } else if (!strcasecmp(b->state, "discharging")) {
+- if (b->current_now > MIN_PRESENT_RATE) {
+- b->seconds = 3600 * b->charge_now / b->current_now;
+- b->poststr = " remaining";
+- } else {
+- b->poststr = "discharging at zero rate - will never fully discharge.";
+- b->seconds = -1;
+- }
+- } else {
+- b->poststr = NULL;
+- b->seconds = -1;
+- }
++ switch(state) {
++ case BATT_FULL:
++ b->state = "Full";
++ break;
++ case BATT_DISCHARGING:
++ b->state = "Discharging";
++ break;
++ case BATT_CHARGING:
++ b->state = "Charging";
++ break;
++ case BATT_CRITICAL:
++ b->state = "Critical";
++ break;
++ case BATT_NONE:
++ b->state = "Unavailable";
++ break;
++ default:
++ b->state = "Unknown";
++ break;
++
++ }
++
++ snprintf(sstmp, sizeof(sstmp), "hw.acpi.battery.time");
++ sysctlbyname(sstmp, &c, &intlen, NULL, 0);
++ b->seconds = c * 60;
+
+- return b;
+ }
+
+-
+ battery *battery_get() {
+- GError * error = NULL;
+- const gchar *entry;
+- GDir * dir = g_dir_open( ACPI_PATH_SYS_POWER_SUPPY, 0, &error );
+- battery *b = NULL;
+- if ( dir == NULL )
+- {
+- g_warning( "NO ACPI/sysfs support in kernel: %s", error->message );
+- return NULL;
+- }
+- while ( ( entry = g_dir_read_name (dir) ) != NULL )
+- {
+- b = battery_new();
+- b->path = g_strdup( entry );
+- battery_update ( b );
+- if ( b->type_battery == TRUE )
+- break;
+- /* ignore non-batteries */
+- else {
+- g_free(b);
+- b = NULL;
+- }
+- }
+- g_dir_close( dir );
++ battery *b = battery_new();
++ battery_update(b);
+ return b;
+ }
+
+-void battery_free(battery* bat)
+-{
+- if (bat) {
+- g_free(bat->path);
+- g_free(bat);
+- }
+-}
+-
+ gboolean battery_is_charging( battery *b )
+ {
+ if (!b->state)
+@@ -327,11 +161,3 @@
+ strcasecmp( b->state, "Full" ) == 0
+ || strcasecmp( b->state, "Charging" ) == 0 );
+ }
+-
+-gint battery_get_remaining( battery *b )
+-{
+- return b->seconds;
+-}
+-
+-
+-/* vim: set sw=4 et sts=4 : */
Added: head/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.h Thu Jul 24 13:12:35 2014 (r362794)
@@ -0,0 +1,38 @@
+--- ./src/plugins/batt/batt_sys.h.orig 2014-05-09 09:15:04.000000000 -0400
++++ ./src/plugins/batt/batt_sys.h 2014-05-27 18:14:12.000000000 -0400
+@@ -23,6 +23,12 @@
+ #ifndef BATT_SYS_H
+ #define BATT_SYS_H
+
++/* The states a battery can have */
++#define BATT_FULL 0
++#define BATT_DISCHARGING 1
++#define BATT_CHARGING 2
++#define BATT_CRITICAL 5
++#define BATT_NONE 7
+
+ #define BUF_SIZE 1024
+ #define ACPI_PATH_SYS_POWER_SUPPY "/sys/class/power_supply"
+@@ -35,7 +41,7 @@
+ typedef struct battery {
+ int battery_num;
+ /* path to battery dir */
+- gchar *path;
++ const gchar *path;
+ /* sysfs file contents */
+ int charge_now;
+ int energy_now;
+@@ -55,10 +61,9 @@
+ } battery;
+
+ battery *battery_get();
+-battery *battery_update( battery *b );
+-void battery_print(battery *b, int show_capacity);
++void battery_update( battery *b );
++void battery_print(battery *b);
++void battery_reset(battery *b);
+ gboolean battery_is_charging( battery *b );
+-gint battery_get_remaining( battery *b );
+-void battery_free(battery* bat);
+
+ #endif
Added: head/x11/lxpanel/files/patch-src__plugins__cpufreq__cpufreq.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/lxpanel/files/patch-src__plugins__cpufreq__cpufreq.c Thu Jul 24 13:12:35 2014 (r362794)
@@ -0,0 +1,411 @@
+--- ./src/plugins/cpufreq/cpufreq.c.orig 2014-05-15 23:39:21.000000000 -0400
++++ ./src/plugins/cpufreq/cpufreq.c 2014-05-15 23:57:32.000000000 -0400
+@@ -33,28 +33,13 @@
+
+ #include "dbg.h"
+
+-#define PROC_ICON PACKAGE_DATA_DIR "/lxpanel/images/cpufreq-icon.png"
+-#define SYSFS_CPU_DIRECTORY "/sys/devices/system/cpu"
+-#define SCALING_GOV "scaling_governor"
+-#define SCALING_AGOV "scaling_available_governors"
+-#define SCALING_AFREQ "scaling_available_frequencies"
+-#define SCALING_CUR_FREQ "scaling_cur_freq"
+-#define SCALING_SETFREQ "scaling_setspeed"
+-#define SCALING_MAX "scaling_max_freq"
+-#define SCALING_MIN "scaling_min_freq"
+-
+-
+ typedef struct {
+ GtkWidget *main;
+ GtkWidget *namew;
+ GtkTooltips *tip;
+- GList *governors;
+ GList *cpus;
+- int has_cpufreq;
+- char* cur_governor;
+ int cur_freq;
+ unsigned int timer;
+- gboolean remember;
+ } cpufreq;
+
+ typedef struct {
+@@ -63,243 +48,32 @@
+ } Param;
+
+ static void
+-get_cur_governor(cpufreq *cf){
+- FILE *fp;
+- char buf[ 100 ], sstmp [ 256 ];
+
+- sprintf(sstmp,"%s/%s",cf->cpus->data, SCALING_GOV);
+- if ((fp = fopen( sstmp, "r")) != NULL) {
+- fgets(buf, 100, fp);
+- buf[strlen(buf)-1] = '\0';
+- if(cf->cur_governor)
+- {
+- g_free(cf->cur_governor);
+- cf->cur_governor = NULL;
+- }
+- cf->cur_governor = strdup(buf);
+- fclose(fp);
+- }
+-}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list