asciiwolf pushed to branch main at The Tor Project / Applications / torbrowser-launcher

Commits:

4 changed files:

Changes:

  • BUILD.md
    ... ... @@ -12,7 +12,7 @@ Then install dependencies, build a package, and install:
    12 12
     ### Debian, Ubuntu, Linux Mint, etc.
    
    13 13
     
    
    14 14
     ```sh
    
    15
    -sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-gpg python3-requests python3-socks python3-packaging gnupg2 tor
    
    15
    +sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor
    
    16 16
     ./build_deb.sh
    
    17 17
     sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
    
    18 18
     ```
    
    ... ... @@ -20,7 +20,7 @@ sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
    20 20
     ### Red Hat, Fedora, CentOS, etc.
    
    21 21
     
    
    22 22
     ```sh
    
    23
    -sudo dnf install rpm-build python3-pyside6 python3-gpg python3-requests python3-pysocks python3-packaging gnupg2 tor
    
    23
    +sudo dnf install rpm-build python3-pyside6 python3-gpg python3-requests python3-setuptools python3-pysocks python3-packaging gnupg2 tor
    
    24 24
     ./build_rpm.sh
    
    25 25
     sudo yum install dist/torbrowser-launcher-*.rpm
    
    26 26
     ```
    

  • build_rpm.sh
    ... ... @@ -6,7 +6,7 @@ VERSION=$(cat share/torbrowser-launcher/version)
    6 6
     rm -r build dist
    
    7 7
     
    
    8 8
     # build binary package
    
    9
    -python3 setup.py bdist_rpm --requires="python3-pyside6, python3-gpg, python3-requests, python3-pysocks, python3-packaging, gnupg2, dbus-glib"
    
    9
    +python3 setup.py bdist_rpm --requires="python3-pyside6, python3-gpg, python3-requests, python3-setuptools, python3-pysocks, python3-packaging, gnupg2, dbus-glib"
    
    10 10
     
    
    11 11
     # install it
    
    12 12
     echo ""
    

  • setup.py
    ... ... @@ -31,7 +31,7 @@ import os
    31 31
     import sys
    
    32 32
     import distro
    
    33 33
     import subprocess
    
    34
    -from distutils.core import setup
    
    34
    +from setuptools import setup
    
    35 35
     
    
    36 36
     SHARE = "share"
    
    37 37
     
    

  • stdeb.cfg
    1 1
     [DEFAULT]
    
    2 2
     Package3: torbrowser-launcher
    
    3 3
     Depends3: python3-pyside6.qtcore, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2
    
    4
    -Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2
    
    4
    +Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2
    
    5 5
     Recommends: tor
    
    6 6
     Suite: oracular