summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch29
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch31
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch31
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch57
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch38
-rw-r--r--meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb33
-rw-r--r--meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb44
7 files changed, 44 insertions, 219 deletions
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
deleted file mode 100644
index 4ad57effe9..0000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 17 May 2016 14:14:03 +0300
4Subject: [PATCH] Remove help directory from build
5
6It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils
7
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 Makefile.am | 3 ---
11 1 file changed, 3 deletions(-)
12
13diff --git a/Makefile.am b/Makefile.am
14index e57b203..a88152d 100644
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
18
19 SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx
20
21-if !OS_OSX
22-SUBDIRS += help
23-endif
24
25 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
26
27--
282.8.1
29
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch b/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
deleted file mode 100644
index 4885c45113..0000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 623ffac1f6e7725041b386e0f2933fe36809b5a9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 26 Aug 2017 09:04:30 -0700
4Subject: [PATCH] gedit-utils: qualify handle_builder_error() with format
5 string parameters
6
7gedit-utils.c:1063:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
8 msg_plain = g_strdup_vprintf (message, args);
9 ^~~~~~~
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 gedit/gedit-utils.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c
17index 41a5afd..c800828 100644
18--- a/gedit/gedit-utils.c
19+++ b/gedit/gedit-utils.c
20@@ -1051,7 +1051,7 @@ gedit_utils_is_valid_uri (const gchar *uri)
21 return TRUE;
22 }
23
24-static GtkWidget *
25+static G_GNUC_PRINTF(1, 2) GtkWidget *
26 handle_builder_error (const gchar *message, ...)
27 {
28 GtkWidget *label;
29--
302.14.1
31
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
deleted file mode 100644
index 11afe75ce1..0000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 06:53:35 -0700
4Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined
5 already
6
7Helps compile with musl
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 tests/document-saver.c | 4 ++++
12 1 file changed, 4 insertions(+)
13
14diff --git a/tests/document-saver.c b/tests/document-saver.c
15index 9f44d5a..811ade6 100644
16--- a/tests/document-saver.c
17+++ b/tests/document-saver.c
18@@ -41,6 +41,10 @@
19 #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt"
20 #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt"
21
22+#if !defined(ACCESSPERMS)
23+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
24+#endif
25+
26 static gboolean test_completed;
27 static gboolean mount_completed;
28 static gboolean mount_success;
29--
302.13.2
31
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
deleted file mode 100644
index a28808b8d4..0000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sat, 9 Mar 2013 12:47:06 +0100
4Subject: [PATCH] workaround void pointer arithmetic
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9fixes errors like:
10error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith]
11
12Upstream-Status: Inappropriate [configuration]
13
14Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
15---
16 gedit/gedit-document-input-stream.c | 4 ++--
17 gedit/gedit-smart-charset-converter.c | 2 +-
18 2 files changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c
21index 5a1f961..38316e7 100644
22--- a/gedit/gedit-document-input-stream.c
23+++ b/gedit/gedit-document-input-stream.c
24@@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream *stream,
25
26 do
27 {
28- n = read_line (dstream, buffer + read, space_left);
29+ n = read_line (dstream, ((char*)buffer) + read, space_left);
30 read += n;
31 space_left -= n;
32 } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0);
33@@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream *stream,
34
35 newline = get_new_line (dstream);
36
37- memcpy (buffer + read, newline, newline_size);
38+ memcpy (((char*)buffer) + read, newline, newline_size);
39
40 read += newline_size;
41 dstream->priv->newline_added = TRUE;
42diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c
43index e32b0b1..6745ce3 100644
44--- a/gedit/gedit-smart-charset-converter.c
45+++ b/gedit/gedit-smart-charset-converter.c
46@@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter,
47 do
48 {
49 res = g_converter_convert (G_CONVERTER (converter),
50- inbuf + nread,
51+ ((const char*)inbuf) + nread,
52 inbuf_size - nread,
53 out + nwritten,
54 out_size - nwritten,
55--
561.7.4.4
57
diff --git a/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
deleted file mode 100644
index a5d2310123..0000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 29 Jul 2016 23:19:40 +0200
4Subject: [PATCH] suppress string format literal warning to fix build with gcc6
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Pending
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12---
13 plugins/time/gedit-time-plugin.c | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c
17index d2ffdb9..441d9f9 100644
18--- a/plugins/time/gedit-time-plugin.c
19+++ b/plugins/time/gedit-time-plugin.c
20@@ -473,12 +473,15 @@ get_time (const gchar* format)
21 clock = time (NULL);
22 now = localtime (&clock);
23
24+#pragma GCC diagnostic push
25+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
26 do
27 {
28 out_length += 255;
29 out = g_realloc (out, out_length);
30 }
31 while (strftime (out, out_length, locale_format, now) == 0);
32+#pragma GCC diagnostic pop
33
34 g_free (locale_format);
35
36--
372.5.5
38
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
deleted file mode 100644
index 6e07208886..0000000000
--- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
1SUMMARY = "GNOME editor"
2SECTION = "x11/gnome"
3LICENSE = "GPLv2+"
4PR = "r2"
5
6DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \
7 gtksourceview2 iso-codes intltool-native gnome-common-native \
8 libice python3-six-native"
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
11
12inherit distro_features_check gnomebase gconf gettext python3native
13
14REQUIRED_DISTRO_FEATURES = "x11"
15
16SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
17 file://0001-workaround-void-pointer-arithmetic.patch \
18 file://0001-Remove-help-directory-from-build.patch \
19 file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \
20 file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \
21 file://0001-gedit-utils-qualify-handle_builder_error-with-format.patch \
22 "
23SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b"
24SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c"
25GNOME_COMPRESS_TYPE="bz2"
26
27EXTRA_OECONF = "--disable-scrollkeeper \
28 --enable-gvfs-metadata"
29
30LDFLAGS += "-lgmodule-2.0 -lICE"
31
32FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
33FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb b/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb
new file mode 100644
index 0000000000..9679a1ce6f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb
@@ -0,0 +1,44 @@
1SUMMARY = "GNOME editor"
2SECTION = "x11/gnome"
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
5
6GNOMEBASEBUILDCLASS = "meson"
7
8DEPENDS = " \
9 yelp-tools-native \
10 libxml2-native \
11 gdk-pixbuf-native \
12 iso-codes \
13 gtk+3 \
14 gsettings-desktop-schemas \
15 gtksourceview4 \
16 libpeas \
17 libsoup-2.4 \
18 gspell \
19 gtksourceview4 \
20"
21
22inherit gnomebase itstool gnome-help gobject-introspection gtk-doc vala gettext distro_features_check upstream-version-is-even
23
24REQUIRED_DISTRO_FEATURES = "x11"
25
26SRC_URI[archive.md5sum] = "ec6632fa73d9ea6c817e74a98d16eab6"
27SRC_URI[archive.sha256sum] = "3e95e51d3ccb495a9ac95aa3ed7fe8fe37ccde7c678f37fa3cea684bc71d507e"
28
29GTKDOC_MESON_OPTION = "documentation"
30
31PACKAGECONFIG ??= "gvfs"
32PACKAGECONFIG[gvfs] = "-Denable-gvfs-metadata=yes,-Denable-gvfs-metadata=no,,gvfs"
33
34PACKAGES += "${PN}-python"
35
36FILES_${PN} += " \
37 ${datadir}/dbus-1 \
38 ${datadir}/metainfo \
39"
40
41FILES_${PN}-python += " \
42 ${PYTHON_SITEPACKAGES_DIR} \
43"
44
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-01 17:32:49 +0000