Différences
Ci-dessous, les différences entre deux révisions de la page.
Les deux révisions précédentesRévision précédenteProchaine révision | Révision précédente | ||
doc:packaging_debian [08/10/2019 11:29] – scorpio810 | doc:packaging_debian [17/01/2024 16:36] (Version actuelle) – scorpio810 | ||
---|---|---|---|
Ligne 16: | Ligne 16: | ||
| | ||
- | [[http:// | + | [[https:// |
=== Git Debian package ==== | === Git Debian package ==== | ||
Ligne 48: | Ligne 48: | ||
cd qet_git | cd qet_git | ||
git pull | git pull | ||
- | #git checkout | + | #git checkout |
GITCOMMIT=$(git rev-parse --short HEAD) | GITCOMMIT=$(git rev-parse --short HEAD) | ||
Ligne 258: | Ligne 258: | ||
echo -e " | echo -e " | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/ | + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/ |
if [ $? != 0 ]; then | if [ $? != 0 ]; then | ||
{ | { | ||
echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " | echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " | ||
- | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/ | + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/ |
} fi | } fi | ||
Ligne 297: | Ligne 297: | ||
debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | ||
- | #dch -i -D cosmic | + | dch -i -D eoan "Eoan Upload to ppa" |
- | #debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | + | debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
Ligne 312: | Ligne 312: | ||
dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu1_source.changes | dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu1_source.changes | ||
dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu2_source.changes | dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu2_source.changes | ||
- | #dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu3_source.changes | + | dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu3_source.changes |
#dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu4_source.changes | #dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu4_source.changes | ||
Ligne 337: | Ligne 337: | ||
cd $DEFAULT_DIR | cd $DEFAULT_DIR | ||
- | cd qelectrotech-$VERSION.r$HEAD/ | + | cd qelectrotech-$VERSION.r$HEAD/ |
cp {lang_extra.nsh, | cp {lang_extra.nsh, | ||
Ligne 351: | Ligne 351: | ||
cd $DEFAULT_DIR | cd $DEFAULT_DIR | ||
- | cd qelectrotech-$VERSION.r$HEAD/ | + | cd qelectrotech-$VERSION.r$HEAD/ |
cp {lang_extra.nsh, | cp {lang_extra.nsh, | ||
Ligne 362: | Ligne 362: | ||
################################################################################################################# | ################################################################################################################# | ||
- | export PATH=/ | + | export PATH=/ |
# | # | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
Ligne 370: | Ligne 370: | ||
#/ | #/ | ||
- | / | + | / |
#build jobs=17 | #build jobs=17 | ||
#build jobs=17 | #build jobs=17 | ||
Ligne 377: | Ligne 377: | ||
#copy 32 bits binarie to /bin Windows packages | #copy 32 bits binarie to /bin Windows packages | ||
- | cd $DEFAULT_DIR/ | + | cd $DEFAULT_DIR/ |
cp qelectrotech.exe / | cp qelectrotech.exe / | ||
cp qelectrotech.exe / | cp qelectrotech.exe / | ||
Ligne 395: | Ligne 395: | ||
################################################################################################################# | ################################################################################################################# | ||
- | export PATH=/ | + | export PATH=/ |
+ | #export PATH=/ | ||
# | # | ||
Ligne 403: | Ligne 404: | ||
#mxe: qmake-qt5 x86_64-w64 | #mxe: qmake-qt5 x86_64-w64 | ||
#/ | #/ | ||
- | / | + | / |
+ | #/ | ||
#build jobs=17 | #build jobs=17 | ||
#make -j17 | #make -j17 | ||
make -j$(nproc) | make -j$(nproc) | ||
- | cd $DEFAULT_DIR/ | + | cd $DEFAULT_DIR/ |
mv qelectrotech.exe / | mv qelectrotech.exe / | ||
Ligne 434: | Ligne 436: | ||
#cd $DEFAULT_DIR | #cd $DEFAULT_DIR | ||
- | #cd qelectrotech-$VERSION.r$HEAD/ | + | #cd qelectrotech-$VERSION.r$HEAD/ |
#cp {lang_extra.nsh, | #cp {lang_extra.nsh, | ||
Ligne 531: | Ligne 533: | ||
read a | read a | ||
if [[ $a == " | if [[ $a == " | ||
- | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress | + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress |
if [ $? != 0 ]; then | if [ $? != 0 ]; then | ||
{ | { | ||
echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " | echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " | ||
- | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress | + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress |
} fi | } fi | ||
Ligne 549: | Ligne 551: | ||
fi | fi | ||
exit | exit | ||
- | |||
Ligne 556: | Ligne 557: | ||
=== AppImage === | === AppImage === | ||
+ | |||
+ | |||
+ | We use now Digikam scripts, on Xubuntu 20.04 VM for create Qt 5.15.X compile environment with system-sqlite (Sqilte3) for database project exporting.\\ | ||
+ | See: | ||
+ | https:// | ||
+ | First read the README file: \\ | ||
+ | https:// | ||
+ | |||
+ | We only use __01-build-host.sh__ | ||
+ | |||
+ | < | ||
+ | git clone https:// | ||
+ | cd digikam/ | ||
+ | |||
+ | |||
+ | |||
+ | < | ||
+ | diff --git a/ | ||
+ | index a362363309..8548419442 100644 | ||
+ | --- a/ | ||
+ | +++ b/ | ||
+ | @@ -38,7 +38,7 @@ ExternalProject_Add(ext_qt5 | ||
+ | | ||
+ | | ||
+ | | ||
+ | - -sql-sqlite | ||
+ | + -system-sqlite | ||
+ | | ||
+ | # | ||
+ | -icu | ||
+ | diff --git a/ | ||
+ | index f8c317f336..77e1247fb3 100755 | ||
+ | --- a/ | ||
+ | +++ b/ | ||
+ | @@ -80,19 +80,10 @@ cmake $ORIG_WD/ | ||
+ | | ||
+ | | ||
+ | | ||
+ | - -DKDE_VERSION=$DK_KDE_VERSION \ | ||
+ | - -DENABLE_QTVERSION=$DK_QTVERSION \ | ||
+ | - -DENABLE_QTWEBENGINE=$DK_QTWEBENGINE | ||
+ | + -DKDE_VERSION=$DK_KDE_VERSION | ||
+ | |||
+ | # Install new cmake recent version and shared lib | ||
+ | |||
+ | -cmake --build . --config RelWithDebInfo --target ext_cmake | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_jasper | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_libde265 | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_libjxl | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_libaom | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_libavif | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_ffmpeg | ||
+ | |||
+ | ################################################################################################# | ||
+ | |||
+ | @@ -107,9 +98,7 @@ cmake $ORIG_WD/ | ||
+ | | ||
+ | | ||
+ | | ||
+ | - -DENABLE_QTVERSION=$DK_QTVERSION \ | ||
+ | - -DENABLE_QTWEBENGINE=$DK_QTWEBENGINE \ | ||
+ | - -DQTWEBENGINE_VERSION=$DK_QTWEBENGINEVERSION | ||
+ | + -DENABLE_QTVERSION=$DK_QTVERSION | ||
+ | |||
+ | # Low level libraries and Qt dependencies | ||
+ | # NOTE: The order to compile each component here is very important. | ||
+ | @@ -121,9 +110,7 @@ cmake --build . --config RelWithDebInfo --target ext_openssl | ||
+ | |||
+ | cmake --build . --config RelWithDebInfo --target ext_qt$DK_QTVERSION -- -j$CPU_CORES | ||
+ | |||
+ | -if [[ $DK_QTWEBENGINE = 0 ]] ; then | ||
+ | - cmake --build . --config RelWithDebInfo --target ext_qtwebkit | ||
+ | -fi | ||
+ | + | ||
+ | |||
+ | # Clean up previous openssl install | ||
+ | |||
+ | @@ -131,9 +118,7 @@ rm -fr / | ||
+ | rm -fr / | ||
+ | rm -fr / | ||
+ | |||
+ | -cmake --build . --config RelWithDebInfo --target ext_imagemagick | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_opencv | ||
+ | -cmake --build . --config RelWithDebInfo --target ext_heif | ||
+ | + | ||
+ | |||
+ | ################################################################################################# | ||
+ | |||
+ | diff --git a/ | ||
+ | index 523b1c4c73..92dad7912e 100755 | ||
+ | --- a/ | ||
+ | +++ b/ | ||
+ | @@ -123,35 +123,5 @@ cmake --build . --config RelWithDebInfo --target ext_breeze | ||
+ | |||
+ | ################################################################################################# | ||
+ | |||
+ | -if [[ $DK_QTVERSION == 6 ]] ; then | ||
+ | - | ||
+ | - KF6_GITREV_LST=$ORIG_WD/ | ||
+ | - | ||
+ | - echo "List git sub-module revisions in $KF6_GITREV_LST" | ||
+ | - | ||
+ | - if [ -f $KF6_GITREV_LST ] ; then | ||
+ | - rm -f $KF6_GITREV_LST | ||
+ | - fi | ||
+ | - | ||
+ | - currentDate=`date +" | ||
+ | - echo "+KF6 Snapshot $currentDate" | ||
+ | - | ||
+ | - # --- List git revisions for all sub-modules | ||
+ | - | ||
+ | - DIRS=$(find $BUILDING_DIR/ | ||
+ | - | ||
+ | - for ITEM in $DIRS ; do | ||
+ | - | ||
+ | - COMPONENT=(echo $ITEM | cut -d' | ||
+ | - SUBDIR=$BUILDING_DIR/ | ||
+ | - cd $SUBDIR | ||
+ | - echo " | ||
+ | - cd $ORIG_WD | ||
+ | - | ||
+ | - done | ||
+ | - | ||
+ | - cat $KF6_GITREV_LST | ||
+ | - | ||
+ | -fi | ||
+ | |||
+ | | ||
+ | diff --git a/ | ||
+ | index 2bcfca9e7c..d428e12a5e 100644 | ||
+ | --- a/ | ||
+ | +++ b/ | ||
+ | @@ -132,17 +132,6 @@ invent.kde.org \ | ||
+ | | ||
+ | " | ||
+ | |||
+ | -if [[ ! -f $HOME/ | ||
+ | - touch $HOME/ | ||
+ | -fi | ||
+ | - | ||
+ | -for server in $SERVER_LIST; | ||
+ | - | ||
+ | - echo " | ||
+ | |||
+ | - ssh-keygen -R $server | ||
+ | - ssh-keyscan -H $server >> $HOME/ | ||
+ | - | ||
+ | -done | ||
+ | |||
+ | } | ||
+ | diff --git a/ | ||
+ | index 8d5722d756..9bfdf91799 100644 | ||
+ | --- a/ | ||
+ | +++ b/ | ||
+ | @@ -61,7 +61,7 @@ DK_KA_VERSION=" | ||
+ | | ||
+ | |||
+ | # Option to use QtWebEngine instead QtWebkit | ||
+ | -DK_QTWEBENGINE=1 | ||
+ | +DK_QTWEBENGINE=0 | ||
+ | |||
+ | # Installer sub version to differentiates newer updates of the installer itself, even if the underlying application hasn’t changed. | ||
+ | # | ||
+ | @@ -70,7 +70,7 @@ DK_QTWEBENGINE=1 | ||
+ | | ||
+ | |||
+ | # Upload automatically bundle to files.kde.org (pre-release only). | ||
+ | -DK_UPLOAD=1 | ||
+ | +DK_UPLOAD=0 | ||
+ | | ||
+ | |||
+ | # KDE frameworks version + Upload URL. | ||
+ | diff --git a/ | ||
+ | index 0a283ad98d..989e52afa7 100644 | ||
+ | --- a/ | ||
+ | +++ b/ | ||
+ | @@ -211,11 +211,7 @@ for pkg in ${optional_packages[@]}; | ||
+ | echo " | ||
+ | done | ||
+ | |||
+ | -# Install more recent version of NodeJs for QtWebEngine. | ||
+ | -# https:// | ||
+ | |||
+ | -curl -sL https:// | ||
+ | -sudo apt-get install nodejs | ||
+ | |||
+ | echo -e " | ||
+ | |||
+ | |||
+ | </ | ||
+ | |||
+ | |||
+ | |||
+ | |||
+ | |||
+ | |||
< | < | ||
# | # | ||
- | #nettoyage des chroots | + | #set -x |
- | set -x | + | |
#delete old qet.h | #delete old qet.h | ||
rm sources/ | rm sources/ | ||
- | |||
- | # Fait une mise à jour | ||
- | git pull | ||
- | |||
cd sources | cd sources | ||
Ligne 574: | Ligne 766: | ||
cd .. | cd .. | ||
+ | git pull | ||
+ | sed -i ' | ||
GITCOMMIT=$(git rev-parse --short HEAD) | GITCOMMIT=$(git rev-parse --short HEAD) | ||
Ligne 580: | Ligne 773: | ||
HEAD=$(($A+473)) | HEAD=$(($A+473)) | ||
- | VERSION=$(cat sources/ | + | VERSION=$(cat sources/ |
- | tagName=$(cat sources/ | + | tagName=$(cat sources/ |
Ligne 591: | Ligne 784: | ||
- | # On modifie l' | + | # On modifie l' |
sed -i ' | sed -i ' | ||
Ligne 600: | Ligne 793: | ||
qmake ../ | qmake ../ | ||
- | make -j16 | + | make -j48 |
Ligne 626: | Ligne 819: | ||
</ | </ | ||
- | + | ||
+ | === Flatpak === | ||
+ | |||
+ | < | ||
+ | #!/bin/bash | ||
+ | #set -x | ||
+ | |||
+ | |||
+ | #delete old qet.h | ||
+ | rm sources/ | ||
+ | |||
+ | cd sources | ||
+ | git reset --hard origin/ | ||
+ | |||
+ | cd .. | ||
+ | |||
+ | # Fait une mise à jour | ||
+ | git pull | ||
+ | #git checkout test_pugi | ||
+ | |||
+ | sed -i ' | ||
+ | |||
+ | |||
+ | GITCOMMIT=$(git rev-parse --short HEAD) | ||
+ | A=$(git rev-list HEAD --count) | ||
+ | HEAD=$(($A+473)) | ||
+ | |||
+ | VERSION=$(cat sources/ | ||
+ | tagName=$(cat sources/ | ||
+ | |||
+ | |||
+ | # recupere le numero de la nouvelle revision | ||
+ | # | ||
+ | |||
+ | # On recupere le numero de version de l' | ||
+ | tagName=$(sed -n " | ||
+ | |||
+ | |||
+ | # On modifie l' | ||
+ | sed -i ' | ||
+ | |||
+ | cd ~ | ||
+ | flatpak-builder --force-clean --ccache --repo=qet_git/ | ||
+ | flatpak build-update-repo qet_git/ | ||
+ | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress qet_git/ | ||
+ | </ |