-
-
Save starius/48c876bbcee87afa1e5a580e5ffd1449 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/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch | |
| index 91ff9a5..a7966d1 100644 | |
| --- a/src/gtk3-1-fixes.patch | |
| +++ b/src/gtk3-1-fixes.patch | |
| @@ -62,54 +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 | |
| 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