[139105] trunk/dports/aqua/LyX
khindenburg at macports.org
khindenburg at macports.org
Sun Aug 2 10:34:32 PDT 2015
Revision: 139105
https://trac.macports.org/changeset/139105
Author: khindenburg at macports.org
Date: 2015-08-02 10:34:32 -0700 (Sun, 02 Aug 2015)
Log Message:
-----------
lyx: update to 2.1.4; remove unused patches
Modified Paths:
--------------
trunk/dports/aqua/LyX/Portfile
Removed Paths:
-------------
trunk/dports/aqua/LyX/files/patch-configure.diff
trunk/dports/aqua/LyX/files/patch-libc++_compliance.diff
trunk/dports/aqua/LyX/files/patch-types.diff
Modified: trunk/dports/aqua/LyX/Portfile
===================================================================
--- trunk/dports/aqua/LyX/Portfile 2015-08-02 17:17:11 UTC (rev 139104)
+++ trunk/dports/aqua/LyX/Portfile 2015-08-02 17:34:32 UTC (rev 139105)
@@ -6,7 +6,7 @@
name LyX
conflicts LyX1
-version 2.1.3
+version 2.1.4
set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
license GPL-2+
@@ -37,8 +37,8 @@
ftp://ftp.lyx.org/pub/lyx/stable/${branch}.x/ \
http://gd.tuwien.ac.at/publishing/tex/lyx/stable/${branch}.x/
-checksums rmd160 5a7c7cc12d0e0a869ce498fdd5dd48d897785aaa \
- sha256 2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682
+checksums rmd160 aee21b0b039d8b759defaa1d44cf556bc2cecd5c \
+ sha256 d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a
patchfiles patch-config.h.in.diff
Deleted: trunk/dports/aqua/LyX/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/LyX/files/patch-configure.diff 2015-08-02 17:17:11 UTC (rev 139104)
+++ trunk/dports/aqua/LyX/files/patch-configure.diff 2015-08-02 17:34:32 UTC (rev 139105)
@@ -1,10 +0,0 @@
---- configure.orig 2010-11-14 05:58:06.000000000 -0500
-+++ configure 2011-01-30 20:56:40.000000000 -0500
-@@ -8746,6 +8746,7 @@
- QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
-
- LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
-+ LIBS="$LIBS -framework Carbon -framework AppKit"
- fi
- PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
-
Deleted: trunk/dports/aqua/LyX/files/patch-libc++_compliance.diff
===================================================================
--- trunk/dports/aqua/LyX/files/patch-libc++_compliance.diff 2015-08-02 17:17:11 UTC (rev 139104)
+++ trunk/dports/aqua/LyX/files/patch-libc++_compliance.diff 2015-08-02 17:34:32 UTC (rev 139105)
@@ -1,141 +0,0 @@
---- 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,7 @@
-
- // TR1 regex not supported in GCC <= 4.5
- #ifndef LYX_USE_TR1
--# if __GNUC__ == 4
-+# if 0
- # define LYX_USE_TR1
- # endif
- #endif
---- 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 {
---- src/support/strfwd.h
-+++ src/support/strfwd.h
-@@ -29,26 +29,8 @@
- #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 {
---- src/frontends/qt4/InGuiThread.h.orig 2013-04-29 11:58:31.000000000 -0400
-+++ src/frontends/qt4/InGuiThread.h 2013-11-03 22:38:13.000000000 -0500
-@@ -69,25 +69,25 @@
- template<class F, class P1>
- R call(F f, P1& p1)
- {
-- return call(bind(f, ref(p1)));
-+ return call(bind(f, boost::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(bind(f, boost::ref(p1), boost::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(bind(f, boost::ref(p1), boost::ref(p2), boost::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(bind(f, boost::ref(p1), boost::ref(p2), boost::ref(p3), boost::ref(p4)));
- }
-
- /*
-@@ -97,7 +97,7 @@
- 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(bind(f, boost::ref(p1), boost::ref(p2), boost::ref(p3), boost::ref(p4), boost::ref(p5), boost::ref(p6), boost::ref(p7), boost::ref(p8)));
- }
-
- private:
-@@ -131,25 +131,25 @@
- template<class F, class P1>
- void call(F f, P1& p1)
- {
-- call(bind(f, ref(p1)));
-+ call(bind(f, boost::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(bind(f, boost::ref(p1), boost::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(bind(f, boost::ref(p1), boost::ref(p2), boost::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(bind(f, boost::ref(p1), boost::ref(p2), boost::ref(p3), boost::ref(p4)));
- }
-
- /*
-@@ -159,7 +159,7 @@
- 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, boost::ref(p1), boost::ref(p2), boost::ref(p3), boost::ref(p4), boost::ref(p5), boost::ref(p6), boost::ref(p7), boost::ref(p8)));
- }
-
- private:
Deleted: trunk/dports/aqua/LyX/files/patch-types.diff
===================================================================
--- trunk/dports/aqua/LyX/files/patch-types.diff 2015-08-02 17:17:11 UTC (rev 139104)
+++ trunk/dports/aqua/LyX/files/patch-types.diff 2015-08-02 17:34:32 UTC (rev 139105)
@@ -1,11 +0,0 @@
---- src/support/docstring.h.orig 2014-05-08 13:30:22.000000000 -0400
-+++ src/support/docstring.h 2014-05-08 13:31:40.000000000 -0400
-@@ -24,7 +24,7 @@
- * Use std::string only in cases 7-bit ASCII is to be manipulated
- * within the variable.
- */
--typedef std::basic_string<char_type> docstring;
-+//typedef std::basic_string<char_type> docstring;
-
- /// Creates a docstring from a C string of ASCII characters
- docstring const from_ascii(char const *);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150802/3aca8c13/attachment-0001.html>
More information about the macports-changes
mailing list