tobi/M7350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M7350v1_en_gpl

Browse Source
This commit is contained in:
T
2024-09-09 08:52:07 +00:00
commit f9cc65cfda
65988 changed files with 26357421 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oe-core/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h
+5
View File
@@ -0,0 +1,5 @@
/* This is an auto-generated header, DO NOT EDIT! */
#define ICONV_ISO_D_FORMAT "iso-%d-%d"
#define ICONV_ISO_S_FORMAT "iso-%d-%s"
#define ICONV_10646 "iso-10646"
oe-core/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
+32
View File
@@ -0,0 +1,32 @@
Upstream-Status: Inappropriate [configuration]
Index: trunk/configure.in
===================================================================
--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
+++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000
@@ -254,25 +221,6 @@
AC_SUBST(ICONV_CFLAGS)
AC_SUBST(ICONV_LIBS)
-CFLAGS="$CFLAGS -I$srcdir"
-
-AC_MSG_CHECKING(preferred charset formats for system iconv)
-AC_TRY_RUN([
-#define CONFIGURE_IN
-#include "iconv-detect.c"
-],[
- AC_MSG_RESULT(found)
-],[
- AC_MSG_RESULT(not found)
- AC_WARN([
- *** The iconv-detect program was unable to determine the
- *** preferred charset formats recognized by your system
- *** iconv library. It is suggested that you install a
- *** working iconv library such as the one found at
- *** ftp://ftp.gnu.org/pub/gnu/libiconv
- ])
-])
-
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
oe-core/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
+201
View File
@@ -0,0 +1,201 @@
Replace the Novell sample contact with something more appropriate
Upstream-Status: Inappropriate [configuration]
Index: addressbook/libedata-book/ximian-vcard.h
===================================================================
--- addressbook/libedata-book/ximian-vcard.h.orig 2008-09-10 15:26:51.000000000 +0100
+++ addressbook/libedata-book/ximian-vcard.h 2011-12-19 15:25:05.846977809 +0000
@@ -1,80 +1,105 @@
#define XIMIAN_VCARD \
"BEGIN:VCARD\n" \
-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
-"TEL;WORK;VOICE:(617) 613-2000\n" \
-"TEL;WORK;FAX:(617) 613-2001\n" \
-"EMAIL;INTERNET:hello@ximian.com\n" \
-"URL:http://www.ximian.com/\n" \
-"ORG:Novell;Ximian Group\n" \
-"PHOTO;ENCODING=b;TYPE=JPEG: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\n" \
+"VERSION:3.0\n" \
+"FN:Yocto Project\n" \
+"URL:http://www.yoctoproject.org/\n" \
+"EMAIL:yocto@yoctoproject.org\n" \
+"TEL;TYPE=VOICE:+00 000 000 0000\n" \
+"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \
+"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \
+"PHOTO;ENCODING=b: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\n" \
"END:VCARD"
Index: addressbook/backends/file/Makefile.am
===================================================================
--- addressbook/backends/file/Makefile.am.orig 2008-09-10 15:26:50.000000000 +0100
+++ addressbook/backends/file/Makefile.am 2011-12-19 15:23:21.474975428 +0000
@@ -1,4 +1,5 @@
INCLUDES = \
+ -DCREATE_DEFAULT_VCARD \
-DG_LOG_DOMAIN=\"libebookbackend\" \
-I$(top_srcdir) \
-I$(top_builddir) \
oe-core/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch
+78
View File
@@ -0,0 +1,78 @@
G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
build failures. Also resolve other deprecation issues.
RP 2011/10/12
Upstream-Status: Pending
Index: git/libedataserver/e-data-server-util.c
===================================================================
--- git.orig/libedataserver/e-data-server-util.c 2011-10-12 01:42:40.622045788 +0100
+++ git/libedataserver/e-data-server-util.c 2011-10-12 01:48:16.732045664 +0100
@@ -165,7 +165,8 @@
static gunichar
stripped_char (gunichar ch)
{
- gunichar *decomp, retval;
+ gunichar decomp[4];
+ gunichar retval;
GUnicodeType utype;
gsize dlen;
@@ -175,7 +176,7 @@
case G_UNICODE_CONTROL:
case G_UNICODE_FORMAT:
case G_UNICODE_UNASSIGNED:
- case G_UNICODE_COMBINING_MARK:
+ case G_UNICODE_SPACING_MARK:
/* Ignore those */
return 0;
break;
@@ -183,7 +184,7 @@
/* Convert to lowercase, fall through */
ch = g_unichar_tolower (ch);
case G_UNICODE_LOWERCASE_LETTER:
- if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
+ if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
retval = decomp[0];
g_free (decomp);
return retval;
Index: git/addressbook/libedata-book/e-data-book-factory.c
===================================================================
--- git.orig/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:52:25.692045500 +0100
+++ git/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:53:31.862045707 +0100
@@ -238,7 +238,7 @@
return g_strdup_printf (
"/org/gnome/evolution/dataserver/addressbook/%d/%u",
getpid (),
- g_atomic_int_exchange_and_add (&counter, 1));
+ g_atomic_int_add (&counter, 1));
}
static void
Index: git/addressbook/libedata-book/e-data-book.c
===================================================================
--- git.orig/addressbook/libedata-book/e-data-book.c 2011-10-12 01:54:40.752045465 +0100
+++ git/addressbook/libedata-book/e-data-book.c 2011-10-12 01:55:16.012045897 +0100
@@ -553,7 +553,7 @@
return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
getpid (),
- g_atomic_int_exchange_and_add ((int*)&counter, 1));
+ g_atomic_int_add ((int*)&counter, 1));
}
static void
Index: git/calendar/libedata-cal/e-data-cal-factory.c
===================================================================
--- git.orig/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:56.612045081 +0100
+++ git/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:58.832045211 +0100
@@ -227,7 +227,7 @@
return g_strdup_printf (
"/org/gnome/evolution/dataserver/calendar/%d/%u",
getpid (),
- g_atomic_int_exchange_and_add (&counter, 1));
+ g_atomic_int_add (&counter, 1));
}
static void
oe-core/meta/recipes-sato/eds/eds-dbus/iconv-detect.h
+5
View File
@@ -0,0 +1,5 @@
/* This is an auto-generated header, DO NOT EDIT! */
#define ICONV_ISO_D_FORMAT "iso-%d-%d"
#define ICONV_ISO_S_FORMAT "iso-%d-%s"
#define ICONV_10646 "iso-10646"
oe-core/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
+23
View File
@@ -0,0 +1,23 @@
When contacts called for the 1st time, adding new contact always failed but
worked after restart. The reason is e-addressbook-factory used to handle
addressbook leads a segmentation fault. Root cause is that factory would create
the data base if not exist, but use it without proper initialization.
This patch fix it.
Upstream-Status: Submitted
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Index: git/addressbook/backends/file/e-book-backend-file.c
===================================================================
--- git.orig/addressbook/backends/file/e-book-backend-file.c 2010-10-20 16:14:31.000000000 +0800
+++ git/addressbook/backends/file/e-book-backend-file.c 2010-10-22 14:11:47.000000000 +0800
@@ -1217,6 +1217,8 @@
EContact *contact = NULL;
EBookBackendSyncStatus status;
+ /* Initialize file_db, or else following do_create cause seg fault */
+ bf->priv->file_db = db;
status = do_create (bf, XIMIAN_VCARD, &contact);
if (status != GNOME_Evolution_Addressbook_Success)
g_warning ("Cannot create default contact: %d", status);
oe-core/meta/recipes-sato/eds/eds-dbus/nossl.patch
+70
View File
@@ -0,0 +1,70 @@
Upstream-Status: Inappropriate [disable feature]
Index: git/camel/Makefile.am
===================================================================
--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
+++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000
@@ -80,7 +80,6 @@
camel-store-summary.c \
camel-store.c \
camel-tcp-stream-raw.c \
- camel-tcp-stream-ssl.c \
camel-tcp-stream.c \
camel-transport.c \
camel-uid-cache.c \
@@ -133,7 +132,6 @@
camel-store-summary.h \
camel-store.h \
camel-tcp-stream-raw.h \
- camel-tcp-stream-ssl.h \
camel-tcp-stream.h \
camel-transport.h \
camel-uid-cache.h \
Index: git/camel/camel.h
===================================================================
--- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000
+++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000
@@ -122,7 +122,6 @@
#include <camel/camel-string-utils.h>
#include <camel/camel-tcp-stream.h>
#include <camel/camel-tcp-stream-raw.h>
-#include <camel/camel-tcp-stream-ssl.h>
#include <camel/camel-text-index.h>
#include <camel/camel-transport.h>
#include <camel/camel-trie.h>
Index: git/camel/providers/imap/camel-imap-store.c
===================================================================
--- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000
+++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000
@@ -51,7 +51,6 @@
#include "camel/camel-stream.h"
#include "camel/camel-string-utils.h"
#include "camel/camel-tcp-stream-raw.h"
-#include "camel/camel-tcp-stream-ssl.h"
#include "camel/camel-url.h"
#include "camel/camel-utf8.h"
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000
+++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000
@@ -1272,7 +1272,8 @@
dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
dnl libical is fixed, we have to work-around the buggy CFlags.
dnl *****
- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
LIBICAL_EXTRA_LIBS=""
AC_SUBST(LIBICAL_EXTRA_CFLAGS)
AC_SUBST(LIBICAL_EXTRA_LIBS)
Index: git/calendar/libecal/libecal.pc.in
===================================================================
--- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000
+++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000
@@ -12,4 +12,4 @@
Version: @VERSION@
Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1
Libs: -L${libdir} -lecal-1.2
-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
+Cflags: -I${privincludedir}
oe-core/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
+203
View File
@@ -0,0 +1,203 @@
Replace the Novell sample contact with something more appropriate
Upstream-Status: Inappropriate [configuration]
Index: addressbook/libedata-book/ximian-vcard.h
===================================================================
--- addressbook/libedata-book/ximian-vcard.h.orig 2011-12-19 13:58:29.058859231 +0000
+++ addressbook/libedata-book/ximian-vcard.h 2011-12-19 14:41:48.678918549 +0000
@@ -1,80 +1,105 @@
#define XIMIAN_VCARD \
"BEGIN:VCARD\n" \
-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
-"TEL;WORK;VOICE:(617) 613-2000\n" \
-"TEL;WORK;FAX:(617) 613-2001\n" \
-"EMAIL;INTERNET:hello@ximian.com\n" \
-"URL:http://www.ximian.com/\n" \
-"ORG:Novell;Ximian Group\n" \
-"PHOTO;ENCODING=b;TYPE=JPEG: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\n" \
+"VERSION:3.0\n" \
+"FN:Yocto Project\n" \
+"URL:http://www.yoctoproject.org/\n" \
+"EMAIL:yocto@yoctoproject.org\n" \
+"TEL;TYPE=VOICE:+00 000 000 0000\n" \
+"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \
+"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \
+"PHOTO;ENCODING=b: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\n" \
"END:VCARD"
Index: addressbook/backends/file/Makefile.am
===================================================================
--- addressbook/backends/file/Makefile.am.orig 2011-12-19 13:58:28.954859229 +0000
+++ addressbook/backends/file/Makefile.am 2011-12-19 13:58:31.442859286 +0000
@@ -2,6 +2,7 @@
libebookbackendfile_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
+ -DCREATE_DEFAULT_VCARD \
-DG_LOG_DOMAIN=\"libebookbackend\" \
-I$(top_srcdir) \
-I$(top_builddir) \
oe-core/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
+19
View File
@@ -0,0 +1,19 @@
Do not disable old API after upgrading gtk+.
This avoid build error due to defination missing.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [configuration]
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800
+++ git/configure.ac 2010-12-16 10:25:58.000000000 +0800
@@ -147,7 +147,6 @@
AS_COMPILER_FLAGS(WARNING_FLAGS,
"-DG_DISABLE_DEPRECATED
-DPANGO_DISABLE_DEPRECATED
- -DGDK_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
oe-core/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
+64
View File
@@ -0,0 +1,64 @@
Upstream-Status: Inappropriate [disable feature]
Index: git/camel/providers/Makefile.am
===================================================================
--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800
+++ git/camel/providers/Makefile.am 2010-07-08 17:23:56.000000000 +0800
@@ -6,6 +6,10 @@
IMAP4_DIR=imap4
endif
+if ENABLE_IMAPX
+IMAPX_DIR=imapx
+endif
+
if ENABLE_HULA
HULA_DIR=hula
endif
@@ -15,6 +19,6 @@
SENDMAIL_DIR=sendmail
endif
-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imapx $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAPX_DIR) $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
-include $(top_srcdir)/git.mk
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-07-08 17:24:36.000000000 +0800
+++ git/configure.ac 2010-07-08 17:32:06.000000000 +0800
@@ -1002,6 +1002,26 @@
AM_CONDITIONAL(ENABLE_IMAP4, [test x$enable_imap4 = xyes])
dnl ******************************
+dnl IMAPX code support.
+dnl ******************************
+AC_ARG_ENABLE(imapx,
+ AS_HELP_STRING([--enable-imapx=no/yes],
+ [Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),
+ [],[enable_imapx=no])
+
+if test "x$enable_imapx" = "xyes"; then
+ AC_DEFINE(ENABLE_IMAPX,1,[Really don't try this at home])
+ AC_PATH_PROG(GPERF, gperf)
+ if test -z "$GPERF" ; then
+ AC_MSG_ERROR([You need gperf to compile imapx provider])
+ fi
+ msg_imapx=yes
+else
+ msg_imapx=no
+fi
+AM_CONDITIONAL(ENABLE_IMAPX, [test x$enable_imapx = xyes])
+
+dnl ******************************
dnl Hula support
dnl ******************************
AC_ARG_ENABLE([hula],
@@ -1541,3 +1561,7 @@
if test "x$msg_hula" = "xyes"; then
echo "Hula support: $msg_hula"
fi
+
+if test "x$msg_imapx" = "xyes"; then
+ echo "IMAPX support: $msg_imapx"
+fi
oe-core/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
+203
View File
@@ -0,0 +1,203 @@
Update git.mk to the version from Pango which has parallel make fixes.
http://git.gnome.org/browse/pango/log/git.mk
commit 6118d5891fee776a087855c335a73c79fdaf036c
RP 16/3/10
Upstream-Status: Pending
Index: git/git.mk
===================================================================
--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
+++ git/git.mk 2010-03-16 11:30:23.000000000 +0000
@@ -82,97 +82,106 @@
### .gitignore generation
$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
- @echo Generating $@; \
- GTKDOCGITIGNOREFILES=; \
- test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
- GTKDOCGITIGNOREFILES=" \
- $(DOC_MODULE)-decl-list.txt \
- $(DOC_MODULE)-decl.txt \
- tmpl/$(DOC_MODULE)-unused.sgml \
- tmpl/*.bak \
- xml html \
- "; \
- GNOMEDOCUTILSGITIGNOREFILES=; \
- test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
- GNOMEDOCUTILSGITIGNOREFILES=" \
- $(_DOC_C_DOCS) \
- $(_DOC_LC_DOCS) \
- $(_DOC_OMF_ALL) \
- $(_DOC_DSK_ALL) \
- $(_DOC_HTML_ALL) \
- $(_DOC_POFILES) \
- */.xml2po.mo \
- */*.omf.out \
- "; \
- INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
- INTLTOOLGITIGNOREFILES=" \
- po/Makefile.in.in \
- po/Makefile.in \
- po/Makefile \
- po/*.gmo \
- po/*.mo \
- po/POTFILES \
- po/stamp-it \
- po/.intltool-merge-cache \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- "; \
- AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
- AUTOCONFGITIGNOREFILES=" \
- autom4te.cache \
- configure \
- config.h \
- stamp-h1 \
- libtool \
- config.lt \
- "; \
- for x in \
- .gitignore \
- $$GTKDOCGITIGNOREFILES \
- $$GNOMEDOCUTILSGITIGNOREFILES \
- $$INTLTOOLGITIGNOREFILES \
- $$AUTOCONFGITIGNOREFILES \
- $(GITIGNOREFILES) \
- $(CLEANFILES) \
- $(PROGRAMS) \
- $(EXTRA_PROGRAMS) \
- $(LTLIBRARIES) \
- so_locations \
- .libs _libs \
- $(MOSTLYCLEANFILES) \
- "*.$(OBJEXT)" \
- "*.lo" \
- $(DISTCLEANFILES) \
- $(am__CONFIG_DISTCLEAN_FILES) \
- $(CONFIG_CLEAN_FILES) \
- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
- "*.tab.c" \
- $(MAINTAINERCLEANFILES) \
- $(BUILT_SOURCES) \
- $(DEPDIR) \
- Makefile \
- Makefile.in \
- "*.orig" \
- "*.rej" \
- "*.bak" \
- "*~" \
- ".*.sw[nop]" \
- ; do echo /$$x; done | \
+ $(AM_V_GEN) \
+ { \
+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+ for x in \
+ $(DOC_MODULE)-decl-list.txt \
+ $(DOC_MODULE)-decl.txt \
+ tmpl/$(DOC_MODULE)-unused.sgml \
+ "tmpl/*.bak" \
+ xml html \
+ ; do echo /$$x; done; \
+ fi; \
+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+ for x in \
+ $(_DOC_C_DOCS) \
+ $(_DOC_LC_DOCS) \
+ $(_DOC_OMF_ALL) \
+ $(_DOC_DSK_ALL) \
+ $(_DOC_HTML_ALL) \
+ $(_DOC_POFILES) \
+ "*/.xml2po.mo" \
+ "*/*.omf.out" \
+ ; do echo /$$x; done; \
+ fi; \
+ if test -f $(srcdir)/po/Makefile.in.in; then \
+ for x in \
+ po/Makefile.in.in \
+ po/Makefile.in \
+ po/Makefile \
+ po/POTFILES \
+ po/stamp-it \
+ po/.intltool-merge-cache \
+ "po/*.gmo" \
+ "po/*.mo" \
+ po/$(GETTEXT_PACKAGE).pot \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
+ ; do echo /$$x; done; \
+ fi; \
+ if test -f $(srcdir)/configure; then \
+ for x in \
+ autom4te.cache \
+ configure \
+ config.h \
+ stamp-h1 \
+ libtool \
+ config.lt \
+ ; do echo /$$x; done; \
+ fi; \
+ for x in \
+ .gitignore \
+ $(GITIGNOREFILES) \
+ $(CLEANFILES) \
+ $(PROGRAMS) \
+ $(check_PROGRAMS) \
+ $(EXTRA_PROGRAMS) \
+ $(LTLIBRARIES) \
+ so_locations \
+ .libs _libs \
+ $(MOSTLYCLEANFILES) \
+ "*.$(OBJEXT)" \
+ "*.lo" \
+ $(DISTCLEANFILES) \
+ $(am__CONFIG_DISTCLEAN_FILES) \
+ $(CONFIG_CLEAN_FILES) \
+ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+ "*.tab.c" \
+ $(MAINTAINERCLEANFILES) \
+ $(BUILT_SOURCES) \
+ $(DEPDIR) \
+ Makefile \
+ Makefile.in \
+ "*.orig" \
+ "*.rej" \
+ "*.bak" \
+ "*~" \
+ ".*.sw[nop]" \
+ ; do echo /$$x; done; \
+ } | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \
- LANG=C sort | uniq > $@.tmp && \
+ LC_ALL=C sort | uniq > $@.tmp && \
mv $@.tmp $@;
-all: $(srcdir)/.gitignore gitignore-recurse
-gitignore-recurse:
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
- done; \
+ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
fi;
+gitignore-recurse:
+ @for subdir in $(DIST_SUBDIRS); do \
+ case " $(SUBDIRS) " in \
+ *" $$subdir "*) :;; \
+ *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+ esac; \
+ done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
maintainer-clean: gitignore-clean
gitignore-clean:
-rm -f $(srcdir)/.gitignore
-.PHONY: gitignore-clean gitignore-recurse
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
oe-core/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
+96
View File
@@ -0,0 +1,96 @@
DESCRIPTION = "Evolution database backend server"
HOMEPAGE = "http://www.gnome.org/projects/evolution/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2 & LGPLv2+"
DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade"
PR = "r2"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution-data-server-dbus-${PV}.tar.gz \
file://oh-contact.patch;striplevel=0 \
file://no_iconv_test.patch \
file://iconv-detect.h"
SRC_URI[md5sum] = "69dc1e4eed6041a91aec76eacf7f17fb"
SRC_URI[sha256sum] = "aa537293c10153dad91aa31b50547e867946d7b937414f2ef734e40967e6ab0a"
S = "${WORKDIR}/evolution-data-server-dbus-${PV}"
inherit autotools pkgconfig
# -ldb needs this on some platforms
LDFLAGS += "-lpthread"
do_configure_append () {
cp ${WORKDIR}/iconv-detect.h ${S}
}
EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
--with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
--disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
libedataserver libedataserver-dev \
libedataserverui libedataserverui-dev"
FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
${libdir}/evolution-data-server*/extensions/.debug/"
RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \
${libdir}/libcamel-provider-*.so.* \
${libdir}/evolution-data-server-*/camel-providers/*.so \
${libdir}/evolution-data-server-*/camel-providers/*.urls"
FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
${libdir}/pkgconfig/camel*pc \
${libdir}/evolution-data-server-*/camel-providers/*.la \
${includedir}/evolution-data-server*/camel"
FILES_libebook = "${libdir}/libebook-*.so.*"
FILES_libebook-dev = "${libdir}/libebook-1.2.so \
${libdir}/pkgconfig/libebook-*.pc \
${includedir}/evolution-data-server*/libebook/*.h"
RRECOMMENDS_libebook = "libedata-book"
FILES_libecal = "${libdir}/libecal-*.so.* \
${datadir}/evolution-data-server-1.4/zoneinfo"
FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
${includedir}/evolution-data-server*/libecal/*.h \
${includedir}/evolution-data-server*/libical/*.h"
RRECOMMENDS_libecal = "libedata-cal tzdata"
FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
${datadir}/dbus-1/services/*.AddressBook.service \
${libdir}/libedata-book-*.so.* \
${libdir}/evolution-data-server-*/extensions/libebook*.so \
${datadir}/evolution-data-server-1.4/weather/Locations.xml"
FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
${libdir}/pkgconfig/libedata-book-*.pc \
${libdir}/evolution-data-server-*/extensions/libebook*.la \
${includedir}/evolution-data-server-*/libedata-book"
FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
${datadir}/dbus-1/services/*.Calendar.service \
${libdir}/libedata-cal-*.so.* \
${libdir}/evolution-data-server-*/extensions/libecal*.so"
FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
${libdir}/pkgconfig/libedata-cal-*.pc \
${includedir}/evolution-data-server-*/libedata-cal \
${libdir}/evolution-data-server-*/extensions/libecal*.la"
FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
${libdir}/pkgconfig/libedataserver-*.pc \
${includedir}/evolution-data-server-*/libedataserver/*.h"
FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
${libdir}/pkgconfig/libedataserverui-*.pc \
${includedir}/evolution-data-server-*/libedataserverui/*.h"
oe-core/meta/recipes-sato/eds/eds-dbus_git.bb
+111
View File
@@ -0,0 +1,111 @@
DESCRIPTION = "Evolution database backend server"
HOMEPAGE = "http://www.gnome.org/projects/evolution/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2 & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
file://libedataserver/e-data-server-util.h;endline=23;md5=9df8127bd8cfdc5469e938fc710d1f40 \
file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical gnome-keyring gperf-native"
SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f"
PV = "2.30+git${SRCPV}"
PR = "r4"
SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://oh-contact.patch;striplevel=0 \
file://nossl.patch \
file://optional_imapx_provider.patch \
file://new-contact-fix.patch \
file://old-gdk-api.patch \
file://depbuildfix.patch \
file://iconv-detect.h"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
# -ldb needs this on some platforms
LDFLAGS += "-lpthread"
# Parallel make shows many issues with this source code.
# Current problems seem to be duplicate execution of the calander/backends
# directories by make resulting in truncated/corrupt .la files
#PARALLEL_MAKE = ""
do_configure_prepend () {
echo "EXTRA_DIST = " > ${S}/gtk-doc.make
}
do_configure_append () {
cp ${WORKDIR}/iconv-detect.h ${S}
}
EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
--with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
--disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather"
PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
libedataserver libedataserver-dev \
libedataserverui libedataserverui-dev"
FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
${libdir}/evolution-data-server*/extensions/.debug/"
RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \
${libdir}/libcamel-provider-*.so.* \
${libdir}/evolution-data-server-*/camel-providers/*.so \
${libdir}/evolution-data-server-*/camel-providers/*.urls"
FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
${libdir}/pkgconfig/camel*pc \
${libdir}/evolution-data-server-*/camel-providers/*.la \
${includedir}/evolution-data-server*/camel"
FILES_libebook = "${libdir}/libebook-*.so.*"
FILES_libebook-dev = "${libdir}/libebook-1.2.so \
${libdir}/pkgconfig/libebook-*.pc \
${includedir}/evolution-data-server*/libebook/*.h"
RRECOMMENDS_libebook = "libedata-book"
FILES_libecal = "${libdir}/libecal-*.so.* \
${datadir}/evolution-data-server-1.4/zoneinfo"
FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
${includedir}/evolution-data-server*/libecal/*.h \
${includedir}/evolution-data-server*/libical/*.h"
RRECOMMENDS_libecal = "libedata-cal tzdata"
FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
${datadir}/dbus-1/services/*.AddressBook.service \
${libdir}/libedata-book-*.so.* \
${libdir}/evolution-data-server-*/extensions/libebook*.so \
${datadir}/evolution-data-server-1.4/weather/Locations.xml"
FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
${libdir}/pkgconfig/libedata-book-*.pc \
${libdir}/evolution-data-server-*/extensions/libebook*.la \
${includedir}/evolution-data-server-*/libedata-book"
FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
${datadir}/dbus-1/services/*.Calendar.service \
${libdir}/libedata-cal-*.so.* \
${libdir}/evolution-data-server-*/extensions/libecal*.so"
FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
${libdir}/pkgconfig/libedata-cal-*.pc \
${includedir}/evolution-data-server-*/libedata-cal \
${libdir}/evolution-data-server-*/extensions/libecal*.la"
FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
${libdir}/pkgconfig/libedataserver-*.pc \
${includedir}/evolution-data-server-*/libedataserver/*.h"
FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
${libdir}/pkgconfig/libedataserverui-*.pc \
${includedir}/evolution-data-server-*/libedataserverui/*.h"
oe-core/meta/recipes-sato/eds/eds-tools_git.bb
+18
View File
@@ -0,0 +1,18 @@
LICENSE = "GPLv2"
SECTION = "x11"
DEPENDS = "dbus-glib eds-dbus"
RDEPENDS_${PN} = "libedata-book"
DESCRIPTION = "Test applications for EDS"
SRCREV = "882df681014cf42f75882995e507c75254b6b62f"
PR = "r0"
SRC_URI = "git://github.com/rossburton/eds-tools.git;protocol=git"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
inherit autotools pkgconfig
S = "${WORKDIR}/${BPN}"
FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so"
oe-core/meta/recipes-sato/gaku/gaku_git.bb
+26
View File
@@ -0,0 +1,26 @@
DESCRIPTION = "Music player"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"
DEPENDS = "gtk+ gstreamer libowl-av"
RDEPENDS_${PN} = "gst-plugins-base-audioconvert \
gst-plugins-base-audioresample \
gst-plugins-base-typefindfunctions \
gst-plugins-base-playbin"
RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \
gst-plugins-base-vorbis \
gst-plugins-base-alsa \
gst-plugins-base-ogg \
${COMMERCIAL_AUDIO_PLUGINS}"
SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5"
PV = "0.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
+23
View File
@@ -0,0 +1,23 @@
DESCRIPTION = "Sato theme engine for GTK"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "LGPLv2.1 & LGPLv2+"
SECTION = "x11/base"
DEPENDS = "gtk+"
RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
PACKAGES += "gtk-theme-sato"
FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
FILES_${PN}-dbg += " ${libdir}/gtk-2.0/*/engines/.debug"
FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
inherit autotools pkgconfig
do_configure_prepend() {
for i in `ls gtk-common`; do
ln -sf ../gtk-common/$i gtk2-engine/$i
done
}
oe-core/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
+15
View File
@@ -0,0 +1,15 @@
require gtk-sato-engine.inc
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
SRCREV = "e4a29fbb7648f12fb3aefd8ea0120c3f54ba392a"
PV = "0.3.3+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
oe-core/meta/recipes-sato/images/core-image-sato-dev.bb
+12
View File
@@ -0,0 +1,12 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
DESCRIPTION = "A core-image-sato image suitable for development that also \
includes a native toolchain and libraries needed to build applications on the \
device itself."
IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
LICENSE = "MIT"
inherit core-image
oe-core/meta/recipes-sato/images/core-image-sato-sdk.bb
+13
View File
@@ -0,0 +1,13 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
DESCRIPTION = "A core-image-sato image that includes everything in \
meta-toolchain. The image also includes development headers and libraries \
to form a complete standalone SDK."
IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs"
EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks"
LICENSE = "MIT"
inherit core-image
oe-core/meta/recipes-sato/images/core-image-sato.bb
+11
View File
@@ -0,0 +1,11 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
DESCRIPTION = "An image with Sato support, a mobile environment and visual \
style that works well with mobile devices."
IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
LICENSE = "MIT"
inherit core-image
oe-core/meta/recipes-sato/leafpad/files/leafpad.desktop
+10
View File
@@ -0,0 +1,10 @@
[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
oe-core/meta/recipes-sato/leafpad/files/owl-menu.patch
+63
View File
@@ -0,0 +1,63 @@
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
oe-core/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+31
View File
@@ -0,0 +1,31 @@
DESCRIPTION = "Simple GTK+ Text Editor"
HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
BUGTRACKER = ""
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"
DEPENDS_append_poky = " libowl"
SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
file://leafpad.desktop"
SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
PR = "r1"
SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
inherit autotools pkgconfig
EXTRA_OECONF = " --enable-chooser --disable-gtktest --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"
oe-core/meta/recipes-sato/libical/files/pthread-fix.patch
+52
View File
@@ -0,0 +1,52 @@
New added pthread feathre leads some deadlock with some unlock code missing.
This patch fix it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Pending
Index: libical-0.47/src/libical/icaltimezone.c
===================================================================
--- libical-0.47.orig/src/libical/icaltimezone.c 2011-12-16 13:42:25.000000000 +0800
+++ libical-0.47/src/libical/icaltimezone.c 2011-12-16 14:16:25.000000000 +0800
@@ -1773,7 +1773,7 @@
filename = (char*) malloc (filename_len);
if (!filename) {
icalerror_set_errno(ICAL_NEWFAILED_ERROR);
- return;
+ goto out;
}
snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
@@ -1783,7 +1783,7 @@
free (filename);
if (!fp) {
icalerror_set_errno(ICAL_FILE_ERROR);
- return;
+ goto out;
}
@@ -1807,7 +1807,7 @@
if (!subcomp) {
icalerror_set_errno(ICAL_PARSE_ERROR);
- return;
+ goto out;
}
icaltimezone_get_vtimezone_properties (zone, subcomp);
@@ -1817,10 +1817,12 @@
icalcomponent_free(comp);
}
#endif
-#ifdef HAVE_PTHREAD
+
out:
+#ifdef HAVE_PTHREAD
pthread_mutex_unlock(&builtin_mutex);
#endif
+ return;
}
oe-core/meta/recipes-sato/libical/libical_0.48.bb
+17
View File
@@ -0,0 +1,17 @@
DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
HOMEPAGE = "http://sourceforge.net/projects/freeassociation/"
BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077"
LICENSE = "LGPLv2.1 | MPL-1"
LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
SECTION = "libs"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz\
file://pthread-fix.patch"
SRC_URI[md5sum] = "e549f434d5fbf9cd156c60ed4943618f"
SRC_URI[sha256sum] = "2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0"
inherit autotools
oe-core/meta/recipes-sato/libowl/libowl_git.bb
+21
View File
@@ -0,0 +1,21 @@
DESCRIPTION = "OpenedHand Widget Library"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2 & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \
file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \
file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730"
SECTION = "libs"
DEPENDS = "gtk+"
SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1"
PV = "0.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
+35
View File
@@ -0,0 +1,35 @@
Upstream-Status: Inappropriate [configuration]
Index: appearance/mb-appearance.c
===================================================================
--- appearance/mb-appearance.c (revision 1614)
+++ appearance/mb-appearance.c (working copy)
@@ -300,11 +300,13 @@
gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button),
gconf_value_get_string (value));
} else if (strcmp (key, HANDED_KEY) == 0) {
+#if 0
GEnumValue *e;
e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE),
gconf_value_get_string (value));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check),
e->value == GTK_CORNER_TOP_RIGHT);
+#endif
}
}
@@ -395,12 +397,13 @@
gtk_container_add (GTK_CONTAINER (align), font_button);
/* Left/Right Handed */
-
+#if 0
frame = new_frame (_("Orientation"), &align);
gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed"));
g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL);
gtk_container_add (GTK_CONTAINER (align), handed_check);
+#endif
gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL);
oe-core/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
+22
View File
@@ -0,0 +1,22 @@
DESCRIPTION = "Matchbox GTK+ theme configuration application."
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"
DEPENDS = "gconf gtk+"
RDEPENDS_${PN} = "settings-daemon"
SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
PV = "0.0+git${SRCPV}"
PR = "r0"
S = "${WORKDIR}/git"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://no-handed.patch;striplevel=0"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+22
View File
@@ -0,0 +1,22 @@
DESCRIPTION = "Sato desktop folders"
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SECTION = "x11"
DEPENDS = ""
CONFLICTS = "matchbox-common"
SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
PV = "0.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
FILES_${PN} += "${datadir}"
oe-core/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
+28
View File
@@ -0,0 +1,28 @@
after gcc linking has changed, all the libraries must be explicitely specified to for linking.
This patch avoids this linking error:
| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M
| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ldbus-1 -lpthread -lrt -lstartup-notification-1 ../libtaku/libinotify.a^M
| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M
| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
| collect2: ld returned 1 exit status^M
| make[2]: *** [matchbox-desktop] Error 1
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
Upstream-Status: Accepted
Index: matchbox-desktop-2/configure.ac
===================================================================
--- matchbox-desktop-2.orig/configure.ac
+++ matchbox-desktop-2/configure.ac
@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then
AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
fi
-PKG_CHECK_MODULES(GTK, gtk+-2.0)
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11])
AC_ARG_ENABLE(startup_notification,
AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]),
oe-core/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
+27
View File
@@ -0,0 +1,27 @@
DESCRIPTION = "Matchbox Window Manager Desktop"
LICENSE = "GPLv2.0+"
DEPENDS = "libmatchbox startup-notification"
SECTION = "x11/wm"
SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c"
SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793"
EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
inherit autotools pkgconfig
FILES_${PN} = "${bindir}/* \
${datadir}/applications \
${libdir}/matchbox/desktop/*.so \
${datadir}/matchbox-desktop \
${datadir}/pixmaps \
${sysconfdir}/matchbox"
FILES_${PN}-dev += "${libdir}/matchbox-desktop \
${includedir}/matchbox-desktop \
${libdir}/matchbox/desktop/*.*a \
${datadir}/matchbox/desktop/modules/*a"
FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
oe-core/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
+15
View File
@@ -0,0 +1,15 @@
DESCRIPTION = "Matchbox Window Manager Desktop"
LICENSE = "GPLv2.0+"
DEPENDS = "gtk+ startup-notification"
SECTION = "x11/wm"
PR = "r2"
SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \
file://dso_linking_change_build_fix.patch"
SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c"
SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75"
EXTRA_OECONF = "--enable-startup-notification"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
+23
View File
@@ -0,0 +1,23 @@
DESCRIPTION = "Matchbox Window Manager Desktop"
HOMEPAGE = "http://matchbox-project.org/"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://libtaku/eggsequence.h;endline=20;md5=b91f68f7642a1459fa1f4c9df94a8f15 \
file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \
file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00"
DEPENDS = "gtk+ startup-notification dbus"
SECTION = "x11/wm"
SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d"
PV = "2.0+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN}-2;protocol=git"
EXTRA_OECONF = "--enable-startup-notification --with-dbus"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
Executable
+23
View File
@@ -0,0 +1,23 @@
#!/bin/sh
. /etc/formfactor/config
CMD=""
if [ "$HAVE_KEYBOARD" = "0" ]; then
CMD="matchbox-keyboard -d"
elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
CMD="matchbox-keyboard -d -o landscape"
elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
CMD="matchbox-keyboard -d -o portrait"
fi
fi
if [ "$CMD" ]; then
# Delay to make sure the window manager is active
# by waiting for the desktop to say its finished loading
dbus-wait org.matchbox_project.desktop Loaded
exec $CMD
fi
oe-core/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
+15
View File
@@ -0,0 +1,15 @@
Upstream-Status: Inappropriate [configuration]
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
@@ -283,7 +283,7 @@
yes)
case "$expat" in
- yes)
+ yes|"")
EXPAT_LIBS="-lexpat"
;;
*)
oe-core/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
+23
View File
@@ -0,0 +1,23 @@
Multiple matchbox-keyboard instances would occupy whole screen and cause X
window segfault(Bug 509). Making matchbox-keyboard singleton is one work
around.
This patch allow only one instance of matchbox-keyboard based on some mechanism
in matchbox-desktop. In future, an applet and GTK-IM modules in
matchbox-keyboard can be used to automatically map/unmap the virtual keyboard
on demand.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [configuration]
Index: matchbox-keyboard/matchbox-keyboard.desktop
===================================================================
--- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800
+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800
@@ -6,3 +6,5 @@
Icon=matchbox-keyboard.png
Categories=Panel;Utility;MB
X-MB-INPUT-MECHANSIM=True
+X-MB-SingleInstance=true
+StartupNotify=true
oe-core/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+62
View File
@@ -0,0 +1,62 @@
DESCRIPTION = "Matchbox virtual keyboard for X11"
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/matchbox-keyboard.h;endline=20;md5=4ba16ff913ad245dd6d95a6c67f72526 \
file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
RDEPENDS_${PN} = "formfactor dbus-wait"
SECTION = "x11"
SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
PV = "0.0+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://configure_fix.patch;maxrev=1819 \
file://single-instance.patch \
file://80matchboxkeyboard.shbg"
S = "${WORKDIR}/git"
inherit autotools pkgconfig gettext
EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
FILES_${PN} = "${bindir}/* \
${sysconfdir} \
${datadir}/applications \
${datadir}/pixmaps \
${datadir}/matchbox-keyboard"
FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d/
install -m 755 ${WORKDIR}/80matchboxkeyboard.shbg ${D}/${sysconfdir}/X11/Xsession.d/
}
pkg_postinst_matchbox-keyboard-im () {
if [ "x$D" != "x" ]; then
exit 1
fi
gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
}
pkg_postrm_matchbox-keyboard-im () {
if [ "x$D" != "x" ]; then
exit 1
fi
gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
}
oe-core/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
+53
View File
@@ -0,0 +1,53 @@
Upstream-Status: Inappropriate [other] - need clean up
diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
@@ -210,9 +210,8 @@
{
XEvent *xevent;
xevent = (XEvent *) gdk_xevent;
- gboolean ret;
- ret = sn_display_process_event (applet->sn_display, xevent);
+ sn_display_process_event (applet->sn_display, xevent);
return GDK_FILTER_CONTINUE;
}
@@ -223,7 +222,6 @@
{
StartupApplet *applet;
Display *xdisplay;
- SnMonitorContext *context;
/* Create applet data structure */
applet = g_slice_new0 (StartupApplet);
@@ -248,7 +246,7 @@
applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
- context = sn_monitor_context_new (applet->sn_display,
+ sn_monitor_context_new (applet->sn_display,
DefaultScreen(xdisplay),
monitor_event_func,
(void *) applet,
diff -ur git.ORIG/applets/startup-notify/startup.c git/applets/startup-notify/startup.c
--- git.ORIG/applets/startup-notify/startup.c 2011-04-28 08:05:46.000000000 -0600
+++ git/applets/startup-notify/startup.c 2011-04-28 09:42:17.793864786 -0600
@@ -305,7 +305,6 @@
StartupApplet *applet;
GtkWidget *widget;
Display *xdisplay;
- SnMonitorContext *context;
applet = g_slice_new0 (StartupApplet);
@@ -317,7 +316,7 @@
applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
- context = sn_monitor_context_new (applet->sn_display,
+ sn_monitor_context_new (applet->sn_display,
DefaultScreen (xdisplay),
monitor_event_func,
applet, NULL);
oe-core/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+37
View File
@@ -0,0 +1,37 @@
DESCRIPTION = "A simple GTK+ based panel for handheld devices."
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \
file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
DEPENDS = "gtk+ startup-notification dbus dbus-glib"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35"
PV = "0.0+git${SRCPV}"
PR = "r2"
RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel"
RCONFLICTS_${PN} = "matchbox-panel"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://gcc-4.6.0-compile.patch"
EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
S = "${WORKDIR}/git"
FILES_${PN} += "${libdir}/matchbox-panel/*.so \
${datadir}/matchbox-panel/brightness/*.png \
${datadir}/matchbox-panel/startup/*.png "
FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
+22
View File
@@ -0,0 +1,22 @@
#!/bin/sh
. /etc/formfactor/config
if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
SHOWCURSOR="no"
else
SHOWCURSOR="yes"
fi
matchbox-desktop &
# Lines containing feature-[foo] are removed at build time if the machine
# doesn't have the feature "foo".
START_APPLETS=showdesktop,windowselector
END_APPLETS=clock,battery,systray,startup-notify,notify
END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
oe-core/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+51
View File
@@ -0,0 +1,51 @@
DESCRIPTION = "Custom MB session files for poky"
HOMEPAGE = "http://www.matchbox-project.org/"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2.0+"
LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
# Distro can override initscripts provider
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
SECTION = "x11"
RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato ${VIRTUAL-RUNTIME_initscripts} matchbox-session"
PR = "r29"
# This package is architecture specific because the session script is modified
# based on the machine architecture.
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI = "file://session"
S = "${WORKDIR}"
do_install() {
# This is the set of machine features that the script has markers for
FEATURES="phone"
SCRIPT="${S}/sedder"
rm -f $SCRIPT
touch $SCRIPT
for FEAT in $FEATURES; do
if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then
echo "/feature-$FEAT/d" >> $SCRIPT
fi
done
install -d ${D}/${sysconfdir}/matchbox
sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
chmod +x ${D}/${sysconfdir}/matchbox/session
}
pkg_postinst_${PN} () {
#!/bin/sh -e
if [ "x$D" != "x" ]; then
exit 1
fi
. ${sysconfdir}/init.d/functions
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
}
oe-core/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
+15
View File
@@ -0,0 +1,15 @@
Upstream-Status: Inappropriate [configuration]
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
@@ -283,7 +283,7 @@
yes)
case "$expat" in
- yes)
+ yes|"")
EXPAT_LIBS="-lexpat"
;;
*)
oe-core/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
+20
View File
@@ -0,0 +1,20 @@
Multiple matchbox-stroke instances would occupy whole screen and cause end user
confusing. Making matchbox-stroke singleton is one work around.
This patch allow only one instance of matchbox-stroke based on some mechanism
in matchbox-desktop.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [configuration]
Index: matchbox-stroke/matchbox-stroke.desktop
===================================================================
--- matchbox-stroke.orig/matchbox-stroke.desktop 2010-07-10 10:23:26.000000000 +0800
+++ matchbox-stroke/matchbox-stroke.desktop 2010-12-22 20:59:26.000000000 +0800
@@ -6,3 +6,5 @@
Icon=matchbox-stroke.png
Categories=Panel;Utility;MB
X-MB-INPUT-MECHANSIM=True
+X-MB-SingleInstance=true
+StartupNotify=true
oe-core/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
+25
View File
@@ -0,0 +1,25 @@
DESCRIPTION = "Matchbox stroke recogniser"
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://src/matchbox-stroke.h;endline=12;md5=8ed5c5bbec2321fbf5d31bdd55af03aa"
DEPENDS = "libfakekey expat libxft"
SECTION = "x11/wm"
SRCREV = "2b772583b61d2f6e8358e7c80e10293fc27cfcb7"
PV = "0.0+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://single-instance.patch \
file://configure_fix.patch;maxrev=1819"
S = "${WORKDIR}/git"
inherit autotools pkgconfig gettext
FILES_${PN} = "${bindir}/* \
${datadir}/applications \
${datadir}/pixmaps \
${datadir}/matchbox-stroke"
oe-core/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
+19
View File
@@ -0,0 +1,19 @@
DESCRIPTION = "Matchbox Terminal"
HOMEPAGE = "http://www.matchbox-project.org/"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820"
DEPENDS = "gtk+ vte"
SECTION = "x11/utils"
SRCREV = "3fc25cb811a8ed306de897edf9b930f4402f3852"
PV = "0.0+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
+11
View File
@@ -0,0 +1,11 @@
require matchbox-theme-sato.inc
DEPENDS = "matchbox-wm-2"
SRCREV = "e3ccc08d4a680d70fd4891fca966aa6ce503065c"
PV = "0.2+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2"
oe-core/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
+13
View File
@@ -0,0 +1,13 @@
DESCRIPTION = "Matchbox window manager Sato themes"
HOMEPAGE = "http://www.matchbox-project.org/"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "CC-BY-SA-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4"
DEPENDS = "matchbox-wm"
SECTION = "x11/wm"
inherit autotools pkgconfig
FILES_${PN} += "${datadir}/themes"
oe-core/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
+8
View File
@@ -0,0 +1,8 @@
require matchbox-theme-sato.inc
PR = "r1"
SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
SRC_URI[md5sum] = "72ae272ef7803141a3dcb69e670cff97"
SRC_URI[sha256sum] = "5b59f9646edbfb907a309332db3bd6fa7080dc1fe24df549480cfae7d974a3fb"
oe-core/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
+13
View File
@@ -0,0 +1,13 @@
require matchbox-theme-sato.inc
SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8"
PV = "0.2+git${SRCPV}"
PR = "r0"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git"
EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
S = "${WORKDIR}/git"
oe-core/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+42
View File
@@ -0,0 +1,42 @@
Fix music player crash if adding unknown type files.
Using bus message to call function flush_head/feed_head in main thread
to protect private data operation.
A better fix may be to listen to bus message "CODEC_NOT_FOUND" and
"MISSING_PLUGIN" directly to avoid hooking into "unknown-type" signal.
We will revisit it in next period.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Upstream-Status: Pending
diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c
--- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800
+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800
@@ -300,13 +300,23 @@
GstCaps *caps,
OwlTagReader *tag_reader)
{
+ GstMessage *message;
+ GstBus *bus;
+
tag_reader->priv->current_error =
g_error_new (OWL_TAG_READER_ERROR,
OWL_TAG_READER_ERROR_UNKNOWN_TYPE,
"Unknown type");
- flush_head (tag_reader);
- feed_head (tag_reader);
+ /**
+ * Post a message to the bus, as we are in another thread here.
+ **/
+ message = gst_message_new_error(GST_OBJECT (decodebin),
+ tag_reader->priv->current_error, NULL);
+
+ bus = gst_pipeline_get_bus (GST_PIPELINE (tag_reader->priv->pipeline));
+ gst_bus_post (bus, message);
+ gst_object_unref (GST_OBJECT (bus));
}
/**
oe-core/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+13
View File
@@ -0,0 +1,13 @@
Upstream-Status: Inappropriate [configuration]
Index: libowl-av/Makefile.am
===================================================================
--- libowl-av.orig/Makefile.am
+++ libowl-av/Makefile.am
@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
snapshot:
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
oe-core/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
+26
View File
@@ -0,0 +1,26 @@
DESCRIPTION = "OpenedHand Widget Library Audio/Video"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \
file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b"
SECTION = "x11"
DEPENDS = "gtk+ gstreamer gst-plugins-base"
RDEPENDS_${PN} = "gst-meta-base"
RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
SRCREV = "1379fd230a32509e94971961183f1031f469737a"
PV = "0.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://gst_change_state.patch \
file://make-382.patch"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
oe-core/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+40
View File
@@ -0,0 +1,40 @@
Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe
If the video player tries to play an unknown type file, it will enter
the error_cb() function, which is called in another thread.
Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
multi-thread operation.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Upstream-Status: Pending
diff -ruN video-orig/src/video.c video/src/video.c
--- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
@@ -96,6 +96,7 @@
{
GtkWidget *dialog;
+ gdk_threads_enter();
dialog = gtk_message_dialog_new (data->window,
GTK_DIALOG_NO_SEPARATOR,
GTK_MESSAGE_ERROR,
@@ -103,6 +104,7 @@
error->message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
+ gdk_threads_leave();
}
/**
@@ -606,7 +608,9 @@
gtk_widget_show_all (GTK_WIDGET (data->window));
+ gdk_threads_enter();
gtk_main ();
+ gdk_threads_leave();
/**
* Cleanup.
oe-core/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
+17
View File
@@ -0,0 +1,17 @@
Make 3.82 is much stricter and demands tabs. Obey.
JL - 15/12/10
Upstream-Status: Inappropriate [configuration]
Index: video/Makefile.am
===================================================================
--- video.orig/Makefile.am
+++ video/Makefile.am
@@ -4,5 +4,5 @@ SUBDIRS = src
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
snapshot:
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
oe-core/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop
+10
View File
@@ -0,0 +1,10 @@
[Desktop Entry]
Name=Video
Exec=video
Icon=video-player
Terminal=false
Type=Application
Categories=AudioVideo;Video;Player;
X-MB-SingleInstance=true
StartupNotify=true
Comment=Video Player
oe-core/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

oe-core/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

oe-core/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 570 B

oe-core/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 689 B

oe-core/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 630 B

oe-core/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 570 B

oe-core/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+41
View File
@@ -0,0 +1,41 @@
DESCRIPTION = "OpenedHand Widget Library video widget"
HOMEPAGE = "http://o-hand.com/"
BUGTRACKER = "http://bugzilla.o-hand.com/"
LICENSE = "LGPLv2.1 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \
file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d"
SECTION = "x11"
DEPENDS = "libowl-av"
SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
PV = "0.1+git${SRCPV}"
PR = "r0"
S = "${WORKDIR}/git"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://gtk_multithread_safe.patch \
file://owl-video-widget.png \
file://stock_media-play.png \
file://stock_volume-0.png \
file://stock_volume-min.png \
file://stock_volume-med.png \
file://stock_volume-max.png \
file://owl-video-widget.desktop \
file://make-382.patch"
inherit autotools pkgconfig
do_install_append () {
install -d ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications
}
oe-core/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
+18
View File
@@ -0,0 +1,18 @@
pcmanfm need a binary xml-purge(from its own source code) to optimize size of
data file, which cause build error on cross-compile environment. Simplely
remove it to work aound this issue.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [embedded specific]
Index: pcmanfm-0.9.7/data/ui/Makefile.am
===================================================================
--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800
+++ pcmanfm-0.9.7/data/ui/Makefile.am 2010-07-29 15:11:24.000000000 +0800
@@ -21,4 +21,4 @@
# Purge GtkBuilder UI files
%.ui: %.glade
cp $< $@
- $(top_builddir)/src/xml-purge $@
+# $(top_builddir)/src/xml-purge $@
oe-core/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 999 B

oe-core/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

oe-core/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

oe-core/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

oe-core/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
+81
View File
@@ -0,0 +1,81 @@
0.9.7 use a new menu bar from gtk_ui_manager, so need a translation here to
enable owl menu
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [enable feature]
Index: pcmanfm-0.9.9/configure.ac
===================================================================
--- pcmanfm-0.9.9.orig/configure.ac 2011-08-10 05:28:31.000000000 +0800
+++ pcmanfm-0.9.9/configure.ac 2011-10-10 15:47:33.000000000 +0800
@@ -70,6 +70,8 @@
gtk_modules="gtk+-2.0 >= 2.16.0"
PKG_CHECK_MODULES(GTK, [$gtk_modules])
+OWL_LIBS="-lowl"
+GTK_LIBS="$GTK_LIBS $OWL_LIBS"
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
Index: pcmanfm-0.9.9/src/main-win.c
===================================================================
--- pcmanfm-0.9.9.orig/src/main-win.c 2011-08-10 05:28:32.000000000 +0800
+++ pcmanfm-0.9.9/src/main-win.c 2011-10-10 15:50:48.000000000 +0800
@@ -37,6 +37,8 @@
#include "pref.h"
#include "tab-page.h"
+#include "libowl/owlwindowmenu.h"
+
static void fm_main_win_finalize (GObject *object);
G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
@@ -400,9 +402,27 @@
}
}
+/* Transfer gtk_ui_manager menubar to gtk menubar */
+static GtkWidget * ui_menubar_to_menu(GtkWidget *menubar)
+{
+ GtkWidget *main_menu;
+ GList *iter;
+
+ main_menu = gtk_menu_new();
+
+ for ( iter = gtk_container_get_children(GTK_CONTAINER(menubar));
+ iter;
+ iter = g_list_next(iter) )
+ {
+ GtkWidget *menu = GTK_WIDGET(iter->data);
+ gtk_widget_reparent(menu, main_menu);
+ }
+ return main_menu;
+}
+
static void fm_main_win_init(FmMainWin *win)
{
- GtkWidget *vbox, *menubar, *toolitem, *btn;
+ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *btn;
GtkUIManager* ui;
GtkActionGroup* act_grp;
GtkAction* act;
@@ -456,7 +476,6 @@
win->popup = gtk_ui_manager_get_widget(ui, "/popup");
gtk_menu_attach_to_widget(GTK_WIDGET(win->popup), win, NULL);
- gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
gtk_box_pack_start( (GtkBox*)vbox, win->toolbar, FALSE, TRUE, 0 );
/* load bookmarks menu */
@@ -517,6 +536,10 @@
gtk_container_add( (GtkContainer*)win, vbox );
gtk_widget_show_all(vbox);
+
+ owl_menubar = ui_menubar_to_menu(menubar);
+ gtk_widget_show_all(owl_menubar);
+ owl_set_window_menu(GTK_WINDOW(win), GTK_MENU(owl_menubar));
}
oe-core/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
+37
View File
@@ -0,0 +1,37 @@
DESCRIPTION = "Fast lightweight tabbed filemanager"
HOMEPAGE = "http://pcmanfm.sourceforge.net/"
BUGTRACKER = ""
LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \
file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
SECTION = "x11"
DEPENDS = "gtk+ startup-notification libfm"
DEPENDS_append_poky = " libowl"
PR = "r0"
COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*)-(linux|freebsd.*)'
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
file://gnome-fs-directory.png \
file://gnome-fs-regular.png \
file://gnome-mime-text-plain.png \
file://emblem-symbolic-link.png \
file://cross-compile-fix.patch"
SRC_URI_append_poky = " file://owl-window-menu.patch"
SRC_URI[md5sum] = "d34a3530a6c5dcd674d23021d71c3e95"
SRC_URI[sha256sum] = "f133c6f207f719d1fc69fe8bc07b2de6883c6937ffa87448df42e3b1a30e0298"
inherit autotools pkgconfig
do_install_append () {
install -d ${D}/${datadir}
install -d ${D}/${datadir}/pixmaps/
install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps
}
oe-core/meta/recipes-sato/pimlico/contacts.inc
+32
View File
@@ -0,0 +1,32 @@
DESCRIPTION = "Address-book application."
HOMEPAGE = "http://pimlico-project.org/contacts.html"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ eds-dbus"
DEPENDS_append_poky = " libowl"
RDEPENDS_${PN} = "libedata-book"
inherit autotools pkgconfig
OWL = "--disable-owl"
OWL_poky = "--enable-owl"
EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
do_install_append () {
install -d ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
}
FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
${datadir}/pixmaps/stock_person.png \
${datadir}/icons/hicolor"
SRC_URI = "file://stock_contact.png \
file://stock_person.png"
SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
oe-core/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
+54
View File
@@ -0,0 +1,54 @@
Upstream-Status: Inappropriate [enable feature]
Index: contacts-0.9/src/contacts-gtk.c
===================================================================
--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100
@@ -220,8 +220,8 @@
vbox7 = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (main_window), vbox7);
- main_menubar = gtk_menu_bar_new ();
- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
+ main_menubar = gtk_menu_new ();
+ gtk_widget_show (main_menubar);
contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts"));
gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
Index: contacts-0.9/src/Makefile.am
===================================================================
--- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100
+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100
@@ -40,7 +40,7 @@
contacts-@FRONTEND@.c \
contacts-@FRONTEND@.h
-contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS)
+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl
contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@
Index: contacts-0.9/src/contacts-main.c
===================================================================
--- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100
+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100
@@ -27,6 +27,8 @@
#include <libgnomevfs/gnome-vfs.h>
#endif
+#include <libowl/owlwindowmenu.h>
+
#include "bacon-message-connection.h"
#include "contacts-defs.h"
#include "contacts-utils.h"
@@ -266,6 +268,10 @@
gtk_widget_show_all (widget);
}
+ gtk_widget_show_all (data->ui->main_menubar);
+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
+ GTK_MENU (data->ui->main_menubar));
+
gtk_main ();
/* if we have modified the current contact, but not saved it, do so now */
oe-core/meta/recipes-sato/pimlico/contacts/make-382.patch
+16
View File
@@ -0,0 +1,16 @@
Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
JL - 15/12/10
Upstream-Status: Accepted
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
+++ git/Makefile.am
@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT)
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
snapshot:
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
oe-core/meta/recipes-sato/pimlico/contacts/stock_contact.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

oe-core/meta/recipes-sato/pimlico/contacts/stock_person.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

oe-core/meta/recipes-sato/pimlico/contacts_0.9.bb
+5
View File
@@ -0,0 +1,5 @@
require contacts.inc
PR = "r4"
SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
oe-core/meta/recipes-sato/pimlico/contacts_git.bb
+19
View File
@@ -0,0 +1,19 @@
require contacts.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933"
PV = "0.12+git${SRCPV}"
PR = "r3"
S = "${WORKDIR}/git"
SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \
file://make-382.patch"
S = "${WORKDIR}/git"
oe-core/meta/recipes-sato/pimlico/dates.inc
+20
View File
@@ -0,0 +1,20 @@
DESCRIPTION = "Dates is a calendar application."
HOMEPAGE = "http://pimlico-project.org/dates.html"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
RDEPENDS_${PN} = "libedata-cal"
inherit autotools gettext pkgconfig gtk-icon-cache
# Poky/Sato specific enhancements
OWL = "--disable-owl"
OWL_poky = "--enable-owl --disable-dnd"
EXTRA_OECONF += "${OWL}"
DEPENDS_append_poky = " libowl"
SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
oe-core/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
+67
View File
@@ -0,0 +1,67 @@
---
src/dates_gtk.c | 5 -----
src/dates_main.c | 5 +++++
src/dates_platform.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
Upstream-Status: Inappropriate [enable feature]
Index: git/src/dates_gtk.c
===================================================================
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
@@ -33,10 +33,6 @@
#endif
#ifndef DATES_PLATFORM_create_main_window
-/* the default implementation assumes that menu is GtkMenuBar */
-#ifdef DATES_MENU_WITHOUT_BAR
-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
-#endif
static GtkWidget *
create_main_window (DatesData * d, GtkWidget * toolbar,
GtkWidget * menu, GtkAccelGroup * accel_group)
@@ -59,7 +55,6 @@
gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
gtk_widget_show (menu);
- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
Index: git/src/dates_main.c
===================================================================
--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
@@ -26,6 +26,8 @@
#include <libical/icaltime.h>
#include <gconf/gconf-client.h>
+#include <gtk/gtkmenuitem.h>
+#include <libowl/owlwindowmenu.h>
#include "dates_types.h"
#include "dates_platform.h"
#include "dates_callbacks.h"
@@ -582,6 +584,9 @@
g_free (url_uri);
}
+ owl_set_window_menu (GTK_WINDOW (data.main_window),
+ GTK_MENU (data.main_menu));
+
gtk_main ();
return 0;
Index: git/src/dates_platform.h
===================================================================
--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
@@ -20,7 +20,7 @@
#include "dates_types.h"
-#ifdef WITH_HILDON
+#if 1
#define DATES_MENU_WITHOUT_BAR 1
#endif
oe-core/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
+46
View File
File diff suppressed because one or more lines are too long
oe-core/meta/recipes-sato/pimlico/dates/make-382.patch
+18
View File
@@ -0,0 +1,18 @@
Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
in upstream git.
JL - 15/12/10
Upstream-Status: Accepted
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
+++ git/Makefile.am
@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
snapshot:
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
oe-core/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
+37
View File
@@ -0,0 +1,37 @@
uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
therefore we introduce a check in configure for the this define
and then we make sure that we use it when it really exists
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2011-07-18 10:34:15.000000000 -0700
+++ git/configure.ac 2011-07-18 10:54:26.403798188 -0700
@@ -98,6 +98,8 @@
src/libgtkdatesview.pc
])
+AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
+
AC_OUTPUT
echo " "
Index: git/src/dates_view.c
===================================================================
--- git.orig/src/dates_view.c 2011-07-18 10:34:15.000000000 -0700
+++ git/src/dates_view.c 2011-07-18 10:58:46.093798136 -0700
@@ -1505,7 +1505,11 @@
priv->days = 1;
priv->months = 0;
priv->months_in_row = 4;
+#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
+#else
+ priv->week_start = 0;
+#endif
priv->dragbox = TRUE;
priv->single_click = TRUE;
priv->double_click = FALSE;
oe-core/meta/recipes-sato/pimlico/dates_0.4.8.bb
+5
View File
@@ -0,0 +1,5 @@
require dates.inc
PR = "r5"
SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
oe-core/meta/recipes-sato/pimlico/dates_git.bb
+18
View File
@@ -0,0 +1,18 @@
require dates.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://src/dates_view.h;endline=22;md5=29f934f356eb970309cdeb6693b3123a \
file://src/dates_hildon.c;endline=19;md5=63938904198b25de429abb65fbdbdb8a \
file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
PV = "0.4.11+git${SRCPV}"
PR = "r5"
S = "${WORKDIR}/git"
SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
file://make-382.patch \
file://dso_linking_change_build_fix.patch \
file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
"
oe-core/meta/recipes-sato/pimlico/tasks.inc
+16
View File
@@ -0,0 +1,16 @@
DESCRIPTION = "Task list application"
HOMEPAGE = "http://pimlico-project.org/tasks.html"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "GPLv2 & GPLv2+"
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ eds-dbus"
DEPENDS_append_poky = " libowl"
inherit autotools pkgconfig gtk-icon-cache
OWL ?= "--disable-owl"
OWL_poky ?= "--enable-owl"
EXTRA_OECONF += "${OWL}"
oe-core/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
+67
View File
@@ -0,0 +1,67 @@
This patch enable owl menu, which is hidden in the title bar to save space on
small screen. It has not been used for a long time, rebase needed.
Upstream-Status: Inappropriate [enable feature]
Index: src/gtk/tasks-ui.xml
===================================================================
--- src/gtk/tasks-ui.xml (revision 338)
+++ src/gtk/tasks-ui.xml (working copy)
@@ -7,17 +7,14 @@
<menuitem action="EditTask"/>
<menuitem action="CompleteTask"/>
<separator/>
+ <menuitem action="Undo"/>
+ <menuitem action="Redo"/>
+ <separator/>
<menuitem action="DeleteTask"/>
<menuitem action="PurgeTasks"/>
<separator/>
+ <menuitem action="About"/>
<menuitem action="Quit"/>
</menu>
- <menu action="EditMenu">
- <menuitem action="Undo"/>
- <menuitem action="Redo"/>
- </menu>
- <menu action="HelpMenu">
- <menuitem action="About"/>
- </menu>
</menubar>
</ui>
Index: src/gtk/main.c
===================================================================
--- src/gtk/main.c (revision 338)
+++ src/gtk/main.c (working copy)
@@ -21,6 +21,7 @@
#include <libecal/e-cal.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <libowl/owlwindowmenu.h>
#include <libkoto/ical-util.h>
#include <libkoto/koto-actions.h>
@@ -564,8 +565,8 @@
gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
gtk_ui_manager_ensure_update (ui_manager);
- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
+ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu");
+ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
box = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (box), 4);
Index: src/gtk/Makefile.am
===================================================================
--- src/gtk/Makefile.am (revision 338)
+++ src/gtk/Makefile.am (working copy)
@@ -4,7 +4,7 @@
bin_PROGRAMS = tasks
tasks_CPPFLAGS = -I$(top_srcdir)/
tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl
tasks_SOURCES = \
main.c \
oe-core/meta/recipes-sato/pimlico/tasks_0.19.bb
+15
View File
@@ -0,0 +1,15 @@
require tasks.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
OWL_poky = "--with-owl"
PR = "r1"
oe-core/meta/recipes-sato/pimlico/tasks_git.bb
+9
View File
@@ -0,0 +1,9 @@
require tasks.inc
SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65"
PV = "0.13+git${SRCPV}"
PR = "r2"
S = "${WORKDIR}/git"
oe-core/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
+203
View File
@@ -0,0 +1,203 @@
This patch enable owl menu, which is hidden in the title bar to save space on
small screen. It has not been used for a long time, rebase needed.
Upstream-Status: Inappropriate [enable feature]
Index: src/gtk.c
===================================================================
--- src/gtk.c (revision 22)
+++ src/gtk.c (working copy)
@@ -28,6 +28,8 @@
#include <gdk/gdkx.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <libowl/owlwindowmenu.h>
+
#include <librsvg/rsvg.h>
#include <X11/Xlib.h>
@@ -1237,6 +1239,7 @@
}
}
+#if 0
static void
add_widget (GtkUIManager *merge,
GtkWidget *widget,
@@ -1247,10 +1250,11 @@
gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
- gtk_widget_show_all (toplevel);
}
+#endif
static GtkActionEntry toplevel_actions[] = {
+ { "Top", NULL, "" },
{ "Game", NULL, N_("Game") },
{ "Settings", NULL, N_("Settings") },
{ "Help", NULL, N_("Help") },
@@ -1303,11 +1307,13 @@
frontend *fe)
{
GString *xml;
+ GError *error = NULL;
gboolean presets = FALSE;
GSList *radio_group = NULL;
int i;
- xml = g_string_new ("<ui><menubar><placeholder name=\"TypePlaceholder\">"
+ xml = g_string_new ("<ui><menubar><menu name=\"TopMenu\" action=\"Top\">"
+ "<placeholder name=\"TypePlaceholder\">"
"<menu name=\"SettingsMenu\" action=\"Settings\">");
for (i = 0; i < midend_num_presets(fe->me); i++) {
@@ -1359,8 +1365,14 @@
"<menuitem name=\"CustomMenu\" action=\"Custom\"/>");
}
- g_string_append (xml, "</menu></placeholder></menubar></ui>");
- gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL);
+ g_string_append (xml, "</menu></placeholder></menu></menubar></ui>");
+
+ gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, &error);
+ if (error != NULL) {
+ g_warning ("Error adding custom: %s", error->message);
+ g_error_free (error);
+ }
+
g_string_free (xml, TRUE);
}
@@ -1434,6 +1446,7 @@
new_window(char *arg, char **error)
{
frontend *fe;
+ GError *err = NULL;
GtkBox *vbox;
GtkUIManager *merge;
GtkActionGroup *actions;
@@ -1496,8 +1509,6 @@
gtk_window_add_accel_group(GTK_WINDOW(fe->window), fe->accelgroup);
merge = gtk_ui_manager_new ();
- g_signal_connect (G_OBJECT (merge), "add_widget",
- G_CALLBACK (add_widget), vbox);
actions = gtk_action_group_new ("PuzzleActions");
gtk_action_group_add_actions (actions, toplevel_actions,
@@ -1509,22 +1520,39 @@
gtk_ui_manager_insert_action_group (merge, actions, 0);
- gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", NULL);
+ gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml",
+ &err);
+ if (err != NULL) {
+ g_warning ("Error making UI: %s", err->message);
+ g_error_free (err);
+ err = NULL;
+ }
if (thegame.can_solve) {
- char *str = "<ui><menubar><menu name=\"GameMenu\" action=\"Game\">"
+ char *str = "<ui><menubar><menu name=\"TopMenu\" action=\"Top\">"
+ "<menu name=\"GameMenu\" action=\"Game\">"
"<placeholder name=\"SolvePlaceholder\">"
"<separator name=\"SolveSep\"/>"
"<menuitem name=\"SolveMenu\" action=\"Solve\"/>"
- "</placeholder></menu></menubar></ui>";
+ "</placeholder></menu></menu></menubar></ui>";
- gtk_ui_manager_add_ui_from_string (merge, str, -1, NULL);
+ gtk_ui_manager_add_ui_from_string (merge, str, -1, &err);
+ if (err != NULL) {
+ g_warning ("Error adding solve. %s", err->message);
+ g_error_free (err);
+ }
}
if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) {
generate_settings_menu (merge, actions, fe);
}
+ /* Do this so that the menu is packed now instead of in the idle loop */
+ gtk_ui_manager_ensure_update (merge);
+
+ owl_set_window_menu_item (GTK_WINDOW (fe->window),
+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu")));
+
setup_colours (fe);
setup_pixbufs (fe);
@@ -1572,7 +1600,7 @@
GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_MOTION_MASK);
- /* The window is shown once the menubar has been added */
+ gtk_widget_show_all (fe->window);
return fe;
}
Index: src/menu.xml
===================================================================
--- src/menu.xml (revision 22)
+++ src/menu.xml (working copy)
@@ -1,26 +1,25 @@
<ui>
<menubar>
-<menu name="GameMenu" action="Game">
- <menuitem name="NewMenu" action="New"/>
- <menuitem name="RestartMenu" action="Restart"/>
-<!-- <menuitem name="SpecificMenu" action="Specific"/> -->
- <menuitem name="RandomMenu" action="Random"/>
- <separator name="GameSep1"/>
- <menuitem name="LoadMenu" action="Load"/>
- <menuitem name="SaveMenu" action="Save"/>
- <separator name="GameSep2"/>
- <menuitem name="UndoMenu" action="Undo"/>
- <menuitem name="RedoMenu" action="Redo"/>
- <placeholder name="CopyPlaceholder"/>
- <placeholder name="SolvePlaceholder"/>
- <separator name="GameSep3"/>
- <menuitem name="QuitMenu" action="Quit"/>
-</menu>
+<menu name="TopMenu" action="Top">
+ <menu name="GameMenu" action="Game">
+ <menuitem name="NewMenu" action="New"/>
+ <menuitem name="RestartMenu" action="Restart"/>
+ <!-- <menuitem name="SpecificMenu" action="Specific"/> -->
+ <menuitem name="RandomMenu" action="Random"/>
+ <separator name="GameSep1"/>
+ <menuitem name="LoadMenu" action="Load"/>
+ <menuitem name="SaveMenu" action="Save"/>
+ <separator name="GameSep2"/>
+ <menuitem name="UndoMenu" action="Undo"/>
+ <menuitem name="RedoMenu" action="Redo"/>
+ <placeholder name="CopyPlaceholder"/>
+ <placeholder name="SolvePlaceholder"/>
+ </menu>
-<placeholder name="TypePlaceholder"/>
-
-<menu name="HelpMenu" action="Help">
+ <placeholder name="TypePlaceholder"/>
<menuitem name="AboutMenu" action="About"/>
+ <menuitem name="QuitMenu" action="Quit"/>
+
</menu>
</menubar>
</ui>
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 22)
+++ src/Makefile.am (working copy)
@@ -10,7 +10,7 @@
lightup loopy map mines net netslide pattern pegs rect samegame \
sixteen slant solo tents twiddle untangle
-libpuzzles_la_LIBADD = $(PUZZLES_LIBS)
+libpuzzles_la_LIBADD = $(PUZZLES_LIBS) -lowl
libpuzzles_la_SOURCES = combi.c \
configuration.c \
drawing.c \
oe-core/meta/recipes-sato/puzzles/oh-puzzles_git.bb
+70
View File
@@ -0,0 +1,70 @@
DESCRIPTION = "Portable Puzzle Collection"
HOMEPAGE = "http://o-hand.com/"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
file://src/tree234.h;endline=28;md5=a188e6d250430ca094a54a82f48472a7 \
file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
SECTION = "x11"
DEPENDS = "gtk+ gconf intltool-native librsvg"
DEPENDS_append_poky = " libowl"
SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
PV = "0.2+git${SRCPV}"
PR = "r10"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 "
S = "${WORKDIR}/git"
inherit autotools pkgconfig
bindir = "/usr/games"
EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
do_install_append () {
install -d ${D}/${datadir}/applications/
cd ${D}/${prefix}/games
for prog in *; do
if [ -x $prog ]; then
# Convert prog to Title Case
title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
echo "making ${D}/${datadir}/applications/$prog.desktop"
cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
[Desktop Entry]
Name=$title
Exec=${prefix}/games/$prog
Icon=applications-games
Terminal=false
Type=Application
Categories=Game;
StartupNotify=true
X-MB-SingleInstance=true
Comment=Play $title.
STOP
fi
done
}
PACKAGES += ${PN}-extra
RDEPENDS_${PN}-extra += "oh-puzzles"
FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/"
FILES_${PN}-dbg += "/usr/games/.debug/*"
FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas"
python __anonymous () {
import bb
var = bb.data.expand("FILES_${PN}", d, 1)
data = d.getVar(var, 1)
for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
data = data + " /usr/games/%s" % name
data = data + " /usr/share/applications/%s.desktop" % name
data = data + " /etc/gconf/schemas/%s.schemas" % name
d.setVar(var, data)
}
oe-core/meta/recipes-sato/puzzles/puzzles_r9375.bb
+62
View File
@@ -0,0 +1,62 @@
DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
DEPENDS = "gtk+ libxt"
PR = "r0"
MOD_PV = "${@d.getVar('PV',1)[1:]}"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5"
# Upstream updates puzzles.tar.gz for the new release, so checksums seem to be changing regularly right now
#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
SRC_URI[md5sum] = "25f2349611cdd8fb35d27b24f5b937a8"
SRC_URI[sha256sum] = "bddf4e52c328c98b9d95bd7daf6b9098f25e8272a7c1059ba69809eb619124a2"
S = "${WORKDIR}/${BPN}-${PV}"
do_configure () {
./mkfiles.pl
}
do_compile_prepend = " \
export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
export XLFLAGS=-lm \
export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*"
FILES_${PN}-dbg += "${prefix}/games/.debug"
do_install () {
rm -rf ${D}/*
export prefix=${D}
export DESTDIR=${D}
install -d ${D}/${prefix}/
install -d ${D}/${prefix}/games/
oe_runmake install
install -d ${D}/${datadir}/
install -d ${D}/${datadir}/applications/
cd ${D}/${prefix}/games
for prog in *; do
if [ -x $prog ]; then
# Convert prog to Title Case
title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
echo "making ${D}/${datadir}/applications/$prog.desktop"
cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
[Desktop Entry]
Name=$title
Exec=${prefix}/games/$prog
Icon=applications-games
Terminal=false
Type=Application
Categories=Game;
StartupNotify=true
X-MB-SingleInstance=true
STOP
fi
done
}
oe-core/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.14/rxvt.desktop
+9
View File
@@ -0,0 +1,9 @@
[Desktop Entry]
Version=1.0
Name=Terminal
Comment=A unicode capable rxvt clone
Exec=rxvt
Icon=terminal
Terminal=false
Type=Application
Categories=Utility;TerminalEmulator;
oe-core/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.14/rxvt.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

oe-core/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.14/xwc.patch
+26
View File
@@ -0,0 +1,26 @@
Upstream-Status: Pending
diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C
--- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800
+++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800
@@ -3152,7 +3152,7 @@
return false;
}
-#if 0
+#if HAVE_XWC
XTextProperty ct;
if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
@@ -3734,9 +3734,11 @@
}
else
#endif
+#ifdef HAVE_XWC
if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
freect = 1;
else
+#endif
{
/* if we failed to convert then send it raw */
ct.value = (unsigned char *)cl;
oe-core/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.14.bb
+68
View File
@@ -0,0 +1,68 @@
SECTION = "x11/utils"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
output. It also supports mixing multiple fonts at the \
same time, including Xft fonts."
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432"
DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
PR = "r0"
SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch \
file://rxvt.desktop \
file://rxvt.png"
SRC_URI[md5sum] = "022235a9a8b012c29e72c49177be6ce4"
SRC_URI[sha256sum] = "29928a33be6b3fb0edd126df2c3d35e1900f8268b546ce54430780c550fa1d52"
inherit autotools update-alternatives
PROVIDES = "virtual/x-terminal-emulator"
ALTERNATIVE_NAME = "x-terminal-emulator"
ALTERNATIVE_PATH = "${bindir}/rxvt"
CFLAGS_append = " -fpermissive"
# This is necessary so that the "tic" command executed during the install can
# link with the correct libary in staging.
export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
EXTRA_OECONF = "--enable-menubar --enable-xim \
--enable-utmp --enable-wtmp --enable-lastlog \
--disable-strings --with-term=rxvt --enable-keepscrolling \
--enable-xft --with-name=rxvt --enable-frills \
--enable-swapscreen --enable-transparency \
--with-codesets=eu \
--enable-cursor-blink --enable-pointer-blank \
--enable-text-blink --enable-rxvt-scroll \
--enable-combining --enable-shared \
--enable-xgetdefault \
--disable-perl \
--with-x=${STAGING_DIR_HOST}${prefix}"
do_configure_prepend () {
cp aclocal.m4 acinclude.m4
}
do_compile_prepend () {
echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
echo '#define HAVE_XLOCALE 1' >> config.h
}
do_install_append () {
install -d ${D}/${datadir}
install -d ${D}/${datadir}/applications
install -d ${D}/${datadir}/pixmaps/
install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
}
FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
oe-core/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+25
View File
@@ -0,0 +1,25 @@
DESCRIPTION = "Sato Icon Theme"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "CC-BY-SA-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
SECTION = "x11"
DEPENDS = ""
inherit autotools pkgconfig allarch
FILES_${PN} += "${datadir}"
EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
#explictly setting "Sato" as default icon theme to avoid icon missing due to
#tricky race condition
pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then
exit 1
fi
gtk-update-icon-cache -q /usr/share/icons/Sato
echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
}
oe-core/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
+53
View File
@@ -0,0 +1,53 @@
pkg-config will only search the target sysroot and we want the native script. This
patch adds an option to allow the path to the tool to be specified.
RP - 12/8/10
Upstream-Status: Pending
Index: sato-icon-theme-0.4.1/configure.ac
===================================================================
--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
+++ sato-icon-theme-0.4.1/configure.ac 2010-08-12 12:48:14.000000000 +0100
@@ -11,20 +11,29 @@
UTILS_REQUIRED=0.8.2
-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
-PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
- have_utils=yes, have_utils=no)
-if test "x$have_utils" = "xyes"; then
- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
- ICONMAP="$UTILS_PATH/icon-name-mapping"
- AC_SUBST(ICONMAP)
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
- and install sato-icon-theme])
+PKG_PROG_PKG_CONFIG()
+
+AC_ARG_WITH(iconmap,
+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
+ ICONMAP=$withval, ICONMAP="")
+
+if test "x$ICONMAP" = "x"; then
+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
+ have_utils=yes, have_utils=no)
+ if test "x$have_utils" = "xyes"; then
+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
+ ICONMAP="$UTILS_PATH/icon-name-mapping"
+
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
+ and install sato-icon-theme])
+ fi
fi
+AC_SUBST(ICONMAP)
AC_CONFIG_FILES([
Makefile
oe-core/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+11
View File
@@ -0,0 +1,11 @@
require sato-icon-theme.inc
DEPENDS += "icon-naming-utils-native"
PR = "r2"
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
file://iconpath-option.patch"
SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
oe-core/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
+15
View File
@@ -0,0 +1,15 @@
Fix the ordering of LDADD options to fix a compilation failure.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Upstream-Status: Inappropriate [configuration]
diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
--- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700
+++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800
@@ -23,4 +23,4 @@
# A standalone tool for running from a terminal and scripts
bin_PROGRAMS = screenshot
screenshot_SOURCES = main.c
-screenshot_LDADD = $(GTK_LIBS) libshot.la
+screenshot_LDADD = libshot.la $(GTK_LIBS)
oe-core/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+23
View File
@@ -0,0 +1,23 @@
DESCRIPTION = "An ultra-simple screen capture utility, aimed at handheld devices"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "GPLv2 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
DEPENDS = "matchbox-panel-2"
SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
PV = "0.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
file://fix_ldadd_order.patch"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
FILES_${PN} += "${libdir}/matchbox-panel/*.so"
FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
oe-core/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
+1
View File
@@ -0,0 +1 @@
/usr/bin/settings-daemon &

Some files were not shown because too many files have changed in this diff Show More