| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Fix FTBFS when translations are missing and the desktop file passed to
tde_create_translated_desktop() is build-time generated.
See TDE/tde-packaging-gentoo #196 for details.
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit f0a5bcc7600c36f8fe59754d1167d1bbc70a4953)
|
|
|
|
|
|
|
| |
of CMAKE_BINARY_DIR is longer than the tested _basename.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 111a08942a8b5452cd51f41e6f811d55de30c657)
|
|
|
|
|
|
|
|
|
|
| |
file for use with intltool-merge already in the configuration phase,
prepare the file during the custom command call just before calling
intltool-merge. This will allow the natural use of the macro with
the generated files.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1686d0e64eefa5f4036dce1800d666c41b0b5e5a)
|
|
|
|
|
|
|
| |
a desktop file in a binary folder.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a5baa2c1ab82309a59ba67db8fd0530f097fd36e)
|
|
|
|
|
|
|
|
| |
to find tde_l10n_merge.pl because it does not have the executable
bit set.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 52001b90693f0c986d6aa2ceec69f9b8fa7b8699)
|
|
|
|
|
|
|
|
| |
of intltool-merge 0.51 to properly merge desktop file translations
containing escaped newline characters - '\n'.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 53c7e28984f89f979c4495b30abdb10a80373d71)
|
|
|
|
|
|
|
| |
so that the result is not time zone dependent.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 43763c6adf901985d44b305b8fcc6270f77b70dd)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b2b9e890528f27daeb577983e1ed4fe2ecf8f852)
|
|
|
|
|
|
|
| |
independently of UMASK and time zone.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7b6865d9e60d3220cecea027f227ab084f1a903c)
|
|
|
|
|
|
|
| |
desktop file when merging translations.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 28260f0078b016aac7f9b924c424bc1ae7d157fd)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ae0ecf194bf51902652570df879579cb76f7db7f)
|
|
|
|
|
| |
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35d01987874772b6d83189d302186b881dbf2e30)
|
|
|
|
|
|
|
| |
Taken from https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0459cbaf3eaf2b123a07d125623db0fc82baa6aa)
|
|
|
|
|
|
|
|
|
| |
If the list of files is obtained internally in a macro,
it will be sorted. This prevents unexpected order of files
- improves certainty for reproducible builds.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fb4f389731cf5a26a0a13e4d31bbbb61724989e7)
|
|
|
|
|
|
|
| |
file that will not be installed directly.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 63b5532a298ccf95e310ae853ff53ade506daf7e)
|
|
|
|
|
|
|
| |
desktop file name that could be the same as the keyword.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9f86304bdd4be37b625ee3ae9d37f2c4006dea14)
|
|
|
|
|
|
|
|
|
| |
Although the processing with configure_file was done properly,
the original source file was used instead of the processed one
to merge the translations.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3bbc0e4d62a37030bf87675a33002ecf91b27107)
|
|
|
|
|
|
|
| |
files to be installed in the same destination folder.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7592371d26c766c79419930e22e2680559f22d95)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1baa4cbbd1bcfd4765c5aeeed07506f312e03bb6)
|
|
|
|
|
|
|
| |
if it has a ".cmake" extension.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 690e7a7ec30cb96baf8c8f0a3f69969ad074aad1)
|
|
|
|
|
|
|
| |
file installed in another location.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8d4479fbcc57a40f2bfcf1f26789e24d853c41b5)
|
|
|
|
|
|
|
| |
This is for the resolution of bug 3133
Signed-off-by: aneejit1 <aneejit1@gmail.com>
(cherry picked from commit 8cf356884f1d6cd583dd28ba638253b6e94e6878)
|
|
|
|
|
|
|
| |
to build tdelibs as such.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1254cb9250044ab80257a032a07aa626ac2aafb2)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4d52ea2c67a7e8cdc263c32da4453c8e4d4ae279)
|
|
|
|
|
|
|
|
|
|
|
| |
properties not only for the default, but also for the specific
build type.
This resolve FTBFS when using private linking if the build is
of type Debug.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e769cc000347ea6c27d14eb1e92c1c1f40e84d74)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d504c98bb7342c38764c83f3f3c0c31eb6834f18)
|
|
|
|
|
|
|
| |
Create the TDE_CMAKE_ROOT and TDE_CMAKE_TEMPLATES variables.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2a847be412bd1dc66e53ea4652cc42f24a412d0f)
|
|
|
|
|
|
|
|
|
| |
use the relative path according to the source directory instead of the
base file names. This will prevent potential base file name collisions
and allow the creation of common rules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c3b52f0e804a75c535f56c550354c0f894d7e960)
|
|
|
|
|
|
|
| |
+ Add *.theme and eventsrc to files known as desktop style.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 55cdb3a75e61ab656c6fa0d372ad096f90152494)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e4b370839f36c271d7f41718070ed30ed89aeebe)
|
|
|
|
|
|
|
| |
+ Add --from-code=UTF-8 to xgettext call.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f5b58cdd21909fd24356e843f629ccb725a4c70c)
|
|
|
|
|
|
|
|
|
| |
This prevents multiple attempts to import exported tdelibs targets,
which would cause a collision if find_package( TDE ) is called
repeatedly for some reason.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e51ecbd59135d3c5a8124de22cdca10ae51beaed)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using the optional SOURCE_BASEDIR argument, it is possible to use
tde_create_handbook in CMakeLists.txt from a folder other than the
folder containing the documentation itself.
This will allow the creation of common rules for generating documentation
for all languages that are currently available, without the need to
create CMakeLists.txt in the directory of each individual language.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f7a3d5c3e272cbb059f96b90a2555506c9a6b454)
|
|
|
|
|
|
|
|
|
|
| |
In the cmake binary directory, the name of the working file must
be used according to the source file to avoid possible collisions
if the source directory contains multiple desktop files installed
as a ".directory" file in multiple destination directories.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3b6509cacff64191851aa1db18f9b2a421c5d33d)
|
|
|
|
|
|
|
|
|
|
| |
except when building tdelibs, where a separate target will be used and
writing metadata will be the last step.
This also resolve TDE/tdelibs#80.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 374fcabb184ddc3d455d8037a9cbdc20fd60744f)
|
|
|
|
|
|
|
|
|
|
| |
Because some of our desktop files contain underscores in variable
names (for example eventsrc), which is not an allowed character
for names of entries in desktop style files, we can't use msgfmt,
so we need intltool-merge.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 34e3154c44c59da784cfad7dcb63497b374cbd7d)
|
|
|
|
|
|
|
| |
+ Fix comment replacement and flag addition for _translatorinfo.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f6f7bfc0071bb86244d31258893cd5c3a676546b)
|
|
|
|
|
|
|
|
| |
This prevents concurrency of writing metadata and linking
with other libraries, which could cause FTBFS.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e72aabadf5ddef845a432542176e969fad8a7ef3)
|
|
|
|
|
|
|
| |
to avoid unnecessary repetition of checks.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 778522d10450a8a45133c65ae0175224c6abc700)
|
|
|
|
|
|
|
|
|
| |
+ For _translatorinfo strings, replace the references
to an intentionally non-existent source file and use
instead comments explaining the purpose of these strings.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4ced9fd928bfdf8a44152492b504bba4e0f98da5)
|
|
|
|
|
|
|
|
|
|
|
|
| |
+ Targets are created to generate files, not just commands.
+ Generating kidl files is created as a separate targets.
+ Headers are added to the list of generated files.
+ This allows for more accurate dependency determination.
+ This prevents files generation from being repeated.
+ This prevents the occasional FTBFS during a parallel build.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5cd16d6fb9d4917676e165655e91d75f36339c4c)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e8a95f169ebebc7d4aa0350cb059f8e5b0fcb018)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9138b8f339759751c22d5ddfcd4d644d3a4ed021)
|
|
|
|
|
|
|
|
| |
as a separate target instead of POST_BUILD command. This prevents the
command from being executed multiple times and thus FTBFS.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e22f5ace4a1eae9b299a8b8c60ceb339c73a2e3c)
|
|
|
|
|
|
|
| |
This allows naturally storing ELF metadata also in tdelibs.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 48b1e42b64d8c5c47461db1bf0ca3db9ce3fe726)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 184d1c2a4d3003cf0d6d4500f0338962ceb0cf35)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3d16bad245edd1352c2d053561d1ccdf3c6b1cf8)
|
|
|
|
|
|
|
|
| |
This solves the case where the desktop file name is not unique
throughout the project.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fd7d9c535e4c910b1ea9a72a9e4adcc27ff29858)
|
|
|
|
|
|
|
|
|
|
|
|
| |
that is generated for merging desktop file translations
will not be performed as a POST BUILD command, but as a
separate target.
This solves premature file deletion if multiple desktop
files use a common translation folder.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7183c21e0836e839d3931d18b1971c7aafccb30e)
|
|
|
|
|
| |
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6574bc5ae92f85d97705d1f41cf52709246122e5)
|