[Dev] Update gnome-boxes to 40.1
theova
theova at bluewin.ch
Wed Jun 2 06:54:25 GMT 2021
The attached patches update gnome-boxes to version 40.1.
It is not possible to build gnome-boxes for arm, the reason is that the
following dependency is missing:
$ pacman -Si edk2-ovmf | grep "Desc"
Description : Firmware for Virtual Machines (x86_64, i686)
-------------- next part --------------
From 4598b0b5d4c67148c890f99c487d09d3a1f31f02 Mon Sep 17 00:00:00 2001
From: Theo von Arx <theova at member.fsf.org>
Date: Wed, 15 Jul 2020 22:19:24 +0200
Subject: [PATCH 1/2] [libosinfo] Update to 1.8.0
- Change to meson build system
- Remove libre.patch as it is obsolete. The build options can be changed
through meson and the dummy example was removed (cf. commit
fb0023625ad5dc0554d0ba2b20d2fd9996d12d47 in libosinfo)
- Built on x86_64, i686, armv7h
---
libre/libosinfo/PKGBUILD | 65 ++++++---------
libre/libosinfo/libre.patch | 156 ------------------------------------
2 files changed, 23 insertions(+), 198 deletions(-)
delete mode 100644 libre/libosinfo/libre.patch
diff --git a/libre/libosinfo/PKGBUILD b/libre/libosinfo/PKGBUILD
index a8662c308..13b2b9a34 100644
--- a/libre/libosinfo/PKGBUILD
+++ b/libre/libosinfo/PKGBUILD
@@ -3,75 +3,56 @@
# Maintainer (Hyperbola): André Silva <emulatorman at hyperbola.info>
# Maintainer: Omar Vega Ramos <ovruni at gnu.org.pe>
# Contributor: Daniel Milewski <niitotantei at gmail.com>
+# Contributor Theova <theova at member.fsf.org>
+
+# Parabola Changes and Rationals:
+# - Remove docs since they contain non-FSDG compliant distros
+
_pkgname=libosinfo-libre
pkgname=libosinfo
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
pkgrel+=.par1
pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"
pkgdesc+=", without non-FSDG compliant distros and operating systems support"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
+arch=(x86_64)
+arch+=(i686 armv7h)
url="https://libosinfo.org/"
-license=('GPL' 'LGPL')
-depends=('glib2' 'libxslt' 'osinfo-db')
-makedepends=('check' 'gobject-introspection' 'intltool' 'libsoup' 'vala' 'gtk-doc')
+license=(GPL LGPL)
+depends=(glib2 hwids libsoup libxslt osinfo-db)
+makedepends=(check gobject-introspection gtk-doc meson vala)
conflicts=(${pkgname}-libre)
replaces=(${pkgname}-libre)
-mksource=(https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.gz{,.asc})
-source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-$pkgver.tar.gz
- 0001-media-Fix-usage-of-application-id.patch
- 0002-loader-Properly-load-the-arch-value-for-images.patch
- libre.patch)
+source=(https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.xz{,.asc})
validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange
'09B9C8FF223EF113AFA06A39EE926C2BDACC177B') # Fabiano Fidêncio <fidencio at redhat.com>
-mksha256sums=('a29e61a82b1a5727b145403914812273dfa033a0c07a15500078726bb3b84165'
- 'SKIP')
-sha256sums=('27efec42a2a2e3ae8b1f6ffcc541aded8b90c06cfbe778b8948f7c0896409eda'
- '439e2cf620560cb116d0c08201282c0e152b46b2ab1fa4abcd7e717a2d45dec7'
- '80c7583882a935658b9f9409cf5beeb36f46c873bb9041bcc858aca4e2fa7741'
- '896216d2f132ff772b3c0cd9e18aa6c45aca2365767fc0c3aa98e8d3a21ca063')
+sha256sums=('49ff32be0d209f6c99480e28b94340ac3dd0158322ae4303adfbdfe973a108a5'
+ 'SKIP')
-mksource() {
- cd $pkgname-$pkgver
- rm -rv {docs,tests/isodata/*}
-}
prepare() {
cd $pkgname-$pkgver
- sed -i '/export LC_ALL = C/d' maint.mk
-
- # Upsteam fixes
- patch -Np1 -i ../0001-media-Fix-usage-of-application-id.patch
- patch -Np1 -i ../0002-loader-Properly-load-the-arch-value-for-images.patch
-
-# rm -rv {docs,tests/isodata/*}
-
- patch -Np1 -i ../libre.patch
+ rm -rv docs
cd po
for file in *.po; do
- intltool-update ${file%.*}
msgattrib --no-obsolete -o $file $file
done
}
build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --with-usb-ids-path=/usr/share/hwdata/usb.ids \
- --with-pci-ids-path=/usr/share/hwdata/pci.ids \
- --enable-gtk-doc
- make
+ arch-meson $pkgname-$pkgver build \
+ -D with-usb-ids-path=/usr/share/hwdata/usb.ids \
+ -D with-pci-ids-path=/usr/share/hwdata/pci.ids \
+ -D enable-gtk-doc=false
+ ninja -C build
}
check() {
- cd $pkgname-$pkgver
- make check || :
+ meson test -C build --print-errorlogs
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
diff --git a/libre/libosinfo/libre.patch b/libre/libosinfo/libre.patch
deleted file mode 100644
index 10d9cf626..000000000
--- a/libre/libosinfo/libre.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- libosinfo-1.2.0.orig/Makefile.am 2018-07-09 09:11:01.000000000 -0500
-+++ libosinfo-1.2.0/Makefile.am 2018-07-09 09:33:13.160987738 -0500
-@@ -1,5 +1,5 @@
-
--SUBDIRS = osinfo tools docs po examples
-+SUBDIRS = osinfo tools po examples
-
- if ENABLE_TESTS
- SUBDIRS += tests
---- libosinfo-1.2.0.orig/Makefile.in 2018-07-09 09:11:01.000000000 -0500
-+++ libosinfo-1.2.0/Makefile.in 2018-07-09 09:33:39.303117264 -0500
-@@ -197,7 +197,7 @@
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = osinfo tools docs po examples tests
-+DIST_SUBDIRS = osinfo tools po examples tests
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/libosinfo.spec.in $(srcdir)/mingw-libosinfo.spec.in \
- $(top_srcdir)/build-aux/compile \
---- libosinfo-1.2.0.orig/configure 2018-07-09 09:11:01.000000000 -0500
-+++ libosinfo-1.2.0/configure 2018-07-09 09:42:21.595733119 -0500
-@@ -15499,7 +15499,7 @@
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-
--ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile tests/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile tests/Makefile examples/Makefile po/Makefile.in"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -16596,8 +16596,6 @@
- "osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;;
- "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
- "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
---- libosinfo-1.2.0.orig/configure.ac 2018-07-09 09:11:01.000000000 -0500
-+++ libosinfo-1.2.0/configure.ac 2018-07-09 09:42:41.148166092 -0500
-@@ -287,8 +287,6 @@
- osinfo/osinfo_version.h
- tools/Makefile
- tests/Makefile
-- docs/Makefile
-- docs/reference/Makefile
- examples/Makefile
- po/Makefile.in
- ])
---- libosinfo-1.2.0.orig/examples/demo.js 2018-07-09 09:11:01.000000000 -0500
-+++ libosinfo-1.2.0/examples/demo.js 2018-07-09 09:43:13.993320287 -0500
-@@ -32,7 +32,7 @@
- print (" OS short id " + name)
- }
-
--var osid = "http://fedoraproject.org/fedora-11"
-+var osid = "https://wiki.parabola.nu/Get_Parabola"
- var hvid = "http://qemu.org/qemu-kvm-0.11.0"
- var drvclass = "net"
- //var drvclass = "audio"
---- libosinfo-1.2.0.orig/examples/libosinfo-dummy-data.xml 2018-07-09 09:11:01.000000000 -0500
-+++ libosinfo-1.2.0/examples/libosinfo-dummy-data.xml 2018-07-09 09:59:11.689219791 -0500
-@@ -64,87 +64,11 @@
- </devices>
- </platform>
-
--<os id="http://fedoraproject.org/fedora-11">
-- <upgrades id="http://fedoraproject.org/fedora-10" />
-- <short-id>fedora11</short-id>
-- <name>Fedora 11</name>
-- <version>11</version>
-- <vendor>Fedora Project</vendor>
-- <x-fruit>apples</x-fruit>
-- <x-animal>marmot</x-animal>
-- <x-animal>aardvark</x-animal>
--
-- <!-- Device support for unspecified platform -->
-- <devices>
-- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
-- <driver>es1391</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
-- <driver>ac97+</driver>
-- </device>
-- </devices>
--</os>
--
--<os id="http://fedoraproject.org/fedora-10">
-- <short-id>fedora10</short-id>
-- <name>Fedora 10</name>
-- <version>10</version>
-- <vendor>Fedora Project</vendor>
--
-- <!-- Device support for unspecified platform -->
-- <devices>
-- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
-- <driver>ac97</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
-- <driver>es1391</driver>
-- </device>
-- </devices>
--</os>
--
--<os id="http://software.opensuse.org/112">
-- <short-id>opensuse11.2</short-id>
-- <name>OpenSuse 11.2</name>
-- <version>11.2</version>
-- <vendor>OpenSuse Project</vendor>
-+<os id="https://wiki.parabola.nu/Get_Parabola">
-+ <short-id>parabola</short-id>
-+ <name>Parabola GNU/Linux-libre</name>
-+ <vendor>Parabola Project</vendor>
- </os>
-
--<deployment id="http://fedoraproject.org/fedora-10?kvm-0.11.0">
-- <platform id="http://qemu.org/qemu-kvm-0.11.0" />
-- <os id="http://fedoraproject.org/fedora-10" />
--
-- <devices>
-- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
-- <driver>ac97</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
-- <driver>ES1370</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/a727/0013">
-- <driver>3com</driver>
-- </device>
-- </devices>
--</deployment>
--
--<deployment id="http://fedoraproject.org/fedora-11?kvm-0.11.0">
-- <platform id="http://qemu.org/qemu-kvm-0.11.0" />
-- <os id="http://fedoraproject.org/fedora-11" />
--
-- <devices>
-- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
-- <driver>es1370</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
-- <driver>ac97</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/1274/1371/80864541">
-- <driver>es1371</driver>
-- </device>
-- <device id="http://pci-ids.ucw.cz/read/PC/a727/0013">
-- <driver>3com</driver>
-- </device>
-- </devices>
--</deployment>
--
- <!-- End of backing data -->
- </libosinfo>
--
2.31.1
-------------- next part --------------
From 89c2e0d2d17519317e0e0a78d53bbdfd55172c5b Mon Sep 17 00:00:00 2001
From: Theo von Arx <theova at member.fsf.org>
Date: Wed, 15 Jul 2020 22:29:53 +0200
Subject: [PATCH 2/2] libre/gnome-boxes: Update to 40.1
---
libre/gnome-boxes/PKGBUILD | 49 +++++++-------------
libre/gnome-boxes/hide_download_button.patch | 25 +++++-----
2 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/libre/gnome-boxes/PKGBUILD b/libre/gnome-boxes/PKGBUILD
index a3da929b0..8d7a99164 100644
--- a/libre/gnome-boxes/PKGBUILD
+++ b/libre/gnome-boxes/PKGBUILD
@@ -10,44 +10,31 @@
# - Replace Windows with Parabola in documention
pkgname=gnome-boxes
-pkgver=3.34.3
-pkgrel=2
+pkgver=40.1
+pkgrel=1
pkgrel+=.par1
-pkgdesc="Simple GNOME application to access remote or virtual systems"
+pkgdesc='Simple GNOME application to access virtual systems'
pkgdesc+=", without suggestions (and logos) of nonfree operating systems"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-url="https://wiki.gnome.org/Apps/Boxes"
+arch=(x86_64)
+arch+=(i686 armv7h)
+url='https://wiki.gnome.org/Apps/Boxes'
+license=(LGPL)
license=('LGPL')
+groups=('gnome')
conflicts=(${pkgname}-libre)
replaces=(${pkgname}-libre)
-groups=('gnome')
-depends=('cdrtools' 'gtk-vnc' 'libarchive' 'libgudev' 'libosinfo' 'libsecret'
- 'libvirt-glib' 'mtools' 'qemu' 'spice-gtk' 'tracker' 'webkit2gtk' 'freerdp')
-makedepends=('git' 'gobject-introspection' 'yelp-tools' 'meson' 'spice-protocol' 'vala')
-_commit=c3bce5984eb53cc883850969f3e4a3e8e2cc6d44 # tags/v3.34.3^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-boxes.git#commit=$_commit"
- "git+https://gitlab.gnome.org/GNOME/gtk-frdp.git"
- "git+https://gitlab.gnome.org/felipeborges/libovf-glib.git")
+depends=('cdrtools' 'edk2-ovmf' 'gtksourceview4' 'gtk-vnc' 'libarchive' 'libgudev' 'libhandy'
+ 'libosinfo' 'libsecret' 'libvirt-glib' 'mtools' 'qemu' 'spice-gtk' 'tracker3'
+ 'webkit2gtk')
+makedepends=('appstream-glib' 'gobject-introspection' 'itstool' 'meson' 'spice-protocol' 'vala')
+source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
source+=(hide_download_button.patch)
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP')
-sha256sums+=('0539b344dc0bc8424539f747ed9c638ea414fe96153b803dae50bf5bf2d5aae5')
+sha256sums=('b1e28f2c7fb76bf4fbb862d0d52e811b94cbe9ff16f067408964568690882ef8')
+sha256sums+=('fc14954460c9c8b53ce47c2621c8c806857183690d3ea5f461a4454e9486466b')
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
prepare() {
- cd $pkgname
-
- git submodule init
- git config --local submodule.subprojects/gtk-frdp.url "$srcdir/gtk-frdp"
- git config --local submodule.subprojects/libovf-glib.url "$srcdir/libovf-glib"
- git submodule update
-
+ cd $pkgname-$pkgver
# remove recommended downloads of nonfree OS
sed -i /os_id/d ./data/recommended-downloads.xml
# Make download button invisible
@@ -58,8 +45,8 @@ prepare() {
}
build() {
- arch-meson $pkgname build
- ninja -C build
+ arch-meson $pkgname-$pkgver build
+ meson compile -C build
}
check() {
diff --git a/libre/gnome-boxes/hide_download_button.patch b/libre/gnome-boxes/hide_download_button.patch
index 1b6d353ad..64d56702c 100644
--- a/libre/gnome-boxes/hide_download_button.patch
+++ b/libre/gnome-boxes/hide_download_button.patch
@@ -1,13 +1,14 @@
-diff --git a/data/ui/wizard-source.ui b/data/ui/wizard-source.ui
-index 94c8a802..a5bfb774 100644
---- a/data/ui/wizard-source.ui
-+++ b/data/ui/wizard-source.ui
-@@ -60,7 +60,7 @@
+diff --git a/data/ui/assistant/pages/index-page.ui
+b/data/ui/assistant/pages/index-page.ui
+index 6eb98db7..9fc555b7 100644
+--- a/data/ui/assistant/pages/index-page.ui
++++ b/data/ui/assistant/pages/index-page.ui
+@@ -161,7 +161,7 @@
- <child>
- <object class="GtkButton" id="download_an_os_button">
-- <property name="visible">True</property>
-+ <property name="visible">False</property>
- <signal name="clicked" handler="on_download_an_os_button_clicked"/>
- <style>
- <class name="boxes-menu-row"/>
+ <child>
+ <object class="GtkButton">
+- <property name="visible">True</property>
++ <property name="visible">False</property>
+ <signal name="clicked" handler="on_download_an_os_button_clicked"/>
+ <style>
+ <class name="boxes-menu-row"/>
--
2.31.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.parabola.nu/pipermail/dev/attachments/20210602/9845291f/attachment-0001.sig>
More information about the Dev
mailing list