Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GTK 4.14.3 and other updates #1320

Merged
merged 7 commits into from
Apr 26, 2024
Merged

GTK 4.14.3 and other updates #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5e6208
Update nasm to version 2.16.03
danyeaw Apr 18, 2024
fb67774
Update SQLite to version 3.45.3
danyeaw Apr 18, 2024
084364e
Update libarchive to version 3.7.3
danyeaw Apr 18, 2024
1045075
Update Opus to version 1.5.2
danyeaw Apr 18, 2024
9683e86
Update GTK to version 4.14.3
danyeaw Apr 20, 2024
2cc4638
Update gdk-pixbuf to version 2.42.11
danyeaw Apr 24, 2024
5b03bd1
Move Opus back to using Meson
danyeaw Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions gvsbuild/patches/opus/pc-files/opus.pc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions gvsbuild/projects/gdk_pixbuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ def __init__(self):
Project.__init__(
self,
"gdk-pixbuf",
version="2.42.10",
version="2.42.11",
repository="https://gitlab.gnome.org/GNOME/gdk-pixbuf",
archive_url="https://download.gnome.org/sources/gdk-pixbuf/{major}.{minor}/gdk-pixbuf-{version}.tar.xz",
hash="ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b",
hash="49dcb402388708647e8c321d56b6fb30f21e51e515d0c5a942268d23052a2f00",
dependencies=[
"ninja",
"pkgconf",
Expand Down
4 changes: 2 additions & 2 deletions gvsbuild/projects/gtk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ def __init__(self):
self,
"gtk4",
prj_dir="gtk4",
version="4.14.2",
version="4.14.3",
lastversion_major=4,
lastversion_even=True,
repository="https://gitlab.gnome.org/GNOME/gtk",
archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz",
hash="22604cef2898a79e5f2143bb7aee2b7d1fa2eb946989a9d1338ecf9c8ae0e072",
hash="2be5c858bdef1104d37848c9779c089372c8d31503f6efc4b94e53b546fc9a43",
dependencies=[
"gdk-pixbuf",
"pango",
Expand Down
4 changes: 2 additions & 2 deletions gvsbuild/projects/libarchive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ def __init__(self):
Project.__init__(
self,
"libarchive",
version="3.7.2",
version="3.7.3",
archive_url="https://libarchive.org/downloads/libarchive-{version}.tar.xz",
hash="04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb",
hash="63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2",
dependencies=[
"cmake",
"ninja",
Expand Down
31 changes: 9 additions & 22 deletions gvsbuild/projects/opus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,30 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.

from gvsbuild.utils.base_builders import CmakeProject
from gvsbuild.utils.base_builders import Meson
from gvsbuild.utils.base_expanders import Tarball
from gvsbuild.utils.base_project import project_add


@project_add
class Opus(Tarball, CmakeProject):
class Opus(Tarball, Meson):
def __init__(self):
CmakeProject.__init__(
Meson.__init__(
self,
"opus",
version="1.5.1",
version="1.5.2",
repository="https://github.com/xiph/opus",
archive_url="https://downloads.xiph.org/releases/opus/opus-{version}.tar.gz",
hash="b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85",
hash="65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1",
dependencies=[
"ninja",
"cmake",
"meson",
"pkgconf",
],
)
self.add_param("-Dtests=disabled")
self.add_param("-Ddocs=disabled")

def build(self):
CmakeProject.build(
self,
use_ninja=True,
cmake_params="-DOPUS_BUILD_SHARED_LIBRARY=ON -DOPUS_BUILD_TESTING=OFF",
)
Meson.build(self)
self.install(r"COPYING share\doc\opus")

configuration = (
"debug-optimized"
if self.opts.release_configuration_is_actually_debug_optimized
else self.opts.configuration
)
if configuration in ["debug-optimized", "debug"]:
self.install(r".\_gvsbuild-cmake\opus.pdb bin")

# FIXME: remove once we switch back to meson
self.install_pc_files()
4 changes: 2 additions & 2 deletions gvsbuild/projects/sqlite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def __init__(self):
Project.__init__(
self,
"sqlite",
version="3.45.2",
version="3.45.3",
archive_url="https://www.sqlite.org/2024/sqlite-autoconf-{major}{minor:0<3}{micro:0<3}.tar.gz",
hash="bc9067442eedf3dd39989b5c5cfbfff37ae66cc9c99274e0c3052dc4d4a8f6ae",
hash="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531",
)

def build(self):
Expand Down
4 changes: 2 additions & 2 deletions gvsbuild/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ def __init__(self):
Tool.__init__(
self,
"nasm",
version="2.16.02",
version="2.16.03",
archive_url="https://www.nasm.us/pub/nasm/releasebuilds/{version}/win64/nasm-{version}-win64.zip",
hash="3facb987f97b9fc4a485d2f95aa64219dbfa991fc5d1867f7b0f93e416074d3c",
hash="3ee4782247bcb874378d02f7eab4e294a84d3d15f3f6ee2de2f47a46aa7226e6",
dir_part="nasm-{version}",
exe_name="nasm.exe",
)
Expand Down
Loading