pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/wxGTK32 x11/wxGTK32: build with configure instead ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/abe8c929483b
branches: trunk
changeset: 382346:abe8c929483b
user: dbj <dbj%pkgsrc.org@localhost>
date: Tue Jul 26 02:58:56 2022 +0000
description:
x11/wxGTK32: build with configure instead of cmake
This package installs different files when built with cmake
For now, temporarily build with configure. Leave cmake as
a package option with the plan to iterate the cmake option
until it builds identically and then remove the cmake option.
diffstat:
x11/wxGTK32/Makefile | 88 +++-
x11/wxGTK32/PLIST | 767 +--------------------------------
x11/wxGTK32/PLIST.cmake | 759 ++++++++++++++++++++++++++++++++
x11/wxGTK32/PLIST.configure | 31 +
x11/wxGTK32/distinfo | 4 +-
x11/wxGTK32/patches/patch-configure | 23 +
x11/wxGTK32/patches/patch-configure.in | 23 +
7 files changed, 923 insertions(+), 772 deletions(-)
diffs (truncated from 1991 to 300 lines):
diff -r 77952394db7a -r abe8c929483b x11/wxGTK32/Makefile
--- a/x11/wxGTK32/Makefile Tue Jul 26 02:25:15 2022 +0000
+++ b/x11/wxGTK32/Makefile Tue Jul 26 02:58:56 2022 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2022/07/21 11:39:21 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/26 02:58:56 dbj Exp $
DISTNAME= wxWidgets-3.2.0
PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK32/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/}
GITHUB_PROJECT= wxWidgets
@@ -15,26 +16,92 @@
LICENSE= gnu-lgpl-v2
USE_TOOLS+= pkg-config msgfmt
-USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
+
+PLIST_SRC+= ${PLIST_SRC_DFLT}
+
+DOCDIR= share/wx-3.2/doc/wxWidgets
+
+INSTALLATION_DIRS+= ${DOCDIR}
+INSTALLATION_DIRS+= bin
+
+REPLACE_SH= wx-config.in wx-config-inplace.in
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Darwin"
+# We build using configure by default
+# The software supports building using cmake but
+# the default cmake configuration is different.
+# In particular, it doesn't install proper locale data
+# and also installs unused headers.
+#
+# This option is expected to be a temporary hack.
+# We should fix cmake builds to match configure builds
+# and remove support for building with GNU_CONFIGURE
+PKG_OPTIONS_VAR= PKG_OPTIONS.wxGTK32
+PKG_SUPPORTED_OPTIONS= cmake
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcmake)
+USE_CMAKE= yes
+CMAKE_ARGS+= -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
+PLIST_SRC+= PLIST.cmake
+
+. if ${OPSYS} != "Darwin"
WX_CONFIG= lib/wx/config/gtk3-unicode-3.2
+. else
+WX_CONFIG= lib/wx/config/osx_cocoa-unicode-3.2
+. endif
+
.else
-WX_CONFIG= lib/wx/config/osx_cocoa-unicode-3.2
+GNU_CONFIGURE= yes
+USE_GNU_CONFIGURE_HOST= no
+CONFIGURE_ARGS+= --with-libpng=sys
+CONFIGURE_ARGS+= --with-libjpeg=sys
+CONFIGURE_ARGS+= --with-libtiff=sys
+CONFIGURE_ARGS+= --with-opengl
+CONFIGURE_ARGS+= --with-expat=sys
+CONFIGURE_ARGS+= --with-zlib=sys
+CONFIGURE_ARGS+= --with-regex=sys
+#CONFIGURE_ARGS+= --disable-webview
+CONFIGURE_ARGS+= --enable-mediactrl
+CONFIGURE_ARGS+= --disable-precomp-headers
+CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/wx-3.2
+CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/wx-3.2
+CONFIGURE_ARGS.Darwin+= --with-osx_cocoa
+CONFIGURE_ARGS.Darwin+= --without-macosx-sdk
+CONFIGURE_ARGS.Darwin+= --without-macosx-version-min
+CONFIGURE_ARGS.Darwin+= --disable-precomp-headers
+CONFIGURE_ARGS.SunOS+= --disable-xlocale
+
+PLIST_SRC+= PLIST.configure
+
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fixing absolute paths.
+SUBST_FILES.fix-paths= configure
+SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g'
+SUBST_VARS.fix-paths= PREFIX
.endif
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/lgpl.txt ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DESTDIR}${PREFIX}/${DOCDIR}
+.if defined(USE_CMAKE)
# Installation rules in cmake are not using DESTDIR properly, do it manually
# https://github.com/wxWidgets/wxWidgets/issues/22647
# CMake Error: failed to create symbolic link '/usr/pkg/bin/wx-config': Permission denied
# CMake Error: failed to create symbolic link '/usr/pkg/bin/wxrc': Permission denied
-post-install:
- cd ${DESTDIR}${PREFIX}/bin && [ -L wx-config ] || ${LN} -s ../${WX_CONFIG} wx-config
- cd ${DESTDIR}${PREFIX}/bin && [ -L wxrc ] || ${LN} -s wxrc-3.2 wxrc
+ ${LN} -sf ../${WX_CONFIG} ${DESTDIR}${PREFIX}/bin/wx-config-3.2
+.endif
+.if defined(GNU_CONFIGURE)
+ ${LN} -sf ../libexec/wx-3.2/wxrc-3.2 ${DESTDIR}${PREFIX}/bin/wxrc-3.2
+ ${LN} -sf ../libexec/wx-3.2/wx-config ${DESTDIR}${PREFIX}/bin/wx-config-3.2
+.endif
+.if defined(USE_CMAKE)
SUBST_CLASSES+= unwrap
SUBST_STAGE.unwrap= post-build
SUBST_FILES.unwrap= ${WX_CONFIG}
@@ -42,13 +109,14 @@
SUBST_SED.unwrap+= -e 's,echo.*/${CC}",echo "${CC}",'
SUBST_SED.unwrap+= -e 's,echo.*/${CXX}",echo "${CXX}",'
SUBST_SED.unwrap+= -e 's,echo.*/${CXX} -o",echo "${CXX} -o",'
+.endif
-PLIST_SRC+= ${PLIST_SRC_DFLT}
-
+.if defined(USE_CMAKE)
# https://github.com/wxWidgets/wxWidgets/issues/22646
.if ${OPSYS} != "Linux"
CMAKE_ARGS+= -DwxUSE_JOYSTICK:BOOL=OFF
.endif
+.endif
.if ${OPSYS} != "Darwin"
.include "../../sysutils/libnotify/buildlink3.mk"
diff -r 77952394db7a -r abe8c929483b x11/wxGTK32/PLIST
--- a/x11/wxGTK32/PLIST Tue Jul 26 02:25:15 2022 +0000
+++ b/x11/wxGTK32/PLIST Tue Jul 26 02:58:56 2022 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2022/07/21 11:39:21 wiz Exp $
-bin/wx-config
-bin/wxrc
+@comment $NetBSD: PLIST,v 1.2 2022/07/26 02:58:56 dbj Exp $
+bin/wx-config-3.2
bin/wxrc-3.2
include/wx-3.2/wx/aboutdlg.h
include/wx-3.2/wx/accel.h
@@ -10,9 +9,6 @@
include/wx-3.2/wx/affinematrix2d.h
include/wx-3.2/wx/affinematrix2dbase.h
include/wx-3.2/wx/afterstd.h
-include/wx-3.2/wx/android/chkconf.h
-include/wx-3.2/wx/android/config_android.h
-include/wx-3.2/wx/android/setup.h
include/wx-3.2/wx/anidecod.h
include/wx-3.2/wx/animate.h
include/wx-3.2/wx/animdecod.h
@@ -30,13 +26,10 @@
include/wx-3.2/wx/aui/aui.h
include/wx-3.2/wx/aui/auibar.h
include/wx-3.2/wx/aui/auibook.h
-include/wx-3.2/wx/aui/barartmsw.h
include/wx-3.2/wx/aui/dockart.h
include/wx-3.2/wx/aui/floatpane.h
include/wx-3.2/wx/aui/framemanager.h
include/wx-3.2/wx/aui/tabart.h
-include/wx-3.2/wx/aui/tabartgtk.h
-include/wx-3.2/wx/aui/tabartmsw.h
include/wx-3.2/wx/aui/tabmdi.h
include/wx-3.2/wx/bannerwindow.h
include/wx-3.2/wx/base64.h
@@ -53,7 +46,6 @@
include/wx-3.2/wx/button.h
include/wx-3.2/wx/calctrl.h
include/wx-3.2/wx/caret.h
-include/wx-3.2/wx/catch_cppunit.h
include/wx-3.2/wx/chartype.h
include/wx-3.2/wx/checkbox.h
include/wx-3.2/wx/checkeddelete.h
@@ -112,28 +104,6 @@
include/wx-3.2/wx/debug.h
include/wx-3.2/wx/debugrpt.h
include/wx-3.2/wx/defs.h
-include/wx-3.2/wx/dfb/app.h
-include/wx-3.2/wx/dfb/bitmap.h
-include/wx-3.2/wx/dfb/brush.h
-include/wx-3.2/wx/dfb/chkconf.h
-include/wx-3.2/wx/dfb/cursor.h
-include/wx-3.2/wx/dfb/dc.h
-include/wx-3.2/wx/dfb/dcclient.h
-include/wx-3.2/wx/dfb/dcmemory.h
-include/wx-3.2/wx/dfb/dcscreen.h
-include/wx-3.2/wx/dfb/dfbptr.h
-include/wx-3.2/wx/dfb/evtloop.h
-include/wx-3.2/wx/dfb/font.h
-include/wx-3.2/wx/dfb/nonownedwnd.h
-include/wx-3.2/wx/dfb/pen.h
-include/wx-3.2/wx/dfb/popupwin.h
-include/wx-3.2/wx/dfb/private.h
-include/wx-3.2/wx/dfb/private/fontmgr.h
-include/wx-3.2/wx/dfb/private/overlay.h
-include/wx-3.2/wx/dfb/region.h
-include/wx-3.2/wx/dfb/toplevel.h
-include/wx-3.2/wx/dfb/window.h
-include/wx-3.2/wx/dfb/wrapdfb.h
include/wx-3.2/wx/dialog.h
include/wx-3.2/wx/dialup.h
include/wx-3.2/wx/dir.h
@@ -195,7 +165,6 @@
include/wx-3.2/wx/gdiobj.h
include/wx-3.2/wx/generic/aboutdlgg.h
include/wx-3.2/wx/generic/accel.h
-include/wx-3.2/wx/generic/activityindicator.h
include/wx-3.2/wx/generic/animate.h
include/wx-3.2/wx/generic/bmpcbox.h
include/wx-3.2/wx/generic/busyinfo.h
@@ -206,11 +175,9 @@
include/wx-3.2/wx/generic/clrpickerg.h
include/wx-3.2/wx/generic/collheaderctrl.h
include/wx-3.2/wx/generic/collpaneg.h
-include/wx-3.2/wx/generic/colour.h
include/wx-3.2/wx/generic/colrdlgg.h
include/wx-3.2/wx/generic/combo.h
include/wx-3.2/wx/generic/creddlgg.h
-include/wx-3.2/wx/generic/ctrlsub.h
include/wx-3.2/wx/generic/custombgwin.h
include/wx-3.2/wx/generic/dataview.h
include/wx-3.2/wx/generic/datectrl.h
@@ -240,26 +207,12 @@
include/wx-3.2/wx/generic/laywin.h
include/wx-3.2/wx/generic/listctrl.h
include/wx-3.2/wx/generic/logg.h
-include/wx-3.2/wx/generic/mask.h
-include/wx-3.2/wx/generic/mdig.h
include/wx-3.2/wx/generic/msgdlgg.h
include/wx-3.2/wx/generic/notebook.h
include/wx-3.2/wx/generic/notifmsg.h
include/wx-3.2/wx/generic/numdlgg.h
-include/wx-3.2/wx/generic/paletteg.h
include/wx-3.2/wx/generic/panelg.h
include/wx-3.2/wx/generic/printps.h
-include/wx-3.2/wx/generic/private/addremovectrl.h
-include/wx-3.2/wx/generic/private/animate.h
-include/wx-3.2/wx/generic/private/grid.h
-include/wx-3.2/wx/generic/private/listctrl.h
-include/wx-3.2/wx/generic/private/markuptext.h
-include/wx-3.2/wx/generic/private/notifmsg.h
-include/wx-3.2/wx/generic/private/richtooltip.h
-include/wx-3.2/wx/generic/private/rowheightcache.h
-include/wx-3.2/wx/generic/private/textmeasure.h
-include/wx-3.2/wx/generic/private/timer.h
-include/wx-3.2/wx/generic/private/widthcalc.h
include/wx-3.2/wx/generic/prntdlgg.h
include/wx-3.2/wx/generic/progdlgg.h
include/wx-3.2/wx/generic/propdlg.h
@@ -272,10 +225,8 @@
include/wx-3.2/wx/generic/splitter.h
include/wx-3.2/wx/generic/srchctlg.h
include/wx-3.2/wx/generic/statbmpg.h
-include/wx-3.2/wx/generic/statline.h
include/wx-3.2/wx/generic/stattextg.h
include/wx-3.2/wx/generic/statusbr.h
-include/wx-3.2/wx/generic/tabg.h
include/wx-3.2/wx/generic/textdlgg.h
include/wx-3.2/wx/generic/timectrl.h
include/wx-3.2/wx/generic/treectlg.h
@@ -285,187 +236,6 @@
include/wx-3.2/wx/glcanvas.h
include/wx-3.2/wx/graphics.h
include/wx-3.2/wx/grid.h
-include/wx-3.2/wx/gtk/accel.h
-include/wx-3.2/wx/gtk/activityindicator.h
-include/wx-3.2/wx/gtk/animate.h
-include/wx-3.2/wx/gtk/anybutton.h
-include/wx-3.2/wx/gtk/app.h
-include/wx-3.2/wx/gtk/assertdlg_gtk.h
-include/wx-3.2/wx/gtk/bitmap.h
-include/wx-3.2/wx/gtk/bmpbuttn.h
-include/wx-3.2/wx/gtk/bmpcbox.h
-include/wx-3.2/wx/gtk/brush.h
-include/wx-3.2/wx/gtk/button.h
-include/wx-3.2/wx/gtk/calctrl.h
-include/wx-3.2/wx/gtk/checkbox.h
-include/wx-3.2/wx/gtk/checklst.h
-include/wx-3.2/wx/gtk/chkconf.h
-include/wx-3.2/wx/gtk/choice.h
-include/wx-3.2/wx/gtk/clipbrd.h
-include/wx-3.2/wx/gtk/clrpicker.h
-include/wx-3.2/wx/gtk/collpane.h
-include/wx-3.2/wx/gtk/colordlg.h
-include/wx-3.2/wx/gtk/colour.h
-include/wx-3.2/wx/gtk/combobox.h
-include/wx-3.2/wx/gtk/control.h
-include/wx-3.2/wx/gtk/cursor.h
-include/wx-3.2/wx/gtk/dataform.h
-include/wx-3.2/wx/gtk/dataobj.h
-include/wx-3.2/wx/gtk/dataobj2.h
-include/wx-3.2/wx/gtk/dataview.h
-include/wx-3.2/wx/gtk/dc.h
-include/wx-3.2/wx/gtk/dcclient.h
-include/wx-3.2/wx/gtk/dcmemory.h
-include/wx-3.2/wx/gtk/dcscreen.h
-include/wx-3.2/wx/gtk/dialog.h
-include/wx-3.2/wx/gtk/dirdlg.h
-include/wx-3.2/wx/gtk/dnd.h
Home |
Main Index |
Thread Index |
Old Index