gnome-boxes: update to 3.24.0

2 files changed, 11 insertions, 78 deletions

diff --git a/libre/gnome-boxes/PKGBUILD b/libre/gnome-boxes/PKGBUILD
index e9cff583a..1f4608041 100644
--- a/libre/gnome-boxes/PKGBUILD
+++ b/libre/gnome-boxes/PKGBUILD
@@ -1,13 +1,14 @@
 # $Id: PKGBUILD 212492 2017-02-15 05:12:21Z bgyorgy $
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer : Isaac David <isacdaavid@at@isacdaavid@dot@info>
 # Contributor: Daniel Milewski <niitotantei@gmail.com>
+# Contributor : André Silva <emulatorman@hyperbola.info>
 
 pkgname=gnome-boxes
-pkgver=3.22.4
+pkgver=3.24.0
 pkgrel=1.parabola1
-pkgdesc="Simple GNOME application to access remote or virtual systems, without artwork for non-FSDG compliant distros and operating systems"
+pkgdesc="Simple GNOME application to access remote or virtual systems, without suggestions (and logos) of nonfree operating systems"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.gnome.org/Apps/Boxes"
 license=('LGPL')
@@ -16,15 +17,16 @@ replaces=(${pkgname}-libre)
 depends=('cdrkit' 'gtk-vnc' 'libarchive' 'libgudev' 'libosinfo' 'libsecret' 'libtracker-sparql'
          'libvirt-glib' 'mtools' 'qemu' 'spice-gtk3')
 makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz
-        libre.patch)
-sha256sums=('585a1c292010ebb479cb60e02621d01d450f84cdad82a61b7ce58a0218e1cff2'
-            '73ea08076d1e2608e27969fbf3127b5f45a659b2a8a89b04e349b519ce1d07ba')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  patch -Np1 -i "$srcdir/libre.patch"
+  # remove distro logos
+  find ./data/osinfo/ -type f -name '*.xml' -exec sed -i '/<os /,/\/os>/ d' {} +
+  # I'd rather not use Windows as example in user docs
+  find ./help/ -type f \( -name '*.po' -o -name '*.page' \) -exec \
+       sed -Ei 's/(Microsoft )?Windows(™)?/Parabola/' {} +
 }
 
 build() {
diff --git a/libre/gnome-boxes/libre.patch b/libre/gnome-boxes/libre.patch
deleted file mode 100644
index db6e4fa98..000000000
--- a/libre/gnome-boxes/libre.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nur gnome-boxes-3.14.1.orig/data/gnome-boxes-logos-db.xml gnome-boxes-3.14.1/data/gnome-boxes-logos-db.xml
---- gnome-boxes-3.14.1.orig/data/gnome-boxes-logos-db.xml	2014-10-12 16:29:00.000000000 -0200
-+++ gnome-boxes-3.14.1/data/gnome-boxes-logos-db.xml	2014-10-18 15:48:32.788450932 -0200
-@@ -2,40 +2,4 @@
- 
-   <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
- 
--  <os id="http://debian.org/debian/1.0">
--    <logo>https://www.debian.org/logos/openlogo-nd.svg</logo>
--  </os>
--
--  <os id="http://fedoraproject.org/fedora/1">
--    <logo>https://people.gnome.org/~zeeshanak/logos/fedora.svg</logo>
--  </os>
--
--  <os id="http://opensuse.org/opensuse/10.2">
--    <logo>https://people.gnome.org/~zeeshanak/logos/opensuse.svg</logo>
--  </os>
--
--  <os id="http://ubuntu.com/ubuntu/4.10">
--    <logo>https://people.gnome.org/~zeeshanak/logos/ubuntu.svg</logo>
--  </os>
--
--  <os id="http://gnome.org/3.6">
--    <logo>https://people.gnome.org/~zeeshanak/logos/gnome-logo.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/4.0">
--    <logo>https://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/5.0">
--    <logo>https://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/6.0">
--    <logo>https://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/7.0">
--    <logo>https://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
- </libosinfo>
-diff -Nur gnome-boxes-3.12.1.orig/help/C/why-do-i-need-virtual-machine.page gnome-boxes-3.12.1/help/C/why-do-i-need-virtual-machine.page
---- gnome-boxes-3.12.1.orig/help/C/why-do-i-need-virtual-machine.page	2014-03-25 12:30:55.000000000 -0300
-+++ gnome-boxes-3.12.1/help/C/why-do-i-need-virtual-machine.page	2014-05-08 03:25:21.826398198 -0300
-@@ -27,8 +27,7 @@
-   <title>Why do I need a virtual machine?</title>
- 
-   <p>A virtual machine can be useful when you need to run applications that will
--  only run on another operating system, on Microsoft Windows™ for instance. A
--  virtual machine can also be used during software development, to test in a
--  pristine environment.</p>
-+  only run on another operating system. A virtual machine can also be used during 
-+  software development, to test in a pristine environment.</p>
- 
- </page>
-diff -Nur gnome-boxes-3.16.0.orig/help/es/why-do-i-need-virtual-machine.page gnome-boxes-3.16.0/help/es/why-do-i-need-virtual-machine.page
---- gnome-boxes-3.16.0.orig/help/es/why-do-i-need-virtual-machine.page	2015-03-23 20:54:10.000000000 -0300
-+++ gnome-boxes-3.16.0/help/es/why-do-i-need-virtual-machine.page	2015-04-10 16:34:13.153515398 -0300
-@@ -36,6 +36,6 @@
- 
-   <title>¿Para qué necesito una máquina virtual?</title>
- 
--  <p>Una máquina virtual puede ser útil cuando necesita ejecutar aplicaciones que sólo funcionan en otro sistema operativo, por ejemplo en Microsoft Windows™. También puede usar una máquina virtual durante el desarrollo de software, para probarlo en un entorno limpio.</p>
-+  <p>Una máquina virtual puede ser útil cuando necesita ejecutar aplicaciones que sólo funcionan en otro sistema operativo. También puede usar una máquina virtual durante el desarrollo de software, para probarlo en un entorno limpio.</p>
- 
- </page>