Commit graph

58 commits

Author SHA1 Message Date
Yaakov Selkowitz
05a75ff161 Update fontconfig config
This should stop the noise seen with flatpak-module-tools, as
/run/host/font-dirs.xml exists only when running flatpaks or building with
flatpak-builder, but not when building in mock (which does not involve
running flatpak).

Fontconfig error: Cannot load config file "/run/host/font-dirs.xml": No such file: /run/host/font-dirs.xml
2025-05-13 18:08:31 -04:00
Yaakov Selkowitz
633155b2bc Update gdk-pixbuf loaders.cache in /usr and /app
The XPM loader from gdk-pixbuf2-modules-extra is sometimes needed
at build time as well (e.g. openslide tests).  In that case, the
loaders.cache in /usr also needs to be updated for build time usage
in addition to that in /app for running the flatpak.
2025-05-04 23:29:59 -04:00
Yaakov Selkowitz
b8c06ebbe8 Add gdk-pixbuf2 loader trigger
This will be used by anything dependent on gdk-pixbuf2-modules-extra.
2025-03-24 22:22:45 -04:00
Yaakov Selkowitz
cb21196de2 Add /app/lib to ld.so.conf
When using the SDK as a replacment for FD.o/GNOME/KDE upstream's to build
with flatpak-builder, libraries will be built into /app/lib rather than in
/app/lib64 as in Fedora builds.
2025-03-24 22:21:59 -04:00
Yaakov Selkowitz
7ecfcc4175 Convert to %autorelease and %autochangelog
[skip changelog]
2025-03-24 22:21:59 -04:00
Yaakov Selkowitz
182ef03f0f Bump version 2025-02-09 13:35:00 -05:00
Yaakov Selkowitz
641ea40056 Enable dynamic ld.so.cache generation
Using LD_LIBRARY_PATH for adding to the default library search path is not
always reliable, as sometimes subprocesses may be launched without this
environment variable, which may cause it to fail if it needs libraries
outside of the runtime.

Instead, we should follow the lead of Flathub flatpaks, and use dynamic
ld.so.cache generation instead.  This automatically creates (or updates) a
cache file in ~/.var/app/$APP_ID/.ld.so/ based on the runtime, app, and any
extensions, and works even for subprocesses with a limited environment.

To implement this, in addition to the changes here, the runtimes need to
*not* pass --env=LD_LIBRARY_PATH, and add the following to finish-args:

    # enable dynamic ld.so.cache generation
    [ -e /usr/bin/ldconfig ] || ln -s ../sbin/ldconfig /usr/bin/ldconfig
    cat /etc/ld.so.conf.d/*.conf > /etc/ld.so.conf
    rm -f /etc/ld.so.conf.d/*.conf

This is necessary because the feature requires ldconfig in /bin (where we
still have a separate /sbin), and the code is not designed to handle
/etc/ld.so.conf.d/*.conf.  This also allows %_sysconfdir/ld.so.conf.d to
work for both RPM builds and flatpak apps rather than having to defining
--env=LD_LIBRARY_PATH in the app too.

https://github.com/flatpak/flatpak/blob/1.15.12/common/flatpak-run.c#L2663
https://github.com/flatpak/flatpak/blob/1.15.12/common/flatpak-run.c#L3083

Fixes: rhbz#2272376
2024-12-10 17:45:54 -05:00
Yaakov Selkowitz
993f50edd6 Bump version 2024-08-14 20:06:47 -04:00
Yaakov Selkowitz
d69e85ba95 Bump version 2024-04-03 12:50:32 -04:00
Yaakov Selkowitz
4490560c84 Add alternatives symlink trigger
Alternatives-based symlinks work when building RPMs, but break in
flatpaks because /etc/alternatives is not writable.  Since flatpak
RPMs are only installed, not removed, this retargets such symlinks
to their intended destination.
2024-03-04 21:00:05 -05:00
Yaakov Selkowitz
144bba5833 Add /app-built X11 font directories to fontconfig path
X11 Type1 and TTF fonts are not included in the runtime but should
be handled by fontconfig if present; e.g. the full java-N-openjdk
requires the Type1 fonts for Swing.
2024-03-04 20:29:27 -05:00
Yaakov Selkowitz
83e26bd6c3 Add Java symlink trigger
This avoids broken symlinks in maven-lib when one of maven's
dependencies are built in /app for flatpaks (e.g. apache-commons-cli,
for freecol and jmol).
2024-03-04 20:29:27 -05:00
Yaakov Selkowitz
8454d0d108 Add graphviz install trigger
graphviz utilitizes a plugin cache which needs to be created once
installed.  While graphviz does have its own %post to do so, when built
in /app it does not work because it first requires ldconfig to be run
(so that the plugins can resolve graphviz's own libraries).

graphviz's %post has been converted to a trigger in rawhide (F40), but
in the meantime for F39, this avoids the issue.
2024-01-02 19:23:23 -05:00
Kalev Lember
d2e4188097 appdata: Add F39 versions 2023-10-06 00:34:30 +02:00
Yaakov Selkowitz
ea290aec62 Provide sitecustomize instead of usercustomize
/app/lib*/pythonX.Y/site-packages should be treated as a distro site
directory, not a user site one. The difference being that sitecustomize
is still respected with scripts using the `python3 -s` shebang, as in
distro-built scripts.
2023-09-04 18:02:17 -04:00
Owen W. Taylor
842f0f4845 Bump for rebuild 2023-08-22 18:44:52 -04:00
Owen W. Taylor
4f475639f7 Bump version 2023-08-07 14:00:06 -04:00
Akira TAGOH
b2fb3ad058 Add a seed for <dir prefix="xdg">fonts</dir>
This is expanded to /usr/local/share/fonts and /usr/share/fonts as well.
We definitely have to have different seed for /usr/share/fonts.
2023-03-22 21:02:02 +09:00
Kalev Lember
ca9f5b820e Revert "Provide systemd packages"
This ended up causing weird issues with build dependencies, e.g.
packages that 'BuildRequires: systemd' for systemd rpm macros no longer
building because they ended up pulling in flatpak-runtime-config instead
of systemd.

