release 0.8

ctlcltd · Jun 13, 2023 · 2c09357 · 2c09357
1 parent 18d3358
commit 2c09357
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -89,7 +89,7 @@ body:
         - I don't know
         - x86_64 (64-bit)
         - i686 (32-bit)
-        - arm64
+        - arm64 (aarch64)
         - other (please specify)
     validations:
       required: true

diff --git a/dist/xdg/io.github.ctlcltd.e2se.metainfo.xml b/dist/xdg/io.github.ctlcltd.e2se.metainfo.xml
@@ -29,6 +29,7 @@
     <binary>e2se-cli</binary>
   </provides>
   <releases>
+    <release version="0.8.0" date="2023-06-13" />
     <release version="0.7.0" date="2023-05-21" />
     <release version="0.6.0-pre" type="development" date="2023-04-07" />
     <release version="0.5.0-pre" type="development" date="2023-03-18" />

diff --git a/scripts/appimage-test.sh b/scripts/appimage-test.sh
@@ -24,13 +24,13 @@
 # apt-get install build-essential cmake ninja-build python3 wget
 # cd $HOME
 # wget https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.sh
-# wget https://master.qt.io/archive/qt/6.5/6.5.0/single/qt-everywhere-src-6.5.0.tar.xz
-# wget https://curl.se/download/curl-8.1.0.tar.xz
+# wget https://master.qt.io/archive/qt/6.5/6.5.1/single/qt-everywhere-src-6.5.1.tar.xz
+# wget https://curl.se/download/curl-8.1.2.tar.xz
 # chmod +x cmake-3.26.4-linux-x86_64.sh
 # ./cmake-3.26.4-linux-x86_64.sh --prefix=/usr/local
-# tar -xf qt-everywhere-src-6.5.0.tar.xz
-# tar -xf curl-8.1.0.tar.xz
-# cd $HOME/qt-everywhere-src-6.5.0
+# tar -xf qt-everywhere-src-6.5.1.tar.xz
+# tar -xf curl-8.1.2.tar.xz
+# cd $HOME/qt-everywhere-src-6.5.1
 # apt-get install libgl1-mesa-dev libglvnd-dev libdrm-dev libfontconfig-dev libfreetype-dev libharfbuzz-dev libgbm-dev libvulkan-dev libwayland-dev libgles-dev libglu1-mesa-dev libgl-dev libinput-dev libxcb-xinput-dev libxcb-xinerama0-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev lib-xext-dev libxcb-xkb-dev libxkbcommon-x11-dev libx11-xcb-dev libxcb-cursor-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-glx0-dev
 # apt-get install libatspi2.0-dev libglib2.0-dev libicu-dev libdouble-conversion-dev libgtk-3-dev libjpeg-dev libpng-dev libmd4c-dev libpcre2-dev libts-dev libudev-dev libssl-dev libpq-dev libproxy-dev libsctp-dev libsystemd-dev libb2-dev libdbus-1-dev libcups2-dev dh-exec
 # apt-get install libkrb5-dev liblttng-ust-dev default-libmysqlclient-dev firebird-dev libsqlite3-dev unixodbc-dev
@@ -46,10 +46,10 @@
 # cd .../qtwayland
 # cmake --install .
 # cd
-# export LD_LIBRARY_PATH=/usr/local/Qt-6.5.0/lib:$LD_LIBRARY_PATH
-# export PATH=/usr/local/Qt-6.5.0/bin:$PATH
+# export LD_LIBRARY_PATH=/usr/local/Qt-6.5.1/lib:$LD_LIBRARY_PATH
+# export PATH=/usr/local/Qt-6.5.1/bin:$PATH
 # qmake --version
-# cd $HOME/curl-8.1.0
+# cd $HOME/curl-8.1.2
 # apt-get install libssl-dev
 # df -h
 # ./configure --prefix=/usr/local --with-openssl --enable-versioned-symbols
@@ -60,8 +60,8 @@
 
 # apt-get install build-essential cmake ninja-build git
 # apt-get install libgl1-mesa-dev libglvnd-dev libxcb-xkb-dev libxkbcommon-x11-dev libvulkan-dev
-# export LD_LIBRARY_PATH=/usr/local/Qt-6.5.0/lib:$LD_LIBRARY_PATH
-# export PATH=/usr/local/Qt-6.5.0/bin:$PATH
+# export LD_LIBRARY_PATH=/usr/local/Qt-6.5.1/lib:$LD_LIBRARY_PATH
+# export PATH=/usr/local/Qt-6.5.1/bin:$PATH
 # ldconfig
 # cd $HOME
 
@@ -76,7 +76,7 @@
 # mv appimagetool-x86_64.AppImage /usr/local/bin/appimagetool
 
 # git clone https://github.com/ctlcltd/e2-sat-editor.git
-# git checkout v0.7.0
+# git checkout v0.8.0
 # cd e2-sat-editor
 
 ./scripts/translations.sh -m
