Age | Commit message (Collapse) | Author |
|
…by a simple/static $(gb_CustomTarget_workdir)/foo
The build system has a lot of overly complicated leftovers from when it
was introduced and had not only deal with split repositories but also
had to coexist with another buildsystem. Along with lots of copy'n'paste
along the years the makefiles became hard to grasp for newcomers with
all our calls and evals.
As a first step to streamline that, the macros from TargetLocations that
simply prefix a static path to the argument (and similar of the same
kind) are a natural pick before simplifying the rules themselves/getting
rid of a bunch of eval statements.
Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Otherwise it is possible that e.g. -Wl,--export-dynamic is passed which is fatal.
Change-Id: I1735641e3149c86456e1164b67509a719e09d446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154340
Reviewed-by: René Engelhard <rene@debian.org>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
Now the headings in the ulf files for .desktop files are
in the form [filename_Key]
Gallery names are also adjusted to fit the new scheme, where there is
no longer a need to pass a --key argument to desktop-translate.py
Sync comments with .desktop files and the remaining .ulf and remove
obsolete Mandriva Linux meta data while at it.
Script to mass-replace relevant names in translations will be
provided to infra.
Change-Id: I87e8028aa5b66f5f5560efa62ddd9b1e5b61c49c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138455
Tested-by: Jenkins
Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Installed as:
/usr/share/application-registry/libreoffice.applications
/usr/share/mime-info/libreoffice.keys
/usr/share/mime-info/libreoffice.mime
Superseded by Shared MIME-info compliant libreoffice.xml, created as
openoffice.org.xml by create_mime_xml.pl from the .desktop files.
Change-Id: Ib8d9a17d09139dd4f50f65572457cef0178750b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105606
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
With 315919306c7b6e95db6a280c4aa8d2203970e292 "Set PYTHONWARNINGS to error by
default for --enable-werror" my build on Fedora 32 started to fail in
CustomTarget_sysui/share with
> Exception ignored in: <socket.socket fd=4, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0>
> Traceback (most recent call last):
> File "/usr/lib/python3.8/site-packages/abrt_exception_handler3.py", line 93, in write_dump
> response = send(data)
> ResourceWarning: unclosed <socket.socket fd=4, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0>
> Traceback (most recent call last):
> File "/usr/bin/g-ir-scanner", line 103, in <module>
> from giscanner.scannermain import scanner_main
> File "/usr/lib64/gobject-introspection/giscanner/scannermain.py", line 35, in <module>
> from giscanner.ast import Include, Namespace
> File "/usr/lib64/gobject-introspection/giscanner/ast.py", line 29, in <module>
> from .sourcescanner import CTYPE_TYPEDEF, CSYMBOL_TYPE_TYPEDEF
> File "/usr/lib64/gobject-introspection/giscanner/sourcescanner.py", line 24, in <module>
> from .libtoolimporter import LibtoolImporter
> File "/usr/lib64/gobject-introspection/giscanner/libtoolimporter.py", line 21, in <module>
> import imp
> File "/usr/lib64/python3.8/imp.py", line 31, in <module>
> warnings.warn("the imp module is deprecated in favour of importlib; "
> DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
Change-Id: I919caaad482e844ef1549f248a2faf2274c9efa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103177
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
...and not also whatever other prerequisites those two rules might have (e.g.,
instdir/program/python.bin).
Before 01344a8ca57636ac87108c22f777a02fe6d963d5 "convert sysui to gbuild and add
to tail_build", the corresponding dmake code in sysui/desktop/share/makefile.mk
had been
> $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/openoffice.mime brand.pl translate.pl ../productversion.mk $(ULFDIR)$/documents.ulf
> $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.keys
[...]
> @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(MISC)/$(@:d:d:f)
[...]
and
> $(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
> $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
[...]
> @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{UNIXBASISROOTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
[...]
where Dmake's $< denotes "the list of prerequisites specified in the current
rule" (<https://www.openoffice.org/tools/dmake/dmake_4.11.html>, section
"RUNTIME MACROS"), whereas GNU Make's $^ denotes all prerequisites.
Change-Id: Ie6efc5d9512408711db32502e0959b32ec232603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91566
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
...since d2c23609083d7b3e5267b1e4c923476cbc509d00 "tdf#130911: convert
desktop-translate from Perl to Python."
Change-Id: I091e137041740e127606e78d2a04163647dba8af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91544
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: Ic0a84f4e46f4bc3312d15a31ea16060851302d2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90847
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.
Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
|
|
Change-Id: I948b0d793085abc973a5e3b2778140d729ff1f59
Reviewed-on: https://gerrit.libreoffice.org/82378
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
|
|
...after 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in
freedesktop-menus (4.14.1)" had moved the INTROSPECTION_SCANNER-related code out
of sysui/desktop/share/create_tree.sh.
Change-Id: Id6208b92abca57ed93f20602619525556c6962b3
Reviewed-on: https://gerrit.libreoffice.org/77078
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf "Only build LOKDocView-0.1.gir when
necessary" had erroneously assumed that LOKDocView-0.1.{gir,typelib} need to be
built when PKGFORMAT contains "deb" or "rpm". But instead, they need to be
built only for some 3rd-party Linux distro builds, never for TDF builds.
Make that explicit with a new --enable-introspection, which those 3rd-party
Linux distros will now have to specify (probably along with other fixes to where
they pick up those LOKDocView-0.1.{gir,typelib} files after
634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in
freedesktop-menus (4.14.1)" had moved them around).
That way, builds that broke after 634844354ee6ed884128086a80c3ee32c889d8c9
"sysui: fix rpm errors in freedesktop-menus (4.14.1)" (like my ASan+UBSan one
that 4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf "Only build LOKDocView-0.1.gir
when necessary" had tried to fix) can be fixed with an (implicit)
--disable-introspection.
This commit contains a revert of 4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf "Only
build LOKDocView-0.1.gir when necessary", which it supersedes.
Change-Id: Idb618e3353da7d68a2e552b0f290775c02327733
Reviewed-on: https://gerrit.libreoffice.org/76997
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Prior to 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in
freedesktop-menus (4.14.1)" it had been build as part of
sysui/desktop/share/create_tree.sh, which is presumably only called when
building for deb or rpm PKGFORMAT. Building it now in more cases started to
cause issues, like
> g-ir-scanner: link: /home/sbergman/llvm/inst/bin/clang --gcc-toolchain=/home/sbergman/gcc/trunk/inst -fdiagnostics-color -fsanitize=address -fsanitize-address-globals-dead-stripping -fsanitize-address-use-after-scope -fsanitize=undefined -fsanitize=local-bounds -fsanitize=nullability -o /home/sbergman/lo/core/tmp-introspectga_nlzjv/LOKDocView-0.1 /home/sbergman/lo/core/tmp-introspectga_nlzjv/LOKDocView-0.1.o -L. -Wl,-rpath,. -Wl,--no-as-needed -L/home/sbergman/lo/core/instdir/program -Wl,-rpath,/home/sbergman/lo/core/instdir/program -llibreofficekitgtk -lgio-2.0 -lgobject-2.0 -Wl,--export-dynamic -pthread -lgmodule-2.0 -lglib-2.0
> /usr/bin/ld: /home/sbergman/lo/core/instdir/program/liblibreofficekitgtk.so: undefined reference to `__ubsan_handle_function_type_mismatch_v1'
> /usr/bin/ld: /home/sbergman/lo/core/instdir/program/liblibreofficekitgtk.so: undefined reference to `__ubsan_vptr_type_cache'
> /usr/bin/ld: /home/sbergman/lo/core/instdir/program/liblibreofficekitgtk.so: undefined reference to `__ubsan_handle_dynamic_type_cache_miss'
in an ASan+UBSan build (where g-ir-scanner should apparently use CXX instead of
CC for linking, but there appears to be no easy way to tell g-ir-scanner to do
so).
Change-Id: I5a960c6ed387722138d4b3d156c87038f3e5b8ca
Reviewed-on: https://gerrit.libreoffice.org/76769
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
RPM build errors:
Explicit %attr() mode not applicable to symlink: /workdir/CustomTarget/sysui/rpm/libreofficedev/freedesktop/usr/bin/libreofficedev6.1
Installed (but unpackaged) file(s) found:
/usr/local/lib/girepository-1.0/LOKDocView-0.1.typelib
/usr/share/gir-1.0/LOKDocView-0.1.gir
The LOKDocView problem turned out to be the result of the first
incremental build after adding --with-package-format, and previously it
was avoided with a if in configure; moving the commands out of
create_tree.sh should be more obvious and reliable though.
Change-Id: I69c1566e26eeaa1d8bf88a3650a78da6ddfb5a3b
Reviewed-on: https://gerrit.libreoffice.org/76596
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
KDE4 is out of maintenance upstream since Nov. 2014, and binaries
provided by TDF have switched to KDE5 as the official backend.
Change-Id: I165465b56d3ba3a18912b203c06ae8fc6111c0c9
Reviewed-on: https://gerrit.libreoffice.org/60014
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
Change-Id: Ie0e8b8b7ad59ee640d6b195dfae1a7cf745056fd
Reviewed-on: https://gerrit.libreoffice.org/54543
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
Move out of unx, as this will eventually compile on other
OS platforms. At least currently it doesn't contain platform
dependant code.
Change-Id: Iea0bebf574201881ea158381fe7ba8af2a9a6488
|
|
Splits the configure checks into a Qt5 and KF5 specific part.
Change-Id: I0a616ba031e1f7fd0385219ac48179adb4bdaf14
|
|
they are KDE3 only and we don't support either KDE3 nor TDE anymore
anyways
Change-Id: I80198c2b63298c0bb3220f3641b6e45107797426
Reviewed-on: https://gerrit.libreoffice.org/41159
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
|
|
It has ~no users, can't even be built on modern Linuxes, and it annoys
folks who want to refactor VCL.
Per ESC decision from 2017-06-08, remove --enable-tde and --enable-tdeab.
Change-Id: I51ce4786f29f8fcac2e2bb2a654c41fbfbbd8afd
Reviewed-on: https://gerrit.libreoffice.org/38718
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I028d4e6d3c5fd57ae412fcfca5184722e4283524
Reviewed-on: https://gerrit.libreoffice.org/18671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Should fix the RHEL6 build.
Change-Id: I3d6e6a2b43c2d6a43ea0686600cf2f893c518cc8
Reviewed-on: https://gerrit.libreoffice.org/18566
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
With the new RHEL6-era baseline TDF can finally ship KDE4 support.
Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3
Reviewed-on: https://gerrit.libreoffice.org/18267
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db
Reviewed-on: https://gerrit.libreoffice.org/18262
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
of application/vnd.oasis.opendocument.text-master-template with
suffic otm
https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html
desktop/icons/oasis-master-document-template.icns is just a copy
of
desktop/icons/oasis-master-document.icns
because I can't draw
Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1
Reviewed-on: https://gerrit.libreoffice.org/11350
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ie10ee80f1d35b40c0baf9d7ba5c1181b52405b5f
|
|
The libreoffice/*.desktop need to have a target and rule to propagate
out-of-date-ness.
Change-Id: If341cc67ed6e24ceee7c00efba2750864aad4a70
|
|
It is constant and can just be replaced by $(SRCDIR)/solenv.
Use BUILD_TYPE where it was used to check if config_*.mk is sourced.
Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
|
|
Change-Id: If585526ab15d31f2f7a1b46c216f0b019d913fd3
|
|
This fixes issues when clicking on various URLS when the KDE only
integration were build.
Change-Id: Id15b67b8a5589bc54e1f3214e07d2e97b3eddea2
Reviewed-on: https://gerrit.libreoffice.org/6018
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ifabf7965c922d7f719201cea39827acbccb57937
|
|
Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
|
|
Change-Id: Iab78a95bc8588b89fb10dc96b6c2c25e864fc1f4
|
|
- $(UNIXFILENAME.$*) is not correctly substituted if the variables are defined
by another VAR.bla variables
- add missing '-' to the iconprefix
- use '$${PRODUCTNAME} $${PRODUCTVERSION}' for the desktop menu; the real name
and version is added later by the installer in instsetto_native
- use correct .po file for the translations
- deliver the localized and corrected desktop files
Change-Id: Ifcf797b57f94b16bd7ee498136c9c353b85c7c46
|
|
Change-Id: I6e119f79a9293fa204904459c75ff97e5d3b5be6
|
|
Change-Id: I52c75432eb30a46b2c6a597211df09fdbb08056c
|
|
The variable UNIXFILENAME used to use the lowercase product name
before gbuildification.
Change-Id: I09a5ff27acf07d394f712d943ea5f83765a7f834
|
|
we keep the printer admin tool, just not install the .desktop
file for it anymore.
Change-Id: I41fcdcca555e16d76fa2de4a929b6ad508b6c066
|
|
Plus avoid use of Export::sLanguages member outside
of the class.
Change-Id: I33702816fdb4980d690cfe8fcd8cc3fbd0df1dd8
|
|
Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006
|
|
Follow-up to 16826147188bd78d67b97863226f903cc24add71 .
|
|
Change-Id: I37841734ee2845679252741b776af03625b49aaa
|
|
Change-Id: Ia32e51f0d95e001bcf07766f6340398e0ab1bf6a
Reviewed-on: https://gerrit.libreoffice.org/2192
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
|