diff options
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/Manifest.gz | bin | 22612 -> 22621 bytes | |||
-rw-r--r-- | x11-libs/gksu/Manifest | 1 | ||||
-rw-r--r-- | x11-libs/gksu/gksu-2.0.2-r1.ebuild | 80 | ||||
-rw-r--r-- | x11-libs/libast/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/libast/libast-0.7-r1.ebuild | 4 | ||||
-rw-r--r-- | x11-libs/neXtaw/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild | 4 | ||||
-rw-r--r-- | x11-libs/wxGTK/Manifest | 6 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch | 75 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch | 39 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch | 140 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild | 161 |
12 files changed, 6 insertions, 508 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz Binary files differindex ba6b893381c7..b78cee54004c 100644 --- a/x11-libs/Manifest.gz +++ b/x11-libs/Manifest.gz diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest index 60976619e5e9..36f421dab1fc 100644 --- a/x11-libs/gksu/Manifest +++ b/x11-libs/gksu/Manifest @@ -2,6 +2,5 @@ AUX gksu-2.0.2-format_security.patch 1341 BLAKE2B 1ceb3ec4f117201d86cf0d110278ec AUX gksu-2.0.2-glib-2.31.patch 870 BLAKE2B 63a65cb59c467b17eca4d69c824a83b5990819c214ae652a9fd368e2ceb4056021025503803d437e82114a7d1eb5929aec301bdd616befde47f6e7a8e8391471 SHA512 1ba77b6eef71629c6552766ebdf42271826b63bd124f38086187be4b8756ccfbd985127f10b35a4628d25f41fbaa7be89895a20241282476131da9486a0dbcbe AUX gksu-2.0.2-nautilus-dir.patch 2640 BLAKE2B 52eacaab2e59a45aa78e76760f720a7a9da3e03264176ae29446edab0e60292b50fcd4d34365feafead5ea5378b805fc080fa8728bc78965625005c952c48cd5 SHA512 d96e36ea8a9e03808214f5e8cc73eb2aef5f663ff0035c4eab854f8f7d313055d9e2b9058abc7b84adb5657e7a390d8e44b42953c7d8304377400b341a50729b DIST gksu-2.0.2.tar.gz 468121 BLAKE2B 42324abed0d79eb00454d23a95b356b023a25e39e1119860d7f271f56b34716e4d4f9084156beb526379fdd9bbe25f2c8591e56e40238d3a79e7b3d8ff4fca58 SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75 -EBUILD gksu-2.0.2-r1.ebuild 2258 BLAKE2B cad0f8890779df52a84d176d0b8110797f04419e39a7a6f1143e6f8b39cbf01f32d06f70bae1933798fd0dc0483d46a6ecb54445b6728ecbc5588e45e8648c51 SHA512 08064d119d87d09c591e475daed04f7b3eefa36b0e0e69d695545c230aae5da045e13bcf391841d7818b9fbd18ecb3433ce61727c329a0788deff0d621a710e9 EBUILD gksu-2.0.2-r2.ebuild 2296 BLAKE2B a91cfed566e8ca6ded271cb041dc1091006c8c46416980633558a602d2b197ff418143e9c7c88945b5cc5f321b216d1318a9ed269042bef73127aff2554d05e9 SHA512 8d52885bcf6974b9337fd3320b68c85920e3ae3f53149ccd4bbd96ea8efdfc9cbc0dd90d401259412fd1efbd023e2795b594a1804bb8bd816de3df1b6d723991 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/x11-libs/gksu/gksu-2.0.2-r1.ebuild b/x11-libs/gksu/gksu-2.0.2-r1.ebuild deleted file mode 100644 index 6032ee3cb1a8..000000000000 --- a/x11-libs/gksu/gksu-2.0.2-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 fixheadtails - -DESCRIPTION="A gtk+ frontend for libgksu" -HOMEPAGE="http://www.nongnu.org/gksu/" -SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="doc gnome" - -RDEPEND=">=x11-libs/libgksu-2.0.8 - >=x11-libs/gtk+-2.4:2 - >=gnome-base/gconf-2 - gnome? ( - >=gnome-base/nautilus-2 - x11-terms/gnome-terminal )" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - doc? ( dev-util/gtk-doc )" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --disable-static - $(use_enable gnome nautilus-extension)" -} - -src_prepare() { - ht_fix_file "${S}/gksu-migrate-conf.sh" - - # https://savannah.nongnu.org/bugs/index.php?36127 - epatch "${FILESDIR}/${PN}-2.0.2-glib-2.31.patch" - - if use gnome ; then - sed 's/x-terminal-emulator/gnome-terminal/' \ - -i gksu.desktop || die "sed 1 failed" - - # Conditional patch to avoid eautoreconf - # https://savannah.nongnu.org/bugs/index.php?36129 - epatch "${FILESDIR}/${PN}-2.0.2-nautilus-dir.patch" - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467024 - eautoreconf - else - sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \ - -i Makefile.am Makefile.in || die "sed 2 failed" - fi - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh" -} - -pkg_postinst() { - gnome2_pkg_postinst - einfo 'updating configuration' - "${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh - einfo "" - einfo "A note on gksudo: It actually runs sudo to get it's work done" - einfo "However, by default, Gentoo's sudo wipes your environment." - einfo "This means that gksudo will fail to run any X-based programs." - einfo "You need to either add yourself to wheel and uncomment this line" - einfo "in your /etc/sudoers:" - einfo "Defaults:%wheel !env_reset" - einfo "Or remove the env_reset line entirely. This can cause security" - einfo "problems; if you don't trust your users, don't do this, use gksu" - einfo "instead." -} diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest index c786af596e92..61ff185921d6 100644 --- a/x11-libs/libast/Manifest +++ b/x11-libs/libast/Manifest @@ -1,5 +1,5 @@ DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d -EBUILD libast-0.7-r1.ebuild 954 BLAKE2B 5a839bebd89af5f9a6c57ed1e74051e790f1640ebf5476de1ac92ebeb9691c2f9ea19b06740981c4dd5b2fb5d83eef957371bad5d5dbe8add942c88f6989c4c5 SHA512 24495307eed6e2fdf0d1411273ff22d089a4c29c1a771569554e14b970c313729776c4068eaba7d8389803df4fc7e3b4a38bdc5c53f40fb4991270487b2b613a +EBUILD libast-0.7-r1.ebuild 953 BLAKE2B abf03af30830dc7bd2a77f8f6046afba8ebff4693da2d479f5ff546e8436564691fdc0b1c46b02e4b15d637e926f3d2005bdcc265e1fc8dd5be4562f9650de39 SHA512 aa481eccdd64e798cad1a7ddb6fb3c378f51ce576bbd28121e7def0c2707fe592bb6ebe1d7685b9a0ef41d0f8e49a890982b890f629031fdaaf81370181fa21b EBUILD libast-0.7.ebuild 945 BLAKE2B c9a34ed7034bd0cb52f5d9f50e9843d8bc5c15c91e2fb889eb22a3ec4853ebcb70ca24abbd7a83483f1a1f67f770002990406407a9294a88db2021daf03bc9ab SHA512 1632a77e1c5216337fb1f81c15555606f95138c88822feedcf913bc8f33ca16080e5851d8f30bd024e10bb5dd8165d149adca153e25ce1321b2480a8ad5207df EBUILD libast-9999.ebuild 1035 BLAKE2B 6d28c6c66fe9fabd36d7a0fd5674d359348d9974a3eef1a4514568663170db108232464ff4297d4616573b8db1d567ab04b47ee3f50ca1609ff4d3bac6ea56db SHA512 9a08bda18d9d681948b58a9dd12e7b2b282cc6f6f780020936a7e77cbb6c4ee576c24648560c414d1ce256ae4b568bf00000fe12b8df6e6ca1331a053ba02a79 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r1.ebuild index 079c427988ad..281091cbdc3a 100644 --- a/x11-libs/libast/libast-0.7-r1.ebuild +++ b/x11-libs/libast/libast-0.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="imlib cpu_flags_x86_mmx pcre" RDEPEND=" diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest index f81c1674f3b3..36145681c2b9 100644 --- a/x11-libs/neXtaw/Manifest +++ b/x11-libs/neXtaw/Manifest @@ -1,4 +1,4 @@ DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1 EBUILD neXtaw-0.15.1-r1.ebuild 757 BLAKE2B 94f1af2a108d4bb732c297c0b01ad27b7e66837bbb25beda86cfc8aed6a7300bbf6a57d0ff1150cada710ac8c0990f97ba0df61fca32216a5baad09e57e6bda9 SHA512 cc96b5d3579ee917ec8b2986e598a97d4edba46475096af4c5c0435c9a8594fd95c0bf5948623c9dd7865754c2ef36caf51bd59d0dd9c666baf3b200f5cad31e -EBUILD neXtaw-0.15.1-r2.ebuild 769 BLAKE2B 1af332bd99017078592663f7f4858d0c01aa543d2935bf5b028d6720c32e97ca8b91775fbf4f246d6f9dc11cbac245ffc8e2e8077f2cf0893fec9e4dc37c0374 SHA512 e78e192fb27f412ec7e1f72f6061cc61c665a97f7dcb9d7f551b5dc6c7cff150646aba8beed14f3e984c41d2a4143b12b0cb49cc8b04d274d8086915580ec480 +EBUILD neXtaw-0.15.1-r2.ebuild 768 BLAKE2B 4cb943bda72c4c86c7905fd4898fe5066004d6419410284f41f21eed1dcf6297b661c24775d4c9ba6a1e3c0e9d53c9b8fa212d3a30c0da67f0b5cab25efd504f SHA512 282e66c7232ccd9aab93b719dc1afb11120637fde46ff5fb0b3be0a1f8b4490784e9918a5783a221ef865d10f3b5036aaafcc9868d118592a460c9d02fad4589 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild index 377b2c070edc..1dd2077a99bc 100644 --- a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild +++ b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="" RDEPEND="x11-libs/libICE diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 218893b70323..26d93e8d6bb0 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -7,18 +7,12 @@ AUX wxGTK-2.8.12.1-fix-c++14.patch 4518 BLAKE2B 7ea578c93bc87178c35a8257f4fb2857 AUX wxGTK-2.8.12.1-libdir.patch 13266 BLAKE2B d96df55c4e156962db77a317c1046341c679720e75c4adb1daaef3a3bb580c21b8ea025264cb348b2edd15ab1b8300d76859f152745a58af3113c3871793451f SHA512 15eb72936176bfe03b5acb7d52c4158fe4f6bdf9870e72aab8d41e1689ee9886aa3bc8216e782abb756d06607bcedbec184575a2e9634f67f6add1b930297671 AUX wxGTK-2.8.7-mmedia.patch 518 BLAKE2B 7fbaeea8eb8b11a1cfbcbabf2cb1d159d197ff5cbb390c38e8686820276265603c3fd2b7cc3e28bbb264730e08da63c57806aada2d3d0a33af650f855ff511c9 SHA512 8577a701f5d0d03296d2d2dbb3a041023cf7adffc2d09492d2ebd094e0a6796e27abe1f442fee92e661f0f1ea6268499c37ace042cc1434b80aac58639bbc56c AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3 -AUX wxGTK-3.0.0.0-collision.patch 6237 BLAKE2B e37454695da362b7b72d3f828a380ba4b112f20e6586fbc81d2b6f77bc3f18ab6651cf2ef7daa8cb321f6450db434d0f4b62bb74f7f97366ebd258bb651c3fdc SHA512 c68ac400ddc4531d81a251acf1efc4440a5a17d78d9767427121f4ca0425a179a9cdfa94f22ecad0f2cd8f4bf3a4c799a4e21878e93367b57e206f2504a2724f -AUX wxGTK-3.0.2.0-gcc6.patch 1077 BLAKE2B 5fed82c7d3d78314eea51ab5d3fe836e5115c2b6810e3bcda263567fb87f215919b2a8e2617cb7c0eb829ffbe647af0e085e7bba6a0a886d667b854693da4d16 SHA512 6da02b4cdd6e4d33cfd8da5554f1400e2ccb33de7fa12d9da23a8eeac52c724fa339d2e1d413abf5f4590cf0514cf9a8d951589d3e498aae936ab10caf93f585 -AUX wxGTK-3.0.2.0-webview-fixes.patch 9132 BLAKE2B 4ebbef4c0cd7ef1273f5dc7467ffd3e7603150066db3501be6801d58a4243699c232fa46ae559f26dfe6fff4db8fa5f62f303e830dcd9a5f4e6ce5fed323eb28 SHA512 61ff21971d1527cd721f8d2c525e2d55de65f1935135c3cf6c20e0097ef08518f43a7bd96e3d49e22de19dc68462896ab4f7c8679c9632f392b8a0a64df9bc90 AUX wxGTK-3.0.3-collision.patch 6299 BLAKE2B 1130b96f32e2abe7109ca84f1cd0cae0a6742f2f96ad905996157e227236deaff64813f892b649adb2b17beb8fa2b3e9b651f7c397960eb6346bb4bc1e50b417 SHA512 e38a7985c750a34f7ed0b3772677b6b6942340c48d3e70a7c1f1851d2933a4d7823c225203a79c8b713f3d6a1bb0c0d0690d5df027674cd826cea300f9b2ed0f DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72 -DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 BLAKE2B 9b6bea6426663b3457764000c3c91a9bdfa85f7e95cae345eb0ba32c3edf59f010738459123423ad68487eadde221dbc3576903b669b9aa674e052b690079de7 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 -DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 EBUILD wxGTK-2.8.12.1-r2.ebuild 4790 BLAKE2B 556048e9d98cf57dbbf2cf5097101e1640576a0df596e296f0e500d672b417ab530f37469e8bd5cb8c656fe902c572ee4998782bd6a7b8dfd735f87d2f85e681 SHA512 688c1121691fcfd701f6b396aff2425e8aac5eaa644cf1e8d216145b975fb7edef709eae4e9ef0e847f1c3c189685b75f86791487dd4ac71edca579a49f896ee -EBUILD wxGTK-3.0.2.0-r4.ebuild 4207 BLAKE2B d1e31b2efdb825a38f49f21c2f146f73ae2f5fd00cd6dd688a84a2d6b76dcf9180d6eca26ce852faba79a0093b8df6d9e605daec8850273fbcfcddba3f011246 SHA512 4fe3a3b228b345d0e90981af6f37f8d3ded479cd811f14a5e06ff4e1ba6f458926ca8b64983a61a7a7e29c34bbe37b0f50f256548c4b5c37ae6a175d1af8cde8 EBUILD wxGTK-3.0.3-r300.ebuild 5172 BLAKE2B 001d07bebf5f31143f78f1424f46ee936bad83ec22c18cba6f32f57151ec4834dd120824f724b7d395514f0275cbbc0926c2273239ac7a33288f7ae2ce709995 SHA512 411764eb989a09185de0dbf994cddb5ab9423b4bde2117b7e96aa679c21ad63ad8f6e18a1d897758679673a6c6957e3014da09f4dfd45412732402bda23aa471 EBUILD wxGTK-3.0.3.ebuild 4097 BLAKE2B becfe3d3c069ae85d9fdd342f5551cd8c2c45f207485edbf4243813e4346fa11b68c4cd88cfc42b94ca5b05937da1e182f22e107e58e90b0178aa8f68574a178 SHA512 6cca341d1076f359dc919d4fcfdc576bfd1c5af5cb841fecaff62eea87a7a0ef3cb6bffdc357d83329dc994391a5ac199968519698097ad4a59330844af4734f MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch deleted file mode 100644 index a2c6c6e1a8e3..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch +++ /dev/null @@ -1,75 +0,0 @@ -Prevent file collisions between multiple installed SLOTs. - - - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. - - Version the bakefile preset filenames. Unversioned symlinks to these files - are handled by eselect. - - Version wx-config and wxrc. The unversioned forms are wrapper scripts - installed with eselect-wxwidgets. - - Version wxstd.mo and modify AddStdCatalog to use it. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___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_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) -- $(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 \ -@@ -16101,7 +16101,7 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) 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 -@@ -16109,7 +16109,7 @@ locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - ---- a/build/bakefiles/wx.bkl -+++ b/build/bakefiles/wx.bkl -@@ -137,7 +137,7 @@ - <using module="gettext"/> - <gettext-catalogs id="locale"> - <srcdir>$(SRCDIR)/locale</srcdir> -- <catalog-name>wxstd</catalog-name> -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> - <linguas> - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -125,7 +125,6 @@ distclean: clean - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch deleted file mode 100644 index 119175c624d2..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001 -From: Scott Talbert <swt@techie.net> -Date: Sat, 20 Feb 2016 00:08:14 -0500 -Subject: [PATCH] Fix STC compilation with GCC6 - -Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems -with ambiguous overloads. - -Closes #17147. - -Closes https://github.com/wxWidgets/wxWidgets/pull/222 ---- - src/stc/scintilla/src/Editor.cxx | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx -index cd72953..2081df2 100644 ---- a/src/stc/scintilla/src/Editor.cxx -+++ b/src/stc/scintilla/src/Editor.cxx -@@ -11,6 +11,7 @@ - #include <ctype.h> - #include <assert.h> - -+#include <cmath> - #include <string> - #include <vector> - #include <map> -@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) { - } - - static bool Close(Point pt1, Point pt2) { -- if (abs(pt1.x - pt2.x) > 3) -+ if (std::abs(pt1.x - pt2.x) > 3) - return false; -- if (abs(pt1.y - pt2.y) > 3) -+ if (std::abs(pt1.y - pt2.y) > 3) - return false; - return true; - } diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch deleted file mode 100644 index 727fda16ddc1..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch +++ /dev/null @@ -1,140 +0,0 @@ -Backport various webkit-related build fixes: - -a309157a Don't include "webview" in "standard" libraries. -d24f711f Only link webview library with libwebkitgtk in wxGTK, not the core one. -bde287ba Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition -037f6977 Report libraries in EXTRALIBS_WEBVIEW in wx-config output - - ---- a/Makefile.in -+++ b/Makefile.in -@@ -65,6 +65,7 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@ - EXTRALIBS_GUI = @EXTRALIBS_GUI@ - EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ - EXTRALIBS_SDL = @EXTRALIBS_SDL@ -+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@ - CXXWARNINGS = @CXXWARNINGS@ - HOST_SUFFIX = @HOST_SUFFIX@ - DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@ -@@ -15493,7 +15494,7 @@ distclean: clean - @COND_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) - - @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP) --@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS) -+@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(LIBS) - @COND_MONOLITHIC_1_SHARED_1@ $(DYLIB_RPATH_POSTLINK) - @COND_MONOLITHIC_1_SHARED_1@ - @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd) -@@ -15750,7 +15751,7 @@ distclean: clean - @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(DYLIB_RPATH_POSTLINK) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(__webviewdll___so_symlinks_cmd) ---- a/build/bakefiles/config.bkl -+++ b/build/bakefiles/config.bkl -@@ -423,6 +423,7 @@ to run the tests, include CppUnit library here. - <option name="EXTRALIBS_GUI"/> - <option name="EXTRALIBS_OPENGL"/> - <option name="EXTRALIBS_SDL"/> -+ <option name="EXTRALIBS_WEBVIEW"/> - <option name="CXXWARNINGS"/> - <option name="HOST_SUFFIX"/> - <option name="DYLIB_RPATH_INSTALL"/> -@@ -506,6 +507,7 @@ it if SHARED=1 unless you know what you are doing. - <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if> - </set> - <set var="EXTRALIBS_SDL"/> -+ <set var="EXTRALIBS_WEBVIEW"/> - - <set var="WITH_PLUGIN_SDL">0</set> - ---- a/build/bakefiles/monolithic.bkl -+++ b/build/bakefiles/monolithic.bkl -@@ -26,6 +26,7 @@ - <ldlibs>$(EXTRALIBS_HTML)</ldlibs> - <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs> - <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs> -+ <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs> - <library>$(wxscintilla_library_link)</library> - </dll> - ---- a/build/bakefiles/multilib.bkl -+++ b/build/bakefiles/multilib.bkl -@@ -183,6 +183,7 @@ - <sources>$(WEBVIEW_SRC)</sources> - <library>coredll</library> - <library>basedll</library> -+ <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs> - <msvc-headers>$(WEBVIEW_HDR)</msvc-headers> - </dll> - ---- a/build/bakefiles/wxwin.py -+++ b/build/bakefiles/wxwin.py -@@ -51,6 +51,7 @@ EXTRALIBS = { - 'html' : '$(EXTRALIBS_HTML)', - 'adv' : '$(PLUGIN_ADV_EXTRALIBS)', - 'media' : '$(EXTRALIBS_MEDIA)', -+ 'webview' : '$(EXTRALIBS_WEBVIEW)', - } - - def mkLibName(wxid): ---- a/configure.in -+++ b/configure.in -@@ -7249,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then - [ - USE_WEBVIEW_WEBKIT=1 - CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS" -- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS" -+ EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" - ], - [ - AC_MSG_WARN([webkitgtk not found.]) -@@ -7689,7 +7689,6 @@ if test "$wxUSE_GUI" = "yes"; then - BUILT_WX_LIBS="stc $BUILT_WX_LIBS" - fi - if test "$wxUSE_WEBVIEW" = "yes" ; then -- STD_GUI_LIBS="webview $STD_GUI_LIBS" - BUILT_WX_LIBS="webview $BUILT_WX_LIBS" - fi - if test "$wxUSE_XRC" = "yes" ; then -@@ -8002,6 +8001,7 @@ AC_SUBST(EXTRALIBS_GUI) - AC_SUBST(EXTRALIBS_OPENGL) - AC_SUBST(EXTRALIBS_SDL) - AC_SUBST(EXTRALIBS_STC) -+AC_SUBST(EXTRALIBS_WEBVIEW) - AC_SUBST(WITH_PLUGIN_SDL) - AC_SUBST(UNICODE) - AC_SUBST(DEBUG_INFO) ---- a/samples/webview/Makefile.in -+++ b/samples/webview/Makefile.in -@@ -33,6 +33,7 @@ EXTRALIBS = @EXTRALIBS@ - EXTRALIBS_XML = @EXTRALIBS_XML@ - EXTRALIBS_GUI = @EXTRALIBS_GUI@ - EXTRALIBS_SDL = @EXTRALIBS_SDL@ -+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@ - CXXWARNINGS = @CXXWARNINGS@ - HOST_SUFFIX = @HOST_SUFFIX@ - SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -@@ -163,7 +164,7 @@ distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile - - webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc) -- $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -+ $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__webview___mac_setfilecmd) - $(__webview___os2_emxbindcmd) ---- a/wx-config.in -+++ b/wx-config.in -@@ -1032,6 +1032,7 @@ ldlibs_html="@EXTRALIBS_HTML@" - ldlibs_xml="@EXTRALIBS_XML@" - ldlibs_adv="@EXTRALIBS_SDL@" - ldlibs_stc="@EXTRALIBS_STC@" -+ldlibs_webview="@EXTRALIBS_WEBVIEW@" - - - # Order the libraries passed to us correctly for static linking. diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild deleted file mode 100644 index e9f06730d38e..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools eutils multilib-minimal - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://wxwidgets.org/" - -# we use the wxPython tarballs because they include the full wxGTK sources and -# docs, and are released more frequently than wxGTK. -SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 - doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" - -KEYWORDS="arm" -IUSE="+X aqua doc debug libnotify opengl sdl tiff" - -SLOT="3.0" - -RDEPEND=" - dev-libs/expat[${MULTILIB_USEDEP}] - sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) - X? ( - >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/xineramaproto[${MULTILIB_USEDEP}] - x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] - )" - -PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" - -LICENSE="wxWinLL-3 - GPL-2 - doc? ( wxWinFDL-3 )" - -S="${WORKDIR}/wxPython-src-${PV}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch - epatch "${FILESDIR}"/${P}-webview-fixes.patch - epatch "${FILESDIR}"/${P}-gcc6.patch - epatch_user - - for f in $(find "${S}" -name configure.in); do - mv "${f}" "${f/in/ac}" || die - done - AT_M4DIR="${S}/build/aclocal" eautoreconf - - # https://bugs.gentoo.org/536004 - sed \ - -e 's:3\.0\.1:3.0.2:g' \ - -e 's:^wx_release_number=1$:wx_release_number=2:' \ - -i "${S}"/configure || die - -} - -multilib_src_configure() { - local myconf - - # X independent options - myconf=" - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl)" - - # debug in >=2.9 - # there is no longer separate debug libraries (gtk2ud) - # wxDEBUG_LEVEL=1 is the default and we will leave it enabled - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. - # http://docs.wxwidgets.org/3.0/overview_debugging.html - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug \ - && myconf="${myconf} --enable-debug=max" - - # wxGTK options - # --enable-graphics_ctx - needed for webkit, editra - # --without-gnomevfs - bug #203389 - use X && \ - myconf="${myconf} - --enable-graphics_ctx - --with-gtkprint - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --without-gnomevfs - --disable-webview - --disable-mediactrl - $(use_with libnotify) - $(use_with opengl) - $(use_with tiff libtiff sys)" - - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - - # wxBase options - if use !X && use !aqua ; then - myconf="${myconf} - --disable-gui" - fi - - ECONF_SOURCE="${S}" econf ${myconf} -} - -multilib_src_install_all() { - cd "${S}"/docs || die - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - if use doc; then - dodoc -r "${S}"/docs/doxygen/out/html - fi - - # Stray windows locale file, causes collisions - local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" - [[ -e ${wxmsw} ]] && rm "${wxmsw}" -} - -pkg_postinst() { - has_version app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} - -pkg_postrm() { - has_version app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} |