@@ -95,16 +95,23 @@ mv AppDir/usr/share/e2-sat-editor/COPYING AppDir/usr/share/doc/e2-sat-editor/cop
 linuxdeploy --appdir AppDir --plugin qt --output appimage
 
 chmod +x e2_SAT_Editor*.AppImage
-mv e2_SAT_Editor*.AppImage e2-sat-editor-0.7.0-x86_64.AppImage
 
-# ./e2-sat-editor-0.7.0-x86_64.AppImage
+# ./e2_SAT_Editor-x86_64.AppImage
 
 
 # apt-get install nano
 # nano /etc/resolv.conf
 # systemctl restart systemd-resolved
 
-appimagetool AppDir --sign --sign-key $MY_SIGN_KEY
+./e2_SAT_Editor*.AppImage --appimage-extract
 
-# ./e2-sat-editor-0.7.0-x86_64.AppImage --appimage-signature
+mkdir squashfs-root/usr/translations
+cp /usr/local/Qt-6.5.1/share/translations/qtbase_*.qm squashfs-root/usr/translations
+echo "Translations = translations" >> squashfs-root/usr/bin/qt.conf
+
+appimagetool squashfs-root --sign --sign-key $MY_SIGN_KEY
+
+mv e2_SAT_Editor*.AppImage e2-sat-editor-0.8.0-x86_64.AppImage
+
+# ./e2-sat-editor-0.8.0-x86_64.AppImage --appimage-signature
 
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -79,7 +79,7 @@ cleanup () {
 	rm Makefile.Debug
 	rm Makefile.Release
 	rm .qmake.stash
-	rm qrc_resources.cpp
+	rm qrc_resources*.cpp
 	rm -R debug
 	rm -R release
 }

diff --git a/scripts/darwin.sh b/scripts/darwin.sh
@@ -79,7 +79,7 @@ cleanup () {
 	rm Makefile.Debug
 	rm Makefile.Release
 	rm .qmake.stash
-	rm qrc_resources.cpp
+	rm qrc_resources*.cpp
 	rm -R debug
 	rm -R release
 }
@@ -210,7 +210,7 @@ fixes () {
 	install_name_tool -change @loader_path/libbrotlicommon.1.dylib @rpath/libbrotlicommon.1.dylib "libbrotlidec.1.dylib"
 
 	# wrong path: libldap.2.dylib in: Frameworks/libgthread-2.0.0.dylib
-	install_name_tool -change /usr/local/Cellar/glib/2.76.2/lib/libglib-2.0.0.dylib @rpath/libglib-2.0.0.dylib "libgthread-2.0.0.dylib"
+	install_name_tool -change /usr/local/Cellar/glib/2.76.3/lib/libglib-2.0.0.dylib @rpath/libglib-2.0.0.dylib "libgthread-2.0.0.dylib"
 
 	# wrong path: libicuuc.72.dylib in: Frameworks/libicui18n.72.dylib
 	install_name_tool -change @loader_path/libicuuc.72.dylib @rpath/libicuuc.72.dylib "libicui18n.72.dylib"
@@ -226,7 +226,7 @@ fixes () {
 	install_name_tool -delete_rpath @loader_path/../lib "libmd4c.0.dylib"
 
 	# wrong path: libcrypto.1.1.dylib in: Frameworks/libssl.1.1.dylib
-	install_name_tool -change /usr/local/Cellar/openssl@1.1/1.1.1t/lib/libcrypto.1.1.dylib @rpath/libcrypto.1.1.dylib "libssl.1.1.dylib"
+	install_name_tool -change /usr/local/Cellar/openssl@1.1/1.1.1u/lib/libcrypto.1.1.dylib @rpath/libcrypto.1.1.dylib "libssl.1.1.dylib"
 
 	# wrong path: /../lib in: Frameworks/libzstd.1.dylib
 	install_name_tool -delete_rpath @loader_path/../lib "libzstd.1.dylib"
@@ -304,7 +304,7 @@ release () {
 	done
 
 	mkdir PlugIns/{platforms,styles}
-	cp /usr/local/share/qt/plugins/platforms/libqcocoa.dylib PlugIns/styles/libqcocoa.dylib
+	cp /usr/local/share/qt/plugins/platforms/libqcocoa.dylib PlugIns/platforms/libqcocoa.dylib
 	cp /usr/local/share/qt/plugins/styles/libqmacstyle.dylib PlugIns/styles/libqmacstyle.dylib
 
 	printf "%s\n\n" "applying current fixes libs ..."

diff --git a/scripts/mingw.sh b/scripts/mingw.sh
@@ -102,7 +102,7 @@ cleanup () {
 	rm Makefile.Debug
 	rm Makefile.Release
 	rm .qmake.stash
-	rm qrc_resources.cpp
+	rm qrc_resources*.cpp
 	rm -R build
 }
 

diff --git a/src/e2se_defs.h b/src/e2se_defs.h
@@ -17,7 +17,7 @@
 
 
 // build target: debug, release
-#define E2SE_BUILD E2SE_TARGET_DEBUG
+#define E2SE_BUILD E2SE_TARGET_RELEASE
 
 // portable application
 // #define E2SE_PORTABLE