From 832374c01647b7a4148047981f20f73dbfd8db2a Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Tue, 21 Jan 2014 17:44:32 +0400 Subject: [PATCH] lyx-2.1.0_beta2 added --- app-office/lyx/Manifest | 7 +- ...std-vector-when-adding-dummy-cells-f.patch | 42 ---- app-office/lyx/lyx-2.0.3-r1.ebuild | 183 ------------------ ...yx-2.0.5.ebuild => lyx-2.1.0_beta2.ebuild} | 29 ++- 4 files changed, 14 insertions(+), 247 deletions(-) delete mode 100644 app-office/lyx/files/0001-Out-of-range-in-std-vector-when-adding-dummy-cells-f.patch delete mode 100644 app-office/lyx/lyx-2.0.3-r1.ebuild rename app-office/lyx/{lyx-2.0.5.ebuild => lyx-2.1.0_beta2.ebuild} (82%) diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 661b1827..09deeed6 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,6 +1 @@ -AUX 0001-Out-of-range-in-std-vector-when-adding-dummy-cells-f.patch 1519 SHA256 a46a7263b309fb992e325b085c22cf30d796dff92eff4c9e6d10fcfe9ae61e4c SHA512 369175d31c87b9f03b2e8a742e0ac298268fe5c52b5e86aa26bf2079129662d19efb1498648408921ba1f55fde2b5a6b512e671fe0c52269aa240753276e8d99 WHIRLPOOL da164ab396dbb2b9722a6dc268be6e7885d47b65b80e18ff5365ccc2e2146df95dc01c234e01400e816bda41e19af250e60f1b9d9f5b7dbb0f2beafc8f42b9be -AUX 2.0-python.patch 1036 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8 SHA512 81bf78b837d9a4621a230d3d1d4e45c306598b4047227b88e83054268571a496a71babdfe5152b47370a3dbf91767aed366984555225c3900bf6d55dc0e43d31 WHIRLPOOL e47a40db707b68c923bce136c72742242a974fe17c8a167fa0ca6f428bf2937feba3122737417e0902f320c0a8df1d4da72702eea4e4d4fe699b5176bbe5ed19 -DIST lyx-2.0.3.tar.xz 10265532 SHA256 4e1c993754acfb14d5e0f2bd2521fb6686d08e0656ec6e5fde0406c285a05ac8 SHA512 cd5d9b7350beceabd5e2e8b57d7d2a4d2fd40b8975265850dea129c78a5597a4c997dc339151f6bced7cbc2cc1bf73babd0af8f64428ba56505e546e9f01154b WHIRLPOOL 6e6e985f746e22fbb9c9c5501787655c4411b27bf4b577b86e9ca0a82943ce0a689a4d2e20c65283d48c2e3404e13a8ecf4e7f4257de029c2ebaed0b8ad88316 -DIST lyx-2.0.5.tar.xz 10314440 SHA256 d39aada3390a0468b354ec1703f12734bdfe56b08baa7950373748745313fb02 SHA512 15490c9433997231baf841dc45c8697a80b40d1b190d2e5e2e84ab4f17377928458e8217a236653ec53c693bb6e1070e30e0dfcfbb3d1de9f3f3d9af3ae09a39 WHIRLPOOL 95762a73c6c730d27a81ac9291ce4b5ece35ae2c070c41c78800313836126f0763fe1494fb5525930ea90bfa035e3030756218d7da372b06c9e47c498a6c4291 -EBUILD lyx-2.0.3-r1.ebuild 4646 SHA256 c1bd6cf618f669f119fff13f3c722a0d61e2ca733ef1064f2ca04d334b961b4d SHA512 a33714a5bf597f170ad8d09ea212a95ea334a145b0131a6aee59a46b9d6b87f32d934a6f4416e7d2b2bc59e44f005b072077adb84e9526b0142f183b8c88ae85 WHIRLPOOL b13e5b57ac67dfc54c733fb3a6682ac6fd40fb422a06eb8db2cb247e788bcc2e251c5a61c2b2e3414715ff872479e4aa6a64e6db9fbf1e640d954bc9f487df19 -EBUILD lyx-2.0.5.ebuild 4540 SHA256 2e519fc612dd20d601756425d76c898f6cbedec38d67e7f590b54a2014457df8 SHA512 3a4ac6fd62d2f5a01d009a764ec1fa0918f59fc7dbd4c930ee433b00a9c9a9f5496a28069b8acf26ab8908b13d32cecac51fc875cdebeb0e68c0a0f4d48d45b7 WHIRLPOOL f4bc4111def371a87d8ac58292c163b169b5777b0860e6f27deae22dd3aea2409ff0e94d34dfa89274f52f0f4cd8c789de82c1345442326195eb8a5e3e36b415 +DIST lyx-2.1.0beta2.tar.xz 10335516 SHA256 a5a8ee45b6e5c58848dd887fd2c9b6a04273ae4b8a79c7c301472bd0c0eab1b1 SHA512 1697505ea1f4112076b041a488d347a86e53b97e205c2c39afa02bc7bf533a31b944ff1270dc53e240beb815ea74c3460bfc0f2baf3bc396025fcc39e200e0a5 WHIRLPOOL ecea0c9371b41addefe702d77c5c2c49a8f230d0e284b52b0ae30b6b7fbdc6d27acb8b276f2c032a08453643392e20940ae9622f37c3bc089ab7c22e8d92bc20 diff --git a/app-office/lyx/files/0001-Out-of-range-in-std-vector-when-adding-dummy-cells-f.patch b/app-office/lyx/files/0001-Out-of-range-in-std-vector-when-adding-dummy-cells-f.patch deleted file mode 100644 index c59d60ce..00000000 --- a/app-office/lyx/files/0001-Out-of-range-in-std-vector-when-adding-dummy-cells-f.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6e53f28a0f466ff0448021c57b07a677973001e0 Mon Sep 17 00:00:00 2001 -From: Kolan Sh -Date: Wed, 20 Jun 2012 17:01:35 +0400 -Subject: [PATCH] Out of range in std::vector when adding dummy cells for multicol. - On systems with glibc you can see message like that. - *** glibc detected *** tex2lyx: free(): invalid next size (fast): 0x00000000012f5340 *** - Simple test with LaTeX code for reproducing error: - \begin{longtable}{c|c} - \multicolumn{3}{c}{a}\\ - \end{longtable} - This commit should fix the error. - ---- - src/tex2lyx/table.cpp | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp -index dddf71d..a66f842 100644 ---- a/src/tex2lyx/table.cpp -+++ b/src/tex2lyx/table.cpp -@@ -994,8 +994,17 @@ void handle_tabular(Parser & p, ostream & os, bool is_long_tabular, - cellinfo[row][col].content += os.str(); - - // add dummy cells for multicol -- for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) { -+ for (size_t i = 0; i + 1 < ncells; ++i) { - ++col; -+ if (col >= colinfo.size ()) { -+ cerr << "The cell '" -+ << cells[cell] -+ << "' with the number of dummy cells outside" -+ << " the boundaries of the table with fewer columns." -+ << " All other cells in this row will be ignored!" -+ << endl; -+ break; -+ } - cellinfo[row][col].multi = CELL_PART_OF_MULTICOLUMN; - cellinfo[row][col].align = 'c'; - } --- -1.7.3.4 - diff --git a/app-office/lyx/lyx-2.0.3-r1.ebuild b/app-office/lyx/lyx-2.0.3-r1.ebuild deleted file mode 100644 index be098186..00000000 --- a/app-office/lyx/lyx-2.0.3-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.3.ebuild,v 1.13 2012/06/14 07:15:34 yngwin Exp $ - -EAPI=3 - -PYTHON_DEPEND="2" - -inherit gnome2-utils qt4-r2 eutils flag-o-matic font python toolchain-funcs - -MY_P="${P/_}" - -S="${WORKDIR}/${MY_P}" -FONT_S="${S}/lib/fonts" -FONT_SUFFIX="ttf" -DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." -HOMEPAGE="http://www.lyx.org/" -SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz" -#SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/rc3/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ~ia64 ppc ~ppc64 sparc x86 ~x64-macos ~x86-macos" -IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" - -LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" - -for X in ${LANGS}; do - IUSE="${IUSE} linguas_${X}" -done - -COMMONDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-core:4 - dev-libs/libxml2 - media-libs/fontconfig - media-libs/freetype - >=dev-libs/boost-1.34" - -RDEPEND="${COMMONDEPEND} - dev-texlive/texlive-fontsextra - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) - cups? ( net-print/cups ) - latex? ( - virtual/latex-base - app-text/ghostscript-gpl - app-text/noweb - app-text/dvipng - dev-tex/dvipost - dev-tex/chktex - app-text/ps2eps - dev-texlive/texlive-latexextra - dev-texlive/texlive-pictures - dev-texlive/texlive-science - dev-texlive/texlive-genericextra - dev-texlive/texlive-fontsrecommended - || ( - dev-tex/latex2html - dev-tex/tth - dev-tex/hevea - dev-tex/tex4ht - ) - ) - xetex? ( dev-texlive/texlive-xetex ) - luatex? ( >=dev-texlive/texlive-luatex-2010 ) - html? ( dev-tex/html2latex ) - rtf? ( - dev-tex/latex2rtf - app-text/unrtf - dev-tex/html2latex - ) - linguas_he? ( dev-tex/culmus-latex ) - docbook? ( app-text/sgmltools-lite ) - dot? ( media-gfx/graphviz ) - dia? ( app-office/dia ) - subversion? ( config/py-compile - sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die -} - -src_configure() { - tc-export CXX - #bug 221921 - export VARTEXFONTS=${T}/fonts - - econf \ - $(use_enable nls) \ - $(use_enable debug) \ - $(use_enable monolithic-build) \ - $(use_with hunspell) \ - $(use_with aspell) \ - $(use_with enchant) \ - --without-included-boost \ - --disable-stdlib-debug \ - --with-packaging=posix -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt || die - - if use linguas_he ; then - echo "\bind_file cua" > "${T}"/hebrew.bind - echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind - - insinto /usr/share/lyx/bind - doins "${T}"/hebrew.bind || die - fi - - newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png - make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;" - - # fix for bug 91108 - if use latex ; then - dosym ../../../lyx/tex /usr/share/texmf/tex/latex/lyx || die - fi - - # fonts needed for proper math display, see also bug #15629 - font_src_install - - python_convert_shebangs -r 2 "${ED}"/usr/share/${PN} - - if use hunspell ; then - dosym /usr/share/myspell /usr/share/lyx/dicts - dosym /usr/share/myspell /usr/share/lyx/thes - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - font_pkg_postinst - gnome2_icon_cache_update - - # fix for bug 91108 - if use latex ; then - texhash - fi - - # instructions for RTL support. See also bug 168331. - if use linguas_he || use linguas_ar; then - elog - elog "Enabling RTL support in LyX:" - elog "If you intend to use a RTL language (such as Hebrew or Arabic)" - elog "You must enable RTL support in LyX. To do so start LyX and go to" - elog "Tools->Preferences->Language settings->Language" - elog "and make sure the \"Right-to-left language support\" is checked" - elog - fi -} - -pkg_postrm() { - gnome2_icon_cache_update - - if use latex ; then - texhash - fi -} diff --git a/app-office/lyx/lyx-2.0.5.ebuild b/app-office/lyx/lyx-2.1.0_beta2.ebuild similarity index 82% rename from app-office/lyx/lyx-2.0.5.ebuild rename to app-office/lyx/lyx-2.1.0_beta2.ebuild index b879fcc2..e59134b3 100644 --- a/app-office/lyx/lyx-2.0.5.ebuild +++ b/app-office/lyx/lyx-2.1.0_beta2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.4.ebuild,v 1.6 2012/10/10 15:23:33 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.6.ebuild,v 1.10 2013/06/29 16:21:16 ago Exp $ EAPI=3 @@ -15,13 +15,14 @@ FONT_S="${S}/lib/fonts" FONT_SUFFIX="ttf" DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." HOMEPAGE="http://www.lyx.org/" -SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz" -#SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/rc3/${MY_P}.tar.xz" +#SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz" +SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.1/${MY_P}/${MY_P}.tar.xz" +RESTRICT="test" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x64-macos ~x86-macos" -IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" +IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" @@ -29,11 +30,8 @@ for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}" done -COMMONDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-core:4 - dev-libs/libxml2 - media-libs/fontconfig - media-libs/freetype +COMMONDEPEND="dev-qt/qtgui:4 + dev-qt/qtcore:4 >=dev-libs/boost-1.34" RDEPEND="${COMMONDEPEND} @@ -41,7 +39,7 @@ RDEPEND="${COMMONDEPEND} || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) cups? ( net-print/cups ) latex? ( - virtual/latex-base + app-text/texlive app-text/ghostscript-gpl app-text/noweb app-text/dvipng @@ -60,8 +58,6 @@ RDEPEND="${COMMONDEPEND} dev-tex/tex4ht ) ) - xetex? ( dev-texlive/texlive-xetex ) - luatex? ( >=dev-texlive/texlive-luatex-2010 ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf @@ -83,7 +79,6 @@ RDEPEND="${COMMONDEPEND} enchant? ( app-text/enchant )" DEPEND="${COMMONDEPEND} - sys-devel/bc virtual/pkgconfig nls? ( sys-devel/gettext )" @@ -128,7 +123,9 @@ src_install() { doins "${T}"/hebrew.bind || die fi - newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png + newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png + doicon -s 48 "${S}/lib/images/lyx.png" + doicon -s scalable "${S}/lib/images/lyx.svg" make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;" # fix for bug 91108