* [gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/
@ 2020-09-20 14:41 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2020-09-20 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 3eab9edb0ef990241033e674f4bea6438b82bfc7
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 14 17:18:44 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eab9edb
app-office/lyx: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/17538
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-office/lyx/files/lyx-2.3.0-python.patch | 30 -----------------------------
1 file changed, 30 deletions(-)
diff --git a/app-office/lyx/files/lyx-2.3.0-python.patch b/app-office/lyx/files/lyx-2.3.0-python.patch
deleted file mode 100644
index e41c2604bf5..00000000000
--- a/app-office/lyx/files/lyx-2.3.0-python.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 8eea49370a..d7a0f81aa3 100644
---- a/src/support/os.cpp
-+++ b/src/support/os.cpp
-@@ -65,10 +65,10 @@ int timeout_min()
- string const python(bool reset)
- {
- // Check whether the first python in PATH is the right one.
-- static string command = python23("python -tt");
-+ static string command = python23("python2 -tt");
- // FIXME THREAD
- if (reset) {
-- command = python23("python -tt");
-+ command = python23("python2 -tt");
- }
-
- if (command.empty()) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/
@ 2024-07-06 8:18 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-07-06 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 4122954d19d1e38fa0dd4b01a442c09ec05546d0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jul 6 07:41:40 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 08:16:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4122954d
app-office/lyx: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/lyx/files/lyx-2.3.6.1-python.patch | 50 ---------------------
app-office/lyx/files/lyx-prefer-xdg-open.patch | 60 --------------------------
2 files changed, 110 deletions(-)
diff --git a/app-office/lyx/files/lyx-2.3.6.1-python.patch b/app-office/lyx/files/lyx-2.3.6.1-python.patch
deleted file mode 100644
index 666d82c06bf8..000000000000
--- a/app-office/lyx/files/lyx-2.3.6.1-python.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://src.fedoraproject.org/rpms/lyx/raw/054d18eb79a8ec3d4480ab4449b3c62b12770d2d/f/lyx-2.3.6-layout2layout.patch
---- a/lib/scripts/layout2layout.py
-+++ b/lib/scripts/layout2layout.py
-@@ -256,7 +256,7 @@
-
- def trim_bom(line):
- " Remove byte order mark."
-- if line[0:3] == "\357\273\277":
-+ if line[0:3] == b"\357\273\277":
- return line[3:]
- else:
- return line
-@@ -345,8 +345,8 @@
- # for categories
- re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
- re_ExtractCategory = re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\(([^)]+?)\\)\\s*}\\s*$')
-- ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters", "report": "Reports", \
-- "presentation" : "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" : "Handouts"}
-+ ConvDict = {b"article": b"Articles", b"book" : b"Books", b"letter" : b"Letters", b"report": b"Reports", \
-+ b"presentation" : b"Presentations", b"curriculum vitae" : b"Curricula Vitae", b"handout" : b"Handouts"}
- # Arguments
- re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
- re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
-@@ -485,7 +485,7 @@
- continue
- col = match.group(2)
- if col == "collapsable":
-- lines[i] = match.group(1) + "collapsible"
-+ lines[i] = match.group(1) + b"collapsible"
- i += 1
- continue
-
-@@ -703,7 +703,7 @@
- # Insert the required number of arguments at the end of the style definition
- match = re_End.match(lines[i])
- if match:
-- newarg = ['']
-+ newarg = [b'']
- # First the optionals (this is the required order pre 2.1)
- if opts > 0:
- if opts == 1:
-@@ -1153,7 +1153,7 @@
- if latextype == b"item_environment" and label.lower() == b"counter_enumi":
- lines[labeltype_line] = re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line])
- # Don't add the LabelCounter line later
-- counter = ""
-+ counter = b""
-
- # Replace
- #
diff --git a/app-office/lyx/files/lyx-prefer-xdg-open.patch b/app-office/lyx/files/lyx-prefer-xdg-open.patch
deleted file mode 100644
index 5e12f6c2e699..000000000000
--- a/app-office/lyx/files/lyx-prefer-xdg-open.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: "Dr. Tobias Quathamer" <toddy@debian.org>
-Date: Wed, 31 Jan 2018 23:27:37 +0100
-Subject: Prefer xdg-open
-
-Add xdg-open as the first choice whenever this seems to be useful.
----
- lib/configure.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/configure.py b/lib/configure.py
-index 7fee68d..abc4d53 100644
---- a/lib/configure.py
-+++ b/lib/configure.py
-@@ -657,7 +657,7 @@ def checkFormatEntries(dtl_tools):
- checkViewerEditor('a Dia viewer and editor', ['dia'],
- rc_entry = [r'\Format dia dia DIA "" "%%" "%%" "vector,zipped=native", "application/x-dia-diagram"'])
- #
-- checkViewerEditor('an OpenDocument drawing viewer and editor', ['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
-+ checkViewerEditor('an OpenDocument drawing viewer and editor', ['xdg-open', 'libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
- rc_entry = [r'\Format odg "odg, sxd" "OpenDocument drawing" "" "%%" "%%" "vector,zipped=native" "application/vnd.oasis.opendocument.graphics"'])
- #
- checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
-@@ -682,16 +682,16 @@ def checkFormatEntries(dtl_tools):
- \Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap"
- \Format xpm xpm XPM "" "%s" "%s" "" "image/x-xpixmap"'''
- path, iv = checkViewerNoRC('a raster image viewer',
-- ['xv', 'gwenview', 'kview',
-+ ['xdg-open', 'xv', 'gwenview', 'kview',
- 'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt',
-- 'xdg-open', 'gimp-remote', 'gimp'],
-+ 'gimp-remote', 'gimp'],
- rc_entry = [imageformats])
- path, ie = checkEditorNoRC('a raster image editor',
- ['gimp-remote', 'gimp'], rc_entry = [imageformats])
- addToRC(imageformats % ((iv, ie)*10))
- #
- checkViewerEditor('a text editor',
-- ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
-+ ['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
- 'nedit', 'gedit', 'geany', 'leafpad', 'mousepad', 'xed', 'notepad'],
- rc_entry = [r'''\Format asciichess asc "Plain text (chess output)" "" "" "%%" "" ""
- \Format docbook sgml DocBook B "" "%%" "document,menu=export" ""
-@@ -745,7 +745,7 @@ def checkFormatEntries(dtl_tools):
- #checkProg('a Postscript interpreter', ['gs'],
- # rc_entry = [ r'\ps_command "%%"' ])
- checkViewer('a Postscript previewer',
-- ['kghostview', 'okular', 'qpdfview --unique',
-+ ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique',
- 'evince', 'xreader',
- 'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
- rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps"
-@@ -756,7 +756,7 @@ def checkFormatEntries(dtl_tools):
- # maybe use "bestApplication()" from https://github.com/jleclanche/python-mime
- # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime
- checkViewer('a PDF previewer',
-- ['pdfview', 'kpdf', 'okular', 'qpdfview --unique',
-+ ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique',
- 'evince', 'xreader', 'kghostview', 'xpdf', 'SumatraPDF',
- 'acrobat', 'acroread', 'mupdf',
- 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'],
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-06 8:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-06 8:18 [gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2020-09-20 14:41 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox