Merge branch 'release-0730' into HEAD

Author: hemiao2023

CMakeLists.txt

@@ -325,7 +325,9 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
     # we finally get rid of the deprecated code.
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         add_compile_options(-Wno-deprecated-declarations)
-        add_compile_options(-glldb)
+        if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+            add_compile_options(-glldb)
+        endif()
     endif()
 
     if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
@@ -860,8 +862,11 @@ configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fh
 message(STATUS "CMAKE_INSTALL_PREFIX333=${CMAKE_INSTALL_PREFIX}")
 
 message(STATUS "SLIC3R_RESOURCES_DIR222=${SLIC3R_RESOURCES_DIR}")
+message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 # if (WIN32)
 # include(package/package.cmake)
 # elseif( APPLE)
-add_subdirectory(package)
+if (NOT FLATPAK)
+    add_subdirectory(package)
+endif()
 # endif()

cmake/modules/NSIS.template.in

@@ -1020,6 +1020,15 @@ Jump_Del_Thumb:
 
   ;Remove the installation directory if it is empty.
   RMDir "$INSTDIR"
+    ; 判断上级目录是否为 Creality
+  GetFullPathName $R0 "$INSTDIR\.."
+  Push $R0
+  Push "Creality"
+  Call un.StrStr
+  Pop $R1
+  StrCmp "$R1" "Creality" 0 skipCrealityDelete
+      RMDir "$INSTDIR\.."
+  skipCrealityDelete:
 
   ; Remove the registry entries.
   DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
@@ -1067,6 +1076,7 @@ Jump_Del_Thumb:
   secondStartMenuDeleteLoopDone:
 
   DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+  DeleteRegKey /ifempty HKLM "Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   Push $INSTDIR\bin
   StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0

deps/CMakeLists.txt

@@ -246,12 +246,12 @@ if(FLATPAK)
     find_package(ZLIB)
     find_package(PNG)
     find_package(EXPAT)
-    find_package(CURL)
+    #find_package(CURL)
     find_package(JPEG)
     find_package(TIFF)
     find_package(Freetype)
     find_package(OpenSSL 1.1...<3.2)
-    find_package(CURL)
+    #find_package(CURL)
 endif()
 
 set(ZLIB_PKG "")

flatpak/entrypoint

@@ -6,10 +6,4 @@ grep -q org.freedesktop.Platform.GL.nvidia /.flatpak-info && export WEBKIT_DISAB
 # Work-around https://github.com/bambulab/BambuStudio/issues/3440
 export LC_ALL=C.UTF-8
 
-if [ $BAMBU_STUDIO_DARK_THEME == true ]; then
-    export GTK_THEME='Adwaita:dark'
-    # echo "Message: $(date +%T): INFO: using dark theme variant"
-fi
-
-exec /app/bin/crealityprint "$@" &
-$(/app/bin/set-dark-theme-variant.py) &
+exec /app/CrealityPrint "$@"

flatpak/images/1.png

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>io.github.crealityofficial.CrealityPrint</id>
+    <launchable type="desktop-id">io.github.crealityofficial.CrealityPrint.desktop</launchable>
+    <provides>
+        <id>io.github.crealityofficial.CrealityPrint.desktop</id>
+    </provides>
+    <name>CrealityPrint</name>
+    <!-- hehe hadess @ppd 
+    ... seriously though, thanks -->
+    <summary>Get even more perfect prints!</summary>
+    <developer_name>Creality</developer_name>
+    <url type="homepage">https://github.com/CrealityOfficial/CrealityPrint</url>
+    <url type="help">https://github.com/CrealityOfficial/CrealityPrint/wiki</url>
+    <url type="bugtracker">https://github.com/CrealityOfficial/CrealityPrint/issues/</url>
+    <url type="donation"></url>
+    <metadata_license>0BSD</metadata_license>
+    <project_license>AGPL-3.0-only</project_license>
+    <content_rating type="oars-1.1" />
+    <requires>
+        <display_length compare="gt">768</display_length>
+    </requires>
+    <recommends>
+        <control>keyboard</control>
+        <control>pointing</control>
+    </recommends>
+    <screenshots>
+	    <screenshot type="default">
+		    <image>https://pic2-cdn.creality.com/plug/imgs/f7c7444213f1c18da6017221d73b3bac.webp</image>
+		    <caption>A model ready to be sliced on a buildplate.</caption>
+	    </screenshot>
+    </screenshots>
+    <description>
+	    <p>A 3D printer slicer forked from Bambu Studio, PrusaSlicer, and SuperSlicer with many more printer profiles, helpful calibration prints, and many more features to get your 3D printer printing perfectly!</p>
+    </description>
+    <branding>
+	  <color type="primary" scheme_preference="light">#009688</color>
+	</branding>
+    <releases>
+	    <release version="6.2.0" date="2025-06-30"> <url>https://github.com/CrealityOfficial/CrealityPrint/commit/5d2ac094fe3f37ce446a0ee1390a44e6b8649d46</url>
+        </release>
+    </releases>
+</component>