-
-
-
Manual Intervention Required
-
- QElectroTech has been updated and uses newer versions
- of many software packages now.
-
- Unfortunately, this requires a one time manual step from you to
- complete the update.
-
-
- - Open a terminal
- - Run the following command:
-
-
- sudo snap disconnect qelectrotech:kde-frameworks-5-plug kde-frameworks-5-core18:kde-frameworks-5-core18-slot
-
-
-
-
- This will disconnect the outdated software from QElectroTech and will
- enable the application to run with the new platform.
-
-
-
- Your data will not be affected! This command will not delete anything.
-
-
-
- Thank you,
- the QElectroTech developers
-
-
-
-
-
\ No newline at end of file
diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml
index d7c80a71e..400672286 100644
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -56,12 +56,6 @@ parts:
organize:
'*': bin/
- update-instructions:
- plugin: dump
- source: build-aux/snap/local/update-instructions
- organize:
- '*': update-instructions/
-
qet-tb-generator:
plugin: python
source: https://github.com/raulroda/qet_tb_generator-plugin.git
@@ -82,7 +76,7 @@ parts:
- rsync
override-build: |
rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current/ /
-
+
dxf-to-qet:
after: [kde-sdk-setup]
plugin: nil
@@ -101,16 +95,14 @@ parts:
build-packages:
- git
- libsqlite3-dev
- override-pull: |
- snapcraftctl pull
+ override-build: |
displayed_version=$(grep "displayedVersion" sources/qet.h | tr -d "\";" | cut -d" " -f5)
- snap_version="${displayed_version}~$(git rev-parse --short=8 HEAD)"
+ snap_version="${displayed_version}-g$(git rev-parse --short=8 HEAD)"
modified_displayed_version="${snap_version}.snap"
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
snapcraftctl set-version "$snap_version"
- override-build: |
qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
- make -j$(nproc)
+ make -j${SNAPCRAFT_PARALLEL_BUILD_COUNT}
make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
override-stage: |
snapcraftctl stage
diff --git a/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt b/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
index 5ca3c60cc..531637f48 100644
--- a/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
@@ -12,7 +12,7 @@
-