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
4e88cf15
Valider
4e88cf15
rédigé
1 year ago
par
Elliu
Validation de
Kubat
1 year ago
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
BUILD: package_appimages.bash for xcb
parent
d969fbe6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion
!197
Draft: Refactor the whole code.
Modifications
1
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
1 fichier modifié
utils/scripts/docker/package_appimages.bash
+8
-30
8 ajouts, 30 suppressions
utils/scripts/docker/package_appimages.bash
avec
8 ajouts
et
30 suppressions
utils/scripts/docker/package_appimages.bash
+
8
−
30
Voir le fichier @
4e88cf15
...
@@ -21,35 +21,9 @@ function join_by() {
...
@@ -21,35 +21,9 @@ function join_by() {
fi
fi
}
}
function
get_additional_libs
()
{
case
$*
in
*
qt
*
)
for
LIB
in
/usr/lib/x86_64-linux-gnu/libQt6OpenGLWidgets.so
\
/usr/lib/x86_64-linux-gnu/libQt6OpenGL.so
\
/usr/lib/x86_64-linux-gnu/libQt6MultimediaWidgets.so
\
/usr/lib/x86_64-linux-gnu/libQt6Multimedia.so
\
/usr/lib/x86_64-linux-gnu/libQt6Concurrent.so
\
/usr/lib/x86_64-linux-gnu/libQt6WaylandClient.so
\
/usr/lib/x86_64-linux-gnu/libQt6XcbQpa.so
\
/usr/lib/x86_64-linux-gnu/libQt6WlShellIntegration.so.6
\
/usr/lib/x86_64-linux-gnu/libQt6EglFSDeviceIntegration.so
\
/usr/lib/x86_64-linux-gnu/libQt6EglFsKmsGbmSupport.so
\
/usr/lib/x86_64-linux-gnu/libQt6EglFsKmsSupport.so
;
do
for
FILE
in
${
LIB
}*
;
do
echo
-n
" -l
${
FILE
}
"
done
done
;;
*
);;
esac
}
function
deploy
()
{
function
deploy
()
{
local
EXEC
=
${
1
,,
}
local
EXEC
=
${
1
,,
}
local
WITHQTPLUGIN
=
"
$2
"
local
EXTRA_QT_PLUGINS
=
"concurrent;core;dbus;eglfsdeviceintegration;eglfskmssupport;gui;multimedia;multimediawidgets;xcbglintegrations;"
local
EXTRA_QT_PLUGINS+
=
"opengl;openglwidgets;waylandclient;widgets;xcbqpa;wayland-shell-integration;wayland-graphics-integration-client;"
export
EXTRA_QT_PLUGINS
local
EXTRA_PLATFORM_PLUGINS
=
"libqxcb.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
...
@@ -57,10 +31,14 @@ function deploy() {
...
@@ -57,10 +31,14 @@ function deploy() {
local
EXCLUDE_LIBS
=
"libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread libX11-xcb libxcb-"
local
EXCLUDE_LIBS
=
"libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread libX11-xcb libxcb-"
local
EXCLUDE_LIBS
=
"-name *
$(
join_by
"* -or -name *"
$EXCLUDE_LIBS
)
*"
local
EXCLUDE_LIBS
=
"-name *
$(
join_by
"* -or -name *"
$EXCLUDE_LIBS
)
*"
local
qtPlugin
=()
if
[[
"x
$WITHQTPLUGIN
"
==
"x1"
]]
;
then
qtPlugin+
=(
--plugin
qt
)
fi
# 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
"
${
qtPlugin
[@]
}
"
${
*
:2
}
$(
get_additional_libs
$*
)
# 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...
...
@@ -103,5 +81,5 @@ EOF
...
@@ -103,5 +81,5 @@ EOF
deploy lkt
deploy lkt
deploy amadeus
deploy amadeus
deploy lektord
--plugin
qt
deploy lektord
1
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