Commits

松井 鉄史 committed 607eef4

app-office/lyx-2.0.3: no patch, no conditional

  • Participants
  • Parent commits cf1b4ca

Comments (0)

Files changed (4)

File app-office/lyx/Manifest

-AUX 1.6.7-python.patch 906 RMD160 74a2f14445d6b011fe04d06f3bd6710d36ab6351 SHA1 a9bc180553105b61767a82280e211a2c187cfbd4 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d
 AUX 2.0-python.patch 1036 RMD160 1fdf43487cb67e61b02387834402e9618de87082 SHA1 834ac9383503078c6e9d54610056704b7c9d23c0 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8
-AUX lyx-2.0.3-qt4framework.patch 809 RMD160 6622e9906368123e4edc3508f6cc54ec57503384 SHA1 eff09ce37196e98823d66b1bcc42c468ccf3f5ca SHA256 88aa357d104873d008b863c6aa38e277887dd1c9abefddabe808db04c6a4a712
 AUX lyx.desktop 215 RMD160 13192f0f4e84e870565a3daff7d46c56954ed0fe SHA1 f72f3ff17a3a1b84cbb0aaf12c9e75387879a420 SHA256 b0ffd201e0a2e0cb39a52aadb9921e86fbb31c8d3cac04526371d6606246898c
 DIST lyx-2.0.3.tar.xz 10265532 RMD160 fcb3a09626fb5dc49ae25654b5f98e9989d5ff00 SHA1 109dae0ef22a7d8944964b32ee380ad170b0665f SHA256 4e1c993754acfb14d5e0f2bd2521fb6686d08e0656ec6e5fde0406c285a05ac8
-EBUILD lyx-2.0.3.ebuild 4829 RMD160 dafebb8da9924c45a753d5b986328ce5aaa1c7c3 SHA1 aafabfa7870b811737accde076bae676a25232f6 SHA256 216b5a907ad384b1123f38120404d9a570f4cb562856cd2f9eb3a7f85ba10974
+EBUILD lyx-2.0.3.ebuild 4663 RMD160 54462b24eac26bee7b143d6935cead3ac03ba535 SHA1 b3782cbf06a54ebb094100093dae0ffde05dc14a SHA256 3690f044d3c5b1e46db59c639f610a7b24337cb1e1ed1ed7b59ec724e36d4d48
 MISC ChangeLog 32739 RMD160 7251b479500c9e46f757c67841a328955c9d1e90 SHA1 720906edb9b565d386387b691677b361520037d3 SHA256 99b8aa1a6aecac68fd0c96297f1a83f2966dc24a2d560668fe7ffbc4d7647ed1
 MISC metadata.xml 1572 RMD160 850394a1700004439f7258d04732517216d8e31c SHA1 99c60675f6273f853498479676a4be74e07182b3 SHA256 330d0d86b06c6ce15cea6cfdd3bd070bddc82309346902481883575fd211ec14

File app-office/lyx/files/1.6.7-python.patch

-diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
-index 97c4f68..8f05e62 100644
---- a/src/graphics/GraphicsConverter.cpp
-+++ b/src/graphics/GraphicsConverter.cpp
-@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
- 	LYXERR(Debug::GRAPHICS, "build_script ... ");
- 	typedef Graph::EdgePath EdgePath;
- 
--	script << "#!/usr/bin/env python\n"
-+	script << "#!/usr/bin/env python2\n"
- 		  "# -*- coding: utf-8 -*-\n"
- 		  "import os, shutil, sys\n\n"
- 		  "def unlinkNoThrow(file):\n"
-diff --git a/src/support/os.cpp b/src/support/os.cpp
-index 6984d2c..e6f17ff 100644
---- a/src/support/os.cpp
-+++ b/src/support/os.cpp
-@@ -26,7 +26,7 @@ string const python()
- {
- 	// Use the -tt switch so that mixed tab/whitespace indentation is
- 	// an error
--	static string const command("python -tt");
-+	static string const command("python2 -tt");
- 	return command;
- }
- 

File app-office/lyx/files/lyx-2.0.3-qt4framework.patch

---- config/qt4.m4.orig	2010-09-29 04:27:10.000000000 +0900
-+++ config/qt4.m4	2012-03-14 20:00:54.000000000 +0900
-@@ -28,7 +28,7 @@
- 		AC_LANG_CPLUSPLUS
- 		SAVE_CXXFLAGS=$CXXFLAGS
- 		CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
--		for libname in -lQtCore -lQtCore4 '-framework QtCore'
-+		for libname in '-framework QtCore' -lQtCore -lQtCore4
- 		do
- 			QT4_TRY_LINK($libname)
- 			if test -n "$qt4_cv_libname"; then
-@@ -37,9 +37,9 @@
- 			fi
- 		done
- 		qt4_cv_libname=
--		for libname in '-lQtCore -lQtGui' \
--		               '-lQtCore4 -lQtGui4' \
--		               '-framework QtCore -framework QtGui'
-+		for libname in '-framework QtCore -framework QtGui'\
-+		               '-lQtCore -lQtGui' \
-+		               '-lQtCore4 -lQtGui4'
- 		do
- 			QT4_TRY_LINK($libname)
- 			if test -n "$qt4_cv_libname"; then

File app-office/lyx/lyx-2.0.3.ebuild

 PYTHON_DEPEND="2"
 
 inherit qt4-r2 eutils flag-o-matic font python toolchain-funcs
-# 392195: until patch will be upstreamed
-inherit autotools
 
 MY_P="${P/_}"
 
 	epatch "${FILESDIR}"/2.0-python.patch
 	echo "#!/bin/sh" > config/py-compile
 	sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die
-
-	# 392195: until patch will be upstreamed
-	epatch "${FILESDIR}"/lyx-2.0.3-qt4framework.patch
-	eautoreconf
 }
 
 src_configure() {