gtk2 option for wxGTK30

To: tech-pkg%netbsd.org@localhost
Subject: gtk2 option for wxGTK30
From: Manuel Bouyer <bouyer%antioche.eu.org@localhost>
Date: Sun, 25 Nov 2018 18:15:21 +0100

Hello,
I noticed 2 users of wxGTK30 which have troubles since wxGTK30 has been
switched to gtk3.

opencpn triggers assers in gtk3, leading to anoying popups. On linux
it uses gtk2 if it's installed.
There are refresh bugs in kicad's schematic editor, making it hard to
use. Hard enough that I reverted to gtk2 before trying other kicad tools.

The attached patch add a gtk2 option (default off) to wxGTK30. With this I've
rebuild wxGTK30, kicad and opencpn packages and they work fine again.

Would anyone object if I commit this patch ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxGTK30/Makefile,v
retrieving revision 1.28
diff -u -p -u -r1.28 Makefile
--- Makefile	2 May 2018 11:33:44 -0000	1.28
+++ Makefile	25 Nov 2018 17:05:52 -0000
@@ -49,17 +49,9 @@ SUBST_SED.fix-paths=		-e 's,/usr/pkg/inc
 SUBST_SED.fix-paths+=		-e 's,@PREFIX@,${PREFIX},g'
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 PLIST_SRC+=		${PLIST_SRC_DFLT}
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--with-osx_cocoa
-CONFIGURE_ARGS+=	--without-macosx-sdk
-CONFIGURE_ARGS+=	--without-macosx-version-min
-CPPFLAGS+=		-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
-.else
-PLIST_SRC+=		PLIST.gtk3
-CONFIGURE_ARGS+=	--with-gtk=3
-.endif
 
 CONFIGURE_ARGS.SunOS+=	--disable-xlocale
 
