From 1b8dfe266937a37a4c642f96ceb2347bf4c00a17 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 10 Oct 2014 03:20:04 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- ...ering-of-LDADD-options-to-fix-a-compilati.patch | 28 +++++++++++++++ .../gpe-scap/gpe-scap/use.libsoup-2.4.patch | 42 ++++++++++++++++++++++ meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb | 23 ++++++++++++ .../libgpewidget/libgpewidget/glib-2.32.patch | 11 ++++++ .../libgpewidget/libgpewidget/pkgconfig.patch | 11 ++++++ .../libgpewidget/libgpewidget_0.117.bb | 23 ++++++++++++ .../minilite/minilite/makefile-fix.patch | 11 ++++++ .../recipes-graphics/minilite/minilite_0.50.bb | 16 +++++++++ 8 files changed, 165 insertions(+) create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb create mode 100644 meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch create mode 100644 meta-gpe/recipes-graphics/minilite/minilite_0.50.bb (limited to 'meta-gpe/recipes-graphics') diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch new file mode 100644 index 0000000000..c976ff4705 --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch @@ -0,0 +1,28 @@ +From c551dece6768f67b74b508e9c0133320205ef2df Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 23 May 2011 15:03:29 +0200 +Subject: [PATCH] Fix the ordering of LDADD options to fix a compilation failure. + +"invalid DSO for symbol `XUngrabServer' definition " + +Signed-off-by: Koen Kooi +--- + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 2fddc98..45bd850 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" \ + $(GLADE_CFLAGS) \ + -D_GNU_SOURCE + +-LIBS = $(GTK_LIBS) $(GLADE_LIBS) $(XSHAPE_LIBS) ++LIBS = -lX11 $(XSHAPE_LIBS) $(GLADE_LIBS) $(GTK_LIBS) + + bin_PROGRAMS = gpe-scap + gpe_scap_SOURCES = scr-i18n.h \ +-- +1.6.6.1 + diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch new file mode 100644 index 0000000000..3cfe5d7240 --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch @@ -0,0 +1,42 @@ +diff -uNr gpe-scap-1.4.orig/configure.ac gpe-scap-1.4/configure.ac +--- gpe-scap-1.4.orig/configure.ac 2009-03-05 18:53:53.000000000 +0100 ++++ gpe-scap-1.4/configure.ac 2012-05-06 10:18:29.348308322 +0200 +@@ -24,7 +24,7 @@ + AC_SUBST(LDFLAGS) + + dnl libraries +-GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.2" ++GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.4" + PKG_CHECK_MODULES(GTK, $GTK_MODULES) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) +diff -uNr gpe-scap-1.4.orig/src/scr-shot-common.c gpe-scap-1.4/src/scr-shot-common.c +--- gpe-scap-1.4.orig/src/scr-shot-common.c 2009-03-05 12:13:20.000000000 +0100 ++++ gpe-scap-1.4/src/scr-shot-common.c 2012-05-06 10:30:52.299371576 +0200 +@@ -182,12 +182,12 @@ + /* create session and message */ + session = soup_session_sync_new (); + message = soup_message_new ("POST", url); +- soup_message_add_header (message->request_headers, "User-Agent", "gpe-scap/" VERSION); +- soup_message_add_header (message->request_headers, "Accept", ++ soup_message_headers_append (message->request_headers, "User-Agent", "gpe-scap/" VERSION); ++ soup_message_headers_append (message->request_headers, "Accept", + "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); +-/* soup_message_add_header (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); +- soup_message_add_header (message->request_headers, "Keep-Alive", "100"); +- soup_message_add_header (message->request_headers, "Connection", "keep-alive"); ++/* soup_message_headers_append (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); ++ soup_message_headers_append (message->request_headers, "Keep-Alive", "100"); ++ soup_message_headers_append (message->request_headers, "Connection", "keep-alive"); + soup_message_wire add_header (message->request_headers, "Accept-Encoding", "gzip,deflate"); + */ + /* build message body */ +@@ -207,7 +207,7 @@ + memcpy (body + strlen (cmd) + len, tail, strlen (tail)); + + soup_message_set_request (message, "multipart/form-data; boundary="SEP, +- SOUP_BUFFER_SYSTEM_OWNED, body, content_len); ++ SOUP_MEMORY_TAKE, body, content_len); + + soup_session_send_message (session, message); + diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb new file mode 100644 index 0000000000..f51f616ddf --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb @@ -0,0 +1,23 @@ +SUMMARY = "A GPE application that allows you to take screenshots" +SECTION = "gpe" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup-2.4" + +PR = "r3" + +SRC_URI[md5sum] = "eaf545561b0ad981c9d01833f30fcf95" +SRC_URI[sha256sum] = "762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools + +SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch \ + file://use.libsoup-2.4.patch \ +" + +RREPLACES_${PN} = "gpe-screenshot" + diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch new file mode 100644 index 0000000000..f590caa46d --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch @@ -0,0 +1,11 @@ +diff -uNr libgpewidget-0.117.orig/gpehelp.c libgpewidget-0.117/gpehelp.c +--- libgpewidget-0.117.orig/gpehelp.c 2006-10-12 12:20:33.000000000 +0200 ++++ libgpewidget-0.117/gpehelp.c 2012-04-30 07:45:57.813293792 +0200 +@@ -33,7 +33,6 @@ + #include + #include + #include +-#include + + + /* helper function definitions*/ diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch new file mode 100644 index 0000000000..317e01a9b4 --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2006-02-04 17:37:55.000000000 +0100 ++++ configure.ac 2006-02-06 00:56:28.000000000 +0100 +@@ -36,7 +36,7 @@ + ENABLE_CAIRO=$enableval + ], + [ +- PKG_CHECK_EXISTS(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no]) ++ PKG_CHECK_MODULES(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no]) + ]) + + ENABLE_HILDON=false diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb new file mode 100644 index 0000000000..df774eed06 --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender" +PR = "r5" + +inherit gpe pkgconfig autotools gtk-doc + +SRC_URI += "file://pkgconfig.patch;striplevel=0 \ + file://glib-2.32.patch \ +" +SRC_URI[md5sum] = "b85a839264a35d0faf9a1a38c486e189" +SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c" + +GPE_TARBALL_SUFFIX = "bz2" + +EXTRA_OECONF = "--enable-cairo" +LDFLAGS += " -L${STAGING_LIBDIR}" + +PACKAGES =+ "${PN}-bin" diff --git a/meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch b/meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch new file mode 100644 index 0000000000..1be6ceaa8b --- /dev/null +++ b/meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-01-16 22:51:34.000000000 +0100 ++++ minilite-050/Makefile 2009-05-01 16:36:32.000000000 +0200 +@@ -45,7 +45,7 @@ + + install-program: all + mkdir -p $(DESTDIR)$(PREFIX)/bin +- $(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL) -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/meta-gpe/recipes-graphics/minilite/minilite_0.50.bb b/meta-gpe/recipes-graphics/minilite/minilite_0.50.bb new file mode 100644 index 0000000000..81095beea8 --- /dev/null +++ b/meta-gpe/recipes-graphics/minilite/minilite_0.50.bb @@ -0,0 +1,16 @@ +SUMMARY = "GPE Screen light control dockapp" +SECTION = "gpe" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://minilite.c;beginline=8;endline=11;md5=fe9332aaecbce9f74ce2bfeb91680ed1" + +DEPENDS = "libgpewidget" + +inherit gpe + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ + file://makefile-fix.patch" +SRC_URI[md5sum] = "d81cecf269ad7bab0da960e6e7228332" +SRC_URI[sha256sum] = "2b299425203246090a4949e034f1d0efb3ff99cd1591d0e16c57370a530b361e" + +export CVSBUILD="no" -- cgit v1.2.3-54-g00ecf