Update popos-trinity.sh

popos-trinity.sh

@@ -1,35 +1,44 @@
 #!/bin/sh
-
-set -e  # Detener si hay error
+set -e
 
 cd "$HOME"
 
-# Añadir PPA para Qt 6.9+ en Ubuntu 22.04 (Jammy)
+# === 1. Añadir PPA de Qt 6.9 para Jammy ===
 sudo add-apt-repository -y ppa:beineri/opt-qt-6.9.0-jammy
-sudo apt-get update
+sudo apt update
 
-# Instalar dependencias (adaptadas a Jammy + PPA de Qt6)
-sudo apt-get install -y \
+# === 2. Instalar dependencias base (sin webengine) ===
+sudo apt install -y \
     build-essential git curl wget cmake clang ninja-build \
     qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qt6-tools-dev \
     libcurl4-openssl-dev libssl-dev \
     libasound2-dev libpulse-dev libjack-jackd2-dev libpipewire-0.3-dev \
     libx11-dev libxi-dev libxext-dev libxfixes-dev libxcursor-dev libxrandr-dev libxss-dev libxtst-dev \
     libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libvulkan-dev vulkan-validationlayers \
-    libdrm-dev libgbm-dev \
-    libudev-dev libevdev-dev libusb-1.0-0-dev libdbus-1-dev libbluetooth-dev bluez \
-    libibus-1.0-dev libxkbcommon-dev \
-    libpng-dev libzip-dev libcups2-dev
+    libdrm-dev libgbm-dev libudev-dev libevdev-dev libusb-1.0-0-dev libdbus-1-dev \
+    libbluetooth-dev bluez libibus-1.0-dev libxkbcommon-dev libpng-dev libzip-dev libcups2-dev \
+    libxcursor-dev libxcomposite-dev libxdamage-dev libfontconfig1-dev libsrtp2-dev libevent-dev \
+    libjsoncpp-dev libopus-dev libminizip-dev libpci-dev libnss3-dev libnspr4-dev \
+    libatk1.0-dev libatspi2.0-dev libx11-xcb-dev libxkbcommon-x11-dev gperf bison flex ruby python3
 
-# Nota: libsndio-dev no existe en Jammy → omitido
-# Nota: qt6-webengine-dev no está disponible → se omite (Trinity Launcher no lo requiere obligatoriamente si no usa WebEngine)
+# === 3. Compilar e instalar Qt WebEngine (solo si no lo has hecho) ===
+if [ ! -d "$HOME/qtwebengine" ]; then
+    git clone --branch v6.9.0 --depth 1 https://code.qt.io/qt/qtwebengine.git
+    cd qtwebengine
+    export QTDIR=/opt/qt690
+    export PATH="$QTDIR/bin:$PATH"
+    qmake6 qtwebengine.pro
+    make -j$(nproc)
+    sudo make install
+    cd "$HOME"
+fi
 
-# Clonar e instalar mcpelauncher-client-extend
+# === 4. Ahora sí, instalar tus proyectos ===
 git clone https://codeberg.org/javiercplus/mcpelauncher-client-extend.git
 cd mcpelauncher-client-extend
-mkdir -p build
-cd build
-
+mkdir -p build && cd build
+export QTDIR=/opt/qt690
+export PATH="$QTDIR/bin:$PATH"
 CC=clang CXX=clang++ cmake .. \
   -DJNI_USE_JNIVM=ON \
   -DGAMEWINDOW_SYSTEM=SDL3 \
@@ -38,37 +47,28 @@ CC=clang CXX=clang++ cmake .. \
   -DCMAKE_C_FLAGS="-mtune=generic" \
   -DCMAKE_CXX_FLAGS="-mtune=generic" \
   -Wno-dev
-
 make -j$(getconf _NPROCESSORS_ONLN)
 sudo make install
 cd "$HOME"
 
-# Clonar e instalar mcpe-extract
 git clone https://codeberg.org/javiercplus/mcpe-extract.git
 cd mcpe-extract
-mkdir -p build
-cd build
-cmake .. -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+mkdir -p build && cd build
+cmake .. -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
 make -j$(nproc)
 sudo make install
 cd "$HOME"
 
-# Clonar e instalar Trinity Launcher
 git clone https://github.com/Trinity-LA/Trinity-Launcher.git
 cd Trinity-Launcher
-
-# Asegurar permisos y ejecutar build.sh
 chmod +x build.sh
 ./build.sh
-
-# Instalar binarios y recursos del sistema
 sudo cp -f trinito /usr/local/bin/
 sudo cp -f trinchete /usr/local/bin/
 sudo cp -f resources/com.trench.trinity.launcher.svg /usr/share/icons/
 sudo cp -f resources/com.trench.trinity.launcher.desktop /usr/share/applications/
 
 # Limpieza (opcional)
-# rm -f build.sh
-rm -rf mcpelauncher-client-extend mcpe-extract Trinity-Launcher
+# rm -rf qtwebengine mcpelauncher-client-extend mcpe-extract Trinity-Launcher
 
-echo "¡Instalación completada en Pop!_OS"
+echo "✅ Instalación completa con Qt WebEngine en Pop!_OS 22.04"