@@ -101,7 +93,6 @@ post-install:
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
Index: PLIST.gtk2
===================================================================
RCS file: PLIST.gtk2
diff -N PLIST.gtk2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PLIST.gtk2	25 Nov 2018 17:05:52 -0000
@@ -0,0 +1,147 @@
+@comment $NetBSD: PLIST.gtk2,v 1.1 2018/04/29 05:40:09 wiz Exp $
+include/wx-3.0/wx/aui/tabartgtk.h
+include/wx-3.0/wx/generic/fontdlgg.h
+include/wx-3.0/wx/generic/icon.h
+include/wx-3.0/wx/generic/imaglist.h
+include/wx-3.0/wx/generic/paletteg.h
+include/wx-3.0/wx/gtk/accel.h
+include/wx-3.0/wx/gtk/animate.h
+include/wx-3.0/wx/gtk/anybutton.h
+include/wx-3.0/wx/gtk/app.h
+include/wx-3.0/wx/gtk/assertdlg_gtk.h
+include/wx-3.0/wx/gtk/bitmap.h
+include/wx-3.0/wx/gtk/bmpbuttn.h
+include/wx-3.0/wx/gtk/bmpcbox.h
+include/wx-3.0/wx/gtk/brush.h
+include/wx-3.0/wx/gtk/button.h
+include/wx-3.0/wx/gtk/calctrl.h
+include/wx-3.0/wx/gtk/checkbox.h
+include/wx-3.0/wx/gtk/checklst.h
+include/wx-3.0/wx/gtk/chkconf.h
+include/wx-3.0/wx/gtk/choice.h
+include/wx-3.0/wx/gtk/clipbrd.h
+include/wx-3.0/wx/gtk/clrpicker.h
+include/wx-3.0/wx/gtk/collpane.h
+include/wx-3.0/wx/gtk/colordlg.h
+include/wx-3.0/wx/gtk/colour.h
+include/wx-3.0/wx/gtk/combobox.h
+include/wx-3.0/wx/gtk/control.h
+include/wx-3.0/wx/gtk/cursor.h
+include/wx-3.0/wx/gtk/dataform.h
+include/wx-3.0/wx/gtk/dataobj.h
+include/wx-3.0/wx/gtk/dataobj2.h
+include/wx-3.0/wx/gtk/dataview.h
+include/wx-3.0/wx/gtk/dialog.h
+include/wx-3.0/wx/gtk/dirdlg.h
+include/wx-3.0/wx/gtk/dnd.h
+include/wx-3.0/wx/gtk/dvrenderer.h
+include/wx-3.0/wx/gtk/dvrenderers.h
+include/wx-3.0/wx/gtk/evtloop.h
+include/wx-3.0/wx/gtk/evtloopsrc.h
+include/wx-3.0/wx/gtk/filectrl.h
+include/wx-3.0/wx/gtk/filedlg.h
+include/wx-3.0/wx/gtk/filehistory.h
+include/wx-3.0/wx/gtk/filepicker.h
+include/wx-3.0/wx/gtk/font.h
+include/wx-3.0/wx/gtk/fontdlg.h
+include/wx-3.0/wx/gtk/fontpicker.h
+include/wx-3.0/wx/gtk/frame.h
+include/wx-3.0/wx/gtk/gauge.h
+include/wx-3.0/wx/gtk/glcanvas.h
+include/wx-3.0/wx/gtk/gnome/gvfs.h
+include/wx-3.0/wx/gtk/hildon/notifmsg.h
+include/wx-3.0/wx/gtk/hyperlink.h
+include/wx-3.0/wx/gtk/infobar.h
+include/wx-3.0/wx/gtk/listbox.h
+include/wx-3.0/wx/gtk/mdi.h
+include/wx-3.0/wx/gtk/menu.h
+include/wx-3.0/wx/gtk/menuitem.h
+include/wx-3.0/wx/gtk/minifram.h
+include/wx-3.0/wx/gtk/msgdlg.h
+include/wx-3.0/wx/gtk/nonownedwnd.h
+include/wx-3.0/wx/gtk/notebook.h
+include/wx-3.0/wx/gtk/notifmsg.h
+include/wx-3.0/wx/gtk/pen.h
+include/wx-3.0/wx/gtk/popupwin.h
+include/wx-3.0/wx/gtk/print.h
+include/wx-3.0/wx/gtk/radiobox.h
+include/wx-3.0/wx/gtk/radiobut.h
+include/wx-3.0/wx/gtk/region.h
+include/wx-3.0/wx/gtk/scrolbar.h
+include/wx-3.0/wx/gtk/scrolwin.h
+include/wx-3.0/wx/gtk/slider.h
+include/wx-3.0/wx/gtk/spinbutt.h
+include/wx-3.0/wx/gtk/spinctrl.h
+include/wx-3.0/wx/gtk/statbmp.h
+include/wx-3.0/wx/gtk/statbox.h
+include/wx-3.0/wx/gtk/statline.h
+include/wx-3.0/wx/gtk/stattext.h
+include/wx-3.0/wx/gtk/taskbar.h
+include/wx-3.0/wx/gtk/textctrl.h
+include/wx-3.0/wx/gtk/textentry.h
+include/wx-3.0/wx/gtk/tglbtn.h
+include/wx-3.0/wx/gtk/toolbar.h
+include/wx-3.0/wx/gtk/tooltip.h
+include/wx-3.0/wx/gtk/toplevel.h
+include/wx-3.0/wx/gtk/webview_webkit.h
+include/wx-3.0/wx/gtk/webviewhistoryitem_webkit.h
+include/wx-3.0/wx/gtk/window.h
+include/wx-3.0/wx/private/pipestream.h
+include/wx-3.0/wx/private/streamtempinput.h
+include/wx-3.0/wx/unix/execute.h
+include/wx-3.0/wx/unix/fontutil.h
+include/wx-3.0/wx/unix/fswatcher_inotify.h
+include/wx-3.0/wx/unix/glx11.h
+include/wx-3.0/wx/unix/joystick.h
+include/wx-3.0/wx/unix/mimetype.h
+include/wx-3.0/wx/unix/private/pipestream.h
+include/wx-3.0/wx/unix/sound.h
+include/wx-3.0/wx/unix/taskbarx11.h
+include/wx-3.0/wx/unix/utilsx11.h
+lib/libwx_baseu-3.0.so
+lib/libwx_baseu-3.0.so.0
+lib/libwx_baseu-3.0.so.0.4.0
+lib/libwx_baseu_net-3.0.so
+lib/libwx_baseu_net-3.0.so.0
+lib/libwx_baseu_net-3.0.so.0.4.0
+lib/libwx_baseu_xml-3.0.so
+lib/libwx_baseu_xml-3.0.so.0
+lib/libwx_baseu_xml-3.0.so.0.4.0
+lib/libwx_gtk2u_adv-3.0.so
+lib/libwx_gtk2u_adv-3.0.so.0
+lib/libwx_gtk2u_adv-3.0.so.0.4.0
+lib/libwx_gtk2u_aui-3.0.so
+lib/libwx_gtk2u_aui-3.0.so.0
+lib/libwx_gtk2u_aui-3.0.so.0.4.0
+lib/libwx_gtk2u_core-3.0.so
+lib/libwx_gtk2u_core-3.0.so.0
+lib/libwx_gtk2u_core-3.0.so.0.4.0
+lib/libwx_gtk2u_gl-3.0.so
+lib/libwx_gtk2u_gl-3.0.so.0
+lib/libwx_gtk2u_gl-3.0.so.0.4.0
+lib/libwx_gtk2u_html-3.0.so
+lib/libwx_gtk2u_html-3.0.so.0
+lib/libwx_gtk2u_html-3.0.so.0.4.0
+lib/libwx_gtk2u_media-3.0.so
+lib/libwx_gtk2u_media-3.0.so.0
+lib/libwx_gtk2u_media-3.0.so.0.4.0
+lib/libwx_gtk2u_propgrid-3.0.so
+lib/libwx_gtk2u_propgrid-3.0.so.0
+lib/libwx_gtk2u_propgrid-3.0.so.0.4.0
+lib/libwx_gtk2u_qa-3.0.so
+lib/libwx_gtk2u_qa-3.0.so.0
+lib/libwx_gtk2u_qa-3.0.so.0.4.0
+lib/libwx_gtk2u_ribbon-3.0.so
+lib/libwx_gtk2u_ribbon-3.0.so.0
+lib/libwx_gtk2u_ribbon-3.0.so.0.4.0
+lib/libwx_gtk2u_richtext-3.0.so
+lib/libwx_gtk2u_richtext-3.0.so.0
+lib/libwx_gtk2u_richtext-3.0.so.0.4.0
+lib/libwx_gtk2u_stc-3.0.so
+lib/libwx_gtk2u_stc-3.0.so.0
+lib/libwx_gtk2u_stc-3.0.so.0.4.0
+lib/libwx_gtk2u_xrc-3.0.so
+lib/libwx_gtk2u_xrc-3.0.so.0
+lib/libwx_gtk2u_xrc-3.0.so.0.4.0
+lib/wx/config/gtk2-unicode-3.0
+lib/wx/include/gtk2-unicode-3.0/wx/setup.h
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxGTK30/buildlink3.mk,v
retrieving revision 1.14
diff -u -p -u -r1.14 buildlink3.mk
--- buildlink3.mk	29 Apr 2018 05:46:36 -0000	1.14
+++ buildlink3.mk	25 Nov 2018 17:05:52 -0000
@@ -14,6 +14,10 @@ PREPEND_PATH+=			${PREFIX}/libexec/wx-3.
 CONFIGURE_ARGS+=		--with-wx-version=3.0
 CONFIGURE_ARGS+=		--with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config
 
