From b739051c4da30a4cfa16f49cd5fd9b036bcd4bb9 Mon Sep 17 00:00:00 2001 From: LAN-TW Date: Fri, 27 Sep 2013 23:49:48 +0800 Subject: mingw-w64-gtk3: 3.8.4-1 -> 3.10.0-1 --- mingw-w64-gtk3/0004-BURN-THE-.DEF.patch | 164 ++++++++++++++++++++++++++ mingw-w64-gtk3/PKGBUILD | 38 +++--- mingw-w64-gtk3/gtk-dont-define-initguid.patch | 11 -- 3 files changed, 179 insertions(+), 34 deletions(-) create mode 100644 mingw-w64-gtk3/0004-BURN-THE-.DEF.patch delete mode 100644 mingw-w64-gtk3/gtk-dont-define-initguid.patch diff --git a/mingw-w64-gtk3/0004-BURN-THE-.DEF.patch b/mingw-w64-gtk3/0004-BURN-THE-.DEF.patch new file mode 100644 index 0000000..6fa2566 --- /dev/null +++ b/mingw-w64-gtk3/0004-BURN-THE-.DEF.patch @@ -0,0 +1,164 @@ +From 1f4e6cc1a3fe62d05036cfae181f10e07da3764a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= + =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= +Date: Fri, 10 May 2013 09:23:17 +0400 +Subject: [PATCH 4/5] BURN THE .DEF + +--- + gdk/Makefile.am | 23 ++++++----------------- + gdk/makefile.msc | 14 ++++---------- + gtk/Makefile.am | 22 ++++++---------------- + 3 files changed, 16 insertions(+), 43 deletions(-) + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index af0ac94..a0233f9 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -178,8 +178,8 @@ endif # USE_QUARTZ + if USE_WIN32 + libgdk_3_la_SOURCES += gdkkeynames.c + libgdk_3_la_LIBADD += win32/libgdk-win32.la +-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def +-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def ++libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o ++libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o + endif # USE_WIN32 + + if USE_BROADWAY +@@ -269,22 +269,11 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA) + + endif # HAVE_INTROSPECTION + +-if OS_WIN32 +-install-def-file: gdk.def +- mkdir -p $(DESTDIR)$(libdir) +- $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def +-uninstall-def-file: +- -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def +-else +-install-def-file: +-uninstall-def-file: +-endif +- + if MS_LIB_AVAILABLE + noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib + +-gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def +- lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ ++gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la ++ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -out:$@ + + install-ms-lib: + mkdir -p $(DESTDIR)$(libdir) +@@ -381,9 +370,9 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil + + DISTCLEANFILES = gdkconfig.h stamp-gc-h + +-install-data-local: install-ms-lib install-def-file ++install-data-local: install-ms-lib + +-uninstall-local: uninstall-ms-lib uninstall-def-file ++uninstall-local: uninstall-ms-lib + rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h + + # if srcdir!=builddir, clean out maintainer-clean files from builddir +diff --git a/gdk/makefile.msc b/gdk/makefile.msc +index 0d88d1e..f956606 100644 +--- a/gdk/makefile.msc ++++ b/gdk/makefile.msc +@@ -139,25 +139,19 @@ gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template + gdkconfig.h : gdkconfig.h.win32 + copy gdkconfig.h.win32 gdkconfig.h + +-gdk.def: gdk.symbols +- echo EXPORTS > gdk.def +- cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \ +- -DG_GNUC_CONST= \ +- gdk.symbols >> gdk.def +- + # /force /verbose:lib +-libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib ++libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) win32\gdk-win32.lib + $(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \ + gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \ +- $(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def ++ $(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib + + gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS) + lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib + +-gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib ++gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) x11\gdk-x11.lib + $(CC) $(CFLAGS) -LD -Fegdk-x11-$(GTK_VER).dll $(gdk_OBJECTS) \ + $(PANGO)\pango\pangox-$(PANGO_VER).lib \ +- x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def ++ x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) + + testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj + $(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS) +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 60fbc31..5da0b35 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -61,29 +61,19 @@ no_undefined = -no-undefined + endif + + if OS_WIN32 +-gtk_def = gtk.def +-gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def +- + gtk_win32_res = gtk-win32-res.o + gtk_win32_res_ldflag = -Wl,gtk-win32-res.o + + gtk-win32-res.o : gtk-win32.rc + $(WINDRES) gtk-win32.rc $@ + +-install-def-file: gtk.def +- $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def +-uninstall-def-file: +- -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def +-else +-install-def-file: +-uninstall-def-file: + endif + + if MS_LIB_AVAILABLE + noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib + +-gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def +- lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@ ++gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la ++ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -out:$@ + + install-ms-lib: + $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) +@@ -1226,8 +1216,8 @@ libgtk_3_la_DEPENDENCIES = $(deps) + if USE_WIN32 + libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 + libgtk_3_la_LDFLAGS += -Wl,-luuid +-libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps) +-libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) ++libgtk_3_la_DEPENDENCIES += $(gtk_win32_res) $(deps) ++libgtk_target_ldflags = $(gtk_win32_res_ldflag) + endif + + install-exec-hook: +@@ -1279,13 +1269,13 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil + rm libgtk.vs10.sourcefiles.filters + + # Install a RC file for the default GTK+ theme, and key themes +-install-data-local: install-ms-lib install-def-file install-mac-key-theme ++install-data-local: install-ms-lib install-mac-key-theme + $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css + $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css + +-uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme ++uninstall-local: uninstall-ms-lib uninstall-mac-key-theme + rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css + rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css + rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css +-- +1.8.0.3 + diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index b82bb7b..27b0a84 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.8.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="GTK+ is a multi-platform toolkit (v3) (mingw-w64)" arch=(any) @@ -9,47 +9,40 @@ url="http://www.gtk.org" license=("LGPL") makedepends=(mingw-w64-gcc mingw-w64-pkg-config gtk-update-icon-cache python2) # python2 is required to run gdbus-codegen +makedepends+=(autoconf automake libtool) +# autotools are required because several Makefile.am are modified depends=( 'mingw-w64-crt' 'mingw-w64-atk>=2.7.5' 'mingw-w64-pango>=1.32.4' -'mingw-w64-glib2>=2.35.3' -'mingw-w64-cairo>=1.10.0' +'mingw-w64-glib2>=2.37.5' +'mingw-w64-cairo>=1.12.0' 'mingw-w64-gdk-pixbuf2>=2.27.1') options=(!libtool !strip !buildflags) source=( "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz" -"https://git.gnome.org/browse/gtk+/plain/demos/gtk-demo/brick.png?h=gtk-3-8&id=231d6c209f47edac828f52a7316980129c370eb1" -"gtk-dont-define-initguid.patch") +"0004-BURN-THE-.DEF.patch") -# The second source file is downloaded from GNOME. This file exists in the git repository but not in the tarball. Building of demos will fail without this file. -# The third source file is downloaded from Fedora Project +# The second source file is downloaded from Fedora Project -md5sums=('2b232d76c01ceb626948bcbe70b05269' - '523aea0be651baaba128c133751a0f01' - '4038939df90f80ea6923d67afff28e03') +md5sums=('f5148a330886b906ba0eb7842409d93f' + '369582585e60eab9fa5c9aa22a68e41c') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np0 < '../gtk-dont-define-initguid.patch' + patch -Np1 < "../0004-BURN-THE-.DEF.patch" + autoreconf -i for _arch in ${_architectures}; do + unset LDFLAGS export CFLAGS="-O2 -mms-bitfields" export CXXFLAGS="${CFLAGS}" - unset LDFLAGS - export PKG_CONFIG_FOR_BUILD="${_arch}-pkg-config" + export PKG_CONFIG="${_arch}-pkg-config" + export PKG_CONFIG_FOR_BUILD="pkg-config" mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}" - msg "Copying files" - cp -r "${srcdir}/gtk+-${pkgver}/"* \ - "${srcdir}/${pkgname}-${pkgver}-build-${_arch}" - cp '../brick.png?h=gtk-3-8&id=231d6c209f47edac828f52a7316980129c370eb1' \ - "${srcdir}/gtk+-${pkgver}/demos/gtk-demo/brick.png" cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}" - if [ $_arch = "x86_64-w64-mingw32" ]; then - rm "gtk/gtk.def" - fi msg "Starting configure and make" ${srcdir}/gtk+-${pkgver}/configure \ --prefix=/usr/${_arch} \ @@ -59,8 +52,7 @@ build() { --enable-gtk2-dependency \ --enable-static \ --enable-shared \ - --disable-cups \ - --with-included-immodules + --disable-cups make done } diff --git a/mingw-w64-gtk3/gtk-dont-define-initguid.patch b/mingw-w64-gtk3/gtk-dont-define-initguid.patch deleted file mode 100644 index 5f41a48..0000000 --- a/mingw-w64-gtk3/gtk-dont-define-initguid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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