diff options
author | Ting-Wei Lan <lantw44@gmail.com> | 2016-11-25 17:23:49 +0800 |
---|---|---|
committer | Ting-Wei Lan <lantw44@gmail.com> | 2016-11-25 17:23:49 +0800 |
commit | 0202d0667755da7ae3e26992ad66916b182d85a0 (patch) | |
tree | 1ea54d2c7a9f24290daad2837c2b5545f4632c3a | |
parent | 21fb77274e853ab5e71c54e15066c40f8960d9ab (diff) | |
download | AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.tar AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.tar.gz AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.tar.bz2 AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.tar.lz AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.tar.xz AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.tar.zst AUR4-PKGBUILD-0202d0667755da7ae3e26992ad66916b182d85a0.zip |
mingw-w64-gtk3: 3.22.3 -> 3.22.4
-rw-r--r-- | mingw-w64-gtk3/.SRCINFO | 12 | ||||
-rw-r--r-- | mingw-w64-gtk3/PKGBUILD | 12 | ||||
-rw-r--r-- | mingw-w64-gtk3/gtk3-gdkdisplay-win32-winnt.patch | 33 | ||||
-rw-r--r-- | mingw-w64-gtk3/gtk3-gdkscreen-win32-winnt.patch | 31 |
4 files changed, 7 insertions, 81 deletions
diff --git a/mingw-w64-gtk3/.SRCINFO b/mingw-w64-gtk3/.SRCINFO index a181529..7f0051f 100644 --- a/mingw-w64-gtk3/.SRCINFO +++ b/mingw-w64-gtk3/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Nov 11 20:06:01 UTC 2016 +# Tue Nov 22 19:41:08 UTC 2016 pkgbase = mingw-w64-gtk3 pkgdesc = GObject-based multi-platform GUI toolkit (mingw-w64) - pkgver = 3.22.3 + pkgver = 3.22.4 pkgrel = 1 url = http://www.gtk.org install = mingw-w64-gtk3.install @@ -24,12 +24,8 @@ pkgbase = mingw-w64-gtk3 options = !strip options = !buildflags options = staticlibs - source = https://download.gnome.org/sources/gtk+/3.22/gtk+-3.22.3.tar.xz - source = gtk3-gdkdisplay-win32-winnt.patch - source = gtk3-gdkscreen-win32-winnt.patch - sha256sums = e190ab1a9a893861b8e8be341aa57bce8b7146d6445ebfe5a8ab64236fe82ed3 - sha256sums = c3aadfa67e29adea61cec87bd65229d4fb8dc25301cb448bb59f0ead63829ae2 - sha256sums = 6af598b8e9bdace52485013c7b4393903ae829a1f3f637611cedbdee506861c3 + source = https://download.gnome.org/sources/gtk+/3.22/gtk+-3.22.4.tar.xz + sha256sums = 7094a6fcfe133d01c578358bd5d3e499715f1a0206e87bd5cf6c834e301f387f pkgname = mingw-w64-gtk3 diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index 303149f..58b7953 100644 --- a/mingw-w64-gtk3/PKGBUILD +++ b/mingw-w64-gtk3/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: lantw44 at gmail dot com pkgname=mingw-w64-gtk3 -pkgver=3.22.3 +pkgver=3.22.4 pkgrel=1 pkgdesc='GObject-based multi-platform GUI toolkit (mingw-w64)' arch=(any) @@ -24,19 +24,13 @@ depends=( 'mingw-w64-libepoxy>=1.0' 'mingw-w64-pango>=1.37.3') options=(!strip !buildflags staticlibs) -source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz" - 'gtk3-gdkdisplay-win32-winnt.patch' - 'gtk3-gdkscreen-win32-winnt.patch') -sha256sums=('e190ab1a9a893861b8e8be341aa57bce8b7146d6445ebfe5a8ab64236fe82ed3' - 'c3aadfa67e29adea61cec87bd65229d4fb8dc25301cb448bb59f0ead63829ae2' - '6af598b8e9bdace52485013c7b4393903ae829a1f3f637611cedbdee506861c3') +source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz") +sha256sums=('7094a6fcfe133d01c578358bd5d3e499715f1a0206e87bd5cf6c834e301f387f') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 < "${srcdir}/${source[1]}" - patch -Np1 < "${srcdir}/${source[2]}" } build() { diff --git a/mingw-w64-gtk3/gtk3-gdkdisplay-win32-winnt.patch b/mingw-w64-gtk3/gtk3-gdkdisplay-win32-winnt.patch deleted file mode 100644 index 104ebc0..0000000 --- a/mingw-w64-gtk3/gtk3-gdkdisplay-win32-winnt.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 27b68ff1931a2750a1a3effd6a06414142630867 Mon Sep 17 00:00:00 2001 -From: Chun-wei Fan <fanchunwei@src.gnome.org> -Date: Fri, 11 Nov 2016 20:53:41 +0800 -Subject: gdkdisplay-win32.c: Define _WIN32_WINNT - -... to be for Vista (0x0600) or later. This is so that the necessary -items in the Windows headers be activated so that the code will build -properly on mingw-w64, and we already require Vista or later for GTK+. - -Thanks Ting-Wei Lan for pointing this out. - -See: https://bugzilla.gnome.org/show_bug.cgi?id=768081#c62 ---- - gdk/win32/gdkdisplay-win32.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c -index 9267640..ceec5b3 100644 ---- a/gdk/win32/gdkdisplay-win32.c -+++ b/gdk/win32/gdkdisplay-win32.c -@@ -17,6 +17,9 @@ - */ - - #include "config.h" -+ -+#define _WIN32_WINNT 0x0600 -+ - #include "gdk.h" - #include "gdkprivate-win32.h" - #include "gdkdisplay-win32.h" --- -cgit v0.12 - diff --git a/mingw-w64-gtk3/gtk3-gdkscreen-win32-winnt.patch b/mingw-w64-gtk3/gtk3-gdkscreen-win32-winnt.patch deleted file mode 100644 index 7b91b91..0000000 --- a/mingw-w64-gtk3/gtk3-gdkscreen-win32-winnt.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3bdd384a18edaf90eab0d387a08beb8e7044f62 Mon Sep 17 00:00:00 2001 -From: Chun-wei Fan <fanchunwei@src.gnome.org> -Date: Fri, 11 Nov 2016 21:03:46 +0800 -Subject: gdkscreen-win32.c: Also define _WIN32_WINNT - -As in the last commit on gdkdisplay-win32.c, we need to define that to be -0x0600 (Vista) or later so that the items needed in the Windows headers be -activated. - -See: https://bugzilla.gnome.org/show_bug.cgi?id=768081#c62 ---- - gdk/win32/gdkscreen-win32.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c -index 3c14227..281b680 100644 ---- a/gdk/win32/gdkscreen-win32.c -+++ b/gdk/win32/gdkscreen-win32.c -@@ -16,6 +16,9 @@ - */ - - #include "config.h" -+ -+#define _WIN32_WINNT 0x0600 -+ - #include "gdk.h" - #include "gdkprivate-win32.h" - #include "gdkscreenprivate.h" --- -cgit v0.12 - |