summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cairo.mk6
-rw-r--r--src/glib-1-fixes.patch60
-rw-r--r--src/glib.mk6
-rw-r--r--src/gtk3-1-fixes.patch112
-rw-r--r--src/gtk3.mk6
5 files changed, 71 insertions, 119 deletions
diff --git a/src/cairo.mk b/src/cairo.mk
index 0bfc159..75e3a69 100644
--- a/src/cairo.mk
+++ b/src/cairo.mk
@@ -3,11 +3,11 @@
PKG := cairo
$(PKG)_WEBSITE := http://cairographics.org/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.14.6
-$(PKG)_CHECKSUM := 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252
+$(PKG)_VERSION := 1.15.4
+$(PKG)_CHECKSUM := deddf31e196e826e7790bbbf7d0f4b3fd15df243aa48511b349f1791b96be291
$(PKG)_SUBDIR := cairo-$($(PKG)_VERSION)
$(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE)
+$(PKG)_URL := http://cairographics.org/snapshots/$($(PKG)_FILE)
$(PKG)_DEPS := gcc fontconfig freetype-bootstrap glib libpng lzo pixman zlib
define $(PKG)_UPDATE
diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch
index 428cc6a..57cb0ac 100644
--- a/src/glib-1-fixes.patch
+++ b/src/glib-1-fixes.patch
@@ -31,12 +31,15 @@ From: Hans Petter Jansson <hpj@cl.no>
Date: Fri, 15 Jun 2012 15:25:01 +0200
Subject: [PATCH] Avoid DllMain symbol conflict when linking statically
+Adjusted by Boris Nagaev on 29-Jan-2017 to fix
+https://gist.github.com/starius/f4fc85939352cb50122ba29e0f5b140d
+when updating to glib-2.50.2.
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 +56,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 +69,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)
+@@ -245,14 +245,14 @@ glib_init (void)
#if defined (G_OS_WIN32)
@@ -83,6 +86,19 @@ index 1111111..2222222 100644
DWORD fdwReason,
LPVOID lpvReserved)
{
+diff --git a/gobject/gtype.c b/gobject/gtype.c
+index 1111111..2222222 100644
+--- a/gobject/gtype.c
++++ b/gobject/gtype.c
+@@ -4450,7 +4450,7 @@ gobject_init (void)
+ _g_signal_init ();
+ }
+
+-#if defined (G_OS_WIN32)
++#if 0
+
+ BOOL WINAPI DllMain (HINSTANCE hinstDLL,
+ DWORD fdwReason,
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hans Petter Jansson <hpj@cl.no>
@@ -94,7 +110,7 @@ diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1659,10 +1659,16 @@ dnl *****************************
+@@ -1599,10 +1599,16 @@ dnl *****************************
dnl ** Check for inotify (GIO) **
dnl *****************************
inotify_support=no
@@ -123,7 +139,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 +171,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 +195,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 +535,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 +556,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
+@@ -1387,6 +1387,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 +564,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
+@@ -1418,6 +1419,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 +595,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..11972b1 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]\+\.[0-9]*[02468]\.[^']*\)\.tar.*,\1,p" | \
$(SORT) -Vr | \
head -1
endef
diff --git a/src/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch
index d4520d6..15976b3 100644
--- a/src/gtk3-1-fixes.patch
+++ b/src/gtk3-1-fixes.patch
@@ -12,7 +12,7 @@ diff --git a/configure b/configure
index 1111111..2222222 100755
--- a/configure
+++ b/configure
-@@ -7005,15 +7005,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -9378,15 +9378,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
@@ -74,82 +74,6 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 29 Jan 2017 21:48:31 +0100
-Subject: [PATCH] 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).
-
-diff --git a/util/Makefile.in b/util/Makefile.in
-index 1111111..2222222 100644
---- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -107,9 +107,8 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- 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 @@ clean-noinstPROGRAMS:
-
- 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 @@ distclean-compile:
- @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 @@ distdir: $(DISTFILES)
- 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
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 29 Jan 2017 21:50:01 +0100
-Subject: [PATCH] This one fixes "cd $builddir" failing because neither
- $builddir nor $HOME were set
-
-
-diff --git a/configure b/configure
-index 1111111..2222222 100755
---- a/configure
-+++ b/configure
-@@ -23215,7 +23215,7 @@ fi
- 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"
-
-
-
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 29 Jan 2017 21:50:48 +0100
Subject: [PATCH] Not sure what happens when this line is commented out
@@ -158,10 +82,42 @@ diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
index 1111111..2222222 100644
--- a/gtk/a11y/gtkaccessibility.c
+++ b/gtk/a11y/gtkaccessibility.c
-@@ -991,5 +991,5 @@ _gtk_accessibility_init (void)
+@@ -992,5 +992,5 @@ _gtk_accessibility_init (void)
atk_bridge_adaptor_init (NULL, NULL);
#endif
- atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ /* atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); */
}
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Sun, 29 Jan 2017 22:50:45 +0100
+Subject: [PATCH] disable gtk-update-icon-cache
+
+The error: https://gist.github.com/b3030a43a325ee7646a2bda2864465b5
+
+diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in
+index 1111111..2222222 100644
+--- a/demos/gtk-demo/Makefile.in
++++ b/demos/gtk-demo/Makefile.in
+@@ -1422,7 +1422,6 @@ uninstall-hook: uninstall-update-icon-cache
+
+ install-update-icon-cache:
+ $(AM_V_at)$(POST_INSTALL)
+- test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+ uninstall-update-icon-cache:
+ $(AM_V_at)$(POST_UNINSTALL)
+diff --git a/demos/widget-factory/Makefile.in b/demos/widget-factory/Makefile.in
+index 1111111..2222222 100644
+--- a/demos/widget-factory/Makefile.in
++++ b/demos/widget-factory/Makefile.in
+@@ -1161,7 +1161,6 @@ uninstall-hook: uninstall-update-icon-cache
+
+ install-update-icon-cache:
+ $(AM_V_at)$(POST_INSTALL)
+- test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+ uninstall-update-icon-cache:
+ $(AM_V_at)$(POST_UNINSTALL)
diff --git a/src/gtk3.mk b/src/gtk3.mk
index ad02b8c..85e9106 100644
--- a/src/gtk3.mk
+++ b/src/gtk3.mk
@@ -4,12 +4,12 @@ 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)
-$(PKG)_DEPS := gcc atk cairo gdk-pixbuf gettext glib jasper jpeg libpng pango tiff
+$(PKG)_DEPS := gcc atk cairo gdk-pixbuf gettext glib jasper jpeg libepoxy libpng pango tiff
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://git.gnome.org/browse/gtk+/refs/tags' | \
generated by cgit v0.12 at 2024-10-16 17:49:18 (GMT)