Date: Fri, 4 Jan 2019 20:20:20 -0800 From: <soralx@cydem.org> To: <gnome@FreeBSD.org> Subject: [ports/x11-toolkits/gtk30] Make introspection and at-spi2-atk optional Message-ID: <20190104202020.1ae98490@mscad14>
next in thread | raw e-mail | index | archive | help
--MP_/mPMWLfSsTRLSNGB/IxxVmdh
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Howdy!
Attached is a set of patches to make both gobject-introspection
and at-spi2-atk (which requires dbus) optional in the gtk30 port.
Please review.
There will be more patches coming, to enable a system completely
free of DBus and GObject Introspection.
--
[SorAlx] ridin' VN2000 Classic LT
--MP_/mPMWLfSsTRLSNGB/IxxVmdh
Content-Type: application/octet-stream; name=extrapatch-disable_atkbridge
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename=extrapatch-disable_atkbridge
LS0tIGd0ay9hMTF5L2d0a2FjY2Vzc2liaWxpdHkuYy5vcmlnCTIwMTktMDEtMDQgMTg6Mzk6NTcu
NzcxMTU2MDAwIC0wODAwCisrKyBndGsvYTExeS9ndGthY2Nlc3NpYmlsaXR5LmMJCTIwMTktMDEt
MDQgMTg6NDE6MTUuMzIzMTQ0MDAwIC0wODAwCkBAIC0zNywxMCArMzcsNiBAQAogI2luY2x1ZGUg
PGd0ay9ndGt0b2dnbGVidXR0b24uaD4KICNpbmNsdWRlIDxndGsvZ3RrYWNjZXNzaWJsZS5oPgog
Ci0jaWZkZWYgR0RLX1dJTkRPV0lOR19YMTEKLSNpbmNsdWRlIDxhdGstYnJpZGdlLmg+Ci0jZW5k
aWYKLQogc3RhdGljIGdib29sZWFuIGdhaWxfZm9jdXNfd2F0Y2hlciAgICAgIChHU2lnbmFsSW52
b2NhdGlvbkhpbnQgKmloaW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBndWludCAgICAgICAgICAgICAgICAgIG5fcGFyYW1fdmFsdWVzLAogICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBHVmFsdWUgICAgICAgICAgKnBhcmFt
X3ZhbHVlcywKQEAgLTk4OCw5ICs5ODQsNSBAQAogICBfZ3RrX2FjY2Vzc2liaWxpdHlfb3ZlcnJp
ZGVfYXRrX3V0aWwgKCk7CiAgIGRvX3dpbmRvd19ldmVudF9pbml0aWFsaXphdGlvbiAoKTsKIAot
I2lmZGVmIEdES19XSU5ET1dJTkdfWDExCi0gIGF0a19icmlkZ2VfYWRhcHRvcl9pbml0IChOVUxM
LCBOVUxMKTsKLSNlbmRpZgotCiAgIGF0a19taXNjX2luc3RhbmNlID0gZ19vYmplY3RfbmV3IChH
VEtfVFlQRV9NSVNDX0lNUEwsIE5VTEwpOwogfQoKLS0tIGNvbmZpZ3VyZS5iawkyMDE5LTAxLTA0
IDE4OjUzOjM3LjkwNTgyMzAwMCAtMDgwMAorKysgY29uZmlndXJlCQkyMDE5LTAxLTA0IDE4OjUz
OjQyLjI1NjI4MjAwMCAtMDgwMApAQCAtMjY5NDUsNyArMjY5NDUsNyBAQAogIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCiBpZiB0ZXN0IHgkZW5hYmxlX3gxMV9iYWNr
ZW5kID0geHllczsgdGhlbgotICAgQVRLX1BBQ0tBR0VTPSJhdGsgYXRrLWJyaWRnZS0yLjAiCisg
ICBBVEtfUEFDS0FHRVM9ImF0ayIKIGVsc2UKICAgIEFUS19QQUNLQUdFUz0iYXRrIgogZmkK
--MP_/mPMWLfSsTRLSNGB/IxxVmdh
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=gtk30.patch
Index: Makefile
===================================================================
--- Makefile (revision 489302)
+++ Makefile (working copy)
@@ -19,7 +19,6 @@
PORTSCOUT= limit:1,even
-BUILD_DEPENDS+= at-spi2-atk>=0:accessibility/at-spi2-atk
LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -26,20 +25,18 @@
libharfbuzz.so:print/harfbuzz
RUN_DEPENDS+= hicolor-icon-theme>=0:misc/hicolor-icon-theme \
adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
- at-spi2-atk>=0:accessibility/at-spi2-atk \
librsvg2>=0:graphics/librsvg2
USE_PERL5= build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango
+USE_GNOME= atk cairo gdkpixbuf2 pango
#gtk-update-icon-cache
USES= compiler:c11 gettext gmake gnome libtool localbase \
pathfix perl5 pkgconfig tar:xz
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
-CONFIGURE_ARGS= --enable-x11-backend \
- --enable-introspection
+CONFIGURE_ARGS= --enable-x11-backend
CPPFLAGS+= -fno-omit-frame-pointer
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
@@ -53,8 +50,9 @@
org.gtk.Settings.EmojiChooser.gschema.xml \
org.gtk.Settings.FileChooser.gschema.xml
-OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND
-OPTIONS_DEFAULT=CUPS COLORD BROADWAY WAYLAND
+
+OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND ATK-BRIDGE INTROSPECT
+OPTIONS_DEFAULT=CUPS COLORD BROADWAY WAYLAND ATK-BRIDGE INTROSPECT
OPTIONS_SUB= yes
BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
@@ -86,6 +84,19 @@
WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
WAYLAND_USE= GL=egl
+ATK-BRIDGE_DESC= Enable Assistive Technology SPI bridge (requires DBus!)
+ATK-BRIDGE_RUN_DEPENDS= at-spi2-atk>=0:accessibility/at-spi2-atk
+ATK-BRIDGE_BUILD_DEPENDS= at-spi2-atk>=0:accessibility/at-spi2-atk
+ATK-BRIDGE_EXTRA_PATCHES_OFF+= ${FILESDIR}/extrapatch-disable_atkbridge
+
+.include <bsd.port.options.mk>
+
+INTROSPECT_DESC= Generate and install files for GObject Introspection
+INTROSPECT_CONFIGURE_ENABLE= introspection
+.if ${PORT_OPTIONS:MINTROSPECT}
+USE_GNOME+= introspection:build
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
Index: pkg-plist
===================================================================
--- pkg-plist (revision 489302)
+++ pkg-plist (working copy)
@@ -410,9 +410,9 @@
include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h
include/gtk-3.0/unix-print/gtk/gtkunixprint-autocleanups.h
include/gtk-3.0/unix-print/gtk/gtkunixprint.h
-lib/girepository-1.0/Gdk-3.0.typelib
-lib/girepository-1.0/GdkX11-3.0.typelib
-lib/girepository-1.0/Gtk-3.0.typelib
+%%INTROSPECT%%lib/girepository-1.0/Gdk-3.0.typelib
+%%INTROSPECT%%lib/girepository-1.0/GdkX11-3.0.typelib
+%%INTROSPECT%%lib/girepository-1.0/Gtk-3.0.typelib
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so
%%BROADWAY%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-broadway.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.so
@@ -465,9 +465,9 @@
share/applications/gtk3-widget-factory.desktop
share/gettext/its/gtkbuilder.its
share/gettext/its/gtkbuilder.loc
-share/gir-1.0/Gdk-3.0.gir
-share/gir-1.0/GdkX11-3.0.gir
-share/gir-1.0/Gtk-3.0.gir
+%%INTROSPECT%%share/gir-1.0/Gdk-3.0.gir
+%%INTROSPECT%%share/gir-1.0/GdkX11-3.0.gir
+%%INTROSPECT%%share/gir-1.0/Gtk-3.0.gir
%%DATADIR%%-3.0/gtkbuilder.rng
%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html
%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
--MP_/mPMWLfSsTRLSNGB/IxxVmdh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190104202020.1ae98490>