diff options
| author |   Pavel Sanda <ps@twin.jikos.cz> | 2014-03-24 21:33:46 -0700 |
|---|---|---|
| committer | Pavel Sanda <ps@twin.jikos.cz> | 2014-03-24 21:33:46 -0700 |
| commit | a98ee524d1308fbac9fb7f7069a7e80b7f331d93 (patch) | |
| tree | 81aa3cb8092c6d6f070cdd28a774df0ebffce450 | |
| parent | add lyx rc1 (diff) | |
| download | rebutia-a98ee524d1308fbac9fb7f7069a7e80b7f331d93.tar.gz rebutia-a98ee524d1308fbac9fb7f7069a7e80b7f331d93.tar.bz2 rebutia-a98ee524d1308fbac9fb7f7069a7e80b7f331d93.zip | |
live lyx ebuild - change python patch
| -rw-r--r-- | app-office/lyx/Manifest | 2 | ||||
| -rw-r--r-- | app-office/lyx/files/2.0.3-python.patch | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index dae1cca..ddd5c86 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,6 +1,6 @@ AUX 1.6.7-python.patch 906 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d SHA512 60d66a25788102da05e25e69297ba572ff62a5532c36a3c666e7f1d24c023e27e7b9056888b74f6e9ba4581198dcb51cba12f549c374fc7f0a520c39360d2886 WHIRLPOOL d573cb6b4804a65616b8595a9dae7b1f76a807e04335a318e22a1d8cfc7419d7eb04c5fc7cec647bb64b5a3fd4c1c154e2b0d6f4e044ccba756bd18bbbb37791 AUX 2.0-python.patch 1036 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8 SHA512 81bf78b837d9a4621a230d3d1d4e45c306598b4047227b88e83054268571a496a71babdfe5152b47370a3dbf91767aed366984555225c3900bf6d55dc0e43d31 WHIRLPOOL e47a40db707b68c923bce136c72742242a974fe17c8a167fa0ca6f428bf2937feba3122737417e0902f320c0a8df1d4da72702eea4e4d4fe699b5176bbe5ed19 -AUX 2.0.3-python.patch 1036 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8 SHA512 81bf78b837d9a4621a230d3d1d4e45c306598b4047227b88e83054268571a496a71babdfe5152b47370a3dbf91767aed366984555225c3900bf6d55dc0e43d31 WHIRLPOOL e47a40db707b68c923bce136c72742242a974fe17c8a167fa0ca6f428bf2937feba3122737417e0902f320c0a8df1d4da72702eea4e4d4fe699b5176bbe5ed19 +AUX 2.0.3-python.patch 1019 SHA256 a8f93b41bf55f823caec23487aee432bad6e7b55187c6f115decdda855380010 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8 WHIRLPOOL 74ad7056a5e74a95b7150fd14d2aac410c367a1bf98d7d8e2d68b5102059951e8ec40a877b534effc9b3fea04a38acdbadc2d1ce819272cb7d5e4d63bc172404 AUX 2.0.patches 9724 SHA256 9bf26943ce4f27b4cdbfa924f3097aa1bfba6e23a10d8db494148066e9bf8a39 SHA512 99bdb8204d2f2d40adbb6280e8273b6d974ad6db5575388bedb6ed913a2afa17f693c6f35d600cc7d35d637f3426dcc485237be3548f47055588a5c199fb66db WHIRLPOOL b5c1555147329388d4bb1911712a38256c518a4d17cadba3911d125313a607e9eabd5b2f81c4831b6b9b8ae38c05ce0d9c37305b31286a0773fa3288e7c37a08 DIST lyx-2.1.0beta1.tar.xz 10314988 SHA256 5d38caa23e156669da6ebfff8fb80125db24704d9733648eb21be7a2b01f6203 SHA512 77191e569f91ff9b993eb3ce867f45e66924cc293565c9d3bb4d75ce2e98ca3de254528e6f183b7f5fa2bf34b0cd1ba9c3f2d8d4e5daa7b08967365a6b722b01 WHIRLPOOL 79ef55f9a28c0eb9934a14dcda329c456c7f31d505c43adf260fd77db9727f08160236d8104ca1df255cc343608a9f3a8255b27227a275749643f136fbde1a82 DIST lyx-2.1.0beta2.tar.xz 10335516 SHA256 a5a8ee45b6e5c58848dd887fd2c9b6a04273ae4b8a79c7c301472bd0c0eab1b1 SHA512 1697505ea1f4112076b041a488d347a86e53b97e205c2c39afa02bc7bf533a31b944ff1270dc53e240beb815ea74c3460bfc0f2baf3bc396025fcc39e200e0a5 WHIRLPOOL ecea0c9371b41addefe702d77c5c2c49a8f230d0e284b52b0ae30b6b7fbdc6d27acb8b276f2c032a08453643392e20940ae9622f37c3bc089ab7c22e8d92bc20 diff --git a/app-office/lyx/files/2.0.3-python.patch b/app-office/lyx/files/2.0.3-python.patch index e12f66a..5fb2165 100644 --- a/app-office/lyx/files/2.0.3-python.patch +++ b/app-office/lyx/files/2.0.3-python.patch @@ -12,15 +12,18 @@ index 97c4f68..8f05e62 100644 "import os, shutil, sys\n\n" "def unlinkNoThrow(file):\n" diff --git a/src/support/os.cpp b/src/support/os.cpp -index f36331c..02f5a93 100644 +index 8f60c68..2f1cb91 100644 --- a/src/support/os.cpp +++ b/src/support/os.cpp -@@ -57,7 +57,7 @@ static string const python2(string const & binary, bool verbose = false) - string const python() +@@ -63,9 +63,9 @@ int timeout_min() + string const python(bool reset) { // Check whether the first python in PATH is the right one. - static string command = python2("python -tt"); + static string command = python2("python2 -tt"); + if (reset) { +- command = python2("python -tt"); ++ command = python2("python2 -tt"); + } if (command.empty()) { - // It was not, so check whether we can find it elsewhere in |