Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / gnome-boxes
Commits:
5ec9b6c5 by Fabian Bornschein at 2024-08-15T21:27:52+02:00
upgpkg: 47beta-1: gnome-unstable
- - - - -
fbcc572f by Balló György at 2024-08-29T08:40:54+02:00
Remove unused deps
- - - - -
6a41c7ea by Balló György at 2024-09-03T10:43:06+02:00
Remove patch that has been merged by upstream
- - - - -
edfab6ba by Jan Alexander Steffens (heftig) at 2024-09-17T00:52:44+02:00
Merge remote-tracking branch 'origin/gnome-unstable'
* origin/gnome-unstable:
Remove patch that has been merged by upstream
Remove unused deps
upgpkg: 47beta-1: gnome-unstable
- - - - -
4 changed files:
- .SRCINFO
- .nvchecker.toml
- PKGBUILD
- − gnome-boxes-derived-from.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = gnome-boxes
pkgdesc = Simple GNOME application to access virtual systems
- pkgver = 46.1
- pkgrel = 2
+ pkgver = 47beta
+ pkgrel = 1
url = https://apps.gnome.org/Boxes/
arch = x86_64
groups = gnome-extra
@@ -36,12 +36,10 @@ pkgbase = gnome-boxes
depends = spice-gtk
depends = webkit2gtk-4.1
depends = xdg-user-dirs
- source =
git+https://gitlab.gnome.org/GNOME/gnome-boxes.git?signed#tag=46.1
+ source =
git+https://gitlab.gnome.org/GNOME/gnome-boxes.git?signed#tag=47.beta
source = git+https://gitlab.gnome.org/felipeborges/libovf-glib.git
- source = gnome-boxes-derived-from.patch
validpgpkeys = 9B60FE7947F0A3C58136817F2C2A218742E016BE
- b2sums =
58cf53e4c297a5e3cf22a7428b78128973453c93c596819f969a2d0d4ee8eb3d396820c4c01c53b76e6ac23222632d545a332d241d3cb10e8ea3d426f387c9a2
+ b2sums =
a31612bc036481a8187f245d3475a1125c33d1e3be43be77dd7530cca6c2fae5d500bbaed8c093704a3ab6246e77c2ad0c465918765ba85322f71c09eb524995
b2sums = SKIP
- b2sums =
c06080901901e7036b6baddcb6d82c10bdf1f3d1cdbc28757e5f4b23f68e6f41c6a2533b8a502f8dbdf7d4e3562070ca9220a27b1865bafe06c0f237bc106acd
pkgname = gnome-boxes
=====================================
.nvchecker.toml
=====================================
@@ -2,3 +2,5 @@
source = "git"
git = "https://gitlab.gnome.org/GNOME/gnome-boxes.git";
include_regex = '\d+(\.\d+)*'
+from_pattern = '\.([a-z])'
+to_pattern = '\1'
=====================================
PKGBUILD
=====================================
@@ -3,8 +3,8 @@
# Contributor: Stefano Facchini <[email protected]>
pkgname=gnome-boxes
-pkgver=46.1
-pkgrel=2
+pkgver=47beta
+pkgrel=1
pkgdesc='Simple GNOME application to access virtual systems'
arch=(x86_64)
url='https://apps.gnome.org/Boxes/'
@@ -47,12 +47,10 @@ groups=(gnome-extra)
source=(
"git+https://gitlab.gnome.org/GNOME/gnome-boxes.git?signed#tag=${pkgver/[a-z]/.&}";
git+https://gitlab.gnome.org/felipeborges/libovf-glib.git
- gnome-boxes-derived-from.patch
)
b2sums=(
-
58cf53e4c297a5e3cf22a7428b78128973453c93c596819f969a2d0d4ee8eb3d396820c4c01c53b76e6ac23222632d545a332d241d3cb10e8ea3d426f387c9a2
+
a31612bc036481a8187f245d3475a1125c33d1e3be43be77dd7530cca6c2fae5d500bbaed8c093704a3ab6246e77c2ad0c465918765ba85322f71c09eb524995
SKIP
-
c06080901901e7036b6baddcb6d82c10bdf1f3d1cdbc28757e5f4b23f68e6f41c6a2533b8a502f8dbdf7d4e3562070ca9220a27b1865bafe06c0f237bc106acd
)
validpgpkeys=(9B60FE7947F0A3C58136817F2C2A218742E016BE) # Felipe Borges
<[email protected]>
@@ -62,13 +60,6 @@ prepare() {
git submodule init
git submodule set-url subprojects/libovf-glib "$srcdir/libovf-glib"
git -c protocol.file.allow=always -c protocol.allow=never submodule update
-
- # Fix build with gcc 14
- git cherry-pick -n 00183fd26a7b51905c179a427a38bfa18d9eb2d3
-
- # Don't assign wrong icons in the downloader
- # https://gitlab.gnome.org/GNOME/gnome-boxes/-/merge_requests/660
- git apply -3 ../gnome-boxes-derived-from.patch
}
build() {
=====================================
gnome-boxes-derived-from.patch deleted
=====================================
@@ -1,40 +0,0 @@
-From 089722c8c0bc2c99fa3692e30e936e2d2438b0f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
-Date: Wed, 28 Aug 2024 21:28:52 +0200
-Subject: [PATCH] downloader: Don't consider derives-from field for logos
-
-The 'derives-from' field can assign different distributions together, which
-causes that wrong logo is displayed for an unofficial fork. E.g. PureOS is
-displayed with Debian logo, which shouldn't happen. Consider only the
-'upgrades' field, which is always official.
----
- src/downloader.vala | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/downloader.vala b/src/downloader.vala
-index 02504f705..335bf00a8 100644
---- a/src/downloader.vala
-+++ b/src/downloader.vala
-@@ -40,9 +40,7 @@ public static string fetch_os_logo_url (Osinfo.Os os) {
- return os.logo;
-
- string logo_url = null;
-- var derived = os.get_related
(Osinfo.ProductRelationship.DERIVES_FROM);
-- if (derived.get_length () == 0)
-- derived = os.get_related (Osinfo.ProductRelationship.UPGRADES);
-+ var derived = os.get_related (Osinfo.ProductRelationship.UPGRADES);
-
- while (derived.get_length () > 0 && logo_url == null) {
- // FIXME: Does Osinfo allows deriving from multiple OSs?
-@@ -51,7 +49,7 @@ public static string fetch_os_logo_url (Osinfo.Os os) {
- if (parent.logo != null)
- logo_url = parent.logo;
- else
-- derived = parent.get_related
(Osinfo.ProductRelationship.DERIVES_FROM);
-+ derived = parent.get_related
(Osinfo.ProductRelationship.UPGRADES);
- }
-
- return logo_url;
---
-GitLab
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gnome-boxes/-/compare/a6e4758310fea21324ac08a0aa60e09deb0fe38e...edfab6ba6823e18208f829f452b1347b2359a9fd
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gnome-boxes/-/compare/a6e4758310fea21324ac08a0aa60e09deb0fe38e...edfab6ba6823e18208f829f452b1347b2359a9fd
You're receiving this email because of your account on gitlab.archlinux.org.
