This reverts commit 12546c8511f0cc8eec0ca7e8cb86ff00dfd429e6.
Apparently I stirred a hornet's nest with this. And I have already
wasted enough time arguing...
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
- rename main_app.ico to soffice.ico (in case the name is relevant?)
- installer: hard-code path to sysui/desktop/icons/soffice.ico
Change-Id: Iacd6e28201c3f8e69375e0bfc516542e86131912
the minimum version is set based on MACOSX_DEPLOYMENT_VERSION
It's purpose is to prevent the generated app to be executed
on a system that does not meet the requirement
Change-Id: I4ec09f8d1f96af1263d40bbe0e4b144c9622bba4
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>
After recent instdir changes the SCPZIP_REPLACE thing was not used any
more for Info.plist, so all the ${FOO} things were left in Info.plist
unexpanded with predictably wonky results, a non-working app.
Instead just expand it from the configure script.
While at it, use a correct CFBundleShortVersionString: only three
integers should be in that.
Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION
as 1.0, and drop the "variables", as that is what those "variables"
*means*. They were used to refer to the OOo 1.0 formats. (It would
have been utterly wrong to define them as something else, like another
product name and a newer version number, in openoffice.lst, so
pointless to have them there.)
Drop the meaningless BUILDIDCWS.
Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)
For Android and iOS, gb_INSTROOT probably still needs to be set.
The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.
Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
This is apparently not used at all currently; cloph says the
*slackware-menus*.tgz used to be bundled with RPM instsets but the last
release that contained it was apparently OOo 3.1.1; it is gone in OOo
3.2.1 RPM instset. There are no bug reports about it missing, so no
problem with removing it altogether.
Change-Id: I1b93c94c4ac5c1d1826069b05cb58fdbb30cd71f
Use versioned file name for Debian specific /usr/lib/menu/libreoffice.
All the other files have been versioned for years when we did this
for RPMs. Heh, nobody noticed this with DEBs because people were
used to that conflict and did not complain ;-)
Change-Id: I1195279ff4825ed9154cf497ff3cc702f7309b6a
Add back the missing "-debian-menus" suffix. It was lost during gbuildisation.
Also add the X.Y version. The files and menu entries have been versioned
since LO 4.1 but we did not versioned the package name ;-)
Finally, fix typo in the package version definition and mention the
release number again.
Change-Id: I26e1664349c326db199905e6c5b1efb5d2d1723c
All the files and menu entries have been versioned since LO 3.4.
There are not real conflicts with older versions or native Debian
packages any longer.
Change-Id: Ie3afb8b506cb23767b52a5f9cf1c721521e60ec3
The actual purpose is to help Plasma taskbar associate taskbar items
with .desktop files for the purpose of creating launchers. LibreOffice's
WM_CLASS handling is rather broken, but the class part of it usually
ends up being 'libreoffice-<component>', which however doesn't match
names of .desktop files or executables. I fear renaming .desktop files
would cause too much breakages in various places that expect the current
names, so adding StartupWMClass will help Plasma match them.
Change-Id: Ia946307b429d9a7c00408b2b508726fdc88908ac
There was a mistage when merging the clean up.
Note that $(UNIXFILENAME.$*) is not correctly substituted if the variables are define
by another VAR.bla variables. This is why we need to hardcode the lowercase names here.
Change-Id: I9110083122175cdbd09baa0533d890a7ef6d8213
- $(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
The freedesktop solution has been supported by the Linux desktops
for many years. It should be enough these days. At least the
SUSE desktop integration has not been needed since about 2009.
Change-Id: Ib5048bd062802f6e70403e81433ea68ca9dff177
