Date: Thu, 29 May 2014 04:29:53 GMT From: Horia Racoviceanu <horia@racoviceanu.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190363: [maintainer] x11/florence: update to 0.6.2 Message-ID: <201405290429.s4T4Trti013201@cgiserv.freebsd.org> Resent-Message-ID: <201405290430.s4T4U03L072764@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190363
>Category: ports
>Synopsis: [maintainer] x11/florence: update to 0.6.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 29 04:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Horia Racoviceanu
>Release: 10.0-RELEASE
>Organization:
>Environment:
FreeBSD heta 10.0-RELEASE-p3 FreeBSD 10.0-RELEASE-p3 #0: Tue May 13 18:31:10 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
>How-To-Repeat:
>Fix:
- Update to 0.6.2, Announce message:
A lot of bug fixes.
Add commands to the dbus interface.
Add command line options to control the keyboard.
Move at-spi2 handling to a new process in order to avoid deadlocks.
Implement a floating icon for desktops with no systray.
Fix gradients.
remove deprecated GTK3 functions.
- Remove BUILD_DEPENDS and RUN_DEPENDS, implicit
- Add USES=libtool, .la
- Change USE_GSTREAMER to USE_GSTREAMER1
- Add --disable-static to CONFIGURE_ARGS
- Quote variable in CONFIGURE_ARGS
- Add NLS_CONFIGURE_ENABLE=nls
- Add patch for docs to respect nls
- Add patch for docs instead of DOCS_CONFIGURE_WITH=docs, man doesn't get built
- Strip library
- Change pkg-plist
Build log:
https://redports.org/buildarchive/20140529033116-81762/
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 355643)
+++ Makefile (working copy)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= florence
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.6.2
CATEGORIES= x11
MASTER_SITES= SF/florence/florence/${PORTVERSION}/
@@ -14,15 +13,14 @@
LICENSE_COMB= dual
LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= gmake iconv pathfix pkgconfig tar:bzip2
+USES= gmake iconv libtool pathfix pkgconfig tar:bzip2
USE_XORG= xtst xext
USE_GNOME= gtk30 cairo intlhack gnomedocutils librsvg2
-USE_GSTREAMER= yes
+USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--prefix="${LOCALBASE}" \
+ --disable-static
USE_LDCONFIG= yes
INSTALLS_OMF= yes
GLIB_SCHEMAS= org.florence.gschema.xml
@@ -32,6 +30,7 @@
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
+NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
.include <bsd.port.options.mk>
@@ -41,11 +40,21 @@
${WRKSRC}/data/florence.desktop.in.in
.if ! ${PORT_OPTIONS:MNLS}
+ @${REINPLACE_CMD} -e 's|^DOC_LINGUAS =.*|DOC_LINGUAS =|' \
+ ${WRKSRC}/docs/Makefile.in
@${REINPLACE_CMD} -e 's|^ALL_LINGUAS.*|ALL_LINGUAS =|' \
${WRKSRC}/po/Makefile.in.in
.endif
+.if ! ${PORT_OPTIONS:MDOCS}
+ @${REINPLACE_CMD} -e '/^install-data-am:/{N;s/\n.*//;N;s/\n.*//;}; \
+ /^install-data-am:/ s|install-data-local ||' \
+ ${WRKSRC}/docs/Makefile.in
+.endif
+
post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libflorence-1.0.so.1
+
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
Index: distinfo
===================================================================
--- distinfo (revision 355643)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (florence-0.6.0.tar.bz2) = d2d74a923591e1a6db412058877dbf9ef839712af56e41fd41cb8eefbef1f60e
-SIZE (florence-0.6.0.tar.bz2) = 843826
+SHA256 (florence-0.6.2.tar.bz2) = 185ce805be5e5ef7cb42cd1f5abc93ab30b949651f04d37457e40022f98802f3
+SIZE (florence-0.6.2.tar.bz2) = 1073200
Index: pkg-plist
===================================================================
--- pkg-plist (revision 355643)
+++ pkg-plist (working copy)
@@ -1,4 +1,9 @@
bin/florence
+include/florence-1.0/florence.h
+lib/libflorence-1.0.so
+lib/libflorence-1.0.so.1
+lib/libflorence-1.0.so.1.0.0
+libdata/pkgconfig/florence-1.0.pc
man/man1/florence.1.gz
man/man1/florence_applet.1.gz
share/applications/florence.desktop
@@ -65,6 +70,7 @@
%%DATADIR%%/styles/default/sounds/return_release.ogg
%%DATADIR%%/styles/default/sounds/sounds.xml
%%DATADIR%%/styles/default/symbols.xml
+%%DATADIR%%/styles/flat/florence.style
%%DATADIR%%/styles/hard/default.svg
%%DATADIR%%/styles/hard/florence.defs
%%DATADIR%%/styles/hard/florence.style
@@ -117,67 +123,69 @@
%%DATADIR%%/svg11/svg-viewport-attrib.rnc
%%DATADIR%%/svg11/svg-xlink-attrib.rnc
%%DATADIR%%/svg11/svg11.rnc
-share/gnome/help/florence/C/figures/behaviour.png
-share/gnome/help/florence/C/figures/bigger.png
-share/gnome/help/florence/C/figures/close.png
-share/gnome/help/florence/C/figures/configuration.png
-share/gnome/help/florence/C/figures/florence.png
-share/gnome/help/florence/C/figures/layout.png
-share/gnome/help/florence/C/figures/minimize.png
-share/gnome/help/florence/C/figures/move.png
-share/gnome/help/florence/C/figures/smaller.png
-share/gnome/help/florence/C/figures/style.png
-share/gnome/help/florence/C/figures/switch.png
-share/gnome/help/florence/C/figures/window.png
-share/gnome/help/florence/C/florence.xml
-share/gnome/help/florence/C/gfdl.dbk
-share/gnome/help/florence/fr/figures/behaviour.png
-share/gnome/help/florence/fr/figures/bigger.png
-share/gnome/help/florence/fr/figures/close.png
-share/gnome/help/florence/fr/figures/configuration.png
-share/gnome/help/florence/fr/figures/florence.png
-share/gnome/help/florence/fr/figures/layout.png
-share/gnome/help/florence/fr/figures/minimize.png
-share/gnome/help/florence/fr/figures/move.png
-share/gnome/help/florence/fr/figures/smaller.png
-share/gnome/help/florence/fr/figures/style.png
-share/gnome/help/florence/fr/figures/switch.png
-share/gnome/help/florence/fr/figures/window.png
-share/gnome/help/florence/fr/florence.xml
-share/gnome/help/florence/ru/figures/behaviour.png
-share/gnome/help/florence/ru/figures/bigger.png
-share/gnome/help/florence/ru/figures/close.png
-share/gnome/help/florence/ru/figures/configuration.png
-share/gnome/help/florence/ru/figures/florence.png
-share/gnome/help/florence/ru/figures/layout.png
-share/gnome/help/florence/ru/figures/minimize.png
-share/gnome/help/florence/ru/figures/move.png
-share/gnome/help/florence/ru/figures/smaller.png
-share/gnome/help/florence/ru/figures/style.png
-share/gnome/help/florence/ru/figures/switch.png
-share/gnome/help/florence/ru/figures/window.png
-share/gnome/help/florence/ru/florence.xml
+%%PORTDOCS%%share/gnome/help/florence/C/figures/behaviour.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/bigger.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/close.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/configuration.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/florence.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/layout.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/minimize.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/move.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/smaller.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/style.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/switch.png
+%%PORTDOCS%%share/gnome/help/florence/C/figures/window.png
+%%PORTDOCS%%share/gnome/help/florence/C/florence.xml
+%%PORTDOCS%%share/gnome/help/florence/C/gfdl.dbk
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/behaviour.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/bigger.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/close.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/configuration.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/florence.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/layout.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/minimize.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/move.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/smaller.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/style.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/switch.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/figures/window.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/fr/florence.xml
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/behaviour.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/bigger.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/close.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/configuration.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/florence.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/layout.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/minimize.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/move.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/smaller.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/style.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/switch.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/figures/window.png
+%%PORTDOCS%%%%NLS%%share/gnome/help/florence/ru/florence.xml
%%NLS%%share/locale/fr/LC_MESSAGES/florence.mo
%%NLS%%share/locale/it/LC_MESSAGES/florence.mo
%%NLS%%share/locale/ru/LC_MESSAGES/florence.mo
-share/omf/florence/florence-C.omf
-share/omf/florence/florence-fr.omf
-share/omf/florence/florence-ru.omf
+%%PORTDOCS%%share/omf/florence/florence-C.omf
+%%PORTDOCS%%%%NLS%%share/omf/florence/florence-fr.omf
+%%PORTDOCS%%%%NLS%%share/omf/florence/florence-ru.omf
share/pixmaps/florence.svg
-@dirrm share/omf/florence
-@dirrm share/gnome/help/florence/ru/figures
-@dirrm share/gnome/help/florence/ru
-@dirrm share/gnome/help/florence/fr/figures
-@dirrm share/gnome/help/florence/fr
-@dirrm share/gnome/help/florence/C/figures
-@dirrm share/gnome/help/florence/C
-@dirrm share/gnome/help/florence
-@dirrm %%DATADIR%%/svg11
-@dirrm %%DATADIR%%/styles/hard
+@dirrm include/florence-1.0
+@dirrm %%DATADIR%%/layouts
+@dirrm %%DATADIR%%/relaxng
+@dirrm %%DATADIR%%/styles/bright
@dirrm %%DATADIR%%/styles/default/sounds
@dirrm %%DATADIR%%/styles/default
-@dirrm %%DATADIR%%/styles/bright
+@dirrm %%DATADIR%%/styles/flat
+@dirrm %%DATADIR%%/styles/hard
@dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%/relaxng
-@dirrm %%DATADIR%%/layouts
+@dirrm %%DATADIR%%/svg11
@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm share/gnome/help/florence/C/figures
+%%PORTDOCS%%@dirrm share/gnome/help/florence/C
+%%PORTDOCS%%%%NLS%%@dirrm share/gnome/help/florence/fr/figures
+%%PORTDOCS%%%%NLS%%@dirrm share/gnome/help/florence/fr
+%%PORTDOCS%%%%NLS%%@dirrm share/gnome/help/florence/ru/figures
+%%PORTDOCS%%%%NLS%%@dirrm share/gnome/help/florence/ru
+%%PORTDOCS%%@dirrm share/gnome/help/florence
+%%PORTDOCS%%@dirrm share/omf/florence
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405290429.s4T4Trti013201>