diff --git a/mingw-w64-spice-gtk/001-fix-undefined-variables.patch b/mingw-w64-spice-gtk/001-fix-undefined-variables.patch deleted file mode 100644 index 657558f802..0000000000 --- a/mingw-w64-spice-gtk/001-fix-undefined-variables.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/spice-widget-egl.c -+++ b/src/spice-widget-egl.c -@@ -67,16 +66,16 @@ \ - "; - - static void apply_ortho(guint mproj, float left, float right, -- float bottom, float top, float near, float far) -+ float bottom, float top, float near_spice, float far_spice) - - { - float a = 2.0f / (right - left); - float b = 2.0f / (top - bottom); -- float c = -2.0f / (far - near); -+ float c = -2.0f / (far_spice - near_spice); - - float tx = - (right + left) / (right - left); - float ty = - (top + bottom) / (top - bottom); -- float tz = - (far + near) / (far - near); -+ float tz = - (far_spice + near_spice) / (far_spice - near_spice); - - float ortho[16] = { - a, 0, 0, 0, diff --git a/mingw-w64-spice-gtk/003-fix-keymapgen-call.patch b/mingw-w64-spice-gtk/003-fix-keymapgen-call.patch deleted file mode 100644 index 936dd1d5a2..0000000000 --- a/mingw-w64-spice-gtk/003-fix-keymapgen-call.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spice-gtk-0.41/src/meson.build.orig 2022-07-24 19:25:34.615147100 +0200 -+++ spice-gtk-0.41/src/meson.build 2022-07-24 19:25:12.502127800 +0200 -@@ -312,7 +312,7 @@ - foreach keymap : keymaps - varname = 'keymap_@0@2xtkbd'.format(keymap) - target = 'vncdisplay@0@.h'.format(varname) -- cmd = [python, keymapgen, 'code-map', '--lang', 'glib2', '--varname', varname, keymapcsv, keymap, 'xtkbd'] -+ cmd = [python, keymapgen.path(), 'code-map', '--lang', 'glib2', '--varname', varname, keymapcsv, keymap, 'xtkbd'] - spice_client_gtk_sources += custom_target(target, - output : target, - capture : true, diff --git a/mingw-w64-spice-gtk/004-link-to-epoxy.patch b/mingw-w64-spice-gtk/004-link-to-epoxy.patch deleted file mode 100644 index 944fe0305c..0000000000 --- a/mingw-w64-spice-gtk/004-link-to-epoxy.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -150,8 +150,8 @@ - summary_info += {'gtk': d.found()} - if d.found() - spice_gtk_deps += d -+ spice_gtk_deps += dependency('epoxy') - if host_machine.system() != 'windows' -- spice_gtk_deps += dependency('epoxy') - spice_gtk_deps += dependency('x11') - d = dependency('libva-x11', required: false) - if d.found() - diff --git a/mingw-w64-spice-gtk/PKGBUILD b/mingw-w64-spice-gtk/PKGBUILD index 839010b35c..a9a2418988 100644 --- a/mingw-w64-spice-gtk/PKGBUILD +++ b/mingw-w64-spice-gtk/PKGBUILD @@ -3,8 +3,8 @@ _realname=spice-gtk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.41 -pkgrel=3 +pkgver=0.42 +pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="GTK3 widget for SPICE clients (mingw-w64)" @@ -32,26 +32,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" license=("GPL2") url="https://www.spice-space.org/" source=(https://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.xz{,.sig} - 001-fix-undefined-variables.patch - 002-export-symbols.patch - 003-fix-keymapgen-call.patch - 004-link-to-epoxy.patch) -sha256sums=('d8f8b5cbea9184702eeb8cc276a67d72acdb6e36e7c73349fb8445e5bca0969f' + 002-export-symbols.patch) +sha256sums=('9380117f1811ad1faa1812cb6602479b6290d4a0d8cc442d44427f7f6c0e7a58' 'SKIP' - '33a1a6e5c9d58b20d736f69edff4c7973e057724b0b154619388c2e569aae018' - '3295af8a5656adad24c2b3f8858d458597f14acb00bb5782412c2a115cacf507' - '242e8184ab3f53bf895704276f6ffbfd7dab70aafe91f53c49db1cd39d085c64' - 'a56b0e489bc56ec1813d1eda6c6163814c4a5f1b4c919ef92c2d91a7c094ecf2') + '3295af8a5656adad24c2b3f8858d458597f14acb00bb5782412c2a115cacf507') validpgpkeys=('206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho prepare() { cd "${srcdir}"/${_realname}-${pkgver} cp -p src/spice-glib-sym-file src/spice-glib-sym-file.def cp -p src/spice-gtk-sym-file src/spice-gtk-sym-file.def - patch -p1 -i ${srcdir}/001-fix-undefined-variables.patch patch -p1 -i ${srcdir}/002-export-symbols.patch - patch -p1 -i ${srcdir}/003-fix-keymapgen-call.patch - patch -p1 -i ${srcdir}/004-link-to-epoxy.patch } build() {