mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-05 23:40:01 +00:00
build: Update flatpak build and organize folder structure
Flatpak doesn't need to build meson or a patch for ninja and meson to
work properly:
https://github.com/flatpak/flatpak/issues/607
https://bugzilla.gnome.org/show_bug.cgi?id=774368
273e2460aa
This patch updates this and improves the folder structure with a
build-aux folder to clear up the root folder.
https://bugzilla.gnome.org/show_bug.cgi?id=780580
This commit is contained in:
parent
b4d6cfc3f9
commit
13c959d389
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
test -n "$srcdir" || srcdir=$(dirname "$0")
|
test -n "$srcdir" || srcdir=$1
|
||||||
test -n "$srcdir" || srcdir=.
|
test -n "$srcdir" || srcdir=.
|
||||||
|
|
||||||
cd $srcdir
|
cd $srcdir
|
13
build-aux/meson/postinstall.sh
Executable file
13
build-aux/meson/postinstall.sh
Executable file
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Package managers set this so we don't need to run
|
||||||
|
if [ -z "$DESTDIR" ]; then
|
||||||
|
echo Compiling GSettings schemas...
|
||||||
|
glib-compile-schemas ${MESON_INSTALL_PREFIX}/share/glib-2.0/schemas
|
||||||
|
|
||||||
|
echo Updating desktop database...
|
||||||
|
update-desktop-database -q ${MESON_INSTALL_PREFIX}/share/applications
|
||||||
|
|
||||||
|
echo Updating icon cache...
|
||||||
|
gtk-update-icon-cache -q -t -f ${MESON_INSTALL_PREFIX}/share/icons/hicolor
|
||||||
|
fi
|
|
@ -1,7 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Avoid compiling schemas when packaging.
|
|
||||||
if [ -z "$DESTDIR" ]
|
|
||||||
then
|
|
||||||
glib-compile-schemas "${MESON_INSTALL_PREFIX}/share/glib-2.0/schemas"
|
|
||||||
fi
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- mesonbuild/modules/gnome.py.glib 2017-02-21 20:45:17.187843787 -0500
|
|
||||||
+++ mesonbuild/modules/gnome.py 2017-02-21 20:46:18.062188395 -0500
|
|
||||||
@@ -37,7 +37,7 @@
|
|
||||||
#
|
|
||||||
# https://github.com/ninja-build/ninja/issues/1184
|
|
||||||
# https://bugzilla.gnome.org/show_bug.cgi?id=774368
|
|
||||||
-gresource_dep_needed_version = '>= 2.52.0'
|
|
||||||
+gresource_dep_needed_version = '>= 2.50.0'
|
|
||||||
|
|
||||||
native_glib_version = None
|
|
||||||
girwarning_printed = False
|
|
|
@ -101,7 +101,7 @@ subdir ('eel')
|
||||||
subdir ('libnautilus-extension')
|
subdir ('libnautilus-extension')
|
||||||
|
|
||||||
message ('Checking for libgd…')
|
message ('Checking for libgd…')
|
||||||
run_command ('build-scripts/check_libgd.sh')
|
run_command ('build-aux/meson/check_libgd.sh')
|
||||||
|
|
||||||
libgd_options = ['static=true',
|
libgd_options = ['static=true',
|
||||||
'with-gtk-hacks=true',
|
'with-gtk-hacks=true',
|
||||||
|
@ -128,4 +128,4 @@ if get_option ('enable-nst-extension')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Compile GSettings schemas when installing from source.
|
# Compile GSettings schemas when installing from source.
|
||||||
meson.add_install_script ('build-scripts/compile_gschemas.sh')
|
meson.add_install_script ('build-aux/meson/postinstall.sh')
|
||||||
|
|
|
@ -29,28 +29,6 @@
|
||||||
},
|
},
|
||||||
"cleanup": [ "/include", "/share/bash-completion" ],
|
"cleanup": [ "/include", "/share/bash-completion" ],
|
||||||
"modules": [
|
"modules": [
|
||||||
{
|
|
||||||
"name": "meson",
|
|
||||||
"no-autogen": true,
|
|
||||||
"sources": [
|
|
||||||
{
|
|
||||||
"type": "archive",
|
|
||||||
"url": "https://github.com/mesonbuild/meson/releases/download/0.38.1/meson-0.38.1.tar.gz",
|
|
||||||
"sha256": "dcb05349b32427924fa2a258a5e23e40e09c1bf9dd09919198c3a2ae1c38ba53"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "patch",
|
|
||||||
"path": "meson-glib-check.patch",
|
|
||||||
"strip-components": 0
|
|
||||||
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "file",
|
|
||||||
"path": "setuptools-makefile",
|
|
||||||
"dest-filename": "Makefile"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "libexif",
|
"name": "libexif",
|
||||||
"sources": [
|
"sources": [
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
all:
|
|
||||||
python3 ./setup.py build
|
|
||||||
|
|
||||||
install:
|
|
||||||
python3 ./setup.py install --prefix=/app --skip-build --optimize=1
|
|
Loading…
Reference in a new issue