Page MenuHomeFreeBSD
Files F169906845

D58428.id182577.diff
No OneTemporary
Actions

D58428.id182577.diff
View Options

diff --git a/x11/florence/Makefile b/x11/florence/Makefile
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -1,25 +1,31 @@
PORTNAME= florence
-PORTVERSION= 0.6.3
-PORTREVISION= 7
+DISTVERSION= 0.7.0
CATEGORIES= x11
-MASTER_SITES= SF/florence/florence/${PORTVERSION}/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dteske@FreeBSD.org
COMMENT= Extensible scalable virtual keyboard
-WWW= https://florence.sourceforge.net/
+WWW= https://github.com/FrauBSD/florence
LICENSE= GPLv2+ GFDL
LICENSE_COMB= multi
+LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
+LICENSE_FILE_GFDL= ${WRKSRC}/COPYING-DOCS
LIB_DEPENDS= libnotify.so:devel/libnotify
-USES= gmake gnome gstreamer iconv libtool pathfix pkgconfig tar:bzip2 xorg
+USES= gmake gnome gstreamer iconv libtool localbase pathfix \
+ pkgconfig xorg
+USE_GITHUB= yes
+GH_ACCOUNT= FrauBSD
USE_GNOME= gtk30 cairo intlhack librsvg2
USE_LDCONFIG= yes
-USE_XORG= xtst xext
+USE_XORG= xtst xext xrandr
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --without-docs
+# view.c uses XRandR for live panel geometry; configure only pulls x11.
+# Use LDFLAGS (with localbase -L) — LIBS alone fails the compiler smoke test.
+LDFLAGS+= -lXrandr
GLIB_SCHEMAS= org.florence.gschema.xml
@@ -29,19 +35,32 @@
PORTDOCS= AUTHORS ChangeLog NEWS README
-OPTIONS_DEFINE= DOCS NLS
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= DOCS NLS FREEBSD_ORB
+OPTIONS_DEFAULT= DOCS NLS FREEBSD_ORB
+OPTIONS_SUB= yes
+FREEBSD_ORB_DESC= FreeBSD orb glyph for the Super key
NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext
+NLS_USES= gettext
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MFREEBSD_ORB}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-freebsd-orb-super
+.endif
+
.if ${OPSYS} == FreeBSD
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
post-patch:
+# Tag 0.7.0 ships a pre-generated configure still baked as 0.6.3 (configure.ac
+# was bumped but autoreconf was not run). Full autoreconf fails on dead
+# gnome-doc-utils.make conditionals; patch the shipped script instead.
+ @${REINPLACE_CMD} \
+ -e 's|0\.6\.3|${DISTVERSION}|g' \
+ -e 's|f\.agrech@gmail\.com|dteske@FreeBSD.org|g' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^Categories=.*|Categories=Application;Accessibility;System;|' \
${WRKSRC}/data/florence.desktop.in.in
diff --git a/x11/florence/distinfo b/x11/florence/distinfo
--- a/x11/florence/distinfo
+++ b/x11/florence/distinfo
@@ -1,2 +1,3 @@
-SHA256 (florence-0.6.3.tar.bz2) = 422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e
-SIZE (florence-0.6.3.tar.bz2) = 924287
+TIMESTAMP = 1784857759
+SHA256 (FrauBSD-florence-0.7.0_GH0.tar.gz) = 8799cec81721a1c173d531e3b041342461a490f75adf1e42e9cd11d86a1a6d4f
+SIZE (FrauBSD-florence-0.7.0_GH0.tar.gz) = 1108358
diff --git a/x11/florence/files/extra-patch-freebsd-orb-super b/x11/florence/files/extra-patch-freebsd-orb-super
new file mode 100644
--- /dev/null
+++ b/x11/florence/files/extra-patch-freebsd-orb-super
@@ -0,0 +1,23 @@
+--- data/styles/default/symbols.xml.in.in.orig
++++ data/styles/default/symbols.xml.in.in
+@@ -25,17 +25,9 @@
+ </symbol>
+ <symbol>
+ <name>Super_[LR]</name>
+- <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" viewBox="0 -10 64 64">
+- <rect width="64" height="44" x="0" y="0" class="symbol-outline"/>
+- <rect width="9" height="8" x="8" y="6" class="symbol-fill"/>
+- <rect width="9" height="8" x="21" y="6" class="symbol-fill"/>
+- <rect width="9" height="8" x="34" y="6" class="symbol-fill"/>
+- <rect width="9" height="8" x="47" y="6" class="symbol-fill"/>
+- <rect width="9" height="8" x="8" y="18" class="symbol-fill"/>
+- <rect width="9" height="8" x="21" y="18" class="symbol-fill"/>
+- <rect width="9" height="8" x="34" y="18" class="symbol-fill"/>
+- <rect width="9" height="8" x="47" y="18" class="symbol-fill"/>
+- <rect width="48" height="8" x="8" y="30" class="symbol-fill"/>
++ <!-- FreeBSD orb from /usr/local/share/pixmaps/freebsd_orb.xpm — solid white to match key labels. -->
++ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" version="1.1">
++ <image x="12" y="12" width="40" height="40" preserveAspectRatio="xMidYMid meet" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALEAAACvCAYAAACy9T8uAAADY0lEQVR42u3dS47bQAxAQd//0sx+gMCSrO7mpx6gZRBYXcNQDsb+RMTH5Up0xd0/8/Qv+Zub/9KBDL5Hjy09RfutSQf4RtPQvupp9eF0OqQT+UG/cD92Hxawc+7jttd/6gCh7Xkvj7zmSf9kRiO42UAffa2ZDnX1E300xnsKdYrXl3EqWRXc00eIPw1vvvrfzxKI764a+h10FLufHwBU/gcRYpWHDLFMYikD4oBYHSaxZCeW7MQSxJoI2E4sk1jKhhhklV4nIFZJwBCrJWKQBbGUATHIKgMYYpUHHBs/AUh6C3FArFaAIVb5VSIufCqmVBqxlB6wSawRiEFW2gc6iNViCsfN7+yQ0gG+g1gqjxhkmcTSCsB3JzHMgliCWBBDLIilZIAhFsTSy3CtE4IYYmVYHyBWG8QR/ttZxSEvmcTSLshLJjHESjuNAVb5aQyxyk9jiDUCsZR6pYBY5acxwKowjSFW+WkMsXpPY4hV/gEPYFV6wAuI1fJdCohVfi8GWOX3YohVfqWAWOVXCogFsXR6L4ZX5fdiU1gQS6f3YogFsXT64Q5gtZvEUrmHO4gFsQSxBLGmP9xBLIgliCWIBTHEgliCWIJYEEOsiogDYkEsWSekRYhBlkksnUQsmcQSxNI1xH7bWX0AQ6zyq0R4i00QSxBLEGvmg12ErztQl3cmIFb5VQJiQSxZJ6QfAYcvKFf1VQJimcTSAcQBsVpN4W+IQVb6fRhijZjEICv1FIZYEEuLEV9aKS7tHO6nsk5hiDUKMchKCRhiQSwtBBwr1gmQlW4KQ6zygJ8gBlkQS28CfooYZK1AHBBr5BT+BTHIensKf04gBlkrJvJ2xCDrKGCIBTHE6rATw6yjUxhilQf8NmKQtR3wCsQgaytgiAVx/P9zsqQtgFdNYoi1DfBKxDBrC+AdiEFWrDa2AzHIglgAZ0AMMsAtEIMMcAvEIAPcAjHMALdBDDLALRCDDHALxCDDC7HmAs6EGGSAWyAGGuBWiEEGGGL1x1sBMdAQQ6zX4EIMtKkLMcgAN0QM8+D1oRtimN+BG5XPvwtimAesDVMQwzwIb3fEMA/AOwUx0APOdhLgSZgnDadRk7j7dB57jtMRV0btvCAuifrqygSx6yhu9xfi1Oi/Tc0wXSHO+G6Ia/H1D9fS9y4y+jTHAAAAAElFTkSuQmCC"/>
+ </svg>
+ </symbol>
+ <symbol>
diff --git a/x11/florence/pkg-descr b/x11/florence/pkg-descr
--- a/x11/florence/pkg-descr
+++ b/x11/florence/pkg-descr
@@ -1,8 +1,8 @@
-Florence is an extensible scalable virtual keyboard for GNOME. You need it if
-you can't use a real keyboard either because of a handicap, disease,
-broken keyboard or tablet PC but you can use a pointing device. If you can't
-use a pointing device, there is gok: http://www.gok.ca/
-Florence stays out of your way when you don't need it.
-It appears on the screen only when you need it.
-There is an auto-click functionality To help people having difficulties to use
-the click button.
+Florence is an extensible scalable virtual keyboard for X11. You need it if
+you cannot use a real keyboard (for example because of a handicap, a broken
+keyboard, or a tablet PC) but can use a pointing device.
+
+This port tracks the FrauBSD continuation of Florence after the SourceForge
+project stalled at 0.6.3 (2014). It includes sticky modifiers, a safer Resize
+scale path (stock magnifier +/− could crash), Framework-style Fn row layout,
+session placement, and a unified greeter mode.

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 3, 10:26 PM (1 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38167937
Default Alt Text
D58428.id182577.diff (6 KB)

Event Timeline