Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
lektor
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Kubat
lektor
Validations
745b5b41
Vérifiée
Valider
745b5b41
rédigé
1 year ago
par
Kubat
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
BUILD: Try to copy the wayland shell integrations
parent
7ca21bb7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion
!197
Draft: Refactor the whole code.
Modifications
2
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
utils/scripts/docker/package_appimages.bash
+3
-19
3 ajouts, 19 suppressions
utils/scripts/docker/package_appimages.bash
utils/scripts/docker/setup_base.bash
+1
-1
1 ajout, 1 suppression
utils/scripts/docker/setup_base.bash
avec
4 ajouts
et
20 suppressions
utils/scripts/docker/package_appimages.bash
+
3
−
19
Voir le fichier @
745b5b41
...
@@ -46,19 +46,16 @@ function get_additional_libs() {
...
@@ -46,19 +46,16 @@ function get_additional_libs() {
function
deploy
()
{
function
deploy
()
{
local
EXEC
=
${
1
,,
}
local
EXEC
=
${
1
,,
}
local
EXTRA_QT_PLUGINS
=
"concurrent;core;dbus;eglfsdeviceintegration;eglfskmssupport;gui;multimedia;multimediawidgets;"
local
EXTRA_QT_PLUGINS
=
"concurrent;core;dbus;eglfsdeviceintegration;eglfskmssupport;gui;multimedia;multimediawidgets;
xcbglintegrations;
"
local
EXTRA_QT_PLUGINS+
=
"opengl;openglwidgets;waylandclient;widgets;xcbqpa;"
local
EXTRA_QT_PLUGINS+
=
"opengl;openglwidgets;waylandclient;widgets;xcbqpa;
wayland-shell-integration;wayland-graphics-integration-client;
"
export
EXTRA_QT_PLUGINS
export
EXTRA_QT_PLUGINS
local
EXTRA_PLATFORM_PLUGINS
=
"libqxcb.so;
libqeglfs.so;
libqwayland-egl.so;libqwayland-generic.so;"
local
EXTRA_PLATFORM_PLUGINS
=
"libqxcb.so;libqwayland-egl.so;libqwayland-generic.so;"
export
EXTRA_PLATFORM_PLUGINS
export
EXTRA_PLATFORM_PLUGINS
local
EXCLUDE_LIBS
=
"libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread"
local
EXCLUDE_LIBS
=
"libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread"
local
EXCLUDE_LIBS
=
"-name *
$(
join_by
"* -or -name *"
$EXCLUDE_LIBS
)
*"
local
EXCLUDE_LIBS
=
"-name *
$(
join_by
"* -or -name *"
$EXCLUDE_LIBS
)
*"
local
QT_SRC
=
/usr/lib/x86_64-linux-gnu/qt6/plugins
local
QT_DST
=
${
EXEC
^
}
/usr/plugins
# Will do most of the work
# Will do most of the work
linuxdeploy
-v1
--appdir
${
EXEC
^
}
-e
target/release/
${
EXEC
}
\
linuxdeploy
-v1
--appdir
${
EXEC
^
}
-e
target/release/
${
EXEC
}
\
-i
${
EXEC
}
/
${
EXEC
}
.png
-d
${
EXEC
}
/
${
EXEC
}
.desktop
\
-i
${
EXEC
}
/
${
EXEC
}
.png
-d
${
EXEC
}
/
${
EXEC
}
.desktop
\
...
@@ -67,19 +64,6 @@ function deploy() {
...
@@ -67,19 +64,6 @@ function deploy() {
# Handle aftermath things here, we force copy the qt plugins for wayland and remove unwanted
# Handle aftermath things here, we force copy the qt plugins for wayland and remove unwanted
# libs... NOTE: For now we force the xcb platform because of troubles with wayland...
# libs... NOTE: For now we force the xcb platform because of troubles with wayland...
mkdir
-p
${
EXEC
^
}
/apprun-hooks/
mkdir
-p
${
EXEC
^
}
/apprun-hooks/
case
${
*
:2
}
in
*
qt
*
)
for
PLUGIN
in
${
QT_SRC
}
/
*
;
do
local
PLUGIN
=
$(
basename
${
PLUGIN
}
)
mkdir
-p
${
QT_DST
}
/
${
PLUGIN
}
cp
-rf
${
QT_SRC
}
/
${
PLUGIN
}
/
*
${
QT_DST
}
/
${
PLUGIN
}
/
done
for
PRL_FILE
in
/usr/lib/x86_64-linux-gnu/libQt6Wayland
*
.prl
;
do
cp
${
PRL_FILE
}
${
EXEC
^
}
/usr/lib/
$(
basename
${
PRL_FILE
}
)
done
;;
*
);;
esac
find
${
EXEC
^
}
/usr/lib/
-type
f
-and
\(
${
EXCLUDE_LIBS
}
\)
-delete
find
${
EXEC
^
}
/usr/lib/
-type
f
-and
\(
${
EXCLUDE_LIBS
}
\)
-delete
cp
LICENSE CHANGELOG.md CONTRIBUTING.md
${
EXEC
^
}
/
cp
LICENSE CHANGELOG.md CONTRIBUTING.md
${
EXEC
^
}
/
install
-Dm644
${
EXEC
}
/
${
EXEC
}
.appdata.xml
${
EXEC
^
}
/usr/share/metainfo/
${
EXEC
}
.appdata.xml
install
-Dm644
${
EXEC
}
/
${
EXEC
}
.appdata.xml
${
EXEC
^
}
/usr/share/metainfo/
${
EXEC
}
.appdata.xml
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
utils/scripts/docker/setup_base.bash
+
1
−
1
Voir le fichier @
745b5b41
...
@@ -12,7 +12,7 @@ PKG_BACKPORT+=" libqt6multimedia6 libqt6concurrent6 libqt6multimediawidgets6 "
...
@@ -12,7 +12,7 @@ PKG_BACKPORT+=" libqt6multimedia6 libqt6concurrent6 libqt6multimediawidgets6 "
PKG_BACKPORT+
=
" libqt6opengl6 libqt6openglwidgets6 libqt6widgets6"
PKG_BACKPORT+
=
" libqt6opengl6 libqt6openglwidgets6 libqt6widgets6"
PKG_BACKPORT+
=
" qt6-translations-l10n qt6-l10n-tools"
PKG_BACKPORT+
=
" qt6-translations-l10n qt6-l10n-tools"
PKG_BACKPORT+
=
" qt6-wayland-dev qt6-wayland qt6-wayland-dev-tools libqt6waylandclient6"
PKG_BACKPORT+
=
" qt6-wayland-dev qt6-wayland qt6-wayland-dev-tools libqt6waylandclient6
libqt6wlshellintegration6
"
PKG_BACKPORT+
=
" qt6-qpa-plugins"
PKG_BACKPORT+
=
" qt6-qpa-plugins"
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter