mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
Update to 2.1.0.
This allows us to remove many patches that made it into the 2.1 series. For a list of changes, see http://wiki.lyx.org/LyX/NewInLyX21
This commit is contained in:
Raphael Kubo da Costa
parent
18d30488cc
commit
0bbad73ac6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=353034
@ -19,8 +19,8 @@ LICENSE= GPLv2
|
||||
LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \
|
||||
libmythes-1.2.so:${PORTSDIR}/textproc/mythes
|
||||
|
||||
MAJOR_VERSION= 2.0
|
||||
MINOR_VERSION= 8
|
||||
MAJOR_VERSION= 2.1
|
||||
MINOR_VERSION= 0
|
||||
|
||||
USES= desktop-file-utils gmake iconv pkgconfig perl5
|
||||
USE_PYTHON= 2
|
||||
@ -46,13 +46,4 @@ HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
|
||||
NLS_CONFIGURE_OFF= --disable-nls
|
||||
NLS_USES= gettext
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
post-install:
|
||||
# Manually install the 48x48 icon and .desktop file.
|
||||
# Will not be needed in the 2.1 series, see LyX tickets 2820 and 7919.
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/images/lyx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
|
||||
${INSTALL_DATA} ${FILESDIR}/lyx.desktop ${STAGEDIR}${PREFIX}/share/applications
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (lyx-2.0.8.tar.xz) = b4bd32cf5f2c374b1ff88b69b53db0a2ba840942df0c3886b295fb2020683b5e
|
||||
SIZE (lyx-2.0.8.tar.xz) = 10480012
|
||||
SHA256 (lyx-2.1.0.tar.xz) = f1c9a4f2387e38efee43c0684b4f6fc0972f68d6cb2ad06a1b30c58a81f22d48
|
||||
SIZE (lyx-2.1.0.tar.xz) = 10600316
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=LyX
|
||||
GenericName=Document Processor
|
||||
Comment=High level LaTeX frontend
|
||||
Exec=lyx %F
|
||||
TryExec=lyx
|
||||
Icon=lyx
|
||||
StartupNotify=false
|
||||
StartupWMClass=Lyx
|
||||
Terminal=false
|
||||
Categories=Office;WordProcessor;Qt;
|
||||
MimeType=text/x-lyx;application/x-lyx;
|
||||
@ -1,25 +1,8 @@
|
||||
The first change is required to use the C++ tr1 headers only with libstdc++, as
|
||||
they are not in C++11.
|
||||
|
||||
The second change is required to build with libc++, and is commit
|
||||
ca7214b410d80c2108dfb43b89cf3c8fc5073882 upstream:
|
||||
|
||||
commit ca7214b410d80c2108dfb43b89cf3c8fc5073882
|
||||
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
|
||||
Date: Thu Oct 17 23:39:36 2013 +0300
|
||||
|
||||
Remove FreeBSD checks when defining USE_WCHAR_T.
|
||||
|
||||
The problems the comments in the build systems refer to seem to have been
|
||||
fixed for years. [1] says the checks in libstdc++ have been improved, and
|
||||
all supported FreeBSD versions enable wchar_t support unconditionally in
|
||||
libstdc++. Additionally, this needlessly impacts FreeBSD when libc++ is used
|
||||
instead of libstdc++.
|
||||
|
||||
[1] http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.freebsd_wchar
|
||||
This change is required to use the C++ tr1 headers only with libstdc++, as they
|
||||
are not in C++11.
|
||||
--- config.h.in.orig 2013-10-20 20:37:35.000000000 +0300
|
||||
+++ config.h.in 2013-10-20 20:38:41.000000000 +0300
|
||||
@@ -633,7 +633,8 @@
|
||||
@@ -353,7 +353,8 @@
|
||||
|
||||
// TR1 regex not supported in GCC <= 4.5
|
||||
#ifndef LYX_USE_TR1
|
||||
@ -29,22 +12,3 @@ Date: Thu Oct 17 23:39:36 2013 +0300
|
||||
# define LYX_USE_TR1
|
||||
# endif
|
||||
#endif
|
||||
@@ -645,17 +646,7 @@
|
||||
# define BOOST_POSIX_PATH 1
|
||||
#endif
|
||||
|
||||
-/*
|
||||
- * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
|
||||
- * support compiled in:
|
||||
- * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
|
||||
- * And we are not interested at all what libc
|
||||
- * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
|
||||
- * has the needed wchar_t support and uses UCS4. Whether it
|
||||
- * implements this with the help of libc, or whether it has own code
|
||||
- * does not matter for us, because we do not use libc directly (Georg)
|
||||
-*/
|
||||
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
|
||||
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
|
||||
# define USE_WCHAR_T
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
From 2b0a7a5e01c71bd0c809844e0c6779f43870077b Mon Sep 17 00:00:00 2001
|
||||
From: Vincent van Ravesteijn <vfr@lyx.org>
|
||||
Date: Mon, 8 Oct 2012 21:28:55 +0200
|
||||
Subject: [PATCH] Disambiguate std::bind, boost::bind, std::ref, boost::ref
|
||||
|
||||
This fixes compilation with MSVC2012.
|
||||
---
|
||||
src/frontends/qt4/InGuiThread.h | 22 ++++++++++++----------
|
||||
1 file changed, 12 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/frontends/qt4/InGuiThread.h b/src/frontends/qt4/InGuiThread.h
|
||||
index ea5d64b..0609cb0 100644
|
||||
--- src/frontends/qt4/InGuiThread.h
|
||||
+++ src/frontends/qt4/InGuiThread.h
|
||||
@@ -69,25 +69,25 @@ public:
|
||||
template<class F, class P1>
|
||||
R call(F f, P1& p1)
|
||||
{
|
||||
- return call(bind(f, ref(p1)));
|
||||
+ return call(lyx::bind(f, lyx::ref(p1)));
|
||||
}
|
||||
|
||||
template<class F, class P1, class P2>
|
||||
R call(F f, P1& p1, P2& p2)
|
||||
{
|
||||
- return call(bind(f, ref(p1), ref(p2)));
|
||||
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2)));
|
||||
}
|
||||
|
||||
template<class F, class P1, class P2, class P3>
|
||||
R call(F f, P1& p1, P2& p2, P3& p3)
|
||||
{
|
||||
- return call(bind(f, ref(p1), ref(p2), ref(p3)));
|
||||
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3)));
|
||||
}
|
||||
|
||||
template<class F, class P1, class P2, class P3, class P4>
|
||||
R call(F f, P1& p1, P2& p2, P3& p3, P4& p4)
|
||||
{
|
||||
- return call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4)));
|
||||
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4)));
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -97,7 +97,8 @@ public:
|
||||
template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
|
||||
R call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8)
|
||||
{
|
||||
- return call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4), ref(p5), ref(p6), ref(p7), ref(p8)));
|
||||
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4),
|
||||
+ lyx::ref(p5), lyx::ref(p6), lyx::ref(p7), lyx::ref(p8)));
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -131,25 +132,25 @@ public:
|
||||
template<class F, class P1>
|
||||
void call(F f, P1& p1)
|
||||
{
|
||||
- call(bind(f, ref(p1)));
|
||||
+ call(lyx::bind(f, lyx::ref(p1)));
|
||||
}
|
||||
|
||||
template<class F, class P1, class P2>
|
||||
void call(F f, P1& p1, P2& p2)
|
||||
{
|
||||
- call(bind(f, ref(p1), ref(p2)));
|
||||
+ call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2)));
|
||||
}
|
||||
|
||||
template<class F, class P1, class P2, class P3>
|
||||
void call(F f, P1& p1, P2& p2, P3& p3)
|
||||
{
|
||||
- call(bind(f, ref(p1), ref(p2), ref(p3)));
|
||||
+ call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3)));
|
||||
}
|
||||
|
||||
template<class F, class P1, class P2, class P3, class P4>
|
||||
void call(F f, P1& p1, P2& p2, P3& p3, P4& p4)
|
||||
{
|
||||
- call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4)));
|
||||
+ call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4)));
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -159,7 +160,8 @@ public:
|
||||
template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
|
||||
void call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8)
|
||||
{
|
||||
- call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4), ref(p5), ref(p6), ref(p7), ref(p8)));
|
||||
+ call(bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4), lyx::ref(p5),
|
||||
+ lyx::ref(p6), lyx::ref(p7), lyx::ref(p8)));
|
||||
}
|
||||
|
||||
private:
|
||||
--
|
||||
1.8.4.1
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
libc++/C++11 support, obtained from NetBSD.
|
||||
http://mail-index.netbsd.org/pkgsrc-changes/2013/05/09/msg088857.html
|
||||
--- src/support/debug.h
|
||||
+++ src/support/debug.h
|
||||
@@ -17,14 +17,8 @@
|
||||
|
||||
#include "support/strfwd.h"
|
||||
|
||||
-namespace std {
|
||||
-
|
||||
-class ios_base;
|
||||
-
|
||||
-template<typename CharT, typename Traits> class basic_streambuf;
|
||||
-typedef basic_streambuf<char, char_traits<char> > streambuf;
|
||||
-
|
||||
-}
|
||||
+#include <ios>
|
||||
+#include <streambuf>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
@ -1,33 +0,0 @@
|
||||
libc++/C++11 support, obtained from NetBSD.
|
||||
http://mail-index.netbsd.org/pkgsrc-changes/2012/11/23/msg081094.html
|
||||
--- src/support/strfwd.h
|
||||
+++ src/support/strfwd.h
|
||||
@@ -29,26 +29,8 @@ namespace lyx { typedef boost::uint32_t char_type; }
|
||||
#endif
|
||||
|
||||
|
||||
-namespace std {
|
||||
-
|
||||
-template<typename Alloc> class allocator;
|
||||
-
|
||||
-template<typename Char> struct char_traits;
|
||||
-template<> struct char_traits<char>;
|
||||
-#ifdef USE_WCHAR_T
|
||||
-template<> struct char_traits<wchar_t>;
|
||||
-#endif
|
||||
-
|
||||
-template<typename Char, typename Traits, typename Alloc> class basic_string;
|
||||
-typedef basic_string<char, char_traits<char>, allocator<char> > string;
|
||||
-
|
||||
-template<class Char, class Traits> class basic_istream;
|
||||
-template<class Char, class Traits> class basic_ostream;
|
||||
-
|
||||
-typedef basic_istream<char, char_traits<char> > istream;
|
||||
-typedef basic_ostream<char, char_traits<char> > ostream;
|
||||
-
|
||||
-} // namepace std
|
||||
+#include <iostream>
|
||||
+#include <string>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user