* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2016-08-30 14:54 Göktürk Yüksek
0 siblings, 0 replies; 12+ messages in thread
From: Göktürk Yüksek @ 2016-08-30 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 15145b740033975edb49e646ec73d4df5dfcf851
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Aug 6 14:47:39 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 14:53:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15145b74
dev-lang/erlang: remove unused patches
Acked-By: Dirkjan Ochtman <djc <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/2161
dev-lang/erlang/files/16.2-tinfo.patch | 11 -----
dev-lang/erlang/files/17.0-systemd.patch | 85 --------------------------------
2 files changed, 96 deletions(-)
diff --git a/dev-lang/erlang/files/16.2-tinfo.patch b/dev-lang/erlang/files/16.2-tinfo.patch
deleted file mode 100644
index f51ba58..00000000
--- a/dev-lang/erlang/files/16.2-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/configure.in.bak 2013-11-04 14:47:47.838188678 +0100
-+++ erts/configure.in 2013-11-04 14:46:54.352439671 +0100
-@@ -1322,7 +1322,7 @@
- if test "x$with_termcap" != "xno" &&
- test "X$host" != "Xwin32"; then
- # try these libs
-- termcap_libs="ncurses curses termcap termlib"
-+ termcap_libs="tinfo ncurses curses termcap termlib"
-
- for termcap_lib in $termcap_libs; do
- AC_CHECK_LIB($termcap_lib, tgetent, TERMCAP_LIB="-l$termcap_lib")
diff --git a/dev-lang/erlang/files/17.0-systemd.patch b/dev-lang/erlang/files/17.0-systemd.patch
deleted file mode 100644
index 2dba8c8..00000000
--- a/dev-lang/erlang/files/17.0-systemd.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- erts/configure.in 2014-05-08 10:07:18.691087332 +0200
-+++ erts/configure.in 2014-05-08 10:12:56.579375822 +0200
-@@ -366,6 +366,11 @@
- $with_assumed_cache_line_size,
- [Assumed cache-line size (in bytes)])
-
-+AC_ARG_ENABLE(systemd,
-+AS_HELP_STRING([--enable-systemd], [enable systemd support in epmd]),
-+[],
-+[enable_systemd=no])
-+
- dnl Magic test for clearcase.
- OTP_RELEASE=
- if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then
-@@ -1042,8 +1047,6 @@
- AC_CHECK_LIB(inet, main)
- AC_CHECK_LIB(util, openpty)
-
--AC_CHECK_LIB(systemd-daemon, sd_listen_fds)
--
- dnl Try to find a thread library.
- dnl
- dnl ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS, ETHR_THR_LIB_BASE and ETHR_DEFS
-@@ -1679,7 +1682,29 @@
- #endif
- ])
-
--AC_CHECK_HEADERS(systemd/sd-daemon.h)
-+dnl ----------------------------------------------------------------------
-+dnl Check the availability of systemd
-+dnl ----------------------------------------------------------------------
-+if test x"$enable_systemd" != x"no"; then
-+
-+systemd_daemon_save_LIBS=$LIBS
-+LIBS=
-+AC_SEARCH_LIBS(sd_listen_fds,[systemd systemd-daemon],
-+ [have_sd_listen_fds=yes],[have_sd_listen_fds=no],$systemd_daemon_save_LIBS)
-+AC_CHECK_HEADERS(systemd/sd-daemon.h,
-+ [have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no])
-+
-+if test x"$have_sd_listen_fds" = x"yes" && \
-+ test x"$have_systemd_sd_daemon_h" = x"yes"; then
-+ AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon])
-+ SYSTEMD_DAEMON_LIBS=$LIBS
-+elif test x"$enable_systemd" = x"yes"; then
-+ AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed])
-+fi
-+LIBS=$systemd_daemon_save_LIBS
-+fi
-+AC_SUBST(SYSTEMD_DAEMON_LIBS)
-+
-
- dnl ----------------------------------------------------------------------
- dnl Check the availability for libdlpi
---- erts/epmd/src/Makefile.in 2014-05-08 10:07:58.344182314 +0200
-+++ erts/epmd/src/Makefile.in 2014-05-08 10:12:56.580375784 +0200
-@@ -84,7 +84,7 @@
- ifeq ($(findstring ose,$(TARGET)),ose)
- LIBS = $(ERTS_INTERNAL_LIBS) @LIBS@
- else
--LIBS = @LIBS@ $(ERTS_INTERNAL_LIBS)
-+LIBS = @LIBS@ @SYSTEMD_DAEMON_LIBS@ $(ERTS_INTERNAL_LIBS)
- endif
- LDFLAGS = @LDFLAGS@
-
---- erts/epmd/src/epmd_srv.c 2014-05-08 10:07:49.137392770 +0200
-+++ erts/epmd/src/epmd_srv.c 2014-05-08 10:12:39.777759407 +0200
-@@ -213,7 +213,7 @@
- node_init(g);
- g->conn = conn_init(g);
-
--#ifdef HAVE_SYSTEMD_SD_DAEMON_H
-+#ifdef HAVE_SYSTEMD_DAEMON
- if (g->is_systemd)
- {
- int n;
-@@ -310,7 +310,7 @@
- SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport);
- num_sockets = 1;
- }
--#ifdef HAVE_SYSTEMD_SD_DAEMON_H
-+#ifdef HAVE_SYSTEMD_DAEMON
- }
- #endif
-
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2017-09-02 14:46 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2017-09-02 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 288df621e4c446a7c9b7b98d1951e433e38bd7e8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Aug 19 13:02:00 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:46:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288df621
dev-lang/erlang: remove unused patch
dev-lang/erlang/files/erlang-18.0-wx3.0.patch | 531 --------------------------
1 file changed, 531 deletions(-)
diff --git a/dev-lang/erlang/files/erlang-18.0-wx3.0.patch b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch
deleted file mode 100644
index 0537134f305..00000000000
--- a/dev-lang/erlang/files/erlang-18.0-wx3.0.patch
+++ /dev/null
@@ -1,531 +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 <olly@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).
-@@ -2036,212 +2036,212 @@
- -define(wxLANGUAGE_ARABIC_YEMEN, 24).
- -define(wxLANGUAGE_ARMENIAN, 25).
- -define(wxLANGUAGE_ASSAMESE, 26).
---define(wxLANGUAGE_AYMARA, 27).
---define(wxLANGUAGE_AZERI, 28).
---define(wxLANGUAGE_AZERI_CYRILLIC, 29).
---define(wxLANGUAGE_AZERI_LATIN, 30).
---define(wxLANGUAGE_BASHKIR, 31).
---define(wxLANGUAGE_BASQUE, 32).
---define(wxLANGUAGE_BELARUSIAN, 33).
---define(wxLANGUAGE_BENGALI, 34).
---define(wxLANGUAGE_BHUTANI, 35).
---define(wxLANGUAGE_BIHARI, 36).
---define(wxLANGUAGE_BISLAMA, 37).
---define(wxLANGUAGE_BRETON, 38).
---define(wxLANGUAGE_BULGARIAN, 39).
---define(wxLANGUAGE_BURMESE, 40).
---define(wxLANGUAGE_CAMBODIAN, 41).
---define(wxLANGUAGE_CATALAN, 42).
---define(wxLANGUAGE_CHINESE, 43).
---define(wxLANGUAGE_CHINESE_SIMPLIFIED, 44).
---define(wxLANGUAGE_CHINESE_TRADITIONAL, 45).
---define(wxLANGUAGE_CHINESE_HONGKONG, 46).
---define(wxLANGUAGE_CHINESE_MACAU, 47).
---define(wxLANGUAGE_CHINESE_SINGAPORE, 48).
---define(wxLANGUAGE_CHINESE_TAIWAN, 49).
---define(wxLANGUAGE_CORSICAN, 50).
---define(wxLANGUAGE_CROATIAN, 51).
---define(wxLANGUAGE_CZECH, 52).
---define(wxLANGUAGE_DANISH, 53).
---define(wxLANGUAGE_DUTCH, 54).
---define(wxLANGUAGE_DUTCH_BELGIAN, 55).
---define(wxLANGUAGE_ENGLISH, 56).
---define(wxLANGUAGE_ENGLISH_UK, 57).
---define(wxLANGUAGE_ENGLISH_US, 58).
---define(wxLANGUAGE_ENGLISH_AUSTRALIA, 59).
---define(wxLANGUAGE_ENGLISH_BELIZE, 60).
---define(wxLANGUAGE_ENGLISH_BOTSWANA, 61).
---define(wxLANGUAGE_ENGLISH_CANADA, 62).
---define(wxLANGUAGE_ENGLISH_CARIBBEAN, 63).
---define(wxLANGUAGE_ENGLISH_DENMARK, 64).
---define(wxLANGUAGE_ENGLISH_EIRE, 65).
---define(wxLANGUAGE_ENGLISH_JAMAICA, 66).
---define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 67).
---define(wxLANGUAGE_ENGLISH_PHILIPPINES, 68).
---define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 69).
---define(wxLANGUAGE_ENGLISH_TRINIDAD, 70).
---define(wxLANGUAGE_ENGLISH_ZIMBABWE, 71).
---define(wxLANGUAGE_ESPERANTO, 72).
---define(wxLANGUAGE_ESTONIAN, 73).
---define(wxLANGUAGE_FAEROESE, 74).
---define(wxLANGUAGE_FARSI, 75).
---define(wxLANGUAGE_FIJI, 76).
---define(wxLANGUAGE_FINNISH, 77).
---define(wxLANGUAGE_FRENCH, 78).
---define(wxLANGUAGE_FRENCH_BELGIAN, 79).
---define(wxLANGUAGE_FRENCH_CANADIAN, 80).
---define(wxLANGUAGE_FRENCH_LUXEMBOURG, 81).
---define(wxLANGUAGE_FRENCH_MONACO, 82).
---define(wxLANGUAGE_FRENCH_SWISS, 83).
---define(wxLANGUAGE_FRISIAN, 84).
---define(wxLANGUAGE_GALICIAN, 85).
---define(wxLANGUAGE_GEORGIAN, 86).
---define(wxLANGUAGE_GERMAN, 87).
---define(wxLANGUAGE_GERMAN_AUSTRIAN, 88).
---define(wxLANGUAGE_GERMAN_BELGIUM, 89).
---define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 90).
---define(wxLANGUAGE_GERMAN_LUXEMBOURG, 91).
---define(wxLANGUAGE_GERMAN_SWISS, 92).
---define(wxLANGUAGE_GREEK, 93).
---define(wxLANGUAGE_GREENLANDIC, 94).
---define(wxLANGUAGE_GUARANI, 95).
---define(wxLANGUAGE_GUJARATI, 96).
---define(wxLANGUAGE_HAUSA, 97).
---define(wxLANGUAGE_HEBREW, 98).
---define(wxLANGUAGE_HINDI, 99).
---define(wxLANGUAGE_HUNGARIAN, 100).
---define(wxLANGUAGE_ICELANDIC, 101).
---define(wxLANGUAGE_INDONESIAN, 102).
---define(wxLANGUAGE_INTERLINGUA, 103).
---define(wxLANGUAGE_INTERLINGUE, 104).
---define(wxLANGUAGE_INUKTITUT, 105).
---define(wxLANGUAGE_INUPIAK, 106).
---define(wxLANGUAGE_IRISH, 107).
---define(wxLANGUAGE_ITALIAN, 108).
---define(wxLANGUAGE_ITALIAN_SWISS, 109).
---define(wxLANGUAGE_JAPANESE, 110).
---define(wxLANGUAGE_JAVANESE, 111).
---define(wxLANGUAGE_KANNADA, 112).
---define(wxLANGUAGE_KASHMIRI, 113).
---define(wxLANGUAGE_KASHMIRI_INDIA, 114).
---define(wxLANGUAGE_KAZAKH, 115).
---define(wxLANGUAGE_KERNEWEK, 116).
---define(wxLANGUAGE_KINYARWANDA, 117).
---define(wxLANGUAGE_KIRGHIZ, 118).
---define(wxLANGUAGE_KIRUNDI, 119).
---define(wxLANGUAGE_KONKANI, 120).
---define(wxLANGUAGE_KOREAN, 121).
---define(wxLANGUAGE_KURDISH, 122).
---define(wxLANGUAGE_LAOTHIAN, 123).
---define(wxLANGUAGE_LATIN, 124).
---define(wxLANGUAGE_LATVIAN, 125).
---define(wxLANGUAGE_LINGALA, 126).
---define(wxLANGUAGE_LITHUANIAN, 127).
---define(wxLANGUAGE_MACEDONIAN, 128).
---define(wxLANGUAGE_MALAGASY, 129).
---define(wxLANGUAGE_MALAY, 130).
---define(wxLANGUAGE_MALAYALAM, 131).
---define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 132).
---define(wxLANGUAGE_MALAY_MALAYSIA, 133).
---define(wxLANGUAGE_MALTESE, 134).
---define(wxLANGUAGE_MANIPURI, 135).
---define(wxLANGUAGE_MAORI, 136).
---define(wxLANGUAGE_MARATHI, 137).
---define(wxLANGUAGE_MOLDAVIAN, 138).
---define(wxLANGUAGE_MONGOLIAN, 139).
---define(wxLANGUAGE_NAURU, 140).
---define(wxLANGUAGE_NEPALI, 141).
---define(wxLANGUAGE_NEPALI_INDIA, 142).
---define(wxLANGUAGE_NORWEGIAN_BOKMAL, 143).
---define(wxLANGUAGE_NORWEGIAN_NYNORSK, 144).
---define(wxLANGUAGE_OCCITAN, 145).
---define(wxLANGUAGE_ORIYA, 146).
---define(wxLANGUAGE_OROMO, 147).
---define(wxLANGUAGE_PASHTO, 148).
---define(wxLANGUAGE_POLISH, 149).
---define(wxLANGUAGE_PORTUGUESE, 150).
---define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 151).
---define(wxLANGUAGE_PUNJABI, 152).
---define(wxLANGUAGE_QUECHUA, 153).
---define(wxLANGUAGE_RHAETO_ROMANCE, 154).
---define(wxLANGUAGE_ROMANIAN, 155).
---define(wxLANGUAGE_RUSSIAN, 156).
---define(wxLANGUAGE_RUSSIAN_UKRAINE, 157).
---define(wxLANGUAGE_SAMOAN, 158).
---define(wxLANGUAGE_SANGHO, 159).
---define(wxLANGUAGE_SANSKRIT, 160).
---define(wxLANGUAGE_SCOTS_GAELIC, 161).
---define(wxLANGUAGE_SERBIAN, 162).
---define(wxLANGUAGE_SERBIAN_CYRILLIC, 163).
---define(wxLANGUAGE_SERBIAN_LATIN, 164).
---define(wxLANGUAGE_SERBO_CROATIAN, 165).
---define(wxLANGUAGE_SESOTHO, 166).
---define(wxLANGUAGE_SETSWANA, 167).
---define(wxLANGUAGE_SHONA, 168).
---define(wxLANGUAGE_SINDHI, 169).
---define(wxLANGUAGE_SINHALESE, 170).
---define(wxLANGUAGE_SISWATI, 171).
---define(wxLANGUAGE_SLOVAK, 172).
---define(wxLANGUAGE_SLOVENIAN, 173).
---define(wxLANGUAGE_SOMALI, 174).
---define(wxLANGUAGE_SPANISH, 175).
---define(wxLANGUAGE_SPANISH_ARGENTINA, 176).
---define(wxLANGUAGE_SPANISH_BOLIVIA, 177).
---define(wxLANGUAGE_SPANISH_CHILE, 178).
---define(wxLANGUAGE_SPANISH_COLOMBIA, 179).
---define(wxLANGUAGE_SPANISH_COSTA_RICA, 180).
---define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 181).
---define(wxLANGUAGE_SPANISH_ECUADOR, 182).
---define(wxLANGUAGE_SPANISH_EL_SALVADOR, 183).
---define(wxLANGUAGE_SPANISH_GUATEMALA, 184).
---define(wxLANGUAGE_SPANISH_HONDURAS, 185).
---define(wxLANGUAGE_SPANISH_MEXICAN, 186).
---define(wxLANGUAGE_SPANISH_MODERN, 187).
---define(wxLANGUAGE_SPANISH_NICARAGUA, 188).
---define(wxLANGUAGE_SPANISH_PANAMA, 189).
---define(wxLANGUAGE_SPANISH_PARAGUAY, 190).
---define(wxLANGUAGE_SPANISH_PERU, 191).
---define(wxLANGUAGE_SPANISH_PUERTO_RICO, 192).
---define(wxLANGUAGE_SPANISH_URUGUAY, 193).
---define(wxLANGUAGE_SPANISH_US, 194).
---define(wxLANGUAGE_SPANISH_VENEZUELA, 195).
---define(wxLANGUAGE_SUNDANESE, 196).
---define(wxLANGUAGE_SWAHILI, 197).
---define(wxLANGUAGE_SWEDISH, 198).
---define(wxLANGUAGE_SWEDISH_FINLAND, 199).
---define(wxLANGUAGE_TAGALOG, 200).
---define(wxLANGUAGE_TAJIK, 201).
---define(wxLANGUAGE_TAMIL, 202).
---define(wxLANGUAGE_TATAR, 203).
---define(wxLANGUAGE_TELUGU, 204).
---define(wxLANGUAGE_THAI, 205).
---define(wxLANGUAGE_TIBETAN, 206).
---define(wxLANGUAGE_TIGRINYA, 207).
---define(wxLANGUAGE_TONGA, 208).
---define(wxLANGUAGE_TSONGA, 209).
---define(wxLANGUAGE_TURKISH, 210).
---define(wxLANGUAGE_TURKMEN, 211).
---define(wxLANGUAGE_TWI, 212).
---define(wxLANGUAGE_UIGHUR, 213).
---define(wxLANGUAGE_UKRAINIAN, 214).
---define(wxLANGUAGE_URDU, 215).
---define(wxLANGUAGE_URDU_INDIA, 216).
---define(wxLANGUAGE_URDU_PAKISTAN, 217).
---define(wxLANGUAGE_UZBEK, 218).
---define(wxLANGUAGE_UZBEK_CYRILLIC, 219).
---define(wxLANGUAGE_UZBEK_LATIN, 220).
---define(wxLANGUAGE_VIETNAMESE, 221).
---define(wxLANGUAGE_VOLAPUK, 222).
---define(wxLANGUAGE_WELSH, 223).
---define(wxLANGUAGE_WOLOF, 224).
---define(wxLANGUAGE_XHOSA, 225).
---define(wxLANGUAGE_YIDDISH, 226).
---define(wxLANGUAGE_YORUBA, 227).
---define(wxLANGUAGE_ZHUANG, 228).
---define(wxLANGUAGE_ZULU, 229).
-+-define(wxLANGUAGE_AYMARA, 28).
-+-define(wxLANGUAGE_AZERI, 29).
-+-define(wxLANGUAGE_AZERI_CYRILLIC, 30).
-+-define(wxLANGUAGE_AZERI_LATIN, 31).
-+-define(wxLANGUAGE_BASHKIR, 32).
-+-define(wxLANGUAGE_BASQUE, 33).
-+-define(wxLANGUAGE_BELARUSIAN, 34).
-+-define(wxLANGUAGE_BENGALI, 35).
-+-define(wxLANGUAGE_BHUTANI, 36).
-+-define(wxLANGUAGE_BIHARI, 37).
-+-define(wxLANGUAGE_BISLAMA, 38).
-+-define(wxLANGUAGE_BRETON, 40).
-+-define(wxLANGUAGE_BULGARIAN, 41).
-+-define(wxLANGUAGE_BURMESE, 42).
-+-define(wxLANGUAGE_CAMBODIAN, 43).
-+-define(wxLANGUAGE_CATALAN, 44).
-+-define(wxLANGUAGE_CHINESE, 45).
-+-define(wxLANGUAGE_CHINESE_SIMPLIFIED, 46).
-+-define(wxLANGUAGE_CHINESE_TRADITIONAL, 47).
-+-define(wxLANGUAGE_CHINESE_HONGKONG, 48).
-+-define(wxLANGUAGE_CHINESE_MACAU, 49).
-+-define(wxLANGUAGE_CHINESE_SINGAPORE, 50).
-+-define(wxLANGUAGE_CHINESE_TAIWAN, 51).
-+-define(wxLANGUAGE_CORSICAN, 52).
-+-define(wxLANGUAGE_CROATIAN, 53).
-+-define(wxLANGUAGE_CZECH, 54).
-+-define(wxLANGUAGE_DANISH, 55).
-+-define(wxLANGUAGE_DUTCH, 56).
-+-define(wxLANGUAGE_DUTCH_BELGIAN, 57).
-+-define(wxLANGUAGE_ENGLISH, 58).
-+-define(wxLANGUAGE_ENGLISH_UK, 59).
-+-define(wxLANGUAGE_ENGLISH_US, 60).
-+-define(wxLANGUAGE_ENGLISH_AUSTRALIA, 61).
-+-define(wxLANGUAGE_ENGLISH_BELIZE, 62).
-+-define(wxLANGUAGE_ENGLISH_BOTSWANA, 63).
-+-define(wxLANGUAGE_ENGLISH_CANADA, 64).
-+-define(wxLANGUAGE_ENGLISH_CARIBBEAN, 65).
-+-define(wxLANGUAGE_ENGLISH_DENMARK, 66).
-+-define(wxLANGUAGE_ENGLISH_EIRE, 67).
-+-define(wxLANGUAGE_ENGLISH_JAMAICA, 68).
-+-define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 69).
-+-define(wxLANGUAGE_ENGLISH_PHILIPPINES, 70).
-+-define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 71).
-+-define(wxLANGUAGE_ENGLISH_TRINIDAD, 72).
-+-define(wxLANGUAGE_ENGLISH_ZIMBABWE, 73).
-+-define(wxLANGUAGE_ESPERANTO, 74).
-+-define(wxLANGUAGE_ESTONIAN, 75).
-+-define(wxLANGUAGE_FAEROESE, 76).
-+-define(wxLANGUAGE_FARSI, 77).
-+-define(wxLANGUAGE_FIJI, 78).
-+-define(wxLANGUAGE_FINNISH, 79).
-+-define(wxLANGUAGE_FRENCH, 80).
-+-define(wxLANGUAGE_FRENCH_BELGIAN, 81).
-+-define(wxLANGUAGE_FRENCH_CANADIAN, 82).
-+-define(wxLANGUAGE_FRENCH_LUXEMBOURG, 83).
-+-define(wxLANGUAGE_FRENCH_MONACO, 84).
-+-define(wxLANGUAGE_FRENCH_SWISS, 85).
-+-define(wxLANGUAGE_FRISIAN, 86).
-+-define(wxLANGUAGE_GALICIAN, 87).
-+-define(wxLANGUAGE_GEORGIAN, 88).
-+-define(wxLANGUAGE_GERMAN, 89).
-+-define(wxLANGUAGE_GERMAN_AUSTRIAN, 90).
-+-define(wxLANGUAGE_GERMAN_BELGIUM, 91).
-+-define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 92).
-+-define(wxLANGUAGE_GERMAN_LUXEMBOURG, 93).
-+-define(wxLANGUAGE_GERMAN_SWISS, 94).
-+-define(wxLANGUAGE_GREEK, 95).
-+-define(wxLANGUAGE_GREENLANDIC, 96).
-+-define(wxLANGUAGE_GUARANI, 97).
-+-define(wxLANGUAGE_GUJARATI, 98).
-+-define(wxLANGUAGE_HAUSA, 99).
-+-define(wxLANGUAGE_HEBREW, 100).
-+-define(wxLANGUAGE_HINDI, 101).
-+-define(wxLANGUAGE_HUNGARIAN, 102).
-+-define(wxLANGUAGE_ICELANDIC, 103).
-+-define(wxLANGUAGE_INDONESIAN, 104).
-+-define(wxLANGUAGE_INTERLINGUA, 105).
-+-define(wxLANGUAGE_INTERLINGUE, 106).
-+-define(wxLANGUAGE_INUKTITUT, 107).
-+-define(wxLANGUAGE_INUPIAK, 108).
-+-define(wxLANGUAGE_IRISH, 109).
-+-define(wxLANGUAGE_ITALIAN, 110).
-+-define(wxLANGUAGE_ITALIAN_SWISS, 111).
-+-define(wxLANGUAGE_JAPANESE, 112).
-+-define(wxLANGUAGE_JAVANESE, 113).
-+-define(wxLANGUAGE_KANNADA, 114).
-+-define(wxLANGUAGE_KASHMIRI, 115).
-+-define(wxLANGUAGE_KASHMIRI_INDIA, 116).
-+-define(wxLANGUAGE_KAZAKH, 117).
-+-define(wxLANGUAGE_KERNEWEK, 118).
-+-define(wxLANGUAGE_KINYARWANDA, 119).
-+-define(wxLANGUAGE_KIRGHIZ, 120).
-+-define(wxLANGUAGE_KIRUNDI, 121).
-+-define(wxLANGUAGE_KONKANI, 122).
-+-define(wxLANGUAGE_KOREAN, 123).
-+-define(wxLANGUAGE_KURDISH, 124).
-+-define(wxLANGUAGE_LAOTHIAN, 125).
-+-define(wxLANGUAGE_LATIN, 126).
-+-define(wxLANGUAGE_LATVIAN, 127).
-+-define(wxLANGUAGE_LINGALA, 128).
-+-define(wxLANGUAGE_LITHUANIAN, 129).
-+-define(wxLANGUAGE_MACEDONIAN, 130).
-+-define(wxLANGUAGE_MALAGASY, 131).
-+-define(wxLANGUAGE_MALAY, 132).
-+-define(wxLANGUAGE_MALAYALAM, 133).
-+-define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 134).
-+-define(wxLANGUAGE_MALAY_MALAYSIA, 135).
-+-define(wxLANGUAGE_MALTESE, 136).
-+-define(wxLANGUAGE_MANIPURI, 137).
-+-define(wxLANGUAGE_MAORI, 138).
-+-define(wxLANGUAGE_MARATHI, 139).
-+-define(wxLANGUAGE_MOLDAVIAN, 140).
-+-define(wxLANGUAGE_MONGOLIAN, 141).
-+-define(wxLANGUAGE_NAURU, 142).
-+-define(wxLANGUAGE_NEPALI, 143).
-+-define(wxLANGUAGE_NEPALI_INDIA, 144).
-+-define(wxLANGUAGE_NORWEGIAN_BOKMAL, 145).
-+-define(wxLANGUAGE_NORWEGIAN_NYNORSK, 146).
-+-define(wxLANGUAGE_OCCITAN, 147).
-+-define(wxLANGUAGE_ORIYA, 148).
-+-define(wxLANGUAGE_OROMO, 149).
-+-define(wxLANGUAGE_PASHTO, 150).
-+-define(wxLANGUAGE_POLISH, 151).
-+-define(wxLANGUAGE_PORTUGUESE, 152).
-+-define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 153).
-+-define(wxLANGUAGE_PUNJABI, 154).
-+-define(wxLANGUAGE_QUECHUA, 155).
-+-define(wxLANGUAGE_RHAETO_ROMANCE, 156).
-+-define(wxLANGUAGE_ROMANIAN, 157).
-+-define(wxLANGUAGE_RUSSIAN, 158).
-+-define(wxLANGUAGE_RUSSIAN_UKRAINE, 159).
-+-define(wxLANGUAGE_SAMOAN, 161).
-+-define(wxLANGUAGE_SANGHO, 162).
-+-define(wxLANGUAGE_SANSKRIT, 163).
-+-define(wxLANGUAGE_SCOTS_GAELIC, 164).
-+-define(wxLANGUAGE_SERBIAN, 165).
-+-define(wxLANGUAGE_SERBIAN_CYRILLIC, 166).
-+-define(wxLANGUAGE_SERBIAN_LATIN, 167).
-+-define(wxLANGUAGE_SERBO_CROATIAN, 168).
-+-define(wxLANGUAGE_SESOTHO, 169).
-+-define(wxLANGUAGE_SETSWANA, 170).
-+-define(wxLANGUAGE_SHONA, 171).
-+-define(wxLANGUAGE_SINDHI, 172).
-+-define(wxLANGUAGE_SINHALESE, 173).
-+-define(wxLANGUAGE_SISWATI, 174).
-+-define(wxLANGUAGE_SLOVAK, 175).
-+-define(wxLANGUAGE_SLOVENIAN, 176).
-+-define(wxLANGUAGE_SOMALI, 177).
-+-define(wxLANGUAGE_SPANISH, 178).
-+-define(wxLANGUAGE_SPANISH_ARGENTINA, 179).
-+-define(wxLANGUAGE_SPANISH_BOLIVIA, 180).
-+-define(wxLANGUAGE_SPANISH_CHILE, 181).
-+-define(wxLANGUAGE_SPANISH_COLOMBIA, 182).
-+-define(wxLANGUAGE_SPANISH_COSTA_RICA, 183).
-+-define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 184).
-+-define(wxLANGUAGE_SPANISH_ECUADOR, 185).
-+-define(wxLANGUAGE_SPANISH_EL_SALVADOR, 186).
-+-define(wxLANGUAGE_SPANISH_GUATEMALA, 187).
-+-define(wxLANGUAGE_SPANISH_HONDURAS, 188).
-+-define(wxLANGUAGE_SPANISH_MEXICAN, 189).
-+-define(wxLANGUAGE_SPANISH_MODERN, 190).
-+-define(wxLANGUAGE_SPANISH_NICARAGUA, 191).
-+-define(wxLANGUAGE_SPANISH_PANAMA, 192).
-+-define(wxLANGUAGE_SPANISH_PARAGUAY, 193).
-+-define(wxLANGUAGE_SPANISH_PERU, 194).
-+-define(wxLANGUAGE_SPANISH_PUERTO_RICO, 195).
-+-define(wxLANGUAGE_SPANISH_URUGUAY, 196).
-+-define(wxLANGUAGE_SPANISH_US, 197).
-+-define(wxLANGUAGE_SPANISH_VENEZUELA, 198).
-+-define(wxLANGUAGE_SUNDANESE, 199).
-+-define(wxLANGUAGE_SWAHILI, 200).
-+-define(wxLANGUAGE_SWEDISH, 201).
-+-define(wxLANGUAGE_SWEDISH_FINLAND, 202).
-+-define(wxLANGUAGE_TAGALOG, 203).
-+-define(wxLANGUAGE_TAJIK, 204).
-+-define(wxLANGUAGE_TAMIL, 205).
-+-define(wxLANGUAGE_TATAR, 206).
-+-define(wxLANGUAGE_TELUGU, 207).
-+-define(wxLANGUAGE_THAI, 208).
-+-define(wxLANGUAGE_TIBETAN, 209).
-+-define(wxLANGUAGE_TIGRINYA, 210).
-+-define(wxLANGUAGE_TONGA, 211).
-+-define(wxLANGUAGE_TSONGA, 212).
-+-define(wxLANGUAGE_TURKISH, 213).
-+-define(wxLANGUAGE_TURKMEN, 214).
-+-define(wxLANGUAGE_TWI, 215).
-+-define(wxLANGUAGE_UIGHUR, 216).
-+-define(wxLANGUAGE_UKRAINIAN, 217).
-+-define(wxLANGUAGE_URDU, 218).
-+-define(wxLANGUAGE_URDU_INDIA, 219).
-+-define(wxLANGUAGE_URDU_PAKISTAN, 220).
-+-define(wxLANGUAGE_UZBEK, 221).
-+-define(wxLANGUAGE_UZBEK_CYRILLIC, 222).
-+-define(wxLANGUAGE_UZBEK_LATIN, 223).
-+-define(wxLANGUAGE_VIETNAMESE, 225).
-+-define(wxLANGUAGE_VOLAPUK, 226).
-+-define(wxLANGUAGE_WELSH, 227).
-+-define(wxLANGUAGE_WOLOF, 228).
-+-define(wxLANGUAGE_XHOSA, 229).
-+-define(wxLANGUAGE_YIDDISH, 230).
-+-define(wxLANGUAGE_YORUBA, 231).
-+-define(wxLANGUAGE_ZHUANG, 232).
-+-define(wxLANGUAGE_ZULU, 233).
- -define(wxLANGUAGE_USER_DEFINED, 230).
---define(wxLANGUAGE_VALENCIAN, 536870911).
---define(wxLANGUAGE_SAMI, 536870912).
-+-define(wxLANGUAGE_VALENCIAN, 224).
-+-define(wxLANGUAGE_SAMI, 160).
- % From "intl.h": wxLayoutDirection
- -define(wxLayout_Default, 0).
- -define(wxLayout_LeftToRight, 1).
-@@ -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).
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2019-06-17 20:08 Ulrich Müller
0 siblings, 0 replies; 12+ messages in thread
From: Ulrich Müller @ 2019-06-17 20:08 UTC (permalink / raw
To: gentoo-commits
commit: a786c821d962fb985444add36def40029e7faffb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 20:06:05 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 20:07:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a786c821
dev-lang/erlang: Init script relicensed to Apache-2.0.
Acked-by: Steve Arnold <nerdboy <AT> gentoo.org>
Closes: https://bugs.gentoo.org/425928
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-lang/erlang/files/epmd.init | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init
index f0ef7c22416..4b58bd74682 100644
--- a/dev-lang/erlang/files/epmd.init
+++ b/dev-lang/erlang/files/epmd.init
@@ -1,6 +1,6 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the Erlang Public License 1.1
+# Copyright 2010-2018 Gentoo Authors
+# Distributed under the terms of the Apache License, Version 2.0
ZT_ADDRESS=""
pidfile="/var/run/epmd.pid"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2019-07-17 22:04 Zac Medico
0 siblings, 0 replies; 12+ messages in thread
From: Zac Medico @ 2019-07-17 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 4a9591ec984ee18a695479f0c8b058ade20d7e01
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 22:00:38 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 22:04:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9591ec
dev-lang/erlang: make epmd.init need net.lo for >=openrc-0.41.2
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
dev-lang/erlang/files/epmd.init | 4 ++--
dev-lang/erlang/files/epmd.init-r1 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init
index 4b58bd74682..92318d051bf 100644
--- a/dev-lang/erlang/files/epmd.init
+++ b/dev-lang/erlang/files/epmd.init
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 2010-2018 Gentoo Authors
+# Copyright 2010-2019 Gentoo Authors
# Distributed under the terms of the Apache License, Version 2.0
ZT_ADDRESS=""
@@ -7,7 +7,7 @@ pidfile="/var/run/epmd.pid"
command_args="-daemon -relaxed_command_check -address 127.0.0.1"
depend() {
- need loopback
+ need net.lo
before sshd
}
diff --git a/dev-lang/erlang/files/epmd.init-r1 b/dev-lang/erlang/files/epmd.init-r1
index bdd441b997a..eb387a72958 100644
--- a/dev-lang/erlang/files/epmd.init-r1
+++ b/dev-lang/erlang/files/epmd.init-r1
@@ -1,11 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the Erlang Public License 1.1
pidfile="/var/run/epmd.pid"
depend() {
- need loopback
+ need net.lo
before sshd
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2019-09-18 12:44 Hans de Graaff
0 siblings, 0 replies; 12+ messages in thread
From: Hans de Graaff @ 2019-09-18 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 7c85aa7d1c3268ed8a0f7e28ca5c81ff0a7a0d64
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 12:28:16 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 12:28:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c85aa7d
dev-lang/erlang: fix epmd conf.d default args
All epmd options start with a single dash. Use -daemon instead of
--daemon.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
dev-lang/erlang/files/epmd.confd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/erlang/files/epmd.confd b/dev-lang/erlang/files/epmd.confd
index aa4dc3eb5ae..ea1deab6e27 100644
--- a/dev-lang/erlang/files/epmd.confd
+++ b/dev-lang/erlang/files/epmd.confd
@@ -1,2 +1,2 @@
#arguments for run erlang
-command_args="--daemon -relaxed_command_check -address 127.0.0.1"
+command_args="-daemon -relaxed_command_check -address 127.0.0.1"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2020-04-18 21:31 Sergei Trofimovich
0 siblings, 0 replies; 12+ messages in thread
From: Sergei Trofimovich @ 2020-04-18 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 595710bc1ebc502662ba2e8e0acc6991b5f6dc03
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 18 16:51:31 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 21:31:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595710bc
dev-lang/erlang: remove unused file
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15393
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-lang/erlang/files/epmd.confd-r1 | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-lang/erlang/files/epmd.confd-r1 b/dev-lang/erlang/files/epmd.confd-r1
deleted file mode 100644
index 3f6006e643c..00000000000
--- a/dev-lang/erlang/files/epmd.confd-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-#arguments for run erlang
-command_args="-relaxed_command_check -address 127.0.0.1"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2020-05-26 22:56 Sergei Trofimovich
0 siblings, 0 replies; 12+ messages in thread
From: Sergei Trofimovich @ 2020-05-26 22:56 UTC (permalink / raw
To: gentoo-commits
commit: c3ff582e41ebfc0a23d6a3042f2aded4db02a186
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 26 18:06:30 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 26 22:56:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ff582e
dev-lang/erlang: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15976
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch | 15 --------
dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch | 45 ----------------------
2 files changed, 60 deletions(-)
diff --git a/dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch b/dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch
deleted file mode 100644
index 84c9b81ad77..00000000000
--- a/dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/705500
-https://github.com/erlang/otp/pull/2508
-
---- a/lib/asn1/src/Makefile
-+++ b/lib/asn1/src/Makefile
-@@ -190,7 +190,8 @@ asn1rtt_%.$(EMULATOR): asn1rtt_%.erl
- $(V_ERLC) +debug_info $<
-
- $(EVAL_CT_MODULES:%=%.erl): prepare_templates.$(EMULATOR) \
-- $(EBIN)/asn1ct_rtt.$(EMULATOR)
-+ $(EBIN)/asn1ct_rtt.$(EMULATOR) \
-+ $(EBIN)/asn1ct_func.$(EMULATOR)
-
- #
- # Dependencies
diff --git a/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch b/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch
deleted file mode 100644
index 9a7d5939419..00000000000
--- a/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/erlang/otp/pull/2503
-
-From 9fad0c9b71808458e857cbd3871cf80f46a75af1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 14 Jan 2020 23:15:01 +0000
-Subject: [PATCH] ei_portio.h: avoid ODR violation of
- 'ei_default_socket_callbacks'
-
-Noticed as a build failure against fresh gcc-master:
-
-```
-LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call
-ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
-ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
-ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
-ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
-ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
-collect2: error: ld returned 1 exit status
-make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1
-```
-
-The failure looks legitimate: `ei_default_socket_callbacks` is a
-struct defined in 'ei_portio.h' and in 'ei_portio.c'.
-
-The change flips 'ei_portio.h' definition to declaration.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- lib/erl_interface/src/misc/ei_portio.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/erl_interface/src/misc/ei_portio.h
-+++ b/lib/erl_interface/src/misc/ei_portio.h
-@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov
- int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs);
- #endif
-
--ei_socket_callbacks ei_default_socket_callbacks;
-+extern ei_socket_callbacks ei_default_socket_callbacks;
-
- #define EI_FD_AS_CTX__(FD) \
- ((void *) (long) (FD))
---
-2.25.0
-
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2020-08-20 6:36 Sergei Trofimovich
0 siblings, 0 replies; 12+ messages in thread
From: Sergei Trofimovich @ 2020-08-20 6:36 UTC (permalink / raw
To: gentoo-commits
commit: ba67378034a0e8c36e0b6af7cbf9f63d3b82c5be
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 17:38:01 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 06:36:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba673780
dev-lang/erlang: remove unused patches
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17172
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/erlang-20.3.2-dont-ignore-LDFLAGS.patch | 42 ----------
...ang-add-epmd-pid-file-creation-for-openrc.patch | 90 ----------------------
dev-lang/erlang/files/erlang-custom-autoconf.patch | 14 ----
3 files changed, 146 deletions(-)
diff --git a/dev-lang/erlang/files/erlang-20.3.2-dont-ignore-LDFLAGS.patch b/dev-lang/erlang/files/erlang-20.3.2-dont-ignore-LDFLAGS.patch
deleted file mode 100644
index 32dd89e0d6c..00000000000
--- a/dev-lang/erlang/files/erlang-20.3.2-dont-ignore-LDFLAGS.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 69043168302ec7c0bcfaa8b1fb56bfae500bd139 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Sun, 8 Apr 2018 16:11:55 -0400
-Subject: [PATCH] Don't ignore LDFLAGS
-
-Bug: https://bugs.gentoo.org/263129
-
-Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
----
- lib/megaco/src/flex/Makefile.in | 2 +-
- lib/odbc/c_src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index c37ad4d702..400024ca0c 100644
---- a/lib/megaco/src/flex/Makefile.in
-+++ b/lib/megaco/src/flex/Makefile.in
-@@ -66,7 +66,7 @@ endif
- 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 --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index 784e73c47e..51c023f710 100644
---- a/lib/odbc/c_src/Makefile.in
-+++ b/lib/odbc/c_src/Makefile.in
-@@ -82,7 +82,7 @@ CC = @CC@
- 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@
---
-2.17.0
-
diff --git a/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch b/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch
deleted file mode 100644
index 56e3946c93f..00000000000
--- a/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 04ace92c33a699f75445dc99c30d521311aba826 Mon Sep 17 00:00:00 2001
-From: Steve Arnold <nerdboy@gentoo.org>
-Date: Mon, 6 Aug 2018 16:38:30 -0700
-Subject: [PATCH] Add daemon-mode pid file creation when not configured for
- systemd
-
-Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
----
- erts/epmd/src/epmd.c | 39 ++++++++++++++++++++++++++++++++++++++-
- erts/epmd/src/epmd.h | 3 +++
- 2 files changed, 41 insertions(+), 1 deletion(-)
-
-diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
-index 44e997e609..c74888a1ee 100644
---- a/erts/epmd/src/epmd.c
-+++ b/erts/epmd/src/epmd.c
-@@ -40,6 +40,37 @@ static int check_relaxed(void);
- #ifdef __WIN32__
- static int has_console(void);
- #endif
-+#ifndef HAVE_SYSTEMD_DAEMON
-+static int create_pidfile(void);
-+static const char *pidfile = EPMD_PIDFILE;
-+#endif
-+
-+#ifndef HAVE_SYSTEMD_DAEMON
-+static int create_pidfile(void)
-+{
-+ int fd;
-+
-+ unlink(pidfile);
-+
-+ /* open the pidfile */
-+ fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0644);
-+ if (fd >= 0) {
-+ FILE *f;
-+
-+ /* write our pid to it */
-+ f = fdopen(fd, "w");
-+ if (f != NULL) {
-+ fprintf(f, "%d\n", getpid());
-+ fclose(f);
-+ /* leave the fd open */
-+ return 0;
-+ }
-+ close(fd);
-+ }
-+
-+ return -1;
-+}
-+#endif /* (no) HAVE_SYSTEMD_DAEMON */
-
- #ifdef DONT_USE_MAIN
-
-@@ -340,6 +371,13 @@ static void run_daemon(EpmdVars *g)
-
- umask(0);
-
-+#ifndef HAVE_SYSTEMD_DAEMON
-+ if (create_pidfile() < 0) {
-+ dbg_perror(g,"could not create pidfile %s", pidfile);
-+ epmd_cleanup_exit(g,1);
-+ }
-+#endif /* HAVE_SYSTEMD_DAEMON */
-+
- for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */
- close(fd);
- /* Syslog on linux will try to write to whatever if we dont
-@@ -614,4 +652,3 @@ static int check_relaxed(void)
- char* port_str = getenv("ERL_EPMD_RELAXED_COMMAND_CHECK");
- return (port_str != NULL) ? 1 : 0;
- }
--
-diff --git a/erts/epmd/src/epmd.h b/erts/epmd/src/epmd.h
-index cffcd4ae7a..e53322acf5 100644
---- a/erts/epmd/src/epmd.h
-+++ b/erts/epmd/src/epmd.h
-@@ -20,6 +20,9 @@
-
- /* The port number is defined in a makefile */
-
-+/* The name and path to the pid file */
-+#define EPMD_PIDFILE "/var/run/epmd.pid"
-+
- /* Definitions of message codes */
-
- /* Registration and queries */
---
-2.17.0
-
diff --git a/dev-lang/erlang/files/erlang-custom-autoconf.patch b/dev-lang/erlang/files/erlang-custom-autoconf.patch
deleted file mode 100644
index 5ae7b43ba28..00000000000
--- a/dev-lang/erlang/files/erlang-custom-autoconf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur otp-OTP-21.0.5.orig/otp_build otp-OTP-21.0.5/otp_build
---- otp-OTP-21.0.5.orig/otp_build 2018-08-10 19:02:51.000000000 +0200
-+++ otp-OTP-21.0.5/otp_build 2018-08-15 23:44:59.417191209 +0200
-@@ -1343,7 +1343,9 @@
- do_lazy_configure "$@";
- do_boot;;
- autoconf)
-- do_autoconf;;
-+ create_lib_configure_in
-+ distribute_config_helpers
-+ ;;
- configure)
- shift;
- do_configure "$@";;
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2021-02-27 15:38 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2021-02-27 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 0e91cf7d1763e61a5cbc4e0ee6363820161546d7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 27 15:24:52 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 15:36:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e91cf7d
dev-lang/erlang: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/19686
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lang/erlang/files/erlang-23.1.2-ac2.70.patch | 99 ------------------------
1 file changed, 99 deletions(-)
diff --git a/dev-lang/erlang/files/erlang-23.1.2-ac2.70.patch b/dev-lang/erlang/files/erlang-23.1.2-ac2.70.patch
deleted file mode 100644
index 3c3a119270d..00000000000
--- a/dev-lang/erlang/files/erlang-23.1.2-ac2.70.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/lib/crypto/configure.in
-+++ b/lib/crypto/configure.in
-@@ -26,10 +26,11 @@ dnl define([AC_CACHE_SAVE], )dnl
- AC_INIT(vsn.mk)
-
- if test -z "$ERL_TOP" || test ! -d "$ERL_TOP" ; then
-- AC_CONFIG_AUX_DIRS(autoconf)
-+ :
-+ AC_CONFIG_AUX_DIR(autoconf)
- else
- erl_top=${ERL_TOP}
-- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-+ AC_CONFIG_AUX_DIR(../../erts/autoconf)
- fi
-
- if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
---- a/lib/megaco/configure.in
-+++ b/lib/megaco/configure.in
-@@ -26,10 +26,11 @@ dnl define([AC_CACHE_SAVE], )dnl
- AC_INIT(vsn.mk)
-
- if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
-- AC_CONFIG_AUX_DIRS(autoconf)
-+ :
-+ AC_CONFIG_AUX_DIR(autoconf)
- else
- erl_top=${ERL_TOP}
-- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-+ AC_CONFIG_AUX_DIR(../../erts/autoconf)
- fi
-
- if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
---- a/lib/odbc/configure.in
-+++ b/lib/odbc/configure.in
-@@ -26,10 +26,11 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT(c_src/odbcserver.c)
-
- if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
-- AC_CONFIG_AUX_DIRS(autoconf)
-+ :
-+ AC_CONFIG_AUX_DIR(autoconf)
- else
- erl_top=${ERL_TOP}
-- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-+ AC_CONFIG_AUX_DIR(../../erts/autoconf)
- fi
-
- if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
---- a/lib/snmp/configure.in
-+++ b/lib/snmp/configure.in
-@@ -5,10 +5,11 @@ define([AC_CACHE_SAVE], )dnl
- AC_INIT(vsn.mk)
-
- if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
-- AC_CONFIG_AUX_DIRS(autoconf)
-+ :
-+ AC_CONFIG_AUX_DIR(autoconf)
- else
- erl_top=${ERL_TOP}
-- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-+ AC_CONFIG_AUX_DIR(../../erts/autoconf)
- fi
-
- if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
---- a/lib/wx/configure.in
-+++ b/lib/wx/configure.in
-@@ -20,7 +20,7 @@ dnl %CopyrightEnd%
-
- AC_INIT()
-
--AC_CONFIG_AUX_DIRS($srcdir/autoconf)
-+AC_CONFIG_AUX_DIR($srcdir/autoconf)
-
- AC_PREREQ(2.59)
-
-@@ -30,10 +30,11 @@ if test -f ./CONF_INFO; then
- fi
-
- if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
-+ :
- AC_MSG_ERROR([ERL_TOP is not set])
- else
- erl_top=${ERL_TOP}
-- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-+ AC_CONFIG_AUX_DIR(../../erts/autoconf)
- WX_BUILDING_INSIDE_ERLSRC=true
- fi
-
---- a/make/configure.in
-+++ b/make/configure.in
-@@ -82,7 +82,7 @@ AC_SUBST(ERL_TOP)
- dnl
- dnl Aux programs are found in erts/autoconf
- dnl
--AC_CONFIG_AUX_DIR(${srcdir}/erts/autoconf)
-+AC_CONFIG_AUX_DIR(../erts/autoconf)
-
- dnl
- dnl Figure out what we are running on. And in violation of autoconf
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2022-09-12 18:17 Matthew Smith
0 siblings, 0 replies; 12+ messages in thread
From: Matthew Smith @ 2022-09-12 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 629920556e825d37fb5009d828ef8c09d934ceea
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 12 17:19:39 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 18:17:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62992055
dev-lang/erlang: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27229
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
dev-lang/erlang/files/18.2.1-wx3.0.patch | 113 -----------------
.../files/erlang-23.3.4.14-emacs28-compat.patch | 137 ---------------------
2 files changed, 250 deletions(-)
diff --git a/dev-lang/erlang/files/18.2.1-wx3.0.patch b/dev-lang/erlang/files/18.2.1-wx3.0.patch
deleted file mode 100644
index aada0d9eaa1e..000000000000
--- a/dev-lang/erlang/files/18.2.1-wx3.0.patch
+++ /dev/null
@@ -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 <olly@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).
diff --git a/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch b/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch
deleted file mode 100644
index 32844d8dd1a8..000000000000
--- a/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 22a7522ef3f0f3c13618214e61f60cb01d80eef4 Mon Sep 17 00:00:00 2001
-From: Justin Davis <jrcd83@gmail.com>
-Date: Tue, 26 Oct 2021 13:28:16 -0400
-Subject: [PATCH] Fix emacs erlang-mode: xref switched to CL-Lib
-
-Fix for GitHub issue #5314.
-
-Xref is a package which is also bundled with emacs:
-http://elpa.gnu.org/packages/xref.html
-
-Xref switched its own internally defined classes from EIEIO to
-CL-lib (emacs-mirror/emacs@86da812afb2572c7fead2bb07570b976bffd7c55).
-erlang-mode subclasses xref-file-location in order to add a function
-arity slot to xrefs.
-
-If xref-file-location is a class, use defclass to subclass it. Otherwise
-use cl-defstruct. Avoids referencing make-instance, slot-value functions
-from EIEIO. Only references constructor, accessor, and predicate
-functions. Updates comments that make references to classes.
-
-Testing:
-- cd into lib/tools/emacs.
-- Run the tests included with erlang-mode from the shell:
- emacs -Q -batch -L . -l erlang.el -l erlang-test.el \
- -f ert-run-tests-batch-and-exit
-- Copy xref.el from the xref package (>=1.3.1) into the
- lib/tools/emacs directory.
-- Run the tests again. This will load xref.el automatically
- and use the new interface.
----
- lib/tools/emacs/erlang.el | 48 +++++++++++++++++++++++++--------------
- 1 file changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
-index 69a5fdaeb55..40fe32689e7 100644
---- a/lib/tools/emacs/erlang.el
-+++ b/lib/tools/emacs/erlang.el
-@@ -5120,8 +5120,8 @@ about Erlang modules."
- ;;
- ;; As mentioned this xref implementation is based on the etags xref
- ;; implementation. But in the cases where arity is considered the
--;; etags information structures (class xref-etags-location) will be
--;; translated to our own structures which include arity (class
-+;; etags information structures (struct xref-etags-location) will be
-+;; translated to our own structures which include arity (struct
- ;; erlang-xref-location). This translation is started in the function
- ;; `erlang-refine-xrefs'.
-
-@@ -5129,6 +5129,11 @@ about Erlang modules."
- ;; with xref items with xref-etags-location and some deal with xref
- ;; items with erlang-xref-location.
-
-+;; NOTE: Around Sept 2021, the xrefs package changed all of its defined types
-+;; (i.e. xref-location, xref-file-location) from EIEIO classes to CL-Lib
-+;; structures. These are both supported. Older Emacsen with earlier versions of
-+;; xref will continue to use defclass. Newer Emacsen will use cl-defstruct.
-+
- (defun erlang-etags--xref-backend () 'erlang-etags)
-
- (defun erlang-soft-require (feature)
-@@ -5137,6 +5142,7 @@ about Erlang modules."
-
- (when (and (erlang-soft-require 'xref)
- (erlang-soft-require 'cl-generic)
-+ (erlang-soft-require 'cl-lib)
- (erlang-soft-require 'eieio)
- (erlang-soft-require 'etags))
- ;; The purpose of using eval here is to avoid compilation
-@@ -5165,10 +5171,20 @@ about Erlang modules."
- (let ((erlang-replace-etags-tags-completion-table t))
- (tags-completion-table)))
-
-- (defclass erlang-xref-location (xref-file-location)
-- ((arity :type fixnum :initarg :arity
-- :reader erlang-xref-location-arity))
-- :documentation "An erlang location is a file location plus arity.")
-+ ;; Xref 1.3.1 bundled with Emacs 28+ switched from using EIEIO classes to
-+ ;; using CL-Lib structs.
-+ (if (find-class 'xref-file-location)
-+ (progn
-+ (defclass erlang-xref-location (xref-file-location)
-+ ((arity :type fixnum :initarg :arity
-+ :reader erlang-xref-location-arity))
-+ :documentation "An erlang location is a file location plus arity.")
-+ ;; Make a constructor with the same name that a CL structure would have.
-+ (defalias 'make-erlang-xref-location 'erlang-xref-location))
-+ (cl-defstruct (erlang-xref-location
-+ (:include xref-file-location))
-+ "An erlang location is a file location plus arity."
-+ (arity 0 :type fixnum)))
-
- ;; This method definition only calls the superclass which is
- ;; the default behaviour if it was not defined. It is only
-@@ -5331,8 +5347,7 @@ is non-nil then TAG is a regexp."
- xrefs
- (when (and xrefs
- (fboundp 'xref-item-location)
-- (fboundp 'xref-location-group)
-- (fboundp 'slot-value))
-+ (fboundp 'xref-location-group))
- (let (files)
- (cl-loop for xref in xrefs
- for loc = (xref-item-location xref)
-@@ -5357,7 +5372,8 @@ is non-nil then TAG is a regexp."
- t))))
-
- (defun erlang-xrefs-in-file (file kind tag is-regexp)
-- (when (fboundp 'make-instance)
-+ (when (and (fboundp 'make-erlang-xref-location)
-+ (fboundp 'xref-make))
- (with-current-buffer (find-file-noselect file)
- (save-excursion
- (goto-char (point-min))
-@@ -5369,17 +5385,15 @@ is non-nil then TAG is a regexp."
- for name = (match-string-no-properties 1)
- for arity = (save-excursion
- (erlang-get-arity))
-- for loc = (make-instance 'erlang-xref-location
-- :file file
-- :line (line-number-at-pos)
-- :column 0
-- :arity arity)
-+ for loc = (make-erlang-xref-location
-+ :file file
-+ :line (line-number-at-pos)
-+ :column 0
-+ :arity arity)
- for sum = (erlang-xref-summary kind name arity)
- when (and arity
- (not (eq arity last-arity)))
-- collect (make-instance 'xref-item
-- :summary sum
-- :location loc)
-+ collect (xref-make sum loc)
- do (setq last-arity arity)))))))
-
- (defun erlang-xref-summary (kind tag arity)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2022-12-16 20:38 Matthew Smith
0 siblings, 0 replies; 12+ messages in thread
From: Matthew Smith @ 2022-12-16 20:38 UTC (permalink / raw
To: gentoo-commits
commit: e42f2ce182a2274661081bc13ef2e9b7526fab56
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 20:34:43 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 20:38:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42f2ce1
dev-lang/erlang: remove unused files
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
dev-lang/erlang/files/epmd.init | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init
deleted file mode 100644
index 211d1dad47b4..000000000000
--- a/dev-lang/erlang/files/epmd.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2010-2019 Gentoo Authors
-# Distributed under the terms of the Apache License, Version 2.0
-
-ZT_ADDRESS=""
-pidfile="/var/run/epmd.pid"
-command_args="-daemon -relaxed_command_check -address 127.0.0.1"
-
-depend() {
- need loopback
- before sshd
-}
-
-start() {
- ebegin "Starting Erlang Port Mapper Daemon"
- start-stop-daemon --start --quiet \
- --pidfile $pidfile \
- --exec /usr/bin/epmd -- $command_args
- eend $?
-}
-
-stop() {
- ebegin "Stopping Erlang Port Mapper Daemon"
- /usr/bin/epmd -kill >/dev/null
- eend $?
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
@ 2023-10-15 22:04 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2023-10-15 22:04 UTC (permalink / raw
To: gentoo-commits
commit: eb50beb3f0042e73c3b8067bd51024dcfe4e6948
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct 10 18:37:09 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 22:00:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb50beb3
dev-lang/erlang: remove unused files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33281
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lang/erlang/files/epmd.confd-r2 | 2 --
dev-lang/erlang/files/epmd.init-r2 | 23 -----------------------
dev-lang/erlang/files/epmd.service | 9 ---------
3 files changed, 34 deletions(-)
diff --git a/dev-lang/erlang/files/epmd.confd-r2 b/dev-lang/erlang/files/epmd.confd-r2
deleted file mode 100644
index 69fcb0d2aa17..000000000000
--- a/dev-lang/erlang/files/epmd.confd-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-#arguments for run erlang
-command_args="-address 127.0.0.1"
diff --git a/dev-lang/erlang/files/epmd.init-r2 b/dev-lang/erlang/files/epmd.init-r2
deleted file mode 100644
index 08a230ec15cf..000000000000
--- a/dev-lang/erlang/files/epmd.init-r2
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the Erlang Public License 1.1
-
-name="Erlang Port Mapper Daemon"
-
-command="/usr/bin/epmd"
-command_user="epmd"
-command_group="epmd"
-
-command_background=yes
-pidfile="/var/run/epmd.pid"
-
-depend() {
- need loopback
- before sshd
-}
-
-stop() {
- ebegin "Stopping ${name}"
- ${command} -kill >/dev/null
- eend $?
-}
diff --git a/dev-lang/erlang/files/epmd.service b/dev-lang/erlang/files/epmd.service
deleted file mode 100644
index 57382ff36a40..000000000000
--- a/dev-lang/erlang/files/epmd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Erlang Portmapper Daemon
-Wants=network.target
-
-[Service]
-ExecStart=/usr/bin/epmd
-
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-10-15 22:04 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-17 20:08 [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2023-10-15 22:04 Conrad Kostecki
2022-12-16 20:38 Matthew Smith
2022-09-12 18:17 Matthew Smith
2021-02-27 15:38 Conrad Kostecki
2020-08-20 6:36 Sergei Trofimovich
2020-05-26 22:56 Sergei Trofimovich
2020-04-18 21:31 Sergei Trofimovich
2019-09-18 12:44 Hans de Graaff
2019-07-17 22:04 Zac Medico
2017-09-02 14:46 Michael Palimaka
2016-08-30 14:54 Göktürk Yüksek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox