sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

leafpad: Replace with L3afpad 

L3afpad is a GTK+3 fork of leafpad.

(From OE-Core rev: b700bf582754b105976ad2de601193c8007842d9)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen 2016-04-27 14:49:14 +03:00 committed by Richard Purdie
parent 920fc82da8
commit 79faec0435
8 changed files with 27 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
View File

@ -187,7 +187,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
gtk-theme-clearlooks \
xdg-utils \
epiphany \
leafpad \
l3afpad \
pcmanfm \
vte \
"

4
meta/recipes-graphics/builder/files/builder_session.sh
View File

@ -23,8 +23,8 @@ if [ ! -d /home/builder/.local/share/applications ]; then
xdg-mime default epiphany.desktop x-scheme-handler/https
xdg-mime default epiphany.desktop text/html
#register text files with leafpad text editor
xdg-mime default leafpad.desktop text/plain
#register text files with l3afpad text editor
xdg-mime default l3afpad.desktop text/plain
fi
cd /home/builder/poky

23
meta/recipes-sato/l3afpad/l3afpad_git.bb Normal file
View File

@ -0,0 +1,23 @@
SUMMARY = "Simple GTK+ Text Editor"
HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad"
# Note that COPYING seems to mistakenly contain LGPLv2.1.
# The source code is marked GPLv2+ and COPYING used to contain
# that as well.
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
file://src/l3afpad.h;endline=20;md5=8848fd645cd45115d8cb47ca5c42a50e \
file://src/utils.c;endline=20;md5=ae4792f69d3bb7b7ba91d582ba9b1a05"
DEPENDS = "gtk+3 intltool-native gettext-native"
PV = "0.8.18.1.11+git${SRCPV}"
SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git"
SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff"
S = "${WORKDIR}/git"
inherit autotools pkgconfig distro_features_check
EXTRA_OECONF = "--disable-emacs --disable-print"
FILES_${PN} += "${datadir}/icons"

10
meta/recipes-sato/leafpad/files/leafpad.desktop
View File

@ -1,10 +0,0 @@
[Desktop Entry]
Name=Notes
Exec=/usr/bin/leafpad
Comment=Text Editor
Icon=accessories-text-editor
Terminal=false
Type=Application
Categories=GTK;Utility;TextEditor;
X-MB-SingleInstance=true
StartupNotify=true

63
meta/recipes-sato/leafpad/files/owl-menu.patch
View File

@ -1,63 +0,0 @@
Upstream-Status: Inappropriate [enable feature]
--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
@@ -152,7 +152,7 @@
}
accel_group = gtk_accel_group_new();
- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
+ ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group);
gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL);
gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL);
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
--- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100
+++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100
@@ -18,6 +18,8 @@
*/
#include "leafpad.h"
+#include <libowl/owlwindowmenu.h>
+
/*
static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view)
{
@@ -52,7 +54,6 @@
gtk_container_add(GTK_CONTAINER(window), vbox);
menubar = create_menu_bar(window);
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
--- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100
+++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100
@@ -244,6 +244,7 @@
Conf *conf;
GtkItemFactory *ifactory;
gchar *stdin_data = NULL;
+ GtkWidget *menu;
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -293,7 +294,10 @@
conf->autoindent);
gtk_widget_show_all(pub->mw->window);
+ owl_set_window_menu (GTK_WINDOW(pub->mw->window),
+ GTK_MENU(pub->mw->menubar));
+
g_free(conf->fontname);
g_free(conf);
--- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100
+++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100
@@ -27,4 +27,4 @@
i18n.h
leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS)
-leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS)
+leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl

81
meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch
View File

@ -1,81 +0,0 @@
From 316ccb1733a6da726c0e7f0748e3e88ec459ca54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
Date: Fri, 13 May 2016 14:36:51 -0500
Subject: [PATCH] src/{dialog,gtkprint}.c: Fix security formatting issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
../../../../../../../workspace/sources/leafpad/src/dialog.c: In
unction
'run_dialog_message':
../../../../../../../workspace/sources/leafpad/src/dialog.c:39:3:
rror:
format not a string literal and no format arguments
[-Werror=format-security]
str);
^
../../../../../../../workspace/sources/leafpad/src/dialog.c: In
unction
'create_dialog_message_question':
../../../../../../../workspace/sources/leafpad/src/dialog.c:64:3:
rror:
format not a string literal and no format arguments
[-Werror=format-security]
str);
../../../../../../../workspace/sources/leafpad/src/gtkprint.c: In
function 'create_error_dialog':
../../../../../../../workspace/sources/leafpad/src/gtkprint.c:168:3:
error: format not a string literal and no format arguments
[-Werror=format-security]
message);
[YOCTO #9546]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Upstream-status: Pending
---
src/dialog.c | 4 ++--
src/gtkprint.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/dialog.c b/src/dialog.c
index 14b69d7..8c8f2da 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -36,7 +36,7 @@ void run_dialog_message(GtkWidget *window,
GTK_DIALOG_DESTROY_WITH_PARENT,
type,
GTK_BUTTONS_NONE,
- str);
+ str, NULL);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
@@ -61,7 +61,7 @@ GtkWidget *create_dialog_message_question(GtkWidget *window, gchar *message, ...
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
- str);
+ str, NULL);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_NO, GTK_RESPONSE_NO,
diff --git a/src/gtkprint.c b/src/gtkprint.c
index 3f39384..e2bb83a 100644
--- a/src/gtkprint.c
+++ b/src/gtkprint.c
@@ -165,7 +165,7 @@ static void create_error_dialog(GtkTextView *text_view, gchar *message)
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_NONE,
- message);
+ message, NULL);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
--
2.1.4

37
meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
View File

@ -1,37 +0,0 @@
SUMMARY = "Simple GTK+ Text Editor"
HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
LICENSE = "GPLv2 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
DEPENDS = "gtk+ intltool-native libowl gettext-native"
# The libowl requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://leafpad.desktop \
file://src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch \
"
SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
PR = "r2"
SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
inherit autotools pkgconfig distro_features_check
EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print"
do_install_append () {
install -d ${D}/${datadir}
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
}
FILES_${PN} += "${datadir}/applications/leafpad.desktop"
PACKAGES += "leafpad-stock-icons"
FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"

2
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
View File

@ -47,7 +47,7 @@ WEB ?= ""
SUMMARY_${PN}-apps = "Sato desktop - applications"
RDEPENDS_${PN}-apps = "\
leafpad \
l3afpad \
gst-player-bin \
matchbox-terminal \
sato-screenshot \