Re: [LyX/master] Update ru.po and UserGuide

2023-11-11 Thread Pavel Sanda
On Fri, Nov 10, 2023 at 06:07:02PM +0100, Yuriy Skalko wrote:
> If previous versions will be left, then there will be duplicated items in
> menu since these linguistics tables "tableaux" translate just as "tables".
> So I added these "(ling.)" prefixes to distinguish them.
> 
> There is also a calque from "tableau" word, but it has different meaning and
> does not fit here.

Well I doubt that you want to have "Table (lit.)" in the latex output, but if
there is no corresponding word for tableaux in your language, then this whole
discussion is probably void anyway.

In next iteration I'll replace the strings in layouttranslation in whatever
you decide is best and is present in the .po file.

Pavel
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: cmake build with qt6 (macos) does not include "plugins"

2023-11-11 Thread Scott Kostyshak
On Sat, Nov 11, 2023 at 06:07:14PM +0100, Kornel Benko wrote:
> Am Sat, 11 Nov 2023 11:14:51 -0500
> schrieb Scott Kostyshak :
> 
> > > diff --git a/development/cmake/post_install/CMakeLists.txt
> > > b/development/cmake/post_install/CMakeLists.txt index 
> > > 52a2f782af..f83cdaad0b 100644
> > > --- a/development/cmake/post_install/CMakeLists.txt
> > > +++ b/development/cmake/post_install/CMakeLists.txt
> > > @@ -28,14 +28,18 @@ if(LYX_BUNDLE)
> > >  endif()
> > >  
> > >  if(Qt5Core_FOUND)
> > > - file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/imageformats")
> > > - install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION
> > > "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime REGEX 
> > > "\\_debug\\.dylib$" EXCLUDE)
> > > +   file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/imageformats")
> > > +   install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION
> > > "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime REGEX 
> > > "\\_debug\\.dylib$" EXCLUDE)
> > > if(APPLE) if(Qt5Core_VERSION VERSION_GREATER_EQUAL 5.10.0)
> > >   install_qt_plugin("Qt5::QMacStylePlugin")
> > >   endif()
> > >  install_qt_plugin("Qt5::QCocoaIntegrationPlugin")
> > > endif()
> > > +else()
> > > +# With QT6, just copy all the plugins
> > > +file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/*")
> > > +install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION
> > > "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime REGEX 
> > > "\\_debug\\.dylib$" EXCLUDE)
> > > endif() 
> > >  # Install code does the following:  
> > 
> > @Kornel seems like we might want this one in master?
> > 
> > Scott
> 
> Yes, I am only waiting for 2.4 be out. Nobody outside of MAC seems to use 
> BUNDLE though.

Sounds good,

Scott


signature.asc
Description: PGP signature
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: cmake build with qt6 (macos) does not include "plugins"

2023-11-11 Thread Kornel Benko
Am Sat, 11 Nov 2023 11:14:51 -0500
schrieb Scott Kostyshak :

> > diff --git a/development/cmake/post_install/CMakeLists.txt
> > b/development/cmake/post_install/CMakeLists.txt index 
> > 52a2f782af..f83cdaad0b 100644
> > --- a/development/cmake/post_install/CMakeLists.txt
> > +++ b/development/cmake/post_install/CMakeLists.txt
> > @@ -28,14 +28,18 @@ if(LYX_BUNDLE)
> >  endif()
> >  
> >  if(Qt5Core_FOUND)
> > -   file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/imageformats")
> > -   install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION
> > "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime REGEX "\\_debug\\.dylib$" 
> > EXCLUDE)
> > +   file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/imageformats")
> > +   install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION
> > "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime REGEX "\\_debug\\.dylib$" 
> > EXCLUDE)
> > if(APPLE) if(Qt5Core_VERSION VERSION_GREATER_EQUAL 5.10.0)
> > install_qt_plugin("Qt5::QMacStylePlugin")
> > endif()
> >  install_qt_plugin("Qt5::QCocoaIntegrationPlugin")
> > endif()
> > +else()
> > +# With QT6, just copy all the plugins
> > +file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/*")
> > +install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION
> > "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime REGEX "\\_debug\\.dylib$" 
> > EXCLUDE)
> > endif() 
> >  # Install code does the following:  
> 
> @Kornel seems like we might want this one in master?
> 
> Scott

Yes, I am only waiting for 2.4 be out. Nobody outside of MAC seems to use 
BUNDLE though.

Kornel


pgpRGXK9Zg_AU.pgp
Description: Digitale Signatur von OpenPGP
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: cmake build with qt6 (macos) does not include "plugins"

2023-11-11 Thread Scott Kostyshak
On Tue, Nov 07, 2023 at 05:42:27PM +0100, pdv wrote:
> On 06/11/2023 19:17, pdv wrote:
> > On 04/11/2023 20:35, Kornel Benko wrote:
> > > Am Sat, 4 Nov 2023 18:05:42 +0100
> > > schrieb pdv :
> > > 
> > > > On 04/11/2023 17:55, pdv wrote:
> > > > > On 21/03/2023 19:27, Kornel Benko wrote:
> > > > > > Am Tue, 21 Mar 2023 15:27:41 +0100
> > > > > > schrieb pdv :
> > > > > > 
> > > > > > > On 21/03/2023 11:00, Kornel Benko wrote:
> > > > > > > > Am Mon, 20 Mar 2023 20:05:32 +0100
> > > > > > > > schrieb pdv :
> > > > > > > > > It's within the first if() else(), that's
> > > > > > > > > thus for qt6(see below). I
> > > > > > > > > suppose this should work for all platforms,
> > > > > > > > > but I checked it on macos
> > > > > > > > > only. Your patch is limited to APPLE and also works for me; 
> > > > > > > > > If this
> > > > > > > > > problem doesn't occur for other platforms,
> > > > > > > > > it's ok for me of course.
> > > > > > > > 
> > > > > > > > Probably no one else is using the bundle option 
> > > > > > > > (-DLYX_BUNDLE=ON).
> > > > > > > > 
> > > > > > > > If you could try to use cmake without this option, I'd be 
> > > > > > > > interested
> > > > > > > > if it works for
> > > > > > > > you too.
> > > > > > > 
> > > > > > > Apparently no problem. -DLYX_BUNDLE=OFF works too for me.
> > > > > > > 
> > > > > > > > In this case we could get rid of it (probably).
> > > > > > > > 
> > > > > > > >  Kornel
> > > > > > > > 
> > > > > > > 
> > > > > > > 
> > > > > > 
> > > > > > Good, so I will disable this option for lyx2.5 then.
> > > > > > 
> > > > > >  Kornel
> > > > > > 
> > > > > > 
> > > > > I have build the latest lyx-master and I still need my (previous) 
> > > > > patch
> > > > > to build a LyX.app which includes all required Qt6 frameworks (I want 
> > > > > a
> > > > > stand-alone app).
> > > > > 
> > > > > I'm using a recent version of CMake and apparently versions older than
> > > > > 3.5 will not longer be supported. To get rid of the annoying warnings
> > > > > I've upped the minimum version from 3.1 to 3.5 (new patch included).
> > > > > 
> > > > > pdv
> > > > > 
> > > > Sorry, forgot to include the patch.
> > > 
> > > Will be done for 2.4.x versions. Also for other CMakeLists.txt's in
> > > the lyx-sources.
> > > 
> > > Kornel
> > > 
> > > 
> > OK, thanks.
> > 
> > Regarding the original issue, I'm still largely in the dark.
> > 
> > I've build qt-6.2 (-debug-and-release option), installed cmake3.26 and
> > I'm using macos 10.14 and xcode. lyx has been updated to a very recent
> > master-version.
> > 
> > Building a complete (qt frameworks included) debuggable LyX2.4.app with
> > cmake does not work for me; the plug-ins are not copied into the bundle
> > and cmake's fixup_bundle step subsequently fails.
> > 
> > When I apply my patch (see first message) the plugins are copied but the
> > fixup_bundle step still fails.
> > 
> > Only the QtCore, ... frameworks have been copied to the bundle (probably
> > by the install command in my patch), but not the QtCore_debug, ...
> > versions, although no error is reported by fixup_bundle at copy time.
> > 
> > That's because they are copied to a folder named /@rpath/ in my
> > build-folder instead of into the bundle.
> > Apparently the @rpath used in the qt libraries is not handled properly
> > by the cmake scripts.
> > 
> > Can anyone confirm that a stand-alone LyX2.4.app can be build with cmake
> > on macos or have any other suggestion?
> > 
> > pdv
> > 
> > 
> > 
> The problem with the _debug libraries is obvious. As for qt5 no _debug
> libraries should be copied for qt6 either. I adapted my patch (included)
> accordingly.
> 
> I once more tested a number of configurations and this is my conclusion.
> I can build a bundle with LYX_DMG=off and LYX_BUNDLE=on, the latter sets
> also LYX_CPACK=on.
> 
> These are my resulting settings after cmake configure:
> 
> LYX_ENABLE_BUILD_TYPE:STRING   = AUTO   : Allows to tweak the compiled
> code (AUTO release prerelease development gprof)
> LYX_CPACK:BOOL = ON : Use the CPack management
> (Implies LYX_INSTALL option)
> LYX_LOCALVERSIONING:BOOL   = ON : Add version info to
> created package name (only used if LYX_CPACK option set)
> LYX_INSTALL:BOOL   = OFF: Build install
> projects/rules (implies a bunch of other options)
> LYX_NLS:BOOL   = ON : Enable Native Language
> Support (NLS)
> LYX_REQUIRE_SPELLCHECK:BOOL= OFF: Abort if no spellchecker
> available
> LYX_ASPELL:BOOL= ON : Require aspell
> LYX_ENCHANT:BOOL   = OFF: Require Enchant
> LYX_HUNSPELL:BOOL  = ON : Require Hunspell
> LYX_RELEASE:BOOL   = ON : Build release version,
> build debug when disabled
> LYX_DEBUG:BOOL = OFF: Enforce debug build
> LYX_NO_OPTIMIZE:BOOL   = OFF