From 9ea75122d58571098f482f80ea07f0aebc6cae61 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Mon, 17 Jun 2013 20:20:53 +0800 Subject: mingw-w64-gtk2: 2.24.18-1 -> 2.24.19-1 --- mingw-w64-gtk2/.SRCINFO | 8 ++++---- mingw-w64-gtk2/PKGBUILD | 11 +++++++---- mingw-w64-gtk2/gtk-dont-define-initguid.patch | 11 +++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 mingw-w64-gtk2/gtk-dont-define-initguid.patch diff --git a/mingw-w64-gtk2/.SRCINFO b/mingw-w64-gtk2/.SRCINFO index b8ba622..76ee811 100644 --- a/mingw-w64-gtk2/.SRCINFO +++ b/mingw-w64-gtk2/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mingw-w64-gtk2 pkgdesc = GTK+ is a multi-platform toolkit (v2) (mingw-w64) - pkgver = 2.24.18 + pkgver = 2.24.19 pkgrel = 1 url = http://www.gtk.org arch = any @@ -16,9 +16,9 @@ pkgbase = mingw-w64-gtk2 options = !libtool options = !strip options = !buildflags - source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.18.tar.xz - source = http://pkgs.fedoraproject.org/cgit/mingw-gtk2.git/plain/gtk-dont-define-initguid.patch?id=3224e445dad240da5f5ebfe371e8c9f627459089 - md5sums = 4309379acdcd8abfb72ea89bce3e7746 + source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.19.tar.xz + source = gtk-dont-define-initguid.patch + md5sums = 490236abeb0d9351b2a34e9aca70e1de md5sums = 4038939df90f80ea6923d67afff28e03 pkgname = mingw-w64-gtk2 diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD index 2c947e6..ae7c61a 100644 --- a/mingw-w64-gtk2/PKGBUILD +++ b/mingw-w64-gtk2/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mingw-w64-gtk2 -pkgver=2.24.18 +pkgver=2.24.19 pkgrel=1 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)" arch=(any) @@ -15,15 +15,18 @@ mingw-w64-gdk-pixbuf2) options=(!libtool !strip !buildflags) source=( "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz" -"http://pkgs.fedoraproject.org/cgit/mingw-gtk2.git/plain/gtk-dont-define-initguid.patch?id=3224e445dad240da5f5ebfe371e8c9f627459089") -md5sums=('4309379acdcd8abfb72ea89bce3e7746' +"gtk-dont-define-initguid.patch") + +# The second source file is downloaded from Fedora Project + +md5sums=("490236abeb0d9351b2a34e9aca70e1de" "4038939df90f80ea6923d67afff28e03") _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np0 < '../gtk-dont-define-initguid.patch?id=3224e445dad240da5f5ebfe371e8c9f627459089' + patch -Np0 < '../gtk-dont-define-initguid.patch' for _arch in ${_architectures}; do export CFLAGS="-O2 -mms-bitfields" export CXXFLAGS="${CFLAGS}" diff --git a/mingw-w64-gtk2/gtk-dont-define-initguid.patch b/mingw-w64-gtk2/gtk-dont-define-initguid.patch new file mode 100644 index 0000000..5f41a48 --- /dev/null +++ b/mingw-w64-gtk2/gtk-dont-define-initguid.patch @@ -0,0 +1,11 @@ +--- gdk/win32/gdkdnd-win32.c.orig 2013-04-04 21:15:55.689671748 +0200 ++++ gdk/win32/gdkdnd-win32.c 2013-04-04 21:16:02.083782327 +0200 +@@ -70,8 +70,6 @@ + * + */ + +-#define INITGUID +- + #include "gdkdnd.h" + #include "gdkproperty.h" + #include "gdkinternals.h" -- cgit v1.2.3