+pkgbase := wxGTK30
+.include "../../mk/pkg-build-options.mk"
+
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
@@ -22,7 +26,11 @@ CONFIGURE_ARGS+=		--with-wx-config=${PRE
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.wxGTK30:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.else
 .include "../../x11/gtk3/buildlink3.mk"
+.endif
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ options.mk	25 Nov 2018 17:05:52 -0000
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.3 2018/06/25 10:01:51 leot Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.wxGTK30
+.if ${OPSYS} != "Darwin"
+PKG_SUPPORTED_OPTIONS=	gtk2
+PKG_SUGGESTED_OPTIONS=
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--with-osx_cocoa
+CONFIGURE_ARGS+=	--without-macosx-sdk
+CONFIGURE_ARGS+=	--without-macosx-version-min
+CPPFLAGS+=		-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
+.else
+.  if !empty(PKG_OPTIONS:Mgtk2)
+PLIST_SRC+=		PLIST.gtk2
+CONFIGURE_ARGS+=	--with-gtk=2
+.include "../../x11/gtk2/buildlink3.mk"
+. else
+PLIST_SRC+=		PLIST.gtk3
+CONFIGURE_ARGS+=	--with-gtk=3
+.include "../../x11/gtk3/buildlink3.mk"
+. endif
+.endif

Follow-Ups:
- Re: gtk2 option for wxGTK30
  - From: Manuel Bouyer
- Re: gtk2 option for wxGTK30
  - From: Darrin B. Jewell

Prev by Date: dragonfly patches, upstreaming, PR 47042
Next by Date: Re: ncurses/builtin.mk
Previous by Thread: dragonfly patches, upstreaming, PR 47042
Next by Thread: Re: gtk2 option for wxGTK30
Indexes:

Home | Main Index | Thread Index | Old Index