From owner-svn-ports-head@freebsd.org Tue Jun 12 07:17:12 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 586D61005A83; Tue, 12 Jun 2018 07:17:12 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9C8C771DC0; Tue, 12 Jun 2018 07:17:11 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C39A272CE; Tue, 12 Jun 2018 07:17:11 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5C7HBmj005553; Tue, 12 Jun 2018 07:17:11 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5C7HA1e005551; Tue, 12 Jun 2018 07:17:10 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201806120717.w5C7HA1e005551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 12 Jun 2018 07:17:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472232 - in head/x11-toolkits/wxgtk31: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/x11-toolkits/wxgtk31: . files X-SVN-Commit-Revision: 472232 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jun 2018 07:17:12 -0000 Author: yuri Date: Tue Jun 12 07:17:10 2018 New Revision: 472232 URL: https://svnweb.freebsd.org/changeset/ports/472232 Log: x11-toolkits/wxgtk31: Change to gtk3 because it is the latest gtk version Also remove the stray file wxmsw.mo that caused conflict with wxgtk30. This patch is a portion of the patch from the bug#228904. PR: 228904 Submitted by: Greg V Modified: head/x11-toolkits/wxgtk31/Makefile head/x11-toolkits/wxgtk31/files/patch-Makefile.in head/x11-toolkits/wxgtk31/pkg-plist Modified: head/x11-toolkits/wxgtk31/Makefile ============================================================================== --- head/x11-toolkits/wxgtk31/Makefile Tue Jun 12 04:23:29 2018 (r472231) +++ head/x11-toolkits/wxgtk31/Makefile Tue Jun 12 07:17:10 2018 (r472232) @@ -3,8 +3,9 @@ PORTNAME= wx DISTVERSIONPREFIX= v DISTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits -PKGNAMESUFFIX= 31-gtk2 +PKGNAMESUFFIX= 31-gtk3 MAINTAINER= yuri@FreeBSD.org COMMENT= GUI toolkit (wxWidgets) with GTK+ bindings @@ -29,7 +30,7 @@ GH_PROJECT= wxWidgets GNU_CONFIGURE= yes USE_XORG= x11 sm xxf86vm xtst USE_GL= gl glu -USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_LDCONFIG= yes USE_CXXSTD= c++11 CONFIGURE_ARGS= --with-libpng=sys \ @@ -38,7 +39,7 @@ CONFIGURE_ARGS= --with-libpng=sys \ --with-zlib=sys \ --with-expat=sys \ --with-opengl \ - --with-gtk \ + --with-gtk=3 \ --without-gnomevfs \ --disable-epollloop \ --disable-joystick \ @@ -66,7 +67,7 @@ MSPACK_CONFIGURE_WITH= libmspack MSPACK_LIB_DEPENDS= libmspack.so:archivers/libmspack WEBKIT_CONFIGURE_ENABLE= webview -WEBKIT_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 +WEBKIT_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 .include @@ -77,5 +78,8 @@ CONFIGURE_ARGS+=--disable-precomp-headers post-build-NLS-on: @${DO_MAKE_BUILD} allmo -C ${BUILD_WRKSRC}/locale + +post-install-NLS-on: # stray file: https://trac.wxwidgets.org/ticket/18147 + @${RM} ${STAGEDIR}${PREFIX}/share/locale/it/LC_MESSAGES/wxmsw.mo .include Modified: head/x11-toolkits/wxgtk31/files/patch-Makefile.in ============================================================================== --- head/x11-toolkits/wxgtk31/files/patch-Makefile.in Tue Jun 12 04:23:29 2018 (r472231) +++ head/x11-toolkits/wxgtk31/files/patch-Makefile.in Tue Jun 12 07:17:10 2018 (r472232) @@ -8,6 +8,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ +@@ -54,6 +55,7 @@ + TOOLKIT = @TOOLKIT@ + TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ + TOOLKIT_VERSION = @TOOLKIT_VERSION@ ++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ + TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ + EXTRALIBS = @EXTRALIBS@ + EXTRALIBS_XML = @EXTRALIBS_XML@ @@ -15214,9 +15215,9 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) Modified: head/x11-toolkits/wxgtk31/pkg-plist ============================================================================== --- head/x11-toolkits/wxgtk31/pkg-plist Tue Jun 12 04:23:29 2018 (r472231) +++ head/x11-toolkits/wxgtk31/pkg-plist Tue Jun 12 07:17:10 2018 (r472232) @@ -1,5 +1,5 @@ -bin/wx-config -bin/wxrc-gtk2u-3.1 +bin/wxgtk3u-3.1-config +bin/wxrc-gtk3u-3.1 include/wx-3.1/wx/aboutdlg.h include/wx-3.1/wx/accel.h include/wx-3.1/wx/access.h @@ -29,7 +29,6 @@ include/wx-3.1/wx/aui/dockart.h include/wx-3.1/wx/aui/floatpane.h include/wx-3.1/wx/aui/framemanager.h include/wx-3.1/wx/aui/tabart.h -include/wx-3.1/wx/aui/tabartgtk.h include/wx-3.1/wx/aui/tabmdi.h include/wx-3.1/wx/bannerwindow.h include/wx-3.1/wx/base64.h @@ -183,7 +182,6 @@ include/wx-3.1/wx/generic/dvrenderers.h include/wx-3.1/wx/generic/fdrepdlg.h include/wx-3.1/wx/generic/filectrlg.h include/wx-3.1/wx/generic/filepickerg.h -include/wx-3.1/wx/generic/fontdlgg.h include/wx-3.1/wx/generic/fswatcher.h include/wx-3.1/wx/generic/grid.h include/wx-3.1/wx/generic/gridctrl.h @@ -728,46 +726,47 @@ lib/libwx_baseu_net-3.1.so.1.0.0 lib/libwx_baseu_xml-3.1.so lib/libwx_baseu_xml-3.1.so.1 lib/libwx_baseu_xml-3.1.so.1.0.0 -lib/libwx_gtk2u_adv-3.1.so -lib/libwx_gtk2u_adv-3.1.so.1 -lib/libwx_gtk2u_adv-3.1.so.1.0.0 -lib/libwx_gtk2u_aui-3.1.so -lib/libwx_gtk2u_aui-3.1.so.1 -lib/libwx_gtk2u_aui-3.1.so.1.0.0 -lib/libwx_gtk2u_core-3.1.so -lib/libwx_gtk2u_core-3.1.so.1 -lib/libwx_gtk2u_core-3.1.so.1.0.0 -lib/libwx_gtk2u_gl-3.1.so -lib/libwx_gtk2u_gl-3.1.so.1 -lib/libwx_gtk2u_gl-3.1.so.1.0.0 -lib/libwx_gtk2u_html-3.1.so -lib/libwx_gtk2u_html-3.1.so.1 -lib/libwx_gtk2u_html-3.1.so.1.0.0 -%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so -%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so.1 -%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so.1.0.0 -lib/libwx_gtk2u_propgrid-3.1.so -lib/libwx_gtk2u_propgrid-3.1.so.1 -lib/libwx_gtk2u_propgrid-3.1.so.1.0.0 -lib/libwx_gtk2u_qa-3.1.so -lib/libwx_gtk2u_qa-3.1.so.1 -lib/libwx_gtk2u_qa-3.1.so.1.0.0 -lib/libwx_gtk2u_ribbon-3.1.so -lib/libwx_gtk2u_ribbon-3.1.so.1 -lib/libwx_gtk2u_ribbon-3.1.so.1.0.0 -lib/libwx_gtk2u_richtext-3.1.so -lib/libwx_gtk2u_richtext-3.1.so.1 -lib/libwx_gtk2u_richtext-3.1.so.1.0.0 -lib/libwx_gtk2u_stc-3.1.so -lib/libwx_gtk2u_stc-3.1.so.1 -lib/libwx_gtk2u_stc-3.1.so.1.0.0 -%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so -%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so.1 -%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so.1.0.0 -lib/libwx_gtk2u_xrc-3.1.so -lib/libwx_gtk2u_xrc-3.1.so.1 -lib/libwx_gtk2u_xrc-3.1.so.1.0.0 -lib/wx/include/gtk2-unicode-3.1/wx/setup.h +lib/libwx_gtk3u_adv-3.1.so +lib/libwx_gtk3u_adv-3.1.so.1 +lib/libwx_gtk3u_adv-3.1.so.1.0.0 +lib/libwx_gtk3u_aui-3.1.so +lib/libwx_gtk3u_aui-3.1.so.1 +lib/libwx_gtk3u_aui-3.1.so.1.0.0 +lib/libwx_gtk3u_core-3.1.so +lib/libwx_gtk3u_core-3.1.so.1 +lib/libwx_gtk3u_core-3.1.so.1.0.0 +lib/libwx_gtk3u_gl-3.1.so +lib/libwx_gtk3u_gl-3.1.so.1 +lib/libwx_gtk3u_gl-3.1.so.1.0.0 +lib/libwx_gtk3u_html-3.1.so +lib/libwx_gtk3u_html-3.1.so.1 +lib/libwx_gtk3u_html-3.1.so.1.0.0 +%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so +%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.1 +%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.1.0.0 +lib/libwx_gtk3u_propgrid-3.1.so +lib/libwx_gtk3u_propgrid-3.1.so.1 +lib/libwx_gtk3u_propgrid-3.1.so.1.0.0 +lib/libwx_gtk3u_qa-3.1.so +lib/libwx_gtk3u_qa-3.1.so.1 +lib/libwx_gtk3u_qa-3.1.so.1.0.0 +lib/libwx_gtk3u_ribbon-3.1.so +lib/libwx_gtk3u_ribbon-3.1.so.1 +lib/libwx_gtk3u_ribbon-3.1.so.1.0.0 +lib/libwx_gtk3u_richtext-3.1.so +lib/libwx_gtk3u_richtext-3.1.so.1 +lib/libwx_gtk3u_richtext-3.1.so.1.0.0 +lib/libwx_gtk3u_stc-3.1.so +lib/libwx_gtk3u_stc-3.1.so.1 +lib/libwx_gtk3u_stc-3.1.so.1.0.0 +%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so +%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.1 +%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.1.0.0 +lib/libwx_gtk3u_xrc-3.1.so +lib/libwx_gtk3u_xrc-3.1.so.1 +lib/libwx_gtk3u_xrc-3.1.so.1.0.0 +lib/wx/3.1.1/web-extensions/webkit2_extu-3.1.1.so +lib/wx/include/gtk3-unicode-3.1/wx/setup.h share/aclocal/wxwin31.m4 share/bakefile/presets/wx31.bkl share/bakefile/presets/wx31_presets.py @@ -784,7 +783,6 @@ share/bakefile/presets/wx31_xrc.bkl %%NLS%%share/locale/fr/LC_MESSAGES/wxstd31.mo %%NLS%%share/locale/hu/LC_MESSAGES/wxstd31.mo %%NLS%%share/locale/id/LC_MESSAGES/wxstd31.mo -%%NLS%%share/locale/it/LC_MESSAGES/wxmsw.mo %%NLS%%share/locale/it/LC_MESSAGES/wxstd31.mo %%NLS%%share/locale/ja/LC_MESSAGES/wxstd31.mo %%NLS%%share/locale/nl/LC_MESSAGES/wxstd31.mo