Date: Friday, April 30, 2021 @ 10:37:49 Author: arodseth Revision: 925333
archrelease: copy trunk to community-x86_64 Added: erlang/repos/community-x86_64/PKGBUILD (from rev 925332, erlang/trunk/PKGBUILD) erlang/repos/community-x86_64/epmd.conf (from rev 925332, erlang/trunk/epmd.conf) erlang/repos/community-x86_64/epmd.service (from rev 925332, erlang/trunk/epmd.service) erlang/repos/community-x86_64/epmd.socket (from rev 925332, erlang/trunk/epmd.socket) erlang/repos/community-x86_64/erlang-22.0-dont-ignore-LDFLAGS.patch (from rev 925332, erlang/trunk/erlang-22.0-dont-ignore-LDFLAGS.patch) erlang/repos/community-x86_64/wx3.patch (from rev 925332, erlang/trunk/wx3.patch) Deleted: erlang/repos/community-x86_64/PKGBUILD erlang/repos/community-x86_64/epmd.conf erlang/repos/community-x86_64/epmd.service erlang/repos/community-x86_64/epmd.socket erlang/repos/community-x86_64/erlang-22.0-dont-ignore-LDFLAGS.patch erlang/repos/community-x86_64/wx3.patch ---------------------------------------+ PKGBUILD | 212 +++++++++++++++--------------- epmd.conf | 6 epmd.service | 22 +-- epmd.socket | 18 +- erlang-22.0-dont-ignore-LDFLAGS.patch | 54 +++---- wx3.patch | 226 ++++++++++++++++---------------- 6 files changed, 269 insertions(+), 269 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-04-30 10:37:39 UTC (rev 925332) +++ PKGBUILD 2021-04-30 10:37:49 UTC (rev 925333) @@ -1,106 +0,0 @@ -# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> -# Contributor: loqs -# Contributor: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Vesa Kaihlavirta <v...@archlinux.org> -# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> -# Contributor: Tom Burdick <thomas.burd...@wrightwoodtech.com> -# Contributor: Ricardo Catalinas Jiménez <jimenezr...@gmail.com> - -pkgbase=erlang -pkgname=(erlang erlang-unixodbc) -pkgver=23.3.1 -pkgrel=1 -_docver=23.3 -arch=(x86_64) -url='https://www.erlang.org' -license=(Apache) -makedepends=(fop git glu java-environment libxslt lksctp-tools - mesa perl unixodbc wxgtk3) -options=(staticlibs) -source=("git+https://github.com/erlang/otp.git#tag=OTP-$pkgver" - "$url/download/otp_doc_man_$_docver.tar.gz" - wx3.patch - erlang-22.0-dont-ignore-LDFLAGS.patch - epmd.conf - epmd.service - epmd.socket) -sha256sums=('SKIP' - 'b890e99d3fe1b317ed083455985225550ebf74b4a8ec2af4c758e4ce6e2934ff' - 'b0e1d2ed833feb0f308060c2a451fcd58fceb68c9c63432fab38ae4cd0264ee2' - 'd84d3644621df383ba24d0f4132dfdc92dc175c12a8f82dd0f107c2d0e7fd626' - '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2' - 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' - '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34') - -prepare() { - # For Erlang to find wx-config-gtk3 as wx-config in the $PATH - mkdir -p bin - ln -s /usr/bin/wx-config-gtk3 bin/wx-config - export PATH="$srcdir/bin:$PATH" - - cd otp - - # Patch for autoconf - git cherry-pick -n c5b04efb55304a7c6f569c33c8e5875a32877f31 - - patch -p1 -i ../erlang-22.0-dont-ignore-LDFLAGS.patch - patch -p1 -i ../wx3.patch - - ./otp_build autoconf -} - -build() { - cd otp - export PATH="$srcdir/bin:$PATH" - export WX_GKT_VER="3.0" - ./configure \ - --prefix=/usr \ - --enable-builtin-zlib \ - --enable-smp-support \ - --with-odbc \ - --with-wx-config=/usr/bin/wx-config-gtk3 - make -} - -package_erlang() { - pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' - depends=(glu ncurses openssl wxgtk3) - optdepends=('erlang-unixodbc: database support' - 'java-environment: for Java support' - 'lksctp-tools: for SCTP support') - provides=(erlang-nox) - conflicts=(erlang-nox) - - export PATH="$srcdir/bin:$PATH" - make -C otp DESTDIR="$pkgdir" install - - # move files that belong to the erlang-unixodbc package - mkdir -p unixodbc - mv "$pkgdir/usr/lib/erlang/lib/odbc"* "$srcdir/unixodbc/" - - # services and configuration - install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service" - install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket" - install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd" - - # readme and licenses - install -Dm644 otp/README.md "$pkgdir/usr/share/doc/$pkgname/README.md" - install -Dm644 otp/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm644 otp/CONTRIBUTING.md "$pkgdir/usr/share/doc/$pkgname/CONTRIBUTING.md" - install -Dm644 otp/AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS" - - # man pages - cp -r man "$pkgdir/usr/lib/erlang/" -} - -package_erlang-unixodbc() { - pkgdesc='Unixodbc support for Erlang' - depends=(erlang-nox unixodbc) - - install -d "$pkgdir/usr/lib/erlang/lib" - mv unixodbc/* "$pkgdir/usr/lib/erlang/lib/" - install -Dm644 otp/LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENCE.txt" -} - -# getver: raw.githubusercontent.com/erlang/otp/maint/OTP_VERSION Copied: erlang/repos/community-x86_64/PKGBUILD (from rev 925332, erlang/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-04-30 10:37:49 UTC (rev 925333) @@ -0,0 +1,106 @@ +# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> +# Contributor: loqs +# Contributor: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Vesa Kaihlavirta <v...@archlinux.org> +# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burd...@wrightwoodtech.com> +# Contributor: Ricardo Catalinas Jiménez <jimenezr...@gmail.com> + +pkgbase=erlang +pkgname=(erlang erlang-unixodbc) +pkgver=23.3.2 +pkgrel=1 +_docver=23.3 +arch=(x86_64) +url='https://www.erlang.org' +license=(Apache) +makedepends=(fop git glu java-environment libxslt lksctp-tools + mesa perl unixodbc wxgtk3) +options=(staticlibs) +source=("git+https://github.com/erlang/otp.git#tag=OTP-$pkgver" + "$url/download/otp_doc_man_$_docver.tar.gz" + wx3.patch + erlang-22.0-dont-ignore-LDFLAGS.patch + epmd.conf + epmd.service + epmd.socket) +sha256sums=('SKIP' + 'b890e99d3fe1b317ed083455985225550ebf74b4a8ec2af4c758e4ce6e2934ff' + 'b0e1d2ed833feb0f308060c2a451fcd58fceb68c9c63432fab38ae4cd0264ee2' + 'd84d3644621df383ba24d0f4132dfdc92dc175c12a8f82dd0f107c2d0e7fd626' + '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2' + 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' + '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34') + +prepare() { + # For Erlang to find wx-config-gtk3 as wx-config in the $PATH + mkdir -p bin + ln -s /usr/bin/wx-config-gtk3 bin/wx-config + export PATH="$srcdir/bin:$PATH" + + cd otp + + # Patch for autoconf + git cherry-pick -n c5b04efb55304a7c6f569c33c8e5875a32877f31 + + patch -p1 -i ../erlang-22.0-dont-ignore-LDFLAGS.patch + patch -p1 -i ../wx3.patch + + ./otp_build autoconf +} + +build() { + cd otp + export PATH="$srcdir/bin:$PATH" + export WX_GKT_VER="3.0" + ./configure \ + --prefix=/usr \ + --enable-builtin-zlib \ + --enable-smp-support \ + --with-odbc \ + --with-wx-config=/usr/bin/wx-config-gtk3 + make +} + +package_erlang() { + pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' + depends=(glu ncurses openssl wxgtk3) + optdepends=('erlang-unixodbc: database support' + 'java-environment: for Java support' + 'lksctp-tools: for SCTP support') + provides=(erlang-nox) + conflicts=(erlang-nox) + + export PATH="$srcdir/bin:$PATH" + make -C otp DESTDIR="$pkgdir" install + + # move files that belong to the erlang-unixodbc package + mkdir -p unixodbc + mv "$pkgdir/usr/lib/erlang/lib/odbc"* "$srcdir/unixodbc/" + + # services and configuration + install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service" + install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket" + install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd" + + # readme and licenses + install -Dm644 otp/README.md "$pkgdir/usr/share/doc/$pkgname/README.md" + install -Dm644 otp/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 otp/CONTRIBUTING.md "$pkgdir/usr/share/doc/$pkgname/CONTRIBUTING.md" + install -Dm644 otp/AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS" + + # man pages + cp -r man "$pkgdir/usr/lib/erlang/" +} + +package_erlang-unixodbc() { + pkgdesc='Unixodbc support for Erlang' + depends=(erlang-nox unixodbc) + + install -d "$pkgdir/usr/lib/erlang/lib" + mv unixodbc/* "$pkgdir/usr/lib/erlang/lib/" + install -Dm644 otp/LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENCE.txt" +} + +# getver: raw.githubusercontent.com/erlang/otp/maint/OTP_VERSION Deleted: epmd.conf =================================================================== --- epmd.conf 2021-04-30 10:37:39 UTC (rev 925332) +++ epmd.conf 2021-04-30 10:37:49 UTC (rev 925333) @@ -1,3 +0,0 @@ -#ERL_EPMD_ADDRESS= -#ERL_EPMD_PORT=4369 -#ERL_EPMD_RELAXED_COMMAND_CHECK= Copied: erlang/repos/community-x86_64/epmd.conf (from rev 925332, erlang/trunk/epmd.conf) =================================================================== --- epmd.conf (rev 0) +++ epmd.conf 2021-04-30 10:37:49 UTC (rev 925333) @@ -0,0 +1,3 @@ +#ERL_EPMD_ADDRESS= +#ERL_EPMD_PORT=4369 +#ERL_EPMD_RELAXED_COMMAND_CHECK= Deleted: epmd.service =================================================================== --- epmd.service 2021-04-30 10:37:39 UTC (rev 925332) +++ epmd.service 2021-04-30 10:37:49 UTC (rev 925333) @@ -1,11 +0,0 @@ -[Unit] -Description=Erlang Port Mapper Daemon - -[Service] -EnvironmentFile=/etc/conf.d/epmd -ExecStart=/usr/bin/epmd -daemon $EPMD_OPTS -ExecStop=/usr/bin/epmd -kill -Type=forking - -[Install] -WantedBy=multi-user.target Copied: erlang/repos/community-x86_64/epmd.service (from rev 925332, erlang/trunk/epmd.service) =================================================================== --- epmd.service (rev 0) +++ epmd.service 2021-04-30 10:37:49 UTC (rev 925333) @@ -0,0 +1,11 @@ +[Unit] +Description=Erlang Port Mapper Daemon + +[Service] +EnvironmentFile=/etc/conf.d/epmd +ExecStart=/usr/bin/epmd -daemon $EPMD_OPTS +ExecStop=/usr/bin/epmd -kill +Type=forking + +[Install] +WantedBy=multi-user.target Deleted: epmd.socket =================================================================== --- epmd.socket 2021-04-30 10:37:39 UTC (rev 925332) +++ epmd.socket 2021-04-30 10:37:49 UTC (rev 925333) @@ -1,9 +0,0 @@ -[Unit] -Conflicts=epmd.service - -[Socket] -ListenStream=4369 -Accept=no - -[Install] -WantedBy=sockets.target Copied: erlang/repos/community-x86_64/epmd.socket (from rev 925332, erlang/trunk/epmd.socket) =================================================================== --- epmd.socket (rev 0) +++ epmd.socket 2021-04-30 10:37:49 UTC (rev 925333) @@ -0,0 +1,9 @@ +[Unit] +Conflicts=epmd.service + +[Socket] +ListenStream=4369 +Accept=no + +[Install] +WantedBy=sockets.target Deleted: erlang-22.0-dont-ignore-LDFLAGS.patch =================================================================== --- erlang-22.0-dont-ignore-LDFLAGS.patch 2021-04-30 10:37:39 UTC (rev 925332) +++ erlang-22.0-dont-ignore-LDFLAGS.patch 2021-04-30 10:37:49 UTC (rev 925333) @@ -1,27 +0,0 @@ -This is a forward port of erlang-20.3.2-dont-ignore-LDFLAGS.patch -Anthony G. Basile <bluen...@gentoo.org> - -diff -Naur otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in otp-OTP-22.0/lib/megaco/src/flex/Makefile.in ---- otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in 2019-05-10 12:42:49.000000000 +0000 -+++ otp-OTP-22.0/lib/megaco/src/flex/Makefile.in 2019-06-04 15:53:37.899372564 +0000 -@@ -47,7 +47,7 @@ - CC = @DED_CC@ - CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@ - LD = @DED_LD@ --LDFLAGS = @DED_LDFLAGS@ -+LDFLAGS += @DED_LDFLAGS@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - PERL = @PERL@ -diff -Naur otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in otp-OTP-22.0/lib/odbc/c_src/Makefile.in ---- otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in 2019-05-10 12:42:49.000000000 +0000 -+++ otp-OTP-22.0/lib/odbc/c_src/Makefile.in 2019-06-04 15:53:37.900372572 +0000 -@@ -82,7 +82,7 @@ - CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@ - EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET) - LD = @LD@ --LDFLAGS = $(ODBC_LIB) $(EI_LDFLAGS) -+LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS) - LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB) - INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE) - TARGET_FLAGS = @TARGET_FLAGS@ Copied: erlang/repos/community-x86_64/erlang-22.0-dont-ignore-LDFLAGS.patch (from rev 925332, erlang/trunk/erlang-22.0-dont-ignore-LDFLAGS.patch) =================================================================== --- erlang-22.0-dont-ignore-LDFLAGS.patch (rev 0) +++ erlang-22.0-dont-ignore-LDFLAGS.patch 2021-04-30 10:37:49 UTC (rev 925333) @@ -0,0 +1,27 @@ +This is a forward port of erlang-20.3.2-dont-ignore-LDFLAGS.patch +Anthony G. Basile <bluen...@gentoo.org> + +diff -Naur otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in otp-OTP-22.0/lib/megaco/src/flex/Makefile.in +--- otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in 2019-05-10 12:42:49.000000000 +0000 ++++ otp-OTP-22.0/lib/megaco/src/flex/Makefile.in 2019-06-04 15:53:37.899372564 +0000 +@@ -47,7 +47,7 @@ + CC = @DED_CC@ + CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@ + LD = @DED_LD@ +-LDFLAGS = @DED_LDFLAGS@ ++LDFLAGS += @DED_LDFLAGS@ + LEX = @LEX@ + LEXLIB = @LEXLIB@ + PERL = @PERL@ +diff -Naur otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in otp-OTP-22.0/lib/odbc/c_src/Makefile.in +--- otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in 2019-05-10 12:42:49.000000000 +0000 ++++ otp-OTP-22.0/lib/odbc/c_src/Makefile.in 2019-06-04 15:53:37.900372572 +0000 +@@ -82,7 +82,7 @@ + CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@ + EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET) + LD = @LD@ +-LDFLAGS = $(ODBC_LIB) $(EI_LDFLAGS) ++LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS) + LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB) + INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE) + TARGET_FLAGS = @TARGET_FLAGS@ Deleted: wx3.patch =================================================================== --- wx3.patch 2021-04-30 10:37:39 UTC (rev 925332) +++ wx3.patch 2021-04-30 10:37:49 UTC (rev 925333) @@ -1,113 +0,0 @@ -Description: Fix constants for wxwidgets3.0 - The values of wx constants can change between stable release series (and - some have between 2.8 and 3.0), but erlang seems to hardcode these values. -Author: Olly Betts <o...@survex.com> -Bug-Debian: https://bugs.debian.org/766790 -Forwarded: no -Last-Update: 2014-11-25 - ---- a/lib/wx/include/wx.hrl -+++ b/lib/wx/include/wx.hrl -@@ -767,7 +767,7 @@ - % From "checkbox.h" - -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192). - -define(wxCHK_3STATE, 4096). ---define(wxCHK_2STATE, 0). -+-define(wxCHK_2STATE, 16384). - % From "checkbox.h": wxCheckBoxState - -define(wxCHK_UNCHECKED, 0). - -define(wxCHK_CHECKED, 1). -@@ -1014,10 +1014,10 @@ - -define(wxSIZE_AUTO_WIDTH, 1). - -define(wxSETUP, 131072). - -define(wxMORE, 65536). ---define(wxHELP, 32768). ---define(wxRESET, 16384). ---define(wxBACKWARD, 8192). ---define(wxFORWARD, 4096). -+-define(wxHELP, 4096). -+-define(wxRESET, 32768). -+-define(wxBACKWARD, 16384). -+-define(wxFORWARD, 8192). - -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)). - -define(wxICON_ASTERISK, ?wxICON_INFORMATION). - -define(wxICON_STOP, ?wxICON_HAND). -@@ -1049,8 +1049,8 @@ - -define(wxTC_TOP, 0). - -define(wxTC_FIXEDWIDTH, 32). - -define(wxTC_RIGHTJUSTIFY, 16). ---define(wxSP_WRAP, 8192). ---define(wxSP_ARROW_KEYS, 4096). -+-define(wxSP_WRAP, 32768). -+-define(wxSP_ARROW_KEYS, 16384). - -define(wxSP_VERTICAL, ?wxVERTICAL). - -define(wxSP_HORIZONTAL, ?wxHORIZONTAL). - -define(wxSB_VERTICAL, ?wxVERTICAL). -@@ -1071,8 +1071,8 @@ - -define(wxCB_SIMPLE, 4). - -define(wxLB_INT_HEIGHT, 2048). - -define(wxLB_HSCROLL, ?wxHSCROLL). ---define(wxLB_ALWAYS_SB, 1024). ---define(wxLB_NEEDED_SB, 512). -+-define(wxLB_ALWAYS_SB, 512). -+-define(wxLB_NEEDED_SB, 0). - -define(wxLB_OWNERDRAW, 256). - -define(wxLB_EXTENDED, 128). - -define(wxLB_MULTIPLE, 64). -@@ -1548,7 +1548,7 @@ - -define(wxUPDATE_UI_FROMIDLE, 2). - % From "dialog.h" - -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)). ---define(wxDIALOG_NO_PARENT, 1). -+-define(wxDIALOG_NO_PARENT, 32). - % From "dirctrlg.h" - -define(wxDIRCTRL_DIR_ONLY, 16). - -define(wxDIRCTRL_SELECT_FIRST, 32). -@@ -3728,7 +3728,7 @@ - -define(wxSTC_KEY_LEFT, 302). - -define(wxSTC_KEY_UP, 301). - -define(wxSTC_KEY_DOWN, 300). ---define(wxSTC_MODEVENTMASKALL, 8191). -+-define(wxSTC_MODEVENTMASKALL, 1048575). - -define(wxSTC_MULTILINEUNDOREDO, 4096). - -define(wxSTC_MOD_BEFOREDELETE, 2048). - -define(wxSTC_MOD_BEFOREINSERT, 1024). -@@ -3810,7 +3810,7 @@ - -define(wxSTC_INDIC_TT, 2). - -define(wxSTC_INDIC_SQUIGGLE, 1). - -define(wxSTC_INDIC_PLAIN, 0). ---define(wxSTC_INDIC_MAX, 7). -+-define(wxSTC_INDIC_MAX, 31). - -define(wxSTC_CASE_LOWER, 2). - -define(wxSTC_CASE_UPPER, 1). - -define(wxSTC_CASE_MIXED, 0). -@@ -3835,7 +3835,7 @@ - -define(wxSTC_CHARSET_BALTIC, 186). - -define(wxSTC_CHARSET_DEFAULT, 1). - -define(wxSTC_CHARSET_ANSI, 0). ---define(wxSTC_STYLE_MAX, 127). -+-define(wxSTC_STYLE_MAX, 255). - -define(wxSTC_STYLE_LASTPREDEFINED, 39). - -define(wxSTC_STYLE_CALLTIP, 38). - -define(wxSTC_STYLE_INDENTGUIDE, 37). -@@ -3934,9 +3934,9 @@ - -define(wxTE_PROCESS_TAB, 64). - -define(wxTE_MULTILINE, 32). - -define(wxTE_READONLY, 16). ---define(wxTE_AUTO_SCROLL, 8). -+-define(wxTE_AUTO_SCROLL, 0). - -define(wxTE_NO_VSCROLL, 2). ---define(wxHAS_TEXT_WINDOW_STREAM, 0). -+-define(wxHAS_TEXT_WINDOW_STREAM, 1). - % From "textctrl.h": wxTextAttrAlignment - -define(wxTEXT_ALIGNMENT_DEFAULT, 0). - -define(wxTEXT_ALIGNMENT_LEFT, 1). -@@ -3986,7 +3986,7 @@ - -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)). - -define(wxRESIZE_BORDER, 64). - -define(wxTINY_CAPTION_VERT, 128). ---define(wxTINY_CAPTION_HORIZ, 256). -+-define(wxTINY_CAPTION_HORIZ, 128). - -define(wxMAXIMIZE_BOX, 512). - -define(wxMINIMIZE_BOX, 1024). - -define(wxSYSTEM_MENU, 2048). Copied: erlang/repos/community-x86_64/wx3.patch (from rev 925332, erlang/trunk/wx3.patch) =================================================================== --- wx3.patch (rev 0) +++ wx3.patch 2021-04-30 10:37:49 UTC (rev 925333) @@ -0,0 +1,113 @@ +Description: Fix constants for wxwidgets3.0 + The values of wx constants can change between stable release series (and + some have between 2.8 and 3.0), but erlang seems to hardcode these values. +Author: Olly Betts <o...@survex.com> +Bug-Debian: https://bugs.debian.org/766790 +Forwarded: no +Last-Update: 2014-11-25 + +--- a/lib/wx/include/wx.hrl ++++ b/lib/wx/include/wx.hrl +@@ -767,7 +767,7 @@ + % From "checkbox.h" + -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192). + -define(wxCHK_3STATE, 4096). +--define(wxCHK_2STATE, 0). ++-define(wxCHK_2STATE, 16384). + % From "checkbox.h": wxCheckBoxState + -define(wxCHK_UNCHECKED, 0). + -define(wxCHK_CHECKED, 1). +@@ -1014,10 +1014,10 @@ + -define(wxSIZE_AUTO_WIDTH, 1). + -define(wxSETUP, 131072). + -define(wxMORE, 65536). +--define(wxHELP, 32768). +--define(wxRESET, 16384). +--define(wxBACKWARD, 8192). +--define(wxFORWARD, 4096). ++-define(wxHELP, 4096). ++-define(wxRESET, 32768). ++-define(wxBACKWARD, 16384). ++-define(wxFORWARD, 8192). + -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)). + -define(wxICON_ASTERISK, ?wxICON_INFORMATION). + -define(wxICON_STOP, ?wxICON_HAND). +@@ -1049,8 +1049,8 @@ + -define(wxTC_TOP, 0). + -define(wxTC_FIXEDWIDTH, 32). + -define(wxTC_RIGHTJUSTIFY, 16). +--define(wxSP_WRAP, 8192). +--define(wxSP_ARROW_KEYS, 4096). ++-define(wxSP_WRAP, 32768). ++-define(wxSP_ARROW_KEYS, 16384). + -define(wxSP_VERTICAL, ?wxVERTICAL). + -define(wxSP_HORIZONTAL, ?wxHORIZONTAL). + -define(wxSB_VERTICAL, ?wxVERTICAL). +@@ -1071,8 +1071,8 @@ + -define(wxCB_SIMPLE, 4). + -define(wxLB_INT_HEIGHT, 2048). + -define(wxLB_HSCROLL, ?wxHSCROLL). +--define(wxLB_ALWAYS_SB, 1024). +--define(wxLB_NEEDED_SB, 512). ++-define(wxLB_ALWAYS_SB, 512). ++-define(wxLB_NEEDED_SB, 0). + -define(wxLB_OWNERDRAW, 256). + -define(wxLB_EXTENDED, 128). + -define(wxLB_MULTIPLE, 64). +@@ -1548,7 +1548,7 @@ + -define(wxUPDATE_UI_FROMIDLE, 2). + % From "dialog.h" + -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)). +--define(wxDIALOG_NO_PARENT, 1). ++-define(wxDIALOG_NO_PARENT, 32). + % From "dirctrlg.h" + -define(wxDIRCTRL_DIR_ONLY, 16). + -define(wxDIRCTRL_SELECT_FIRST, 32). +@@ -3728,7 +3728,7 @@ + -define(wxSTC_KEY_LEFT, 302). + -define(wxSTC_KEY_UP, 301). + -define(wxSTC_KEY_DOWN, 300). +--define(wxSTC_MODEVENTMASKALL, 8191). ++-define(wxSTC_MODEVENTMASKALL, 1048575). + -define(wxSTC_MULTILINEUNDOREDO, 4096). + -define(wxSTC_MOD_BEFOREDELETE, 2048). + -define(wxSTC_MOD_BEFOREINSERT, 1024). +@@ -3810,7 +3810,7 @@ + -define(wxSTC_INDIC_TT, 2). + -define(wxSTC_INDIC_SQUIGGLE, 1). + -define(wxSTC_INDIC_PLAIN, 0). +--define(wxSTC_INDIC_MAX, 7). ++-define(wxSTC_INDIC_MAX, 31). + -define(wxSTC_CASE_LOWER, 2). + -define(wxSTC_CASE_UPPER, 1). + -define(wxSTC_CASE_MIXED, 0). +@@ -3835,7 +3835,7 @@ + -define(wxSTC_CHARSET_BALTIC, 186). + -define(wxSTC_CHARSET_DEFAULT, 1). + -define(wxSTC_CHARSET_ANSI, 0). +--define(wxSTC_STYLE_MAX, 127). ++-define(wxSTC_STYLE_MAX, 255). + -define(wxSTC_STYLE_LASTPREDEFINED, 39). + -define(wxSTC_STYLE_CALLTIP, 38). + -define(wxSTC_STYLE_INDENTGUIDE, 37). +@@ -3934,9 +3934,9 @@ + -define(wxTE_PROCESS_TAB, 64). + -define(wxTE_MULTILINE, 32). + -define(wxTE_READONLY, 16). +--define(wxTE_AUTO_SCROLL, 8). ++-define(wxTE_AUTO_SCROLL, 0). + -define(wxTE_NO_VSCROLL, 2). +--define(wxHAS_TEXT_WINDOW_STREAM, 0). ++-define(wxHAS_TEXT_WINDOW_STREAM, 1). + % From "textctrl.h": wxTextAttrAlignment + -define(wxTEXT_ALIGNMENT_DEFAULT, 0). + -define(wxTEXT_ALIGNMENT_LEFT, 1). +@@ -3986,7 +3986,7 @@ + -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)). + -define(wxRESIZE_BORDER, 64). + -define(wxTINY_CAPTION_VERT, 128). +--define(wxTINY_CAPTION_HORIZ, 256). ++-define(wxTINY_CAPTION_HORIZ, 128). + -define(wxMAXIMIZE_BOX, 512). + -define(wxMINIMIZE_BOX, 1024). + -define(wxSYSTEM_MENU, 2048).