This reverts commit a26a5bb71c.
Reason for revert: apparently compilation with installation sets wasn't tested at all/the change is incomplete and breaks because of missing files.
Change-Id: Ied6973659bd0c25f613d615a4cae699b04ae2a43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99398
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Added generic icon declarations to the "Imported Type UTIs"
Some 3rd party formats are only in the "Document types",
most notably the old MS formats
Those need to be restructured to at minimum be by type
(e.g., text), or moved to Imported Type UTIs
Change-Id: I43f4d15a7c13f511178fb34371ccea4860e6873e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94625
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Previous approach of setting the bundle version made e.g.,
6.4.0.3 show up as version 6.4.3 which was clearly wrong
CFBundleShortVersionString is supposed to be only three integers,
but this does not seem to be enforced by Apple.
Other applications, such as Spotiy, include even more than LO
Removed CFBundleGetInfoString as it's been deprecated since 10.5
Change-Id: I7c64553f6bc2712506062d8f8ec388f5279b333d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94623
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Flash technology is going to be retired by the end of 2020 by Adobe:
https://theblog.adobe.com/adobe-flash-update/
With this ahead doesn't make much sense for LO 7.0 to support exporting
presentations and drawings to swf anymore.
Change-Id: Ic2c6e95db2f56bcd4eb25abdd0a6748aee9b0e4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92507
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
...and not also whatever other prerequisites those two rules might have (e.g.,
instdir/program/python.bin).
Before 01344a8ca5 "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>
while (<>) { ... }
opens all the file names given on the command line in succession, and executes
the loop body once for every line read from those files. So the existing loop
processed each file over and over N times, where N is the number of lines in
that file. This appears to have been broken ever since the code's introduction
in be63ae6cba "INTEGRATION: CWS networker3
(1.1.2); FILE ADDED: 2004/05/20 11:38:58 obr 1.1.2.1: #i20355#,#i20356# new
directories for system wide desktop integration".
Change-Id: I8b4f0c6812bf3ba42da4b7c55c38e52c91dd4229
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91558
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.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>
This allows KDE Plasma's start menu and task manager to display an icon together with the action
Change-Id: I78a6912809d643046d143690785e30b052573d8a
Reviewed-on: https://gerrit.libreoffice.org/78364
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
...after 634844354e "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>
4b4c7e76e6 "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
634844354e "sysui: fix rpm errors in
freedesktop-menus (4.14.1)" had moved them around).
That way, builds that broke after 634844354e
"sysui: fix rpm errors in freedesktop-menus (4.14.1)" (like my ASan+UBSan one
that 4b4c7e76e6 "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 4b4c7e76e6 "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 634844354e "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>
...as otherwise languages like Slovenian (which do not have a full system
integration) fall back to other LibreOffice.app/Contents/Resource/*.lproj
localizations instead of to English (whose Info.plist is stored as
LibreOffice.app/Contents/Info.plist, not as some
LibreOffice.app/Contents/Resources/en.lproj/InfoPlist.strings as is done for
other languages).
Change-Id: Ic69907a066e9afe1d66045016ad6bf9d997c67d0
Reviewed-on: https://gerrit.libreoffice.org/75728
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
At least building on Flathub makes presence of this information a hard
requirement now (see <https://blogs.gnome.org/hughsie/2019/03/28/
new-appstream-validation-requirements/> and witness the failed
<https://flathub.org/builds/#/builders/32/builds/3597>).
The suggested way to calculate that information is via the form at
<https://hughsie.github.io/oars/generate.html>, which I filled in as follows
(the answers I selected are prefixed with "=>"):
> By answering all the questions you can generate AppStream-compatible markup
> for the upstream AppData file.
>
> If the user is able to "enable" NSFW or "adult" content, then this should be
> included in the assessment even if it is turned off by default.
>
> What type of component are you generating content for:
=> Application that can connect to the Internet
> OARS has multiple versions, and the newer versions include more questions
> involving specific cultural and religious sensitivities. What version of OARS
> metadata do you want to produce:
=> 1.0 (works with all clients)
> Advertising
>
> Defined as the activity of producing advertisements for commercial products or
> services.
>
> For example, this would include banners showing the Coca-Cola logo shown in a
> Soccer game.
=> None
> Gambling
>
> Defined as taking a risky action in the hope of a desired result.
>
> For example, this would include spinning a wheel to get in-app credits.
=> None
> In-App Purchases
>
> Defined as items or points that a user can buy for use within a virtual world
> to improve a character or enhance the playing experience.
=> None
> Online Text-only Messaging
>
> Defined as any messaging system connected to the Internet.
=> None
> Online Audio and Video Messaging
>
> Defined as any multimedia messaging system connected to the Internet.
=> None
> Contact Details
>
> Defined as sharing identifiable details with other users to allow out-of-band
> communication.
=> None
> Information Sharing
>
> Defined as sharing information with a legal entity typically used for
> advertising or for sending back diagnostic data.
>
> For example, this would include sending your purchasing history to Amazon.
=> None
> Location Sharing
>
> Defined as sharing your physical real-time location.
>
> For example, this would include uploading the GPS co-ordinates of your current
> location. NOTE: This does not include heuristic based location services, e.g.
> GeoIP and others.
=> None
> The following markup can be pasted into the existing application AppData file.
>
> <content_rating type="oars-1.0" />
Change-Id: I063484d8031892c20f88999c5a9beeae3666511c
Reviewed-on: https://gerrit.libreoffice.org/72581
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Don't know how this got broken, presumably somewhere along the line from
01344a8ca5 "convert sysui to gbuild and add to
tail_build" through 4430ace32a "tdf#90753:
AutoInstall more packages" to the current state, where a spurious bin directory
containing InfoPlist_*.zip files containing (empty) InfoPlist.strings files is
placed in instdir/ and in the root window of .dmg files.
As discussed in the <https://developer.apple.com/library/archive/documentation/
General/Reference/InfoPlistKeyReference/Articles/
AboutInformationPropertyListFiles.html> "Localizing Property List Values"
section, those InfoPlist.strings files shall apparently be placed into the
Contents/Resources/*.lproj/ directories. (And the zip wrappers were presumably
needed in the past to transport their payload to the proper places in the
installation set, and are now obsolete.)
The list of Apple language IDs for the *.lproj directories was already
duplicated in Makefile.in (test-install target) and
solenv/bin/modules/installer/simplepackage.pm (sub create_package). Ultimately
those lists should all be consolidated. Also, mapping from our language IDs
(see solenv/inc/langlist.mk) to the Apple *.lproj ones needs some fixing (e.g.,
from zh-CN to zh_CN), and it is not clear to me why the old code explicilty
added en-US to the gb_WITH_LANG list of languages for which to generate
InfoPlist_*.zip and InfoPlist.strings files (when that would presumably be the
non-localized strings stored in Info.plist itself). But as mentiond, those
InfoPlist.strings files are all empty anyway (which may be due to another bug?),
so it shouldn't matter much---at least for now---what
Contents/Resources/*.lproj/InfoPlist.strings files exactly are present in an
installation set.
Change-Id: Iaadce2375ed319928891bace44f9866622ec3084
Reviewed-on: https://gerrit.libreoffice.org/71277
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
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>
It's hard to find an application that can display these file types
on Linux, so suggest LO for those.
Change-Id: I9b32b4ee2057e82a13b8fc95478f2bc2cf7ffca5
Reviewed-on: https://gerrit.libreoffice.org/63372
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
the actual .desktop files are in the main rpm, the freedesktop-menus
package only has symlinks pointing to it
Change-Id: I0816255dd56cd2281b441836871d281e112a659a
AppArmor denies writing to .ps files and dealing with temporaries needed
for "Print to file" functionality. Add .ps to the allowed extensions
list, also giving access to rm executable together with writing
printing-related temporary file.
Change-Id: I415e1401878bff6459f42162d4e8b517261b9cec
Reviewed-on: https://gerrit.libreoffice.org/59114
Tested-by: Jenkins
Reviewed-by: Rene Engelhard <rene@debian.org>
Currently, exporting document to .epub fails if AppArmor profile is
enabled. This patch fixes it by registering .epub extension within
AppArmor profile.
Change-Id: I5075ac803ffd9157c2f2cc6546895149b0fdd5f2
Reviewed-on: https://gerrit.libreoffice.org/59004
Tested-by: Jenkins
Reviewed-by: Rene Engelhard <rene@debian.org>
Commit c86e4ad533 introduced qt-related
rules, like linking to ~/.config/#[0-9]* files, though does not allow to
write the files themselves, in result producing DENIED log entries if
AppArmor profile is enabled. This is fixed by adding read-write rule for
particular files.
Change-Id: I6441398c4fcfbfcf59ba5f5b3178682c1e5d1cd5
Reviewed-on: https://gerrit.libreoffice.org/59007
Tested-by: Jenkins
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
Add rules to fix file dialog and other issues with 6.2 alpha1 on Debian
Buster with KDE desktop.
Change-Id: Ib1b20c5809ac9bdea1bf2623eff4345fa42fd4f3
Reviewed-on: https://gerrit.libreoffice.org/58702
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Add rule to allow creating temporary files like `lu6924jgpjkq.tmp`,
because without it files cannot be saved.
Change-Id: I640897df5d325e2d01da16840034abbd095fb276
Reviewed-on: https://gerrit.libreoffice.org/58672
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
7c6ca00e61 broke the Mac build, because
the files from infoplist Package have double "/" because of the empty
path in the call to gb_Package_add_files.
Change-Id: I3a72e8de0a8f2256b068a491231aaaa3d3b00b6e
