From c59df9219bfadf6b22cdf1de0008f505f1238d93 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 19 Nov 2014 14:06:56 +0000 Subject: [PATCH] Fix segmentation fault in vncview (net-misc/tigervnc) (bug #529856 by Maxim Britov). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- x11-libs/fltk/ChangeLog | 9 +- x11-libs/fltk/Manifest | 10 +- .../files/fltk-1.3.3-fl_open_display.patch | 10 ++ x11-libs/fltk/fltk-1.3.3-r1.ebuild | 170 ++++++++++++++++++ 4 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch create mode 100644 x11-libs/fltk/fltk-1.3.3-r1.ebuild diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index 06cce36021cc..d959cdcb2b3f 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.242 2014/11/08 18:17:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.243 2014/11/19 14:06:54 jer Exp $ + +*fltk-1.3.3-r1 (19 Nov 2014) + + 19 Nov 2014; Jeroen Roovers +fltk-1.3.3-r1.ebuild, + +files/fltk-1.3.3-fl_open_display.patch: + Fix segmentation fault in vncview (net-misc/tigervnc) (bug #529856 by Maxim + Britov). 08 Nov 2014; Jeroen Roovers fltk-1.3.3.ebuild: Readd the old USE=static-libs after a fruitless venture into redesigning the diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index 199a78de5656..2c11973d0ecd 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -8,17 +8,19 @@ AUX fltk-1.3.1-as-needed.patch 5672 SHA256 46931bde1b60bbc82d12b638d9e1dddaf98e6 AUX fltk-1.3.2-conf-tests.patch 2259 SHA256 f309d0871780ebb830ede6dfc99c660eb48878c830aada0d8264aae3d9abbde6 SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459 WHIRLPOOL c56189507b1b81aa87c520de4ac01915c5de9a12412b54ca7d5ab8f30f7f4ae3270171fdb66e3608ce514328958cef820d4271d9570037d77512286205e3c697 AUX fltk-1.3.2-desktop.patch 456 SHA256 6e519612de37f4cea83bded50dc3bf856c13af53da108def188a5edcbf3d506f SHA512 405b604471f86d2eb013b1e7ee2d73574cb322ee3e519092c984bbb0fe46cf2438762c63ff6a1c31467e92257dc84fa4d1725ff50238379273ca28c687f1bc13 WHIRLPOOL 613bd7ae2ba18f3d68fedb9bd32a771a8b242395d494ac139c26da9175ccb454f24baad1d4715fed7f369a3e0ae73f1ab1d7811e270d0fe3061df8dd3bf6ca11 AUX fltk-1.3.2-jpeg-9a.patch 583 SHA256 5dd7ddcf9c393e0d73f361a06e190e1abcb9b2c1fd04753cae03a3dac8da1c96 SHA512 faf615c5f65e4f0ffbe6131469a971fc60bb1c376d71c59182d406b8481c55ff4e5264dac168a9cd1164b00b86678fb7141b119f91dee83307eb7ee6522a35ee WHIRLPOOL 31d4729b1aa5eb1aa32df453a589a1c23f50d96889e04992338d7ee0ddec5dc75287833ed8956e052ae026997a0a7c059f8e0cbbdceef4e8a6143380d022e6c2 +AUX fltk-1.3.3-fl_open_display.patch 210 SHA256 11eed0cdbd45e458f1bee8394fe3bc0280599b7bf5d2f7919976614c032325f1 SHA512 902d69af29fa08dbb85ecadc709ea4c5999bee5d0acbb6338b62e2f561ae3baa90350fbd92c16791a58858635ffbdf9cc6512c54712abd1e2700f633122e082d WHIRLPOOL 946d06fd2d7acd6888f897da5d854b510c3d22bb2d88efecc75118580c652fa6df00c2b912b9a891cf00db7e367aa4eccb2215caf394315cfeaffa7efb012bc9 AUX fltk-1.3.3-visibility.patch 302 SHA256 ac6d73daadd6d0310e3cf32c4edac1c06f45334088d71c7a51720406b901e855 SHA512 f643b472f91972a49c3f2b7f7084d5f1ee2e4cbcca033226b03c516e6393341416f37e5b05ad2744ffb18581483a13ef052fcf62f1e8ebee70980d820b55fa72 WHIRLPOOL 8b34feb00a598afed90185ebfed82c00bf517cddb9342b37f064d8f22a8525dab485586d8fc154265b7ad9c9c026a25c4a53fc93ad7f0d83d33e1db9925cf5cb DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781 DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761 EBUILD fltk-1.3.2.ebuild 3667 SHA256 2f6dafa4899ec2c5512925f09a8cbe2fcc70fb4086aef380d8a3b7958eefa77b SHA512 0725a2cf279f964295e16b29d1eab5d8653553d6499ac4f8a8e970e4a75f701b1593df8a1c271456e8e66d27506a30c1d9949f8cf0c33c7140d8ea0f54f49bfb WHIRLPOOL cb605e2d62a4980110402f6f2d212e60ee4f017d3eb0da998cebb5e8f71f086d5bd7a41aa7bb9f5c9d1ad01b35d2c3623c8c6bdf118e6267ed217ac317b22a23 +EBUILD fltk-1.3.3-r1.ebuild 3987 SHA256 7eed0de091f579040b336f966c78706f490cce5e958be0a80dbc48796e774c5a SHA512 cc5b929a69a3909cea23a017ceae9a219b02f081e3143dd77a3cb5b00b75f63b005da74b1de08f5acc759e29a9675cd9b6f8b8c9426607877cdbfe80375ea6b8 WHIRLPOOL 3eb02ed44609ffe51f8ae4c2180d2256358de0e76c99e541101c4cc9db5f7fba4cb8bbd961330d02375a496cd46bd148037e31421530e8cbebfd2b6d5af9fae4 EBUILD fltk-1.3.3.ebuild 3932 SHA256 511938eafe41719ab5beec17a3e698c112b9dd075243a497662f0339e855a951 SHA512 fc2c0ae90a3a01e8cb7d7916bf842dc2fab0c71dab0f933117e5beffcd0f0c7c95d8f6f137f9ba129b1b1d2be06b61e7d63674200642fa2c570f6ff4917b83b4 WHIRLPOOL a65a62131ee54d167eccd44f895395355fa5d015504bc76a2546bcc7057587e329365d247f852c981d445da3f7e2609d681c595b9ac49b475d385b3333f4c2d2 -MISC ChangeLog 33757 SHA256 8891880df6d8c79ae866981681b3aadbb147d538d13b6b1fb2ddeaf7f54b5ce7 SHA512 cca79062b4bee0fb5753432e85200f9841419d90bc05dee1bf51f0271d644d1e34e36fc0bd1e9c2644062174b29afdbeca114062266ba900a7aceadc4611861f WHIRLPOOL fa266f6bdae7bcfeeb1ec0c9290abc2595476e589f1a5a17cab72bf5ea065f54a6a2f4a78e3c524be16a3c01e99246dcdc84c77156426e42f71ad8ee9c3957fe +MISC ChangeLog 33990 SHA256 32eb7f6a6f97642ebb8254ad71d4d05ef7ef2d232e38cf79eeddb1ff6d89bfc3 SHA512 49f4354451baf051de2144ba315fdf1defaa8ccfbf00d57488c28bb0d90829a6743794771a90742301f717daf469acfaf14fd308f356a1d61627158f0ae82ac8 WHIRLPOOL 0d9ef8f8710d12462dde2606136ca3f720d2e86322ac69980da0d6c2456ca0d123f2be974fafeca393658d4f8c9b9c53fa93cdf3dd5e7e3c442fa5d0e7d35798 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlReXjYACgkQVWmRsqeSphNS/QCeP6vCIB4nSKH0QjYPkWYhsWQY -OlYAn3p1IVRGdcHe7LcsksoggZbx8/bx -=EhRM +iEYEAREIAAYFAlRspAAACgkQVWmRsqeSphMA7wCfd8NJM2htJ1+ffmljq73nbldP +IX4AnjJsYqj40ZnWYLApKMh4GMlZS6pC +=7Fgj -----END PGP SIGNATURE----- diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch new file mode 100644 index 000000000000..562f1157038f --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch @@ -0,0 +1,10 @@ +--- a/src/Fl_x.cxx ++++ b/src/Fl_x.cxx +@@ -2211,6 +2211,7 @@ + static int result = -1; + + if (result == -1) { ++ fl_open_display(); + result = 0; + unsigned long nitems; + unsigned long *words = 0; diff --git a/x11-libs/fltk/fltk-1.3.3-r1.ebuild b/x11-libs/fltk/fltk-1.3.3-r1.ebuild new file mode 100644 index 000000000000..888218b09254 --- /dev/null +++ b/x11-libs/fltk/fltk-1.3.3-r1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.3-r1.ebuild,v 1.1 2014/11/19 14:06:54 jer Exp $ + +EAPI=5 + +inherit autotools eutils fdo-mime flag-o-matic + +DESCRIPTION="C++ user interface toolkit for X and OpenGL" +HOMEPAGE="http://www.fltk.org/" +SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" + +SLOT="1" +LICENSE="FLTK LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="cairo debug doc examples games opengl pdf static-libs threads xft xinerama" + +RDEPEND=" + >=media-libs/libpng-1.2:0 + virtual/jpeg:0 + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + cairo? ( x11-libs/cairo ) + opengl? ( virtual/opengl ) + xinerama? ( x11-libs/libXinerama ) + xft? ( x11-libs/libXft )" +DEPEND="${RDEPEND} + x11-proto/xextproto + doc? ( + app-doc/doxygen + pdf? ( dev-texlive/texlive-latex ) + ) + xinerama? ( x11-proto/xineramaproto )" + +FLTK_INCDIR=${EPREFIX}/usr/include/fltk +FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk + +src_prepare() { + rm -rf zlib jpeg png || die + epatch \ + "${FILESDIR}"/${PN}-1.3.2-desktop.patch \ + "${FILESDIR}"/${PN}-1.3.0-share.patch \ + "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \ + "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \ + "${FILESDIR}"/${PN}-1.3.3-visibility.patch \ + "${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch + + sed -i \ + -e 's:@HLINKS@::g' FL/Makefile.in || die + sed -i \ + -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ + -e '/^LDFLAGS=/d' \ + "${S}/fltk-config.in" || die + # some fixes introduced because slotting + sed -i \ + -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \ + src/Makefile || die + # docs in proper docdir + sed -i \ + -e "/^docdir/s:fltk:${PF}/html:" \ + -e "/SILENT:/d" \ + makeinclude.in || die + sed -e "s/7/${PV}/" \ + < "${FILESDIR}"/FLTKConfig.cmake \ + > CMake/FLTKConfig.cmake || die + sed -e 's:-Os::g' -i configure.in || die + + use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" + + # also in Makefile:config.guess config.sub: + cp misc/config.{guess,sub} . || die + + eautoconf +} + +src_configure() { + econf \ + --includedir=${FLTK_INCDIR}\ + --libdir=${FLTK_LIBDIR} \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --enable-largefile \ + --enable-shared \ + --enable-xdbe \ + --disable-localjpeg \ + --disable-localpng \ + --disable-localzlib \ + $(use_enable debug) \ + $(use_enable cairo) \ + $(use_enable opengl gl) \ + $(use_enable threads) \ + $(use_enable xft) \ + $(use_enable xinerama) +} + +src_compile() { + default + if use doc; then + cd "${S}"/documentation + emake html + if use pdf; then + emake pdf + fi + fi + if use games; then + cd "${S}"/test + emake blocks checkers sudoku + fi +} + +src_test() { + emake -C test +} + +src_install() { + default + + emake -C fluid \ + DESTDIR="${D}" install-linux + if use doc; then + emake -C documentation \ + DESTDIR="${D}" install + fi + + local apps="fluid" + if use games; then + emake -C test \ + DESTDIR="${D}" install-linux + emake -C documentation \ + DESTDIR="${D}" install-linux + apps+=" sudoku blocks checkers" + fi + + for app in ${apps}; do + dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \ + /usr/share/pixmaps/${app}.png + done + + dodoc CHANGES README CREDITS ANNOUNCEMENT + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins test/*.{h,cxx,fl} test/demo.menu + fi + + insinto /usr/share/cmake/Modules + doins CMake/FLTK*.cmake + + echo "LDPATH=${FLTK_LIBDIR}" > 99fltk + echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk + doenvd 99fltk + + # FIXME: This is bad, but building only shared libraries is hardly supported + # FIXME: The executables in test/ are linking statically against libfltk + if ! use static-libs; then + rm "${ED}"/usr/lib*/fltk/*.a || die + fi + + prune_libtool_files +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} -- 2.26.2