This reverts commit ccc5a2ff39.
2023-03-18 23:12:18 +01:00
Kalev Lember
fe2b787e62 appdata: Add F38 versions 2023-03-18 23:12:18 +01:00
Akira TAGOH
8686361974 Add 05-flatpak-fontpath.conf
We need a different MD5 for fontconfig cache to avoid
conflict between caches on host and flatpak.

See https://github.com/fedora-silverblue/issue-tracker/issues/305
2023-03-18 15:53:05 +09:00
Yaakov Selkowitz
ccc5a2ff39 Provide systemd packages
These belong on the host, but a lot of packages have hard dependencies
thereon.  Providing these here avoids the need to fix all those
immediately.
2023-02-23 11:18:54 -05:00
Yaakov Selkowitz
44e2d9720a Add metainfo for KDE runtimes
Also, use SPDX license names in AppData.
2023-02-22 11:43:55 -05:00
Yaakov Selkowitz
025c396a89 Remove package notes from flatpak-builder compile flags
As implemented in redhat-rpm-config, package notes requires several
RPM-specific environment variables to be set, and therefore only work
with RPM builds.  This causes gcc to be unable to compile in other use
cases, such as with flatpak-builder.
2023-02-20 21:11:11 -05:00
Akira TAGOH
8089af8255 Include fonts-dir.xml
Sync up with upstream change in fontconfig-flatpak.conf.

https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/1493
2022-11-17 19:46:21 +09:00
Kalev Lember
5895a480a3 Revert "Fix search paths for /app-installed python modules" (#2026979)
The python path issue is now fixed so we can go back to using the
original code.

https://bugzilla.redhat.com/show_bug.cgi?id=2026979

This reverts commit 2a984132dc.
2022-09-06 09:12:35 +02:00
Kalev Lember
a8adb83cc2 Correctly substitute /app/lib in flatpak-builder defaults.json ldflags 2022-09-06 09:06:27 +02:00
Kalev Lember
d333ca8010 appdata: Add F37 versions 2022-08-17 23:51:50 +02:00
Kalev Lember
2a984132dc Fix search paths for /app-installed python modules (#2112499)
This works around Python prefix changes in F36 that broke our
usercustomize.py, leading to python module search paths changing to
/app/local/lib.

As a work around, do the path mangling in the spec file and avoid doing
it at runtime.

https://bugzilla.redhat.com/show_bug.cgi?id=2112499
2022-08-04 11:16:08 +02:00
Tomas Popela
41b65b2844 appdata: Add F36 version 2022-05-02 19:44:08 +02:00
Kalev Lember
c070b580e4 appdata: Add F35 versions 2021-10-01 01:41:45 +02:00
Kalev Lember
bbc9f83404 appdata: Add F34 versions 2021-03-27 21:20:10 +01:00
Kalev Lember
23a68b312c Install flatpak-builder defaults.json config file
This makes it easier to use the Fedora flatpak SDK when building with
flatpak-builder (as opposed to building flatpaks in koji).
2021-02-02 12:41:33 +01:00
Fedora Release Engineering
a3e8ca4f3c - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 05:38:34 +00:00
Kalev Lember
26a85e4340 appdata: Use F33 GA release date 2020-10-27 09:06:01 +01:00
Kalev Lember
ee50a34bc2 Add release date for F33 runtime/sdk 2020-09-29 14:00:42 +02:00
Kalev Lember
dfe54d76c8 Update the version in appdata files as rawhide is now at 33 2020-07-29 22:10:34 +02:00
Kalev Lember
2a4e459104 Install appdata for both the Platform and the Sdk
This should make both the runtime and the sdk correctly show up in gnome-software.

I am not sure what to do with the license field; I've left it as
GPL-2.0+ for now, matching what the freedesktop and gnome runtimes are
doing, but it's clearly not correct (we include many libraries with many
different licenses, not just GPL-2.0+). I've left a FIXME in the appdata
files for now.
2020-07-29 21:29:16 +02:00
Fedora Release Engineering
fa6e7378f4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 17:33:08 +00:00
Kalev Lember
54fb203609 Remove Python 2 support
https://bugzilla.redhat.com/show_bug.cgi?id=1801932
2020-03-06 12:27:37 +01:00
Fedora Release Engineering
09c9de5dbe - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 18:37:36 +00:00
Owen W. Taylor
56e70a0284 Fix comment location in fontconfig config file 2019-08-08 17:33:23 +00:00
Mark Otaris
27155327b8 Update font config to match freedesktop-sdk
This is necessary for custom user fonts to work.
2019-07-25 23:33:45 -04:00
Fedora Release Engineering
c93a5956cb - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 00:41:12 +00:00
Fedora Release Engineering
3bc9aa48fa - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 19:48:55 +00:00
Owen W. Taylor
f1b4680012 Add missed file 2018-09-28 09:38:20 -04:00
Owen W. Taylor
2ea41f54bf Add a usercustomize.py to set up Python paths 2018-09-28 09:16:57 -04:00
Owen W. Taylor
36bc609f8b Fix path to gsettings schemas in trigger 2018-09-08 14:52:40 -04:00
Owen W. Taylor
54c964f6bf Avoid comments leaking into scriplets 2018-09-08 14:06:11 -04:00
Owen W. Taylor
628473497e Add file triggers from glibc, glib2, and fontconfig 2018-09-08 00:19:48 -04:00