diff options
| author | Pavel Vinogradov | 2018-02-14 13:59:44 -0500 |
|---|---|---|
| committer | Pavel Vinogradov | 2018-02-14 13:59:44 -0500 |
| commit | f4d71e04ee57d2ea3677cb7a510b8c9ee9599262 (patch) | |
| tree | 73496ba369e1ac16b7ef45c9ba3c99bd8fbb2637 /x11-toolkits | |
| parent | d5cbe0e69244c4caf639d74454e6deeb9bf1b00d (diff) | |
x11-toolkits/gtk+3: added patch for testsuite Makefile + some reorganization
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk+3/HISTORY | 6 | ||||
| -rwxr-xr-x | x11-toolkits/gtk+3/PRE_BUILD | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch (renamed from x11-toolkits/gtk+3/gtkfontchooserwidgetprivate.h.patch) | 0 | ||||
| -rw-r--r-- | x11-toolkits/gtk+3/patches/testsuite.patch | 14 |
4 files changed, 19 insertions, 3 deletions
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY index 66a82c89e0..7f506fe578 100644 --- a/x11-toolkits/gtk+3/HISTORY +++ b/x11-toolkits/gtk+3/HISTORY @@ -1,7 +1,9 @@ 2018-02-14 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 3.22.27 - * PRE_BUILD, gtkfontchooserwidgetprivate.h.patch: added a combined - patch to fix missing private header error + * PRE_BUILD, + patches/{gtkfontchooserwidgetprivate.h.patch,testsuite.patch}: added + a combined patch to fix missing private header error + a patch for + testsuite Makefile to avoid symlinking of existing file 2017-11-08 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 3.22.26 diff --git a/x11-toolkits/gtk+3/PRE_BUILD b/x11-toolkits/gtk+3/PRE_BUILD index 0773478875..f80ee7decc 100755 --- a/x11-toolkits/gtk+3/PRE_BUILD +++ b/x11-toolkits/gtk+3/PRE_BUILD @@ -1,4 +1,4 @@ default_pre_build && cd "${SOURCE_DIRECTORY}" && -patch -p1 < "${SPELL_DIRECTORY}/gtkfontchooserwidgetprivate.h.patch" +apply_patch_dir patches diff --git a/x11-toolkits/gtk+3/gtkfontchooserwidgetprivate.h.patch b/x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch index 40d490925d..40d490925d 100644 --- a/x11-toolkits/gtk+3/gtkfontchooserwidgetprivate.h.patch +++ b/x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch diff --git a/x11-toolkits/gtk+3/patches/testsuite.patch b/x11-toolkits/gtk+3/patches/testsuite.patch new file mode 100644 index 0000000000..fc3f2a8894 --- /dev/null +++ b/x11-toolkits/gtk+3/patches/testsuite.patch @@ -0,0 +1,14 @@ +diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am +index 99718b6..45eed14 100644 +--- a/testsuite/gtk/Makefile.am ++++ b/testsuite/gtk/Makefile.am +@@ -157,9 +157,6 @@ keyhash_SOURCES = \ + gtkkeyhash.c: $(top_srcdir)/gtk/gtkkeyhash.c + $(AM_V_GEN) $(LN_S) $^ $@ + +-gtkresources.c: $(top_builddir)/gtk/gtkresources.c +- $(AM_V_GEN) $(LN_S) $^ $@ +- + gtkprivate.c: $(top_srcdir)/gtk/gtkprivate.c + $(AM_V_GEN) $(LN_S) $^ $@ + |