diff options
author | sL1pKn07 | 2020-11-06 16:15:01 +0100 |
---|---|---|
committer | sL1pKn07 | 2020-11-06 16:15:01 +0100 |
commit | ffe0247c8900cec40ca7781a61fd5dceb3fa1a8f (patch) | |
tree | 9fc59da1515eb80d2e61cf2bc4b30841260713ef | |
download | aur-ffe0247c8900cec40ca7781a61fd5dceb3fa1a8f.tar.gz |
Initial commit
-rw-r--r-- | .SRCINFO | 64 | ||||
-rw-r--r-- | .gitignore | 8 | ||||
-rw-r--r-- | PKGBUILD | 178 | ||||
-rw-r--r-- | make-abicheck-non-fatal.patch | 15 | ||||
-rw-r--r-- | wxGTK-collision.patch | 75 |
5 files changed, 340 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..2c7622a0eec7 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,64 @@ +pkgbase = wxwidgets-dev-light + pkgdesc = wxWidgets suite for Base and GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!) + pkgver = 3.1.4 + pkgrel = 1 + url = http://wxwidgets.org + arch = x86_64 + license = custom:wxWindows + makedepends = git + makedepends = glu + makedepends = bash + makedepends = gtk2 + makedepends = gtk3 + makedepends = libsm + makedepends = libgl + makedepends = libnotify + source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.1.4 + source = make-abicheck-non-fatal.patch + source = git+https://github.com/wxWidgets/Catch.git + source = wxGTK-collision.patch + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + +pkgname = wxbase-dev-light + pkgdesc = wxWidgets Base. Development branch (GNOME/GStreamer free!) + depends = wxcommon-light + depends = bash + depends = expat + depends = zlib + provides = wxbase-dev + conflicts = wxbase-dev + options = !emptydirs + +pkgname = wxgtk2-dev-light + pkgdesc = wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!) + depends = wxcommon-light + depends = libgl + depends = gtk2 + depends = libsm + depends = sdl2 + depends = libnotify + provides = wxgtk2-dev + conflicts = wxgtk2-dev + options = !emptydirs + +pkgname = wxgtk3-dev-light + pkgdesc = wxWidgets GTK3 Toolkit. Development branch (GNOME/GStreamer free!) + depends = wxcommon-light + depends = gtk3 + depends = libsm + depends = sdl2 + depends = libnotify + provides = wxgtk3-dev + conflicts = wxgtk3-dev + options = !emptydirs + +pkgname = wxcommon-dev-light + pkgdesc = wxWidgets common. Development branch (GNOME/GStreamer free!) + depends = wxbase-light + provides = wxgtk-common-dev + conflicts = wxgtk-common-dev + options = !emptydirs + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..f0a1ca0d6365 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +* +!.gitignore +!.SRCINFO +!PKGBUILD +!config.conf +!wx-config.sh +!make-abicheck-non-fatal.patch +!wxGTK-collision.patch diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..80589f2ea042 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,178 @@ +# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com> + +pkgbase=wxwidgets-dev-light +pkgname=('wxbase-dev-light' + 'wxgtk2-dev-light' + 'wxgtk3-dev-light' + 'wxcommon-dev-light' + ) +pkgver=3.1.4 +pkgrel=1 +pkgdesc="wxWidgets suite for Base and GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!)" +arch=('x86_64') +url='http://wxwidgets.org' +license=('custom:wxWindows') +makedepends=('git' + 'glu' + 'bash' + 'gtk2' + 'gtk3' + 'libsm' + 'libgl' + 'libnotify' + ) +source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}" + 'make-abicheck-non-fatal.patch' + 'git+https://github.com/wxWidgets/Catch.git' + 'wxGTK-collision.patch' + ) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + ) + +prepare() { + mkdir -p build-{base,gtk{2,3}} + + cd wxwidgets + + git config submodule.3rdparty/catch.url "${srcdir}/Catch" + git submodule update --init 3rdparty/catch + + patch -Np1 -i "${srcdir}/wxGTK-collision.patch" + + # C++ ABI check is too strict and breaks with GCC 5.1 + # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 + patch -Np1 -i "${srcdir}/make-abicheck-non-fatal.patch" +} + +build() { + msg2 "Build WxBASE" + cd "${srcdir}/build-base" + ../wxwidgets/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --with-regex=builtin \ + --disable-{precomp-headers,gui} + + make + make -C ../wxwidgets/locale allmo + + msg2 "Build WxGTK2" + cd "${srcdir}/build-gtk2" + ../wxwidgets/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --with-gtk=2 \ + --with-lib{jpeg,png,tiff,xpm}=sys \ + --with-regex=builtin \ + --with-{opengl,sdl} \ + --enable-graphics_ctx \ + --without-gnomevfs \ + --disable-{gtktest,sdltest,precomp-headers,mediactrl,webview} + + make + make -C ../wxwidgets/locale allmo + + msg2 "Build WxGTK3" + cd "${srcdir}/build-gtk3" + ../wxwidgets/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --with-gtk=3 \ + --with-lib{jpeg,png,tiff,xpm}=sys \ + --with-regex=builtin \ + --with-{opengl,sdl} \ + --enable-graphics_ctx \ + --without-gnomevfs \ + --disable-{gtktest,sdltest,precomp-headers,mediactrl,webview} + + make + make -C ../wxwidgets/locale allmo +} + +package_wxbase-dev-light() { + pkgdesc="wxWidgets Base. Development branch (GNOME/GStreamer free!)" + depends=('wxcommon-light' + 'bash' + 'expat' + 'zlib' + ) + provides=('wxbase-dev') + conflicts=('wxbase-dev') + options=('!emptydirs') + + make -C build-base DESTDIR="${pkgdir}" install + + mv "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-base-3.1" + rm -fr "${pkgdir}/usr/include" + rm -fr "${pkgdir}/usr/share" + + install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxbase-dev-light/LICENSE" +} + +package_wxgtk2-dev-light() { + pkgdesc="wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!)" + depends=('wxcommon-light' + 'libgl' + 'gtk2' + 'libsm' + 'sdl2' + 'libnotify' + ) + provides=('wxgtk2-dev') + conflicts=('wxgtk2-dev') + options=('!emptydirs') + + make -C build-gtk2 DESTDIR="${pkgdir}" install + + cp -P "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-gtk2-3.1" + rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.1} + rm -fr "${pkgdir}/usr/include" + rm -fr "${pkgdir}/usr/lib/"*baseu* + rm -fr "${pkgdir}/usr/share" + + install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk2-dev-light/LICENSE" +} + +package_wxgtk3-dev-light() { + pkgdesc="wxWidgets GTK3 Toolkit. Development branch (GNOME/GStreamer free!)" + depends=('wxcommon-light' + 'gtk3' + 'libsm' + 'sdl2' + 'libnotify' + ) + provides=('wxgtk3-dev') + conflicts=('wxgtk3-dev') + options=('!emptydirs') + + make -C build-gtk3 DESTDIR="${pkgdir}" install + + mv "${pkgdir}/usr/bin/wx-config-3.1" "${pkgdir}/usr/bin/wx-config-gtk3-3.1" + rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.1} + rm -fr "${pkgdir}/usr/include" + rm -fr "${pkgdir}/usr/lib/"*baseu* + rm -fr "${pkgdir}/usr/share" + + install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk3-dev-light/LICENSE" +} + +package_wxcommon-dev-light() { + pkgdesc="wxWidgets common. Development branch (GNOME/GStreamer free!)" + depends=('wxbase-light') + provides=('wxgtk-common-dev') + conflicts=('wxgtk-common-dev') + options=('!emptydirs') + + make -C build-gtk2 DESTDIR="${pkgdir}" install + make -C build-gtk3 DESTDIR="${pkgdir}" install + make -C build-base DESTDIR="${pkgdir}" install + + rm -fr "${pkgdir}/usr/bin/wx-config-3.1" + rm -fr "${pkgdir}/usr/lib" + rm -fr "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + + install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-dev-light/LICENSE" +} diff --git a/make-abicheck-non-fatal.patch b/make-abicheck-non-fatal.patch new file mode 100644 index 000000000000..50092e93c103 --- /dev/null +++ b/make-abicheck-non-fatal.patch @@ -0,0 +1,15 @@ +diff -up a/src/common/appbase.cpp.abicheck b/src/common/appbase.cpp +--- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -850,10 +850,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP + diff --git a/wxGTK-collision.patch b/wxGTK-collision.patch new file mode 100644 index 000000000000..f189837050cf --- /dev/null +++ b/wxGTK-collision.patch @@ -0,0 +1,75 @@ +Prevent file collisions between multiple installed SLOTs. + + - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. + - Version the bakefile preset filenames. Unversioned symlinks to these files + are handled by eselect. + - Version wx-config and wxrc. The unversioned forms are wrapper scripts + installed with eselect-wxwidgets. + - Version wxstd.mo and modify AddStdCatalog to use it. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -13814,10 +13814,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) + + 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_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal +- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) ++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ ++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) + $(DYLIB_RPATH_INSTALL) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ +@@ -14713,7 +14713,7 @@ install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -14721,7 +14721,7 @@ locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + +--- a/build/bakefiles/wx.bkl ++++ b/build/bakefiles/wx.bkl +@@ -137,7 +137,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +--- a/src/common/translation.cpp ++++ b/src/common/translation.cpp +@@ -1522,7 +1522,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c + + bool wxTranslations::AddStdCatalog() + { +- if ( !AddCatalog(wxS("wxstd")) ) ++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) + return false; + + // there may be a catalog with toolkit specific overrides, it is not +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -121,7 +121,6 @@ distclean: clean + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) + @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) + @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) +-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) + + @COND_USE_XRC_1@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |