Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f4d71e04ee57d2ea3677cb7a510b8c9ee9599262)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f4d71e04ee57d2ea3677cb7a510b8c9ee9599262)
  • Date: Wed, 14 Feb 2018 19:02:30 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

x11-toolkits/gtk+3/HISTORY | 6 -
x11-toolkits/gtk+3/PRE_BUILD | 2
x11-toolkits/gtk+3/gtkfontchooserwidgetprivate.h.patch | 48
----------
x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch | 48
++++++++++
x11-toolkits/gtk+3/patches/testsuite.patch | 14 ++
5 files changed, 67 insertions(+), 51 deletions(-)

New commits:
commit f4d71e04ee57d2ea3677cb7a510b8c9ee9599262
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-toolkits/gtk+3: added patch for testsuite Makefile + some
reorganization

diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 66a82c8..7f506fe 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,7 +1,9 @@
2018-02-14 Pavel Vinogradov <public AT 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 AT sourcemage.org>
* DETAILS: version 3.22.26
diff --git a/x11-toolkits/gtk+3/PRE_BUILD b/x11-toolkits/gtk+3/PRE_BUILD
index 0773478..f80ee7d 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/gtkfontchooserwidgetprivate.h.patch
deleted file mode 100644
index 40d4909..0000000
--- a/x11-toolkits/gtk+3/gtkfontchooserwidgetprivate.h.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 842c2f9..63f88e9 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -481,6 +481,7 @@ gtk_private_h_sources = \
- gtkfilesystemmodel.h \
- gtkfontchooserprivate.h \
- gtkfontchooserutils.h \
-+ gtkfontchooserwidgetprivate.h \
- gtkgestureprivate.h \
- gtkgesturedragprivate.h \
- gtkgesturelongpressprivate.h \
-diff --git a/gtk/gtkfontchooserwidgetprivate.h
b/gtk/gtkfontchooserwidgetprivate.h
-new file mode 100644
-index 0000000..f51447e
---- /dev/null
-+++ b/gtk/gtkfontchooserwidgetprivate.h
-@@ -0,0 +1,30 @@
-+/* GTK - The GIMP Toolkit
-+ * Copyright (C) 2017 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see
<http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__
-+#define __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__
-+
-+#include "gtkfontchooserwidget.h"
-+
-+G_BEGIN_DECLS
-+
-+gboolean gtk_font_chooser_widget_handle_event (GtkWidget *widget,
-+ GdkEventKey *event);
-+
-+G_END_DECLS
-+
-+#endif /* __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__ */
diff --git a/x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch
b/x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch
new file mode 100644
index 0000000..40d4909
--- /dev/null
+++ b/x11-toolkits/gtk+3/patches/gtkfontchooserwidgetprivate.h.patch
@@ -0,0 +1,48 @@
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 842c2f9..63f88e9 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -481,6 +481,7 @@ gtk_private_h_sources = \
+ gtkfilesystemmodel.h \
+ gtkfontchooserprivate.h \
+ gtkfontchooserutils.h \
++ gtkfontchooserwidgetprivate.h \
+ gtkgestureprivate.h \
+ gtkgesturedragprivate.h \
+ gtkgesturelongpressprivate.h \
+diff --git a/gtk/gtkfontchooserwidgetprivate.h
b/gtk/gtkfontchooserwidgetprivate.h
+new file mode 100644
+index 0000000..f51447e
+--- /dev/null
++++ b/gtk/gtkfontchooserwidgetprivate.h
+@@ -0,0 +1,30 @@
++/* GTK - The GIMP Toolkit
++ * Copyright (C) 2017 Red Hat, Inc.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library. If not, see
<http://www.gnu.org/licenses/>.
++ */
++
++#ifndef __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__
++#define __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__
++
++#include "gtkfontchooserwidget.h"
++
++G_BEGIN_DECLS
++
++gboolean gtk_font_chooser_widget_handle_event (GtkWidget *widget,
++ GdkEventKey *event);
++
++G_END_DECLS
++
++#endif /* __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__ */
diff --git a/x11-toolkits/gtk+3/patches/testsuite.patch
b/x11-toolkits/gtk+3/patches/testsuite.patch
new file mode 100644
index 0000000..fc3f2a8
--- /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) $^ $@
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f4d71e04ee57d2ea3677cb7a510b8c9ee9599262), Pavel Vinogradov, 02/14/2018

Archive powered by MHonArc 2.6.24.

Top of Page