Re: make rpmdist failing
On 7/22/23 20:10, José Matos wrote: On Sat, 2023-07-22 at 23:59 +0200, Jean-Marc Lasgouttes wrote: I suspect rpmdist dislikes the hyphens after RC1. Are you sure that this is typical of rpm naming? You could try underscores instead. In the past our release nme were more like lyx-2.4.0rc1 Jean-Marc is right regarding the name scheme: [name]-[version]-[release].[arch].rpm 2.4.0-RC1-devel does not work but 2.4.0-RC1.devel would where 2.4.0 is the version and RC1-devel is the release. Notice also that nowadays rpm supports the pre-release naming scheme like 2.4.0~rc1 for the version. This is only relevant if you plan to later release lyx-2.4.0-1 to ensure that rpm considers that this version is newer than lyx-2.4.0~rc1-1 (for example) OK, after changing the version in configure.ac to 2.4.0~RC1.1, I get further. But then I get: RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/metainfo/org.lyx.LyX.metainfo.xml Any idea what that is? Full rpm-related output below. Riki + TEXMF=/usr/share/texmf + mkdir -p /home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/share/texmf/tex/ latex + mv /home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/share/lyx/tex /home/ri kiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64//usr/share/texmf/tex/latex/lyx + cp -a lib/images/lyx.png /home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/ share/lyx/images/ + /usr/bin/find-debuginfo -j16 --strict-build-id -m -i --build-id-seed 2.4.0~RC1.1-2 --uni que-debug-suffix -2.4.0~RC1.1-2.x86_64 --unique-debug-src-base lyx-2.4.0~RC1.1-2.x86_64 -- run-dwz --dwz-low-mem-die-limit 1000 --dwz-max-die-limit 11000 -S debugsourcefiles .list /home/rikiheck/rpmbuild/BUILD/lyx-2.4.0~RC1.1 extracting debug info from /home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/ bin/lyx extracting debug info from /home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/ bin/lyxclient extracting debug info from /home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/ bin/tex2lyx /usr/bin/gdb /usr/bin/gdb /tmp/tmp.OR6YbGHPBg (1/1) 100 % 4136 B / 21.3 KiB = 0.190 /tmp/tmp.MOjAyU9Hxr (1/1) 100 % 23.5 KiB / 187.6 KiB = 0.125 /usr/bin/gdb /tmp/tmp.LMb3FJ2a5s (1/1) 100 % 130.1 KiB / 1016.2 KiB = 0.128 original debug info size: 279980kB, size after compression: 232736kB /usr/bin/sepdebugcrcfix: Updated 3 CRC32s, 0 CRC32s did match. 19714 blocks + /usr/lib/rpm/check-buildroot + /usr/lib/rpm/redhat/brp-ldconfig + /usr/lib/rpm/brp-compress + /usr/lib/rpm/redhat/brp-strip-lto /usr/bin/strip + /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip + /usr/lib/rpm/check-rpaths + /usr/lib/rpm/redhat/brp-mangle-shebangs *** WARNING: ./usr/share/lyx/scripts/csv2lyx.py is executable but has no shebang, removing executable bit *** WARNING: ./usr/share/lyx/scripts/fen2ascii.py is executable but has no shebang, removi ng executable bit *** WARNING: ./usr/share/lyx/scripts/prefs2prefs_prefs.py is executable but has no shebang , removing executable bit *** WARNING: ./usr/share/lyx/scripts/fig2pdftex.py is executable but has no shebang, remov ing executable bit *** WARNING: ./usr/share/lyx/scripts/lyxpak.py is executable but has no shebang, removing executable bit *** WARNING: ./usr/share/lyx/scripts/convertDefault.py is executable but has no shebang, r emoving executable bit *** WARNING: ./usr/share/lyx/scripts/clean_dvi.py is executable but has no shebang, removi ng executable bit *** WARNING: ./usr/share/lyx/scripts/legacy_lyxpreview2ppm.py is executable but has no she bang, removing executable bit *** WARNING: ./usr/share/lyx/scripts/fig2pstex.py is executable but has no shebang, removi ng executable bit *** WARNING: ./usr/share/lyx/scripts/lyxpreview2bitmap.py is executable but has no shebang , removing executable bit *** WARNING: ./usr/share/lyx/scripts/lyxpreview_tools.py is executable but has no shebang, removing executable bit *** WARNING: ./usr/share/lyx/scripts/docbook_copy.py is executable but has no shebang, rem oving executable bit *** WARNING: ./usr/share/lyx/scripts/prefs2prefs.py is executable but has no shebang, remo ving executable bit *** WARNING: ./usr/share/lyx/scripts/TeXFiles.py is executable but has no shebang, removin g executable bit *** WARNING: ./usr/share/lyx/scripts/include_bib.py is executable but has no shebang, remo ving executable bit *** WARNING: ./usr/share/lyx/scripts/ext_copy.py is executable but has no shebang, removin g executable bit *** WARNING: ./usr/share/lyx/scripts/html2latexwrapper.py is executable but has no shebang , removing executable bit *** WARNING: ./usr/share/lyx/scripts/convert_pdf.py is executable but has no shebang, remo ving executable bit *** WARNING: ./usr/share/lyx/scripts/docbook2epub.py is executable but has no shebang, rem oving executable bit *** WARNING: ./usr/share/lyx/scripts/layout2layout.py is executable but has no shebang,
Re: [PATCH] Making Update::SinglePar work inside insets
Le 23/07/2023 à 02:40, Richard Kimberly Heck a écrit : I was hoping to go to RC1 pretty soon, so it might not be the right time for that. We might go ahead and branch 2.5.0dev once RC1 is out. Fine with me. JMarc -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: How should we handle neg*space insets in find?
Am Sat, 22 Jul 2023 19:36:06 -0400
schrieb Scott Kostyshak :
> On Sat, Jul 22, 2023 at 05:30:16PM +0200, Kornel Benko wrote:
> > Am Sat, 22 Jul 2023 06:54:37 -0400
> > schrieb Scott Kostyshak :
> >
> > > On Sat, Jul 22, 2023 at 11:57:58AM +0200, Kornel Benko wrote:
> > > >
> > > > * Should we discard them
> > > > * Handle like white space
> > > >
> > > > If using in findadv with selected 'Adhere to search string formatting
> > > > of'
> > > > they are treated as ordinary non-word chars.
> > > > Without this option, the are discarded.
> > > >
> > > > I am unsure, how to proceed. Using them as white spaces disables the
> > > > specific
> > > > search for them.
> > >
> > > That's a tough one. I guess I would treat like positive space. Would that
> > > make
> > > sense?
> > >
> > > s.
> >
> > I don't feel so. What if one wants to find an occurrence of, say
> > negthinspace, and
> > then the search stops at each white space? On big documents this may be
> > annoying.
>
> I see, I don't have much intuition on the best approach.
>
> Scott
I have a patch ready, so that neg*space chars are handled like white space iff
no
formatted search is in effect.
I had to rename hasToString() to findUsesToString() because even that
InsetSpace.cpp has
toString(), we need to call plaintext() in src/Paragraph.cpp
Kornel
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d7fa35ef2e..466a091e70 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -4311,11 +4311,11 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options, const Out
|| (c == '\n' && (options & AS_STR_NEWLINES)))
os.put(c);
else if (c == META_INSET && (options & AS_STR_INSETS)) {
if (c == META_INSET && (options & AS_STR_PLAINTEXT)) {
LASSERT(runparams != nullptr, return docstring());
-if (runparams->find_effective() && getInset(i)->hasToString())
+if (runparams->find_effective() && getInset(i)->findUsesToString())
getInset(i)->toString(os);
else
getInset(i)->plaintext(os, *runparams);
} else if (c == META_INSET && (options & AS_STR_MATHED)
&& getInset(i)->lyxCode() == REF_CODE) {
diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 1b7adb5e89..6f3402c024 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -347,11 +347,11 @@ public:
/// normal stream, and which will in fact be written after the current
/// paragraph closes. this is appropriate e.g. for floats.
virtual docstring xhtml(XMLStream &, OutputParams const &) const;
///
- virtual bool hasToString() const { return false; }
+ virtual bool findUsesToString() const { return false; }
/// Writes a string representation of the inset to the odocstream.
/// This one should be called when you want the whole contents of
/// the inset.
virtual void toString(odocstream &) const {}
/// Appends a potentially abbreviated version of the inset to
diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 16e5524e23..627e685661 100644
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -78,11 +78,11 @@ private:
///
void docbook(XMLStream &, OutputParams const &) const override;
///
docstring xhtml(XMLStream &, OutputParams const &) const override;
///
- bool hasToString() const override { return true; }
+ bool findUsesToString() const override { return true; }
///
void toString(odocstream &) const override;
///
void forOutliner(docstring &, size_t const, bool const) const override;
///
diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index 56ad45a9b6..b1b27e0291 100644
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -60,11 +60,11 @@ public:
///
void docbook(XMLStream &, OutputParams const &) const override;
///
docstring xhtml(XMLStream &, OutputParams const &) const override;
///
- bool hasToString() const override { return true; }
+ bool findUsesToString() const override { return true; }
///
void toString(odocstream &) const override;
///
void forOutliner(docstring &, size_t const, bool const) const override;
///
diff --git a/src/insets/InsetCounter.h b/src/insets/InsetCounter.h
index eb6338dde2..65a38ab325 100644
--- a/src/insets/InsetCounter.h
+++ b/src/insets/InsetCounter.h
@@ -41,11 +41,11 @@ public:
///
void docbook(XMLStream &, OutputParams const &) const override;
///
docstring xhtml(XMLStream &, OutputParams const &) const override;
///
- bool hasToString() const override { return true; }
+ bool findUsesToString() const override { return true; }
///
void toString(odocstream &) const override;
///
void validate(LaTeXFeatures & features) const override;
///
diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h
index 59615b0d5b..36bd249902 100644
--- a/src/insets/InsetHyperlink.h
+++ b/src/insets/InsetHyperlink.h
@@ -32,11 +32,11 @@ public:
///
bool hasSettings() const override { return true; }
///
bool isInToc()
