gtk3: Update to 3.12.1
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
--- gtk+-2.24.20/gdk/Makefile.am.orig 2013-07-28 21:56:07.983654900 +0000
|
||||
+++ gtk+-2.24.20/gdk/Makefile.am 2013-07-28 22:00:08.786733000 +0000
|
||||
@@ -2,6 +2,8 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
-include $(INTROSPECTION_MAKEFILE)
|
||||
INTROSPECTION_GIRS =
|
||||
+INTROSPECTION_SCANNER_ENV = \
|
||||
+ CC="$(CC)"
|
||||
INTROSPECTION_SCANNER_ARGS = \
|
||||
--add-include-path=../gdk
|
||||
INTROSPECTION_COMPILER_ARGS = \
|
||||
--- gtk+-2.24.20/gtk/Makefile.am.orig 2013-02-03 20:54:15.000000000 +0000
|
||||
+++ gtk+-2.24.20/gtk/Makefile.am 2013-07-28 22:06:06.408145200 +0000
|
||||
@@ -2,6 +2,8 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
-include $(INTROSPECTION_MAKEFILE)
|
||||
INTROSPECTION_GIRS =
|
||||
+INTROSPECTION_SCANNER_ENV = \
|
||||
+ CC="$(CC)"
|
||||
INTROSPECTION_SCANNER_ARGS = \
|
||||
--add-include-path=../gdk
|
||||
INTROSPECTION_COMPILER_ARGS = \
|
||||
@@ -1,73 +0,0 @@
|
||||
--- gtk+-2.24.20/gdk/Makefile.am.orig 2013-07-28 23:30:01.983082000 +0000
|
||||
+++ gtk+-2.24.20/gdk/Makefile.am 2013-07-29 00:06:24.167684200 +0000
|
||||
@@ -207,7 +207,9 @@
|
||||
Gdk_3_0_gir_FILES = $(introspection_files)
|
||||
Gdk_3_0_gir_CFLAGS = $(INCLUDES)
|
||||
INTROSPECTION_GIRS += Gdk-3.0.gir
|
||||
-
|
||||
+if OS_WIN32
|
||||
+Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
|
||||
+endif
|
||||
if USE_X11
|
||||
x11_introspection_files = \
|
||||
x11/checksettings.c \
|
||||
@@ -253,6 +255,59 @@
|
||||
|
||||
endif # USE_X11
|
||||
|
||||
+if OS_WIN32
|
||||
+w32_introspection_files = \
|
||||
+ win32/gdkcursor-win32.c \
|
||||
+ win32/gdkdevicemanager-win32.c \
|
||||
+ \
|
||||
+ win32/gdkdevice-virtual.c \
|
||||
+ \
|
||||
+ win32/gdkdevice-win32.c \
|
||||
+ \
|
||||
+ win32/gdkdevice-wintab.c \
|
||||
+ \
|
||||
+ win32/gdkdisplaymanager-win32.c \
|
||||
+ win32/gdkdisplay-win32.c \
|
||||
+ win32/gdkdnd-win32.c \
|
||||
+ win32/gdkevents-win32.c \
|
||||
+ win32/gdkgeometry-win32.c \
|
||||
+ win32/gdkglobals-win32.c \
|
||||
+ win32/gdkinput.c \
|
||||
+ win32/gdkkeys-win32.c \
|
||||
+ win32/gdkmain-win32.c \
|
||||
+ win32/gdkproperty-win32.c \
|
||||
+ win32/gdkscreen-win32.c \
|
||||
+ win32/gdkselection-win32.c \
|
||||
+ win32/gdktestutils-win32.c \
|
||||
+ win32/gdkvisual-win32.c \
|
||||
+ win32/gdkwin32.h \
|
||||
+ win32/gdkwin32cursor.h \
|
||||
+ win32/gdkwin32display.h \
|
||||
+ win32/gdkwin32displaymanager.h \
|
||||
+ win32/gdkwin32dnd.h \
|
||||
+ win32/gdkwin32id.c \
|
||||
+ win32/gdkwin32keys.h \
|
||||
+ win32/gdkwin32misc.h \
|
||||
+ win32/gdkwin32screen.h \
|
||||
+ win32/gdkwin32window.h \
|
||||
+ win32/gdkwindow-win32.c
|
||||
+
|
||||
+
|
||||
+GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
|
||||
+GdkWin32_3_0_gir_SCANNERFLAGS = \
|
||||
+ --identifier-prefix=Gdk \
|
||||
+ --c-include="gdk/gdkwin32.h" \
|
||||
+ --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
|
||||
+GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
|
||||
+GdkWin32_3_0_gir_LIBS = libgdk-3.la
|
||||
+GdkWin32_3_0_gir_FILES = $(w32_introspection_files)
|
||||
+GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
|
||||
+INTROSPECTION_GIRS += GdkWin32-3.0.gir
|
||||
+
|
||||
+
|
||||
+
|
||||
+endif # OS_WIN32
|
||||
+
|
||||
girdir = $(datadir)/gir-1.0
|
||||
gir_DATA = $(INTROSPECTION_GIRS)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
_realname=gtk3
|
||||
_mingw_suff=mingw-w64-${CARCH}
|
||||
pkgname="${_mingw_suff}-${_realname}"
|
||||
pkgver=3.12.0
|
||||
pkgver=3.12.1
|
||||
pkgrel=1
|
||||
pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
|
||||
arch=('any')
|
||||
@@ -25,17 +25,13 @@ depends=("${_mingw_suff}-gcc-libs"
|
||||
options=('strip' 'staticlibs')
|
||||
source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
|
||||
0001-REBURN-THE-DEF-FILE.mingw.patch
|
||||
0009-give-cc-to-gir-scanner.mingw.patch
|
||||
0010-put-gtk-dll-into-path.mingw.patch
|
||||
0011-gir-for-gdkwin32.mingw.patch
|
||||
0012-embed-manifest.all.patch
|
||||
0014-fix-gnu-print-format.patch
|
||||
0015-Suppress-a-warning-from-SetWindowLongPtr.all.patch)
|
||||
md5sums=('4e493fb68cded7420a7d8bcebdf13811'
|
||||
md5sums=('d4fa17f3916bdd737c37cdf123c1b24a'
|
||||
'53ddd35c66dafd59567c4babf79d2821'
|
||||
'e8bd83e4eb9877d009ad57458cf5a6b0'
|
||||
'9e0296da2986be7697cf343563b85d1f'
|
||||
'167f8218771d5304477a7649b0b91d2f'
|
||||
'47aa5b0d120102d526d2f781338f93b1'
|
||||
'3052a2c4dac22042780471b14463ea89'
|
||||
'36ad8b20dd38e586e92ddb39c59eb923')
|
||||
@@ -43,9 +39,7 @@ md5sums=('4e493fb68cded7420a7d8bcebdf13811'
|
||||
prepare() {
|
||||
cd "${srcdir}/gtk+-${pkgver}"
|
||||
patch -Np1 -i "${srcdir}/0001-REBURN-THE-DEF-FILE.mingw.patch"
|
||||
patch -Np1 -i "${srcdir}/0009-give-cc-to-gir-scanner.mingw.patch"
|
||||
patch -Np1 -i "${srcdir}/0010-put-gtk-dll-into-path.mingw.patch"
|
||||
patch -Np1 -i "${srcdir}/0011-gir-for-gdkwin32.mingw.patch"
|
||||
patch -Np1 -i "${srcdir}/0012-embed-manifest.all.patch"
|
||||
patch -Np1 -i "${srcdir}/0014-fix-gnu-print-format.patch"
|
||||
patch -Np1 -i "${srcdir}/0015-Suppress-a-warning-from-SetWindowLongPtr.all.patch"
|
||||
|
||||
Reference in New Issue
Block a user