From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-office/texmacs/Manifest | 9 +++ .../texmacs-1.99-remove-new-declaration.patch | 19 ++++++ .../texmacs/files/texmacs-1.99.2-desktop.patch | 23 +++++++ .../files/texmacs-1.99.6-guile-size_t.patch | 21 ++++++ .../texmacs/files/texmacs-1.99.6-math_util.patch | 15 +++++ app-office/texmacs/files/texmacs-plugins-1.patch | 48 ++++++++++++++ app-office/texmacs/files/texmacs-updates.patch | 29 +++++++++ app-office/texmacs/metadata.xml | 15 +++++ app-office/texmacs/texmacs-1.99.6-r2.ebuild | 76 ++++++++++++++++++++++ 9 files changed, 255 insertions(+) create mode 100644 app-office/texmacs/Manifest create mode 100644 app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch create mode 100644 app-office/texmacs/files/texmacs-1.99.2-desktop.patch create mode 100644 app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch create mode 100644 app-office/texmacs/files/texmacs-1.99.6-math_util.patch create mode 100644 app-office/texmacs/files/texmacs-plugins-1.patch create mode 100644 app-office/texmacs/files/texmacs-updates.patch create mode 100644 app-office/texmacs/metadata.xml create mode 100644 app-office/texmacs/texmacs-1.99.6-r2.ebuild (limited to 'app-office/texmacs') diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest new file mode 100644 index 000000000000..c0cb0427cea7 --- /dev/null +++ b/app-office/texmacs/Manifest @@ -0,0 +1,9 @@ +AUX texmacs-1.99-remove-new-declaration.patch 842 BLAKE2B d460a29e2c25467083f3dce164bc194aa49b7621188a701b057918a99ed377cd3467e8eec6b0c6988269454950a8750498fe0bb0bbf001eaf434221cfbe695cb SHA512 2296a42b907577f44e3b498ffa95cf1a1cc1dc729e340d3238b1e19796854d7405fbab888910f1f305a87477cdd40648a7bd2c5651f65bc642273ef4310df9a9 +AUX texmacs-1.99.2-desktop.patch 632 BLAKE2B cecbcf2b6cd731ef6e710d6e361af138a7ecc3f799fa1a046239319f481eac5a7ad4a7c40ab77e4c18809b9d80e51cb3b4815465e29d7e4597cbba1575fca885 SHA512 b523cde99001915ea83b1dfc644f1d4189b7c04ca11d7504e4f63dad1c19c6bb23af1d6b028ff9635594146c7263730a843b833cd77bf9a91023102f68e7cac3 +AUX texmacs-1.99.6-guile-size_t.patch 777 BLAKE2B de238311e50465a7644cd2b38dcdab093e7607edfb1b256b691a440c10254417c57c1cabcab694ff2e2001fe7772d23f0fbc0d75bd89807434805030adc60c5f SHA512 646123b545eb64c5af8041c0d93498ea8f984a6ac6c9820288c3e9a0e78a4dc3ef85665839aa48af02078aa41cf3ff60af6d759f5e16ad3a85f1a0dcf964c1ec +AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495edaeb93698068c3fd17c6705b3e70f571f28fb51e62e9568b22c77b8f20a59253bc9d994b890f555cf30ab58df84bf89 SHA512 9bc920c80ad5e68bf2262c1f808ac71b04fdeb301f0daa884ee1049c668f80151c4ab94972f902ec7417f6fed3057e5373673c0507597dcacc97b932bdf8ced5 +AUX texmacs-plugins-1.patch 2920 BLAKE2B b0b19c3e573b6d8d4a10b128feee839bd991eab46d39b5959d3afce3a02ccc471a6db9b5807523f35fb23dae87957b19fce1181296453fb19e2538c720798a38 SHA512 e8d9617166b712dfdf72b4c7b97a8945cbd5d505c092eb59a31de05b44b48d75839cb6344ba96ec378cca322a3fc17d99cb7f8e27c1fed86dc0d3329b02c1ca6 +AUX texmacs-updates.patch 1387 BLAKE2B 4a6014fb55e912611aab02fc27970aad58183f3cabded7f773def36c56a0dd1ae6e16c955c7b6ee37a696470e04219dfb5abaf64885c3d1af9c8dc792f73511f SHA512 209c5f64e21ae76fe41419101afb98ce4f61f040e9d29e3dbe37ec5bb0e16a1f3dd5aebe381db99e8d7278c5c36cd1654f78ba4af69e032670b1fdb62aafbda1 +DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9290488031d6f7f4343be4a04af44d8994dc791eb23a2a2b71b7a853a3a90482313062fbfc045cf585afdf8f1f8d2a5f3 SHA512 2e262037654493075cc4a3d47b93de08c3ad2d6f10ce5fe814a8046b38d327c5dd88c1575dff7e2145f1541f9765dc50ec5abcd63146090eea98ab5db9d103ee +EBUILD texmacs-1.99.6-r2.ebuild 1785 BLAKE2B 6fb9540ef2c46708964b09fc23b5a74e6ea118c305ce8854b5de63e006031ed15b23c0a3f0ac8f4c3f33992893107352344c55188d56e5f8903179ecefc1bba6 SHA512 8cfd5382dae4077521cef701d4035091dd3bb747bc228014317fb239ca956866203003e73c45dd23923f0f538ae7426793eb1c9e071cb8c9c455cf6281759af9 +MISC metadata.xml 465 BLAKE2B 83db49ca728b78d790abe6b985aa080aeeef8c053a11b3528ae5ffceaf9869412e54811869126783ab342b39664413ff8c456677234e6ee7b0e16284c4006a05 SHA512 265d5a99f3545c420a002d757a136dc4bfd320af5420d70b723b023274ee7a44ed47e26735cec36775130f4a0dcc984f29239514780e3a8e86cbae00c93e9610 diff --git a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch new file mode 100644 index 000000000000..45b08226f652 --- /dev/null +++ b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch @@ -0,0 +1,19 @@ +Remove new/delete declarations, which cause problems with recent GCC versions: +* /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4/new:135:41: error: declaration of ‘void operator delete [](void*) throw ()’ has a different exception specifier + +See also: https://bugs.gentoo.org/show_bug.cgi?id=590002 + +--- TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp ++++ TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp +@@ -384,11 +384,6 @@ + void operator delete (register void* ptr) throw(); + void* operator new[] (register size_t s) throw(std::bad_alloc); + void operator delete[] (register void* ptr) throw(); +-#else +-void* operator new (register size_t s); +-void operator delete (register void* ptr); +-void* operator new[] (register size_t s); +-void operator delete[] (register void* ptr); + #endif + #endif // not defined NO_FAST_ALLOC + diff --git a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch new file mode 100644 index 000000000000..275f5571ebd8 --- /dev/null +++ b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch @@ -0,0 +1,23 @@ + TeXmacs/misc/mime/texmacs.desktop | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/TeXmacs/misc/mime/texmacs.desktop b/TeXmacs/misc/mime/texmacs.desktop +index 493103c..cfd66b3 100644 +--- a/TeXmacs/misc/mime/texmacs.desktop ++++ b/TeXmacs/misc/mime/texmacs.desktop +@@ -1,14 +1,9 @@ + [Desktop Entry] + Name=GNU TeXmacs + Comment=A structured wysiwyg scientific text editor +-BinaryPattern=texmacs +-Protocols= + MimeType=text/x-texmacs;text/plain;text/x-tex; + Exec=texmacs %f + Icon=TeXmacs +-TerminalOptions= +-Path= + Type=Application +-Terminal=0 +-MapNotify=false ++Terminal=false + Categories=Education;Science;Math; diff --git a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch new file mode 100644 index 000000000000..3068169618fb --- /dev/null +++ b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch @@ -0,0 +1,21 @@ +C compiler compiles this code for bot int-based and size_t-based +guile. C++ compiler does not (and is what used by texmacs). + +https://bugs.gentoo.org/652054 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 37e9e87..5de2711 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}") + SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS}) + SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES}) + + MESSAGE(STATUS "Checking the size_t of guile strings") + +-CHECK_C_SOURCE_COMPILES( "#include ++CHECK_CXX_SOURCE_COMPILES( "#include + #include + void print_string (SCM s) { + int len_r; + char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; } + " _guile_str_size_test) diff --git a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch new file mode 100644 index 000000000000..006c92c2be33 --- /dev/null +++ b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch @@ -0,0 +1,15 @@ +diff -r -U2 TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp +--- TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp 2017-12-22 03:27:43.000000000 +0700 ++++ TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp 2017-12-22 16:44:35.052378917 +0700 +@@ -24,11 +24,4 @@ + inline int sign (double x) { return x>0?1:x<0?-1:0; } + inline bool fnull (double x, double approx) { return norm(x) <= approx; } +-#ifndef __SUNPRO_CC +-inline double pow (double x, int n) { +- double r= 1.0; +- while (n > 0) { r *= x; n--; } +- return r; } +-#endif +- + + #endif // defined MATH_UTIL_H diff --git a/app-office/texmacs/files/texmacs-plugins-1.patch b/app-office/texmacs/files/texmacs-plugins-1.patch new file mode 100644 index 000000000000..1d3299f407ce --- /dev/null +++ b/app-office/texmacs/files/texmacs-plugins-1.patch @@ -0,0 +1,48 @@ +diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/axiom/Makefile TeXmacs-1.0.7.21-src/plugins/axiom/Makefile +--- TeXmacs-1.0.7.21-src.orig/plugins/axiom/Makefile 2013-11-04 06:09:24.000000000 +0700 ++++ TeXmacs-1.0.7.21-src/plugins/axiom/Makefile 2013-12-29 02:40:24.263756226 +0700 +@@ -16,3 +16,3 @@ + bin/tm_axiom: src/tm_axiom.c +- $(CC) $(CPPFLAGS) $(CFLAGS) src/tm_axiom.c -o bin/tm_axiom ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_axiom.c -o bin/tm_axiom + +diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/graphviz/Makefile TeXmacs-1.0.7.21-src/plugins/graphviz/Makefile +--- TeXmacs-1.0.7.21-src.orig/plugins/graphviz/Makefile 2013-11-04 06:09:18.000000000 +0700 ++++ TeXmacs-1.0.7.21-src/plugins/graphviz/Makefile 2013-12-29 02:41:10.245753123 +0700 +@@ -16,3 +16,3 @@ + bin/tm_graphviz: src/tm_graphviz.c +- $(CC) $(CPPFLAGS) $(CFLAGS) src/tm_graphviz.c -o bin/tm_graphviz ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_graphviz.c -o bin/tm_graphviz + +diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/maple/Makefile TeXmacs-1.0.7.21-src/plugins/maple/Makefile +--- TeXmacs-1.0.7.21-src.orig/plugins/maple/Makefile 2013-11-04 06:09:23.000000000 +0700 ++++ TeXmacs-1.0.7.21-src/plugins/maple/Makefile 2013-12-29 02:41:45.834750721 +0700 +@@ -17,3 +17,3 @@ + bin/tm_maple_5: src/tm_maple_5.cpp +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5 ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5 + +diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/mathematica/Makefile TeXmacs-1.0.7.21-src/plugins/mathematica/Makefile +--- TeXmacs-1.0.7.21-src.orig/plugins/mathematica/Makefile 2013-11-04 06:09:22.000000000 +0700 ++++ TeXmacs-1.0.7.21-src/plugins/mathematica/Makefile 2013-12-29 02:42:33.470747506 +0700 +@@ -14,3 +14,3 @@ + bin/realpath: src/realpath.c +- $(CC) $(CPPFLAGS) $(CFLAGS) src/realpath.c -o bin/realpath ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/realpath.c -o bin/realpath + +diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/r/Makefile TeXmacs-1.0.7.21-src/plugins/r/Makefile +--- TeXmacs-1.0.7.21-src.orig/plugins/r/Makefile 2013-11-04 06:09:24.000000000 +0700 ++++ TeXmacs-1.0.7.21-src/plugins/r/Makefile 2013-12-29 02:43:32.538743520 +0700 +@@ -16,3 +16,3 @@ + bin/tm_r: src/tm_r.c +- $(CC) $(CPPFLAGS) $(CFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil + +diff -r -U1 TeXmacs-1.0.7.21-src.orig/plugins/shell/Makefile TeXmacs-1.0.7.21-src/plugins/shell/Makefile +--- TeXmacs-1.0.7.21-src.orig/plugins/shell/Makefile 2013-11-04 06:09:21.000000000 +0700 ++++ TeXmacs-1.0.7.21-src/plugins/shell/Makefile 2013-12-29 02:44:07.584741155 +0700 +@@ -16,3 +16,3 @@ + bin/tm_shell: src/tm_shell.cpp +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I../../src/System src/tm_shell.cpp -o bin/tm_shell -lutil ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -I../../src/System src/tm_shell.cpp -o bin/tm_shell -lutil + diff --git a/app-office/texmacs/files/texmacs-updates.patch b/app-office/texmacs/files/texmacs-updates.patch new file mode 100644 index 000000000000..f9517cd25edc --- /dev/null +++ b/app-office/texmacs/files/texmacs-updates.patch @@ -0,0 +1,29 @@ +diff -r -U1 TeXmacs-1.0.7.16-src.orig/Makefile.in TeXmacs-1.0.7.16-src/Makefile.in +--- TeXmacs-1.0.7.16-src.orig/Makefile.in 2012-07-09 21:33:36.000000000 +0700 ++++ TeXmacs-1.0.7.16-src/Makefile.in 2012-09-16 11:20:06.000000000 +0700 +@@ -171,3 +171,2 @@ + $(DESTDIR)$(datadir)/applications +- @update-desktop-database 2>/dev/null || : + $(MKDIR) $(DESTDIR)$(datadir)/application-registry +@@ -181,3 +180,2 @@ + $(CP) $(tmdir)/misc/mime/texmacs.xml $(DESTDIR)$(datadir)/mime/packages +- @update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || : + $(MKDIR) $(DESTDIR)$(datadir)/pixmaps +@@ -193,4 +191,2 @@ + $(DESTDIR)$(datadir)/icons/gnome/scalable/mimetypes +- @gtk-update-icon-cache -t --force \ +- $(DESTDIR)$(datadir)/icons/gnome 2>/dev/null || : + @echo installed TeXmacs mime info in $(DESTDIR)$(datadir) +@@ -223,3 +219,2 @@ + $(RM) $(datadir)/applications/texmacs.desktop +- @update-desktop-database 2>/dev/null || : + $(RM) $(datadir)/application-registry/texmacs.applications +@@ -228,3 +223,2 @@ + $(RM) $(datadir)/mime/packages/texmacs.xml +- @update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || : + $(RM) $(datadir)/pixmaps/TeXmacs.xpm +@@ -232,4 +226,2 @@ + $(RM) $(datadir)/icons/gnome/scalable/mimetypes/text-texmacs.svg +- @gtk-update-icon-cache -t --force \ +- $(DESTDIR)$(datadir)/icons/gnome 2>/dev/null || : + @echo removed TeXmacs mime info from $(datadir) diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml new file mode 100644 index 000000000000..ba45e88b5f02 --- /dev/null +++ b/app-office/texmacs/metadata.xml @@ -0,0 +1,15 @@ + + + + + grozin@gentoo.org + Andrey Grozin + + + sci@gentoo.org + Gentoo Science Project + + + Add support for media-libs/netpbm + + diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild new file mode 100644 index 000000000000..d033045a79f5 --- /dev/null +++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils xdg-utils gnome2-utils qmake-utils + +MY_P=${P/tex/TeX}-src + +DESCRIPTION="Wysiwyg text processor with high-quality maths" +HOMEPAGE="http://www.texmacs.org/" +SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +IUSE="jpeg netpbm sqlite svg spell" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + app-text/ghostscript-gpl + =dev-qt/qtcore-5.9.1:5 + >=dev-qt/qtgui-5.9.1:5 + >=dev-qt/qtwidgets-5.9.1:5 + >=dev-qt/qtprintsupport-5.9.1:5 + sqlite? ( dev-db/sqlite ) + jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) + netpbm? ( media-libs/netpbm ) + spell? ( app-text/aspell ) + svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # respect LDFLAGS, bug #338459 + "${FILESDIR}"/${PN}-plugins-1.patch + + # dont update mime and desktop databases and icon cache + "${FILESDIR}"/${PN}-updates.patch + + "${FILESDIR}"/${PN}-1.99.2-desktop.patch + + # remove new/delete declarations, bug 590002 + "${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch + + "${FILESDIR}"/${PN}-1.99.6-math_util.patch + + # fix build failure on 32-bit systems, bug #652054 + "${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch +) + +src_configure() { + local mycmakeargs=( + -DUSE_SQLITE=$(usex sqlite sqlite3) + ) + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} -- cgit v1.2.3