diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index 370fe0beb07..64cbbbc7163 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -56,7 +56,7 @@ AppDir: id: com.usebottles.bottles name: Bottles icon: com.usebottles.bottles - version: 2022.5.2-trento-2 + version: 2022.5.2-trento-3 # Set the python executable as entry point exec: usr/bin/python3.10 diff --git a/VERSION b/VERSION index 558b113c1e1..1b74575f792 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2022.5.2-trento-2 \ No newline at end of file +2022.5.2-trento-3 \ No newline at end of file diff --git a/com.usebottles.bottles.dev.json b/com.usebottles.bottles.dev.json index 9567076ad14..cbb7beeb900 100644 --- a/com.usebottles.bottles.dev.json +++ b/com.usebottles.bottles.dev.json @@ -2,9 +2,9 @@ "id": "com.usebottles.bottles", "sdk": "org.gnome.Sdk", "runtime": "org.gnome.Platform", - "runtime-version": "42", "base": "org.winehq.Wine", "base-version": "stable-21.08", + "runtime-version": "42", "command": "bottles", "finish-args": [ "--allow=devel", @@ -18,7 +18,7 @@ "--system-talk-name=org.freedesktop.UDisks2", "--talk-name=org.freedesktop.Notifications", "--env=LD_LIBRARY_PATH=/app/lib:/app/lib32", - "--env=PATH=/app/bin:/app/utils/bin:/usr/bin", + "--env=PATH=/app/bin:/app/utils/bin:/usr/bin:/usr/lib/extensions/vulkan/MangoHud/bin/:/usr/bin:/usr/lib/extensions/vulkan/OBSVkCapture/bin/", "--require-version=1.1.2" ], "inherit-extensions": [ @@ -177,6 +177,20 @@ } ] }, + { + "name": "python-icoextract", + "buildsystem": "simple", + "build-commands": [ + "python3 setup.py install --prefix=/app --root=/" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/jlu5/icoextract/archive/refs/tags/0.1.2.tar.gz", + "sha256": "3818ad889160b33d360da4083da0a32df8d1955fb77a64bfbac49edc15d5ad3b" + } + ] + }, { "name": "patool", "buildsystem": "simple", @@ -191,6 +205,20 @@ } ] }, + { + "name": "python-pefile", + "buildsystem": "simple", + "build-commands": [ + "python3 setup.py install --prefix=/app --root=/" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/erocarrera/pefile/releases/download/v2021.9.3/pefile-2021.9.3.tar.gz", + "sha256": "344a49e40a94e10849f0fe34dddc80f773a12b40675bf2f7be4b8be578bdd94a" + } + ] + }, { "name": "vulkan-tools", "buildsystem": "cmake-ninja", @@ -282,27 +310,6 @@ } ] }, - { - "name": "compat", - "buildsystem": "simple", - "build-commands": [ - "mkdir -p /app/lib/i386-linux-gnu /app/lib/debug/lib/i386-linux-gnu" - ] - }, - { - "name": "i386-libs", - "buildsystem": "simple", - "build-commands": [ - "mkdir -p /app/lib/i386-linux-gnu", - "install -Dm644 ld.so.conf -t /app/etc/" - ], - "sources": [ - { - "type": "file", - "path": "ld.so.conf" - } - ] - }, { "name": "mesa-glu", "config-opts": [ @@ -343,222 +350,6 @@ } ] }, - { - "name": "openldap", - "config-opts": [ - "--disable-slapd", - "--disable-slurpd", - "--disable-bdb", - "--disable-hdb" - ], - "cleanup": [ - "/bin" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.0.tgz", - "sha256": "b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f" - } - ] - }, - { - "name": "openldap-32bit", - "build-options": { - "arch": { - "x86_64": [ - "--disable-slapd", - "--disable-slurpd", - "--disable-bdb", - "--disable-hdb" - ] - } - }, - "config-opts": [ - "--disable-slapd", - "--disable-slurpd", - "--disable-bdb", - "--disable-hdb" - ], - "cleanup": [ - "/bin" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.0.tgz", - "sha256": "b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f" - } - ] - }, - { - "name": "OpenCL", - "buildsystem": "simple", - "build-commands": [ - "cp -av CL $FLATPAK_DEST/include/" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/KhronosGroup/OpenCL-Headers.git", - "commit": "e3cd57376dada061bc6d5f9edfce2ea631b81214" - } - ] - }, - { - "name": "libpcap", - "config-opts": [ - "--enable-ipv6" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz", - "sha256": "ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4" - } - ] - }, - { - "name": "libpcap-32bit", - "build-options": { - "arch": { - "x86_64": { - "prepend-pkg-config-path": "/app/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig", - "ldflags": "-L/app/lib32", - "append-path": "/usr/lib/sdk/toolchain-i386/bin", - "env": { - "CC": "i686-unknown-linux-gnu-gcc", - "CXX": "i686-unknown-linux-gnu-g++" - }, - "libdir": "/app/lib32" - } - } - }, - "config-opts": [ - "--enable-ipv6" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz", - "sha256": "ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4" - } - ] - }, - { - "name": "libcapi20", - "sources": [ - { - "type": "archive", - "url": "http://deb.debian.org/debian/pool/main/libc/libcapi20-3/libcapi20-3_3.27.orig.tar.bz2", - "md5": "439620a9221c0222c35fb3e7a3973700" - } - ] - }, - { - "name": "libcapi20-32bit", - "build-options": { - "arch": { - "x86_64": { - "prepend-pkg-config-path": "/app/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig", - "ldflags": "-L/app/lib32", - "append-path": "/usr/lib/sdk/toolchain-i386/bin", - "env": { - "CC": "i686-unknown-linux-gnu-gcc", - "CXX": "i686-unknown-linux-gnu-g++" - }, - "libdir": "/app/lib32" - } - } - }, - "sources": [ - { - "type": "archive", - "url": "http://deb.debian.org/debian/pool/main/libc/libcapi20-3/libcapi20-3_3.27.orig.tar.bz2", - "md5": "439620a9221c0222c35fb3e7a3973700" - } - ] - }, - { - "name": "libbsd", - "sources": [ - { - "type": "archive", - "url": "https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz", - "sha256": "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" - } - ] - }, - { - "name": "libbsd-32bit", - "build-options": { - "arch": { - "x86_64": { - "prepend-pkg-config-path": "/app/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig", - "ldflags": "-L/app/lib32", - "append-path": "/usr/lib/sdk/toolchain-i386/bin", - "env": { - "CC": "i686-unknown-linux-gnu-gcc", - "CXX": "i686-unknown-linux-gnu-g++" - }, - "libdir": "/app/lib32" - } - } - }, - "sources": [ - { - "type": "archive", - "url": "https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz", - "sha256": "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" - } - ] - }, - { - "name": "libcaca", - "config-opts": [ - "--disable-doc", - "--disable-static", - "--disable-python", - "--disable-ruby" - ], - "sources": [ - { - "type": "archive", - "url": "http://caca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz", - "sha256": "128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4" - } - ] - }, - { - "name": "libcaca-32bit", - "build-options": { - "arch": { - "x86_64": { - "prepend-pkg-config-path": "/app/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig", - "ldflags": "-L/app/lib32", - "append-path": "/usr/lib/sdk/toolchain-i386/bin", - "env": { - "CC": "i686-unknown-linux-gnu-gcc", - "CXX": "i686-unknown-linux-gnu-g++" - }, - "libdir": "/app/lib32" - } - } - }, - "config-opts": [ - "--disable-doc", - "--disable-static", - "--disable-python", - "--disable-ruby" - ], - "sources": [ - { - "type": "archive", - "url": "http://caca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz", - "sha256": "128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4" - } - ] - }, { "name": "rpcsvc-proto", "buildsystem": "autotools", @@ -595,33 +386,19 @@ ] }, { - "name": "samba", - "buildsystem": "autotools", - "config-opts": [ - "--prefix=/app", - "--sbindir=/app/bin", - "--libdir=/app/lib", - "--enable-fhs", - "--disable-python", - "--without-json", - "--without-ad-dc", - "--without-ads", - "--without-pam", - "--without-ldap", - "--without-acl-support", - "--without-systemd" + "name": "LatencyFleX", + "buildsystem": "simple", + "build-commands": [ + "mkdir -p /app/lib/x86_64-linux-gnu/", + "mkdir -p /app/share/vulkan/implicit_layer.d/", + "cp layer/usr/lib/x86_64-linux-gnu/liblatencyflex_layer.so /app/lib/x86_64-linux-gnu/liblatencyflex_layer.so", + "cp layer/usr/share/vulkan/implicit_layer.d/latencyflex.json /app/share/vulkan/implicit_layer.d/latencyflex.json" ], - "build-options": { - "env": { - "PERL5LIB": "/app/lib/perl5/", - "PERL_MM_OPT": "INSTALL_BASE=/app" - } - }, "sources": [ { "type": "archive", - "url": "https://download.samba.org/pub/samba/samba-4.15.7.tar.gz", - "sha256": "76d0096c16ed0265b337d5731f3c0b32eed3adab6fa8b7585c055b287cd05d6b" + "url": "https://github.com/ishitatsuyuki/LatencyFleX/releases/download/v0.1.0/latencyflex-v0.1.0.tar.xz", + "sha256": "9862c7608b85ac6bff018d5926c4692490ff84ca3e649119b7fc53680e64dd1a" } ] }, @@ -691,4 +468,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/data/com.usebottles.bottles.appdata.xml.in b/data/com.usebottles.bottles.appdata.xml.in index 195fe8b181d..bfb7c1c106f 100644 --- a/data/com.usebottles.bottles.appdata.xml.in +++ b/data/com.usebottles.bottles.appdata.xml.in @@ -94,7 +94,7 @@ 768 - +

News

    diff --git a/debian/changelog b/debian/changelog index 29153dfde04..0f67c603693 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -com.usebottles.bottles (2022.5.2-trento-2) precise; urgency=low +com.usebottles.bottles (2022.5.2-trento-3) precise; urgency=low * General improvements to respect GNOME Circle requirements * More consistency of buttons/menus position diff --git a/meson.build b/meson.build index 594f9dfaaf2..5dc71ef42e6 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'bottles', - version: '2022.5.2-trento-2', + version: '2022.5.2-trento-3', meson_version: '>= 0.50.0', default_options: [ 'warning_level=2', diff --git a/src/params.py b/src/params.py index 78b1fd568de..c1c449981c8 100644 --- a/src/params.py +++ b/src/params.py @@ -2,8 +2,8 @@ APP_NAME = "Bottles" APP_NAME_LOWER = APP_NAME.lower() APP_ID = "com.usebottles.bottles" -VERSION = "2022.5.2-trento-2" -VERSION_NUM = "2022.5.2-trento-2" +VERSION = "2022.5.2-trento-3" +VERSION_NUM = "2022.5.2-trento-3" # Internal settings not user editable ANIM_DURATION = 120 diff --git a/src/ui/about.ui b/src/ui/about.ui index 19f8e50284b..64ac403d0c4 100644 --- a/src/ui/about.ui +++ b/src/ui/about.ui @@ -6,7 +6,7 @@ center-on-parent dialog Bottles - 2022.5.2-trento-2 + 2022.5.2-trento-3 © 2017-2022 - Bottles Developers Easily manage wineprefix using environments https://usebottles.com