[oe-commits] org.oe.dev merge of '6d07e119d774985e157fc9a56bb59bfbe0dcec50'
crofton commit
openembedded-commits at lists.openembedded.org
Tue Oct 2 20:04:40 UTC 2007
merge of '6d07e119d774985e157fc9a56bb59bfbe0dcec50'
and '7604e2e8a0c76d28ec378a7800c3e1a42b335da5'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: cd2d09bd89f1169ae4ec847af474c0e14580178d
ViewMTN: http://monotone.openembedded.org/revision/info/cd2d09bd89f1169ae4ec847af474c0e14580178d
Files:
1
packages/gtk-webcore/midori
packages/gtk-webcore/midori/midori.desktop
packages/gtk-webcore/midori_0.0.6.bb
packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch
packages/maemo3/libhildonfm
classes/mono.bbclass
packages/gtk-webcore/midori_0.0.8.bb
packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
packages/maemo3/libhildonfm_1.9.41.bb
packages/mono/collect-paths.py
packages/mono/mono-mcs-intermediate_1.2.5.1.bb
packages/mono/mono_files.py
packages/mtd/mtd-utils-tests_1.0.0+git.bb
classes/package.bbclass
conf/distro/include/sane-srcrevs.inc
conf/machine/htcblueangel.conf
conf/machine/hx4700.conf
packages/atk/atk_1.19.3.bb
packages/fontconfig/fontconfig_2.4.1.bb
packages/gtk+/gtk-2.10.inc
packages/libgcrypt/libgcrypt_1.2.3.bb
packages/linux/linux.inc
packages/maemo3/hildon-1_svn.bb
packages/maemo3/libhildonhelp_1.9.1.bb
packages/mono/README
packages/mono/mono_1.2.5.1.bb
packages/openmoko2/openmoko-dates2_svn.bb
packages/wifistix/wifistix-modules_5.0.16.p0.bb
Diffs:
#
# mt diff -r6d07e119d774985e157fc9a56bb59bfbe0dcec50 -rcd2d09bd89f1169ae4ec847af474c0e14580178d
#
#
#
# delete "packages/gtk-webcore/midori"
#
# delete "packages/gtk-webcore/midori/midori.desktop"
#
# delete "packages/gtk-webcore/midori_0.0.6.bb"
#
# delete "packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch"
#
# add_dir "packages/maemo3/libhildonfm"
#
# add_file "classes/mono.bbclass"
# content [8c6f975d1387bb98881133402216adc4c3dcaac8]
#
# add_file "packages/gtk-webcore/midori_0.0.8.bb"
# content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
#
# add_file "packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff"
# content [ee4fc470a3d819f5721c7acacfee0452817dcf8e]
#
# add_file "packages/maemo3/libhildonfm_1.9.41.bb"
# content [28bd888a778dcd453876624cbdc43e8650ebcd59]
#
# add_file "packages/mono/collect-paths.py"
# content [99c3e3ae6759faa7534a167d2460b09effd4bcbc]
#
# add_file "packages/mono/mono-mcs-intermediate_1.2.5.1.bb"
# content [cfb4d3805aa5678e130a2fe308b7bc1c5c8a9ded]
#
# add_file "packages/mono/mono_files.py"
# content [94dcfc9399594f824dcd8f036ce3d182d7193b16]
#
# add_file "packages/mtd/mtd-utils-tests_1.0.0+git.bb"
# content [03523cf6fd286f903f70fec99e153ed50f356c6d]
#
# patch "classes/package.bbclass"
# from [f055d1bce4ae74cd8130f0a0cd9c819aabc46c99]
# to [c40a90879037567f4894a6044537289dc71ffe3c]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [17f28a36948bf26950e4e783b1b5935187bfe68d]
# to [5d252a434632ec2bd023dab3ea432972270f3467]
#
# patch "conf/machine/htcblueangel.conf"
# from [e65ecf996a1d84af3f34a86f70afe617dec9e302]
# to [0c19233d7062948ae1fec57ba52f8627716d1dd2]
#
# patch "conf/machine/hx4700.conf"
# from [ff48628632c761276f1e19ddd62582b88b0b19ef]
# to [8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5]
#
# patch "packages/atk/atk_1.19.3.bb"
# from [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
# to [e94d8f3fd021065300ad78c840ea3acacdb490d8]
#
# patch "packages/fontconfig/fontconfig_2.4.1.bb"
# from [868e4f599ca1566fbb69670fe3438b55be3102e1]
# to [72b20501701af3510e5f8a1d9644dd7748b52169]
#
# patch "packages/gtk+/gtk-2.10.inc"
# from [2047151920b91f2368752f4cc49b73a3992106a0]
# to [162cf297e438ae9441b397783b38eb85d188382d]
#
# patch "packages/libgcrypt/libgcrypt_1.2.3.bb"
# from [e276a08d0c5be389810c76df1d581dbc07ac6eb8]
# to [b1dae0759fc4781ccd62f97bbf98ed78f9053815]
#
# patch "packages/linux/linux.inc"
# from [fe2aad9ac6339d281fd752e0dfb55dedfd1bc88a]
# to [f2839da09edfd537b53bf525e01839ea27f5767a]
#
# patch "packages/maemo3/hildon-1_svn.bb"
# from [a3c930f472ff7778ca8ec08ae57d1087310b54d3]
# to [6024377620c35f410873bffd7b553a6ddb28bbb3]
#
# patch "packages/maemo3/libhildonhelp_1.9.1.bb"
# from [794cf71da9f0589bdd9c513647e1875421c19e81]
# to [cd086e94da64dcf8c822f1ee0eb56e18c2526ab5]
#
# patch "packages/mono/README"
# from [8785ebebeb5995aafc71ea1e5c86e979a698470a]
# to [faa418e9818e111d50c8516b915b7f627fda79c9]
#
# patch "packages/mono/mono_1.2.5.1.bb"
# from [9499f337192480513d8f5e4e93ed53b3fe0f63ff]
# to [fcfef733807a03e005b267996fee10306b1d8df0]
#
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
# from [3be39f7f10cdcd32b56ee3135d4c0ce268a14ea5]
# to [c0b82b2d1232131cff214e735e422d252a154e6d]
#
============================================================
--- classes/mono.bbclass 8c6f975d1387bb98881133402216adc4c3dcaac8
+++ classes/mono.bbclass 8c6f975d1387bb98881133402216adc4c3dcaac8
@@ -0,0 +1,214 @@
+def mono_get_file_table(packageversion, d):
+ # The packageversion is currently ignored, but might be used in the future
+ # if more than one mono version is available and different versions
+ # need to use different tables
+
+ import bb, sys, os, glob, commands
+ curdir = os.path.dirname( bb.data.getVar('FILE', d, 1) )
+ if curdir not in sys.path: sys.path.append( curdir )
+ from mono_files import debian_mono_file_table
+
+ # mono-jay is not being built (for all platforms at least)
+ IGNORE = ("mono-jay", )
+ file_table = [
+ # Standard package
+ {"name": "mono-doc"},
+
+ # Virtual packages
+ {"name": "mono"},
+ {"name": "mono-runtime"},
+
+ # Not provided by Debian:
+ {"name": "libnunit2.2-cil",
+ "patterns": [
+ "/usr/lib/mono/gac/nunit.*/2.2.*",
+ "/usr/lib/mono/1.0/nunit.*.dll",
+ "/usr/lib/pkgconfig/mono-nunit.pc",
+ ],
+ "assemblies": [
+ ("nunit.core", "2.2.0.0"),
+ ("nunit.framework", "2.2.0.0"),
+ ("nunit.util", "2.2.0.0"),
+ ("nunit.mocks", "2.2.8.0"),
+ ],
+ },
+ {"name": "libmono-cecil0.5-cil",
+ "patterns": [
+ "/usr/lib/mono/gac/Mono.Cecil/0.5.*",
+ ],
+ "assemblies": [
+ ("Mono.Cecil", "0.5.*"),
+ ],
+ },
+ {"name": "libmono-db2-1.0-cil",
+ "patterns": [
+ "/usr/lib/mono/gac/IBM.Data.DB2/1.0*",
+ "/usr/lib/mono/1.0/IBM.Data.DB2.dll",
+ ],
+ "assemblies": [
+ ("IBM.Data.DB2", "1.0*"),
+ ],
+ },
+ ] + debian_mono_file_table
+
+ file_table = [e for e in file_table
+ if not (e.has_key("name") and e["name"] in IGNORE)]
+
+ return file_table
+
+def mono_find_provides_and_requires(files, d):
+ provides = []
+ requires = []
+
+ import bb, os, commands
+
+ pathprefix = "export PATH=%s; export LANG=; export LC_ALL=; " % bb.data.getVar('PATH', d, 1)
+ for filename in files:
+ if not filename.endswith(".dll") and not filename.endswith(".exe"):
+ continue
+ if not os.path.isfile(filename) or os.path.islink(filename):
+ continue
+
+ ## Provides
+ name, version = None, None
+
+ ret, result = commands.getstatusoutput("%smonodis --assembly '%s'" % (pathprefix, filename))
+ if ret:
+ bb.error("raw_provides_and_requires: monodis --assembly '%s' failed, dependency information will be inaccurate" % filename)
+ continue
+ for line in result.splitlines():
+ if not ":" in line: continue
+ key, value = line.split(":", 1)
+ if key.strip() == "Name":
+ name = value.strip()
+ elif key.strip() == "Version":
+ version = value.strip()
+ if name is not None and version is not None:
+ if (name, version) not in provides:
+ provides.append( (name, version) )
+
+ ## Requires
+ name, version = None, None
+ ret, result = commands.getstatusoutput("%smonodis --assemblyref '%s'" % (pathprefix, filename))
+ if ret:
+ bb.error("raw_provides_and_requires: monodis --assemblyref '%s' failed, dependency information will be inaccurate" % filename)
+ continue
+ for line in result.splitlines():
+ if not "=" in line: continue
+ key, value = line.split("=", 1)
+ if ":" in key and key.split(":",1)[1].strip() == "Version":
+ version = value.strip()
+ elif key.strip() == "Name":
+ name = value.strip()
+ if name is not None and version is not None:
+ if (name, version) not in requires:
+ requires.append( (name, version) )
+ name, version = None, None
+
+ # Remove everything from requires that's already in provides as it's not actually required
+ # to be provided externally
+ requires = [e for e in requires if not e in provides]
+ return provides, requires
+
+python mono_do_clilibs() {
+ import bb, os, re, os.path
+
+ exclude_clilibs = bb.data.getVar('EXCLUDE_FROM_CLILIBS', d, 0)
+ if exclude_clilibs:
+ bb.note("not generating clilibs")
+ return
+
+ lib_re = re.compile("^lib.*\.so")
+ libdir_re = re.compile(".*/lib$")
+
+ packages = bb.data.getVar('PACKAGES', d, 1)
+
+ workdir = bb.data.getVar('WORKDIR', d, 1)
+ if not workdir:
+ bb.error("WORKDIR not defined")
+ return
+
+ staging = bb.data.getVar('STAGING_DIR', d, 1)
+ if not staging:
+ bb.error("STAGING_DIR not defined")
+ return
+
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+
+ clilibs_dir = os.path.join(staging, "clilibs")
+ bb.mkdirhier(clilibs_dir)
+
+ provides, requires = {}, {}
+ private_libs = bb.data.getVar('PRIVATE_CLILIBS', d, 1)
+ for pkg in packages.split():
+ bb.debug(2, "calculating clilib provides for %s" % pkg)
+
+ files_to_check = []
+ top = os.path.join(pkgdest, pkg)
+ for root, dirs, files in os.walk(top):
+ for file in files:
+ path = os.path.join(root, file)
+ if file.endswith(".exe") or file.endswith(".dll"):
+ files_to_check.append( path )
+ provides[pkg], requires[pkg] = mono_find_provides_and_requires(files_to_check, d)
+ clilibs_file = os.path.join(clilibs_dir, pkg + ".list")
+ if os.path.exists(clilibs_file):
+ os.remove(clilibs_file)
+ if len(provides[pkg]) > 0:
+ fd = open(clilibs_file, 'w')
+ for s in provides[pkg]:
+ fd.write(" ".join(s) + '\n')
+ fd.close()
+
+ clilib_provider = {}
+ list_re = re.compile('^(.*)\.list$')
+ for file in os.listdir(clilibs_dir):
+ m = list_re.match(file)
+ if m:
+ dep_pkg = m.group(1)
+ fd = open(os.path.join(clilibs_dir, file))
+ lines = fd.readlines()
+ fd.close()
+ for l in lines:
+ clilib_provider[tuple(l.rstrip().split())] = dep_pkg
+
+ for pkg in packages.split():
+ bb.debug(2, "calculating clilib requirements for %s" % pkg)
+
+ deps = []
+ for n in requires[pkg]:
+ if n in clilib_provider.keys():
+ dep_pkg = clilib_provider[n]
+
+ if dep_pkg == pkg:
+ continue
+
+ if not dep_pkg in deps:
+ deps.append(dep_pkg)
+ else:
+ bb.note("Couldn't find CLI library provider for %s" % n)
+
+ deps_file = os.path.join(pkgdest, pkg + ".clilibdeps")
+ if os.path.exists(deps_file):
+ os.remove(deps_file)
+ if len(deps) > 0:
+ fd = open(deps_file, 'w')
+ for dep in deps:
+ fd.write(dep + '\n')
+ fd.close()
+}
+
+python() {
+ # Insert mono_do_clilibs into PACKAGEFUNCS
+ # Needs to be called after populate_packages, but before read_shlibdeps
+ PACKAGEFUNCS = bb.data.getVar("PACKAGEFUNCS", d, 1)
+ if PACKAGEFUNCS:
+ PACKAGEFUNCS = PACKAGEFUNCS.split()
+ if "read_shlibdeps" in PACKAGEFUNCS:
+ i = PACKAGEFUNCS.index("read_shlibdeps")
+ PACKAGEFUNCS.insert(i, "mono_do_clilibs")
+ elif "populate_packages" in PACKAGEFUNCS:
+ i = PACKAGEFUNCS.index("populate_packages")
+ PACKAGEFUNCS.insert(i+1, "mono_do_clilibs")
+ bb.data.setVar("PACKAGEFUNCS", " ".join(PACKAGEFUNCS), d)
+}
============================================================
--- packages/gtk-webcore/midori_0.0.8.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.8.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+ "
+
+
============================================================
--- packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff ee4fc470a3d819f5721c7acacfee0452817dcf8e
+++ packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff ee4fc470a3d819f5721c7acacfee0452817dcf8e
@@ -0,0 +1,132 @@
+--- /tmp/hildon-file-selection.c 2007-10-02 10:08:17.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-selection.c 2007-10-02 11:26:58.292045000 +0200
+@@ -2036,6 +2036,7 @@
+ g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
+ }
+
++#ifdef USE_MAEMO_GTK
+ static void hildon_file_selection_navigation_pane_context(GtkWidget *
+ widget,
+ gpointer data)
+@@ -2052,6 +2053,7 @@
+ ULOG_DEBUG(__FUNCTION__);
+ g_signal_emit(data, signal_content_pane_context_menu, 0);
+ }
++#endif /* USE_MAEMO_GTK */
+
+ static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
+ widget,
+@@ -2200,6 +2202,7 @@
+ }
+ }
+
++#ifdef USE_MAEMO_GTK
+ static gboolean
+ tap_and_hold_query (gpointer self, guint signal_id)
+ {
+@@ -2225,6 +2228,8 @@
+ return tap_and_hold_query (self, signal_navigation_pane_context_menu);
+ }
+
++#endif /* USE_MAEMO_GTK */
++
+ static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
+ * self)
+ {
+@@ -2277,7 +2282,7 @@
+ g_signal_connect_object(tree, "key-press-event",
+ G_CALLBACK(hildon_file_selection_on_content_pane_key),
+ self, 0);
+-
++#ifdef USE_MAEMO_GTK
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2286,6 +2291,7 @@
+ g_signal_connect_object(tree, "tap-and-hold",
+ G_CALLBACK
+ (hildon_file_selection_content_pane_context), self, 0);
++#endif /* USE_MAEMO_GTK */
+
+ g_signal_connect_object(tree, "notify::has-focus",
+ G_CALLBACK(content_pane_focus), self, 0);
+@@ -2397,7 +2403,7 @@
+ (selection, "changed",
+ G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
+ self, 0);
+-
++#ifdef USE_MAEMO_GTK
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2406,7 +2412,7 @@
+ g_signal_connect_object(tree, "tap-and-hold",
+ G_CALLBACK
+ (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+ g_signal_connect_object(tree, "key-press-event",
+ G_CALLBACK(hildon_file_selection_on_content_pane_key),
+ self, 0);
+@@ -2492,7 +2498,7 @@
+ g_signal_connect_object(selection, "changed",
+ G_CALLBACK(hildon_file_selection_selection_changed),
+ self, 0);
+-
++#ifdef USE_MAEMO_GTK
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
+ NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
+@@ -2502,7 +2508,7 @@
+ G_CALLBACK
+ (hildon_file_selection_navigation_pane_context),
+ self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+ g_signal_connect_object(self->priv->dir_tree, "key-press-event",
+ G_CALLBACK
+ (hildon_file_selection_on_navigation_pane_key), self, 0);
+--- /tmp/hildon-file-chooser-dialog.c 2007-10-02 10:14:05.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-chooser-dialog.c 2007-10-02 11:33:43.132045000 +0200
+@@ -191,7 +191,7 @@
+
+ return (first_digit << 4) | second_digit;
+ }
+-
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+ GtkInvalidInputType inv_type,
+ gpointer user_data)
+@@ -202,7 +202,7 @@
+ HCS("ckdg_ib_maximum_characters_reached"));
+ }
+ }
+-
++#endif /* USE_MAEMO_GTK */
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+ int len,
+@@ -1837,8 +1837,9 @@
+ G_PARAM_READWRITE);
+ g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+
+-
++#ifdef USE_MAEMO_GTK
+ hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1976,10 @@
+ g_signal_connect( priv->entry_name, "changed",
+ G_CALLBACK( hildon_file_chooser_entry_changed ),
+ self );
+-
++#ifdef USE_MAEMO_GTK
+ g_signal_connect(priv->entry_name, "invalid-input",
+ G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif /* USE_MAEMO_GTK */
+ priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+ priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+ priv->image_location = gtk_image_new();
============================================================
--- packages/maemo3/libhildonfm_1.9.41.bb 28bd888a778dcd453876624cbdc43e8650ebcd59
+++ packages/maemo3/libhildonfm_1.9.41.bb 28bd888a778dcd453876624cbdc43e8650ebcd59
@@ -0,0 +1,29 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "hildon-thumb%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r7604e2e8a0c76d28ec378a7800c3e1a42b335da5 -rcd2d09bd89f1169ae4ec847af474c0e14580178d
#
#
#
# patch "packages/wifistix/wifistix-modules_5.0.16.p0.bb"
# from [1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11]
# to [1f6020f4a46c11c6f194b1f39764e362f282c95b]
#
============================================================
--- packages/wifistix/wifistix-modules_5.0.16.p0.bb 1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11
+++ packages/wifistix/wifistix-modules_5.0.16.p0.bb 1f6020f4a46c11c6f194b1f39764e362f282c95b
@@ -25,10 +25,10 @@ inherit module-base
inherit module-base
-EXTRA_OEMAKE = "CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
- KERNELDIR=${KERNEL_SOURCE} ARCH=${TARGET_ARCH} \
- CC=${KERNEL_CC} EXTRA_CFLAGS=${CFLAGS} \
- INSTALL_MOD_PATH="${D}"
+EXTRA_OEMAKE = 'CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
+ KERNELDIR="${KERNEL_SOURCE}" ARCH="${TARGET_ARCH}" \
+ CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}" \
+ INSTALL_MOD_PATH="${D}"'
do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
More information about the Openembedded-commits
mailing list