-
-
Save starius/a17cbf86a66983d3140e29652e17c75f to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/gcc.mk b/src/gcc.mk | |
| index be4ebfd..e352d44 100644 | |
| --- a/src/gcc.mk | |
| +++ b/src/gcc.mk | |
| @@ -78,6 +78,7 @@ define $(PKG)_BUILD_mingw-w64 | |
| --prefix='$(PREFIX)/$(TARGET)' \ | |
| --enable-sdk=all \ | |
| --enable-idl \ | |
| + --enable-secure-api \ | |
| $(mingw-w64-headers_CONFIGURE_OPTS) | |
| $(MAKE) -C '$(1).headers-build' install | |
| diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch | |
| index 428cc6a..c2e0fdc 100644 | |
| --- a/src/glib-1-fixes.patch | |
| +++ b/src/glib-1-fixes.patch | |
| @@ -36,7 +36,7 @@ diff --git a/gio/giomodule.c b/gio/giomodule.c | |
| index 1111111..2222222 100644 | |
| --- a/gio/giomodule.c | |
| +++ b/gio/giomodule.c | |
| -@@ -918,14 +918,12 @@ extern GType g_gtk_notification_backend_get_type (void); | |
| +@@ -928,14 +928,12 @@ extern GType g_cocoa_notification_backend_get_type (void); | |
| static HMODULE gio_dll = NULL; | |
| @@ -53,7 +53,7 @@ index 1111111..2222222 100644 | |
| DWORD fdwReason, | |
| LPVOID lpvReserved) | |
| { | |
| -@@ -935,8 +933,6 @@ DllMain (HINSTANCE hinstDLL, | |
| +@@ -945,8 +943,6 @@ DllMain (HINSTANCE hinstDLL, | |
| return TRUE; | |
| } | |
| @@ -66,7 +66,7 @@ diff --git a/glib/glib-init.c b/glib/glib-init.c | |
| index 1111111..2222222 100644 | |
| --- a/glib/glib-init.c | |
| +++ b/glib/glib-init.c | |
| -@@ -237,14 +237,14 @@ glib_init (void) | |
| +@@ -275,14 +275,14 @@ glib_init (void) | |
| #if defined (G_OS_WIN32) | |
| @@ -94,7 +94,7 @@ diff --git a/configure.ac b/configure.ac | |
| index 1111111..2222222 100644 | |
| --- a/configure.ac | |
| +++ b/configure.ac | |
| -@@ -1659,10 +1659,16 @@ dnl ***************************** | |
| +@@ -1600,10 +1600,16 @@ dnl ***************************** | |
| dnl ** Check for inotify (GIO) ** | |
| dnl ***************************** | |
| inotify_support=no | |
| @@ -123,7 +123,7 @@ diff --git a/configure.ac b/configure.ac | |
| index 1111111..2222222 100644 | |
| --- a/configure.ac | |
| +++ b/configure.ac | |
| -@@ -499,6 +499,8 @@ LT_INIT([disable-static win32-dll]) | |
| +@@ -511,6 +511,8 @@ LT_INIT([disable-static win32-dll]) | |
| dnl when using libtool 2.x create libtool early, because it's used in configure | |
| m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) | |
| @@ -155,15 +155,15 @@ index 1111111..2222222 100644 | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | |
| From: Hans Petter Jansson <hpj@cl.no> | |
| Date: Fri, 15 Jun 2012 15:29:38 +0200 | |
| -Subject: [PATCH] Ensure globals are initialized even when DllMain is not being | |
| - run | |
| +Subject: [PATCH] Ensure globals are initialized even when DllMain is not | |
| + being run | |
| diff --git a/glib/gmain.c b/glib/gmain.c | |
| index 1111111..2222222 100644 | |
| --- a/glib/gmain.c | |
| +++ b/glib/gmain.c | |
| -@@ -2577,12 +2577,15 @@ g_get_real_time (void) | |
| +@@ -2657,12 +2657,15 @@ g_get_real_time (void) | |
| #if defined (G_OS_WIN32) | |
| static ULONGLONG (*g_GetTickCount64) (void) = NULL; | |
| static guint32 g_win32_tick_epoch = 0; | |
| @@ -179,7 +179,7 @@ index 1111111..2222222 100644 | |
| g_GetTickCount64 = NULL; | |
| kernel32 = GetModuleHandle ("KERNEL32.DLL"); | |
| if (kernel32 != NULL) | |
| -@@ -2641,6 +2644,9 @@ g_get_monotonic_time (void) | |
| +@@ -2721,6 +2724,9 @@ g_get_monotonic_time (void) | |
| * timeBeginPeriod() to increase it as much as they want | |
| */ | |
| @@ -519,7 +519,7 @@ index 1111111..2222222 100644 | |
| win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE)); | |
| } | |
| -@@ -984,6 +1088,8 @@ g_thread_lookup_native_funcs (void) | |
| +@@ -1041,6 +1145,8 @@ g_thread_lookup_native_funcs (void) | |
| void | |
| g_thread_win32_init (void) | |
| { | |
| @@ -540,7 +540,7 @@ diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c | |
| index 1111111..2222222 100644 | |
| --- a/gio/gdbusaddress.c | |
| +++ b/gio/gdbusaddress.c | |
| -@@ -1325,6 +1325,7 @@ __declspec(dllexport) void CALLBACK g_win32_run_session_bus (HWND hwnd, HINSTANC | |
| +@@ -1388,6 +1388,7 @@ __declspec(dllexport) void CALLBACK g_win32_run_session_bus (HWND hwnd, HINSTANC | |
| __declspec(dllexport) void CALLBACK | |
| g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow) | |
| { | |
| @@ -548,7 +548,7 @@ index 1111111..2222222 100644 | |
| GDBusDaemon *daemon; | |
| GMainLoop *loop; | |
| const char *address; | |
| -@@ -1354,6 +1355,7 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow | |
| +@@ -1420,6 +1421,7 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow | |
| g_main_loop_unref (loop); | |
| g_object_unref (daemon); | |
| @@ -579,23 +579,3 @@ index 1111111..2222222 100644 | |
| dnl | |
| dnl At the end, if we're not within glib, we'll define the public | |
| dnl definitions in terms of our private definitions. | |
| - | |
| - | |
| -From: Boris Pek <tehnick-8@mail.ru> | |
| -Date: Thu, 28 Apr 2016 16:48:12 +0300 | |
| -Subject: [PATCH] fix build with GCC >= 6.x | |
| - | |
| -See plugins/gcc6/README.md | |
| - | |
| -diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c | |
| ---- a/gio/gregistrysettingsbackend.c | |
| -+++ b/gio/gregistrysettingsbackend.c | |
| -@@ -228,7 +228,7 @@ | |
| - if (result_code == ERROR_KEY_DELETED) | |
| - trace ("(%s)", win32_message); | |
| - else | |
| -- g_message (win32_message); | |
| -+ g_message ("%s", win32_message); | |
| - }; | |
| - | |
| - | |
| diff --git a/src/glib.mk b/src/glib.mk | |
| index 8990890..7c0e9b5 100644 | |
| --- a/src/glib.mk | |
| +++ b/src/glib.mk | |
| @@ -4,8 +4,8 @@ PKG := glib | |
| $(PKG)_WEBSITE := http://www.gtk.org/ | |
| $(PKG)_DESCR := GLib | |
| $(PKG)_IGNORE := | |
| -$(PKG)_VERSION := 2.44.1 | |
| -$(PKG)_CHECKSUM := 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 | |
| +$(PKG)_VERSION := 2.50.2 | |
| +$(PKG)_CHECKSUM := be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 | |
| $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) | |
| $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.xz | |
| $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) | |
| @@ -13,7 +13,7 @@ $(PKG)_DEPS := gcc dbus gettext libffi libiconv pcre zlib | |
| define $(PKG)_UPDATE | |
| $(WGET) -q -O- 'http://git.gnome.org/browse/glib/refs/tags' | \ | |
| - $(SED) -n "s,.*tag/?id=\([0-9]\+\.[0-9]*[02468]\.[^']*\).*,\1,p" | \ | |
| + $(SED) -n 's,.*glib-\([0-9][^"]*\)\.tar.*,\1,p' | \ | |
| $(SORT) -Vr | \ | |
| head -1 | |
| endef | |
| diff --git a/src/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch | |
| index 91ff9a5..77b03b4 100644 | |
| --- a/src/gtk3-1-fixes.patch | |
| +++ b/src/gtk3-1-fixes.patch | |
| @@ -62,69 +62,6 @@ These were adapted from the gtk2 patchset. | |
| +Libs: -L${libdir} -lgtk-3 @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32 | |
| Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ | |
| --- | |
| -Here there were two problems, one is that util/extract-strings.exe | |
| -was being cross-built while it should be built locally, the other is | |
| -that in fact it wasn't even being built because of some problem with | |
| -makefile variables (PROGRAMS appears to be empty even if it is set to | |
| -a nonempty value). | |
| - | |
| ---- a/util/Makefile.in 2014-10-21 17:03:07.000000000 +0200 | |
| -+++ b/util/Makefile.in 2014-12-27 23:12:40.910506266 +0100 | |
| -@@ -107,9 +107,8 @@ | |
| - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | |
| - am__v_lt_0 = --silent | |
| - am__v_lt_1 = | |
| --extract_strings_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | |
| -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | |
| -- $(extract_strings_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ | |
| -+extract_strings_LINK = $(CC_FOR_BUILD) \ | |
| -+ $(extract_strings_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) \ | |
| - -o $@ | |
| - AM_V_P = $(am__v_P_@AM_V@) | |
| - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | |
| -@@ -485,7 +484,7 @@ | |
| - | |
| - extract-strings$(EXEEXT): $(extract_strings_OBJECTS) $(extract_strings_DEPENDENCIES) $(EXTRA_extract_strings_DEPENDENCIES) | |
| - @rm -f extract-strings$(EXEEXT) | |
| -- $(AM_V_CCLD)$(extract_strings_LINK) $(extract_strings_OBJECTS) $(extract_strings_LDADD) $(LIBS) | |
| -+ $(AM_V_CCLD)$(extract_strings_LINK) $(extract_strings_OBJECTS) $(extract_strings_LDADD) | |
| - | |
| - mostlyclean-compile: | |
| - -rm -f *.$(OBJEXT) | |
| -@@ -517,7 +516,7 @@ | |
| - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< | |
| - | |
| - extract_strings-extract-strings.o: extract-strings.c | |
| --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extract_strings_CFLAGS) $(CFLAGS) -MT extract_strings-extract-strings.o -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c | |
| -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(extract_strings_CFLAGS) $(CFLAGS_FOR_BUILD) -MT extract_strings-extract-strings.o -MD -MP -MF $(DEPDIR)/extract_strings-extract-strings.Tpo -c -o extract_strings-extract-strings.o `test -f 'extract-strings.c' || echo '$(srcdir)/'`extract-strings.c | |
| - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/extract_strings-extract-strings.Tpo $(DEPDIR)/extract_strings-extract-strings.Po | |
| - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='extract-strings.c' object='extract_strings-extract-strings.o' libtool=no @AMDEPBACKSLASH@ | |
| - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@@ -620,7 +619,7 @@ | |
| - done | |
| - check-am: all-am | |
| - check: check-am | |
| --all-am: Makefile $(PROGRAMS) | |
| -+all-am: Makefile extract-strings$(EXEEXT) | |
| - installdirs: | |
| - install: install-am | |
| - install-exec: install-exec-am | |
| ---- | |
| -This one fixes "cd $builddir" failing because neither $builddir nor | |
| -$HOME were set | |
| - | |
| ---- a/configure 2015-07-24 21:19:46.839151097 +0200 | |
| -+++ b/configure 2015-07-24 21:20:13.655151075 +0200 | |
| -@@ -23215,7 +23215,7 @@ | |
| - NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0` | |
| - # This is the native gtk-update-icon-cache which will be used at | |
| - # build time, NOT the one installed on the target host. | |
| -- GTK_UPDATE_ICON_CACHE="`cd $builddir && pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT" | |
| -+ GTK_UPDATE_ICON_CACHE="`pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT" | |
| - | |
| - | |
| - | |
| ---- | |
| Not sure what happens when this line is commented out. | |
| --- a/gtk/a11y/gtkaccessibility.c 2014-08-15 16:38:05.000000000 +0200 | |
| diff --git a/src/gtk3.mk b/src/gtk3.mk | |
| index ad02b8c..b38d6e4 100644 | |
| --- a/src/gtk3.mk | |
| +++ b/src/gtk3.mk | |
| @@ -4,8 +4,8 @@ PKG := gtk3 | |
| $(PKG)_WEBSITE := http://www.gtk.org/ | |
| $(PKG)_DESCR := GTK+ | |
| $(PKG)_IGNORE := | |
| -$(PKG)_VERSION := 3.14.4 | |
| -$(PKG)_CHECKSUM := a006c716d723dab0c623491566e3292af84c87d9198a30199051d23cfc7bef2f | |
| +$(PKG)_VERSION := 3.22.7 | |
| +$(PKG)_CHECKSUM := a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432 | |
| $(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION) | |
| $(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.xz | |
| $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment