summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/leafpad
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/leafpad')
-rw-r--r--meta/recipes-sato/leafpad/files/leafpad.desktop10
-rw-r--r--meta/recipes-sato/leafpad/files/owl-menu.patch63
-rw-r--r--meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch81
-rw-r--r--meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb37
4 files changed, 0 insertions, 191 deletions
diff --git a/meta/recipes-sato/leafpad/files/leafpad.desktop b/meta/recipes-sato/leafpad/files/leafpad.desktop
deleted file mode 100644
index c7e2d5bb58..0000000000
--- a/meta/recipes-sato/leafpad/files/leafpad.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
1[Desktop Entry]
2Name=Notes
3Exec=/usr/bin/leafpad
4Comment=Text Editor
5Icon=accessories-text-editor
6Terminal=false
7Type=Application
8Categories=GTK;Utility;TextEditor;
9X-MB-SingleInstance=true
10StartupNotify=true
diff --git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch
deleted file mode 100644
index 2ebf74a6f7..0000000000
--- a/meta/recipes-sato/leafpad/files/owl-menu.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Upstream-Status: Inappropriate [enable feature]
2
3--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
4+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
5@@ -152,7 +152,7 @@
6 }
7
8 accel_group = gtk_accel_group_new();
9- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
10+ ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group);
11 gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL);
12 gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL);
13 gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
14
15--- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100
16+++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100
17@@ -18,6 +18,8 @@
18 */
19
20 #include "leafpad.h"
21+#include <libowl/owlwindowmenu.h>
22+
23 /*
24 static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view)
25 {
26@@ -52,7 +54,6 @@
27 gtk_container_add(GTK_CONTAINER(window), vbox);
28
29 menubar = create_menu_bar(window);
30- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
31
32 sw = gtk_scrolled_window_new(NULL, NULL);
33 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
34
35--- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100
36+++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100
37@@ -244,6 +244,7 @@
38 Conf *conf;
39 GtkItemFactory *ifactory;
40 gchar *stdin_data = NULL;
41+ GtkWidget *menu;
42
43 bindtextdomain(PACKAGE, LOCALEDIR);
44 bind_textdomain_codeset(PACKAGE, "UTF-8");
45@@ -293,7 +294,10 @@
46 conf->autoindent);
47
48 gtk_widget_show_all(pub->mw->window);
49+ owl_set_window_menu (GTK_WINDOW(pub->mw->window),
50+ GTK_MENU(pub->mw->menubar));
51+
52 g_free(conf->fontname);
53 g_free(conf);
54
55
56--- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100
57+++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100
58@@ -27,4 +27,4 @@
59 i18n.h
60
61 leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS)
62-leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS)
63+leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl
diff --git a/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch b/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
deleted file mode 100644
index cf2687f015..0000000000
--- a/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 316ccb1733a6da726c0e7f0748e3e88ec459ca54 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Fri, 13 May 2016 14:36:51 -0500
4Subject: [PATCH] src/{dialog,gtkprint}.c: Fix security formatting issues
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9../../../../../../../workspace/sources/leafpad/src/dialog.c: In
10unction
11'run_dialog_message':
12../../../../../../../workspace/sources/leafpad/src/dialog.c:39:3:
13rror:
14format not a string literal and no format arguments
15[-Werror=format-security]
16 str);
17 ^
18../../../../../../../workspace/sources/leafpad/src/dialog.c: In
19unction
20'create_dialog_message_question':
21../../../../../../../workspace/sources/leafpad/src/dialog.c:64:3:
22rror:
23format not a string literal and no format arguments
24[-Werror=format-security]
25 str);
26
27../../../../../../../workspace/sources/leafpad/src/gtkprint.c: In
28function 'create_error_dialog':
29../../../../../../../workspace/sources/leafpad/src/gtkprint.c:168:3:
30error: format not a string literal and no format arguments
31[-Werror=format-security]
32 message);
33
34[YOCTO #9546]
35
36Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
37
38Upstream-status: Pending
39---
40 src/dialog.c | 4 ++--
41 src/gtkprint.c | 2 +-
42 2 files changed, 3 insertions(+), 3 deletions(-)
43
44diff --git a/src/dialog.c b/src/dialog.c
45index 14b69d7..8c8f2da 100644
46--- a/src/dialog.c
47+++ b/src/dialog.c
48@@ -36,7 +36,7 @@ void run_dialog_message(GtkWidget *window,
49 GTK_DIALOG_DESTROY_WITH_PARENT,
50 type,
51 GTK_BUTTONS_NONE,
52- str);
53+ str, NULL);
54 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
55 gtk_dialog_add_buttons(GTK_DIALOG(dialog),
56 GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
57@@ -61,7 +61,7 @@ GtkWidget *create_dialog_message_question(GtkWidget *window, gchar *message, ...
58 GTK_DIALOG_DESTROY_WITH_PARENT,
59 GTK_MESSAGE_QUESTION,
60 GTK_BUTTONS_NONE,
61- str);
62+ str, NULL);
63 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
64 gtk_dialog_add_buttons(GTK_DIALOG(dialog),
65 GTK_STOCK_NO, GTK_RESPONSE_NO,
66diff --git a/src/gtkprint.c b/src/gtkprint.c
67index 3f39384..e2bb83a 100644
68--- a/src/gtkprint.c
69+++ b/src/gtkprint.c
70@@ -165,7 +165,7 @@ static void create_error_dialog(GtkTextView *text_view, gchar *message)
71 GTK_DIALOG_DESTROY_WITH_PARENT,
72 GTK_MESSAGE_ERROR,
73 GTK_BUTTONS_NONE,
74- message);
75+ message, NULL);
76 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
77 gtk_dialog_add_buttons(GTK_DIALOG(dialog),
78 GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
79--
802.1.4
81
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
deleted file mode 100644
index e6a4b56133..0000000000
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
1SUMMARY = "Simple GTK+ Text Editor"
2HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
3
4LICENSE = "GPLv2 & GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
7 file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
8
9DEPENDS = "gtk+ intltool-native libowl gettext-native"
10# The libowl requires x11 in DISTRO_FEATURES
11REQUIRED_DISTRO_FEATURES = "x11"
12
13SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
14 file://leafpad.desktop \
15 file://src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch \
16 "
17
18SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
19SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
20PR = "r2"
21
22SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
23
24inherit autotools pkgconfig distro_features_check
25
26EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print"
27
28do_install_append () {
29 install -d ${D}/${datadir}
30 install -d ${D}/${datadir}/applications
31 install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
32}
33
34FILES_${PN} += "${datadir}/applications/leafpad.desktop"
35
36PACKAGES += "leafpad-stock-icons"
37FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-20 08:55:15 +0000