From 881c1c7b639a97e22355f7810df3a74d4ede7cfd Mon Sep 17 00:00:00 2001 From: fsLeg Date: Sat, 22 Oct 2022 18:28:40 +0300 Subject: [PATCH] wxWidgets3: removed. SBo now has a proper and newer version --- wxWidgets3/README | 10 --- wxWidgets3/collision.patch | 74 ------------------ wxWidgets3/slack-desc | 11 --- wxWidgets3/wxWidgets3.SlackBuild | 126 ------------------------------- wxWidgets3/wxWidgets3.info | 10 --- 5 files changed, 231 deletions(-) delete mode 100644 wxWidgets3/README delete mode 100644 wxWidgets3/collision.patch delete mode 100644 wxWidgets3/slack-desc delete mode 100755 wxWidgets3/wxWidgets3.SlackBuild delete mode 100644 wxWidgets3/wxWidgets3.info diff --git a/wxWidgets3/README b/wxWidgets3/README deleted file mode 100644 index 2c73faf..0000000 --- a/wxWidgets3/README +++ /dev/null @@ -1,10 +0,0 @@ -wxWidgets is a C++ library that lets developers create applications -for Windows, OS X, Linux and UNIX on 32-bit and 64-bit architectures -as well as several mobile platforms including Windows Mobile, iPhone -SDK and embedded GTK+. - -This script will build the package that can be installed alongside with -wxWidgets 2.8. If you need to build a program against this version, use ---with-wx-config=wx-config-3.0 configure option or something similar. -Alternatively, rename wx-config from 2.8 to wx-config-2.8 and use -symlinks to manage your version. diff --git a/wxWidgets3/collision.patch b/wxWidgets3/collision.patch deleted file mode 100644 index 7fea35d..0000000 --- a/wxWidgets3/collision.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/build/bakefiles/wx.bkl 2014-06-15 01:48:48.000000000 +0400 -+++ b/build/bakefiles/wx.bkl 2014-09-16 03:00:03.000000000 +0400 -@@ -137,7 +137,7 @@ - - - $(SRCDIR)/locale -- wxstd -+ wxstd$(WX_RELEASE_NODOT) - - 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/Makefile.in 2020-04-22 16:09:28.000000000 +0300 -+++ b/Makefile.in 2022-02-06 18:17:03.873918027 +0300 -@@ -15278,10 +15278,9 @@ - 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 \ -@@ -16177,7 +16176,7 @@ - $(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 -@@ -16185,7 +16184,7 @@ - $(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 - -@@ -16202,7 +16201,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/msw/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - ---- a/src/common/translation.cpp 2014-06-15 01:48:48.000000000 +0400 -+++ b/src/common/translation.cpp 2014-09-16 03:00:03.000000000 +0400 -@@ -1471,7 +1471,7 @@ - - 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.orig 2019-06-09 14:08:39.141052994 +0300 -+++ b/utils/wxrc/Makefile.in 2019-06-09 14:11:11.963439836 +0300 -@@ -125,7 +125,6 @@ - @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) diff --git a/wxWidgets3/slack-desc b/wxWidgets3/slack-desc deleted file mode 100644 index a10d5ac..0000000 --- a/wxWidgets3/slack-desc +++ /dev/null @@ -1,11 +0,0 @@ -wxWidgets3: wxWidgets (Cross-Platform GUI Library) -wxWidgets3: -wxWidgets3: wxWidgets is a C++ library that lets developers create applications -wxWidgets3: for Windows, OS X, Linux and UNIX on 32-bit and 64-bit architectures -wxWidgets3: as well as several mobile platforms including Windows Mobile, iPhone -wxWidgets3: SDK and embedded GTK+. -wxWidgets3: -wxWidgets3: Website: http://www.wxWidgets.org/ -wxWidgets3: -wxWidgets3: -wxWidgets3: diff --git a/wxWidgets3/wxWidgets3.SlackBuild b/wxWidgets3/wxWidgets3.SlackBuild deleted file mode 100755 index da51a96..0000000 --- a/wxWidgets3/wxWidgets3.SlackBuild +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh - -# Slackware build script for wxWidgets 3.0 - -# Copyright 2013-2022 Vladislav Borisov Moscow, Russia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=wxWidgets3 -VERSION=${VERSION:-3.0.5} -BUILD=${BUILD:-1} -TAG=${TAG:-fsleg} - -SRCNAM=wxWidgets - -# Use parallel building if possible -if [ -z "$NUMJOBS" ]; then - NUMJOBS=$(nproc) -fi - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e # Exit on most errors - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 - -cd $SRCNAM-$VERSION - -# Patch the collision with 2.8 -patch -p1 < $CWD/collision.patch - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --disable-static \ - --with-sdl \ - --with-opengl \ - --enable-unicode \ - --enable-graphics_ctx \ - --enable-display \ - --enable-mediactrl \ - --enable-sound \ - --enable-stc -make -j$NUMJOBS -make install DESTDIR=$PKG - -# Strip binaries and libraries -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Copy program documentation into the package -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a docs* $PKG/usr/doc/$PRGNAM-$VERSION -# Remove unnecessary docs -cd $PKG/usr/doc/$PRGNAM-$VERSION/docs - rm -rf cocoa latex mac metrowerks microwin msw palmos word -cd - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/wxWidgets3/wxWidgets3.info b/wxWidgets3/wxWidgets3.info deleted file mode 100644 index da53db9..0000000 --- a/wxWidgets3/wxWidgets3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wxWidgets3" -VERSION="3.0.5" -HOMEPAGE="http://wxwidgets.org/" -DOWNLOAD="https://github.com/wxWidgets/wxWidgets/releases/download/v${VERSION}/wxWidgets-3.0.5.tar.bz2" -MD5SUM="b4304777652acee8358066cdce5f6f27" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Vladislav Borisov" -EMAIL="fsleg@t-rg.ws" -- 2.46.3