From 4804f2c6b82478aff3e03aafc8942d8880d578ab Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 18 Apr 2009 19:47:22 +0000 Subject: gvfs: Don't refer to the host system (samba includes, gawk). --- recipes/gnome/gvfs_1.2.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/gnome/gvfs_1.2.1.bb b/recipes/gnome/gvfs_1.2.1.bb index 399cce67e7..ba27418e29 100644 --- a/recipes/gnome/gvfs_1.2.1.bb +++ b/recipes/gnome/gvfs_1.2.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" LICENSE = "LGPL" -DEPENDS = "gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf-dbus samba gphoto2" +DEPENDS = "gawk-native gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf-dbus samba gphoto2" inherit gnome -EXTRA_OECONF = "--enable-samba --with-archive-includes=${STAGING_INCDIR}" +EXTRA_OECONF = "--enable-samba --with-archive-includes=${STAGING_INCDIR} --with-samba-includes=${STAGING_INCDIR}" PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" -- cgit v1.2.3 From 9882a7a0b915bfc0d40c37e00191891036531c52 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 18 Apr 2009 19:57:18 +0000 Subject: vala: Fixed bootstrapping. --- recipes/vala/vala-bootstrap-native_0.6.0.bb | 3 ++- recipes/vala/vala_0.6.0.bb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/vala/vala-bootstrap-native_0.6.0.bb b/recipes/vala/vala-bootstrap-native_0.6.0.bb index 8cc3acb52b..36db7174a6 100644 --- a/recipes/vala/vala-bootstrap-native_0.6.0.bb +++ b/recipes/vala/vala-bootstrap-native_0.6.0.bb @@ -1,4 +1,5 @@ -require vala_${PV}.bb +require vala.inc +PR = "r2" inherit native DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.6.0.bb b/recipes/vala/vala_0.6.0.bb index 7b2b4e293c..e03e39f002 100644 --- a/recipes/vala/vala_0.6.0.bb +++ b/recipes/vala/vala_0.6.0.bb @@ -1,2 +1,3 @@ require vala.inc +DEPENDS = "vala-bootstrap-native" PR = "r2" -- cgit v1.2.3 From e7e86adbd0362ebeac9d05cd75e4a81fb9b1e16e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 18 Apr 2009 22:22:15 +0200 Subject: Improve libgemwidget fix --- .../gpephone/libgemwidget/libgemwidget-fixup.diff | 47 +++++++++++----------- 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'recipes') diff --git a/recipes/gpephone/libgemwidget/libgemwidget-fixup.diff b/recipes/gpephone/libgemwidget/libgemwidget-fixup.diff index 9a219f1eb8..90f9877910 100644 --- a/recipes/gpephone/libgemwidget/libgemwidget-fixup.diff +++ b/recipes/gpephone/libgemwidget/libgemwidget-fixup.diff @@ -1,7 +1,6 @@ -Index: libgemwidget-1.0/src/gemfilechooser.c -=================================================================== ---- libgemwidget-1.0.orig/src/gemfilechooser.c 2008-11-04 14:04:26.428221184 +0300 -+++ libgemwidget-1.0/src/gemfilechooser.c 2008-11-04 14:41:58.755239494 +0300 +diff -Narub libgemwidget-1.0.orig/src/gemfilechooser.c libgemwidget-1.0/src/gemfilechooser.c +--- libgemwidget-1.0.orig/src/gemfilechooser.c 2007-11-04 07:48:36.000000000 +0100 ++++ libgemwidget-1.0/src/gemfilechooser.c 2009-04-13 20:05:21.018294446 +0200 @@ -46,6 +46,7 @@ #include #include @@ -10,34 +9,34 @@ Index: libgemwidget-1.0/src/gemfilechooser.c #include "gemfilechooser.h" #include "gemresource.h" #include "gemenv.h" -@@ -304,7 +305,7 @@ gem_file_chooser_finalize (GObject *obje +@@ -304,7 +305,7 @@ } - + static void -gem_file_chooser_file_info_print (GtkFileInfo *info) +gem_file_chooser_file_info_print (GFileInfo *info) { - struct tm loacl_time; - time_t time; -@@ -331,10 +332,10 @@ gem_file_chooser_file_info_print (GtkFil - (gtk_file_info_get_is_folder(info) ? "TRUE" : "FALSE")); - g_print("%s():|- Hidden : %s\n", - __FUNCTION__, + struct tm loacl_time; + time_t time; +@@ -331,10 +332,10 @@ + (gtk_file_info_get_is_folder(info) ? "TRUE" : "FALSE")); + g_print("%s():|- Hidden : %s\n", + __FUNCTION__, - (gtk_file_info_get_is_hidden(info) ? "TRUE" : "FALSE")); + (g_file_info_get_is_hidden(info) ? "TRUE" : "FALSE")); - g_print("%s():|- MIME Type : %s\n", - __FUNCTION__, + g_print("%s():|- MIME Type : %s\n", + __FUNCTION__, - gtk_file_info_get_mime_type(info)); + g_file_info_get_mime_type(info)); - g_print("%s():|- Modified Time : %04d/%02d/%02d %02d:%02d:%02d\n", - __FUNCTION__, - loacl_time.tm_year + 1900, -@@ -345,7 +346,7 @@ gem_file_chooser_file_info_print (GtkFil - loacl_time.tm_sec); - g_print("%s():`- Size : %lld\n", - __FUNCTION__, + g_print("%s():|- Modified Time : %04d/%02d/%02d %02d:%02d:%02d\n", + __FUNCTION__, + loacl_time.tm_year + 1900, +@@ -345,7 +346,7 @@ + loacl_time.tm_sec); + g_print("%s():`- Size : %lld\n", + __FUNCTION__, - gtk_file_info_get_size(info)); + g_file_info_get_size(info)); - - g_print("\n"); - return; + + g_print("\n"); + return; -- cgit v1.2.3 From e50eae6ac5938355d3b2bf896066bc3c12bac093 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 18 Apr 2009 20:52:04 +0000 Subject: nautilus-cd-burner: Added version 2.24.0, removed old one. --- recipes/nautilus/nautilus-cd-burner/makefile.patch | 42 ---------------------- recipes/nautilus/nautilus-cd-burner_2.24.0.bb | 14 ++++++++ recipes/nautilus/nautilus-cd-burner_2.8.5.bb | 30 ---------------- 3 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 recipes/nautilus/nautilus-cd-burner/makefile.patch create mode 100644 recipes/nautilus/nautilus-cd-burner_2.24.0.bb delete mode 100644 recipes/nautilus/nautilus-cd-burner_2.8.5.bb (limited to 'recipes') diff --git a/recipes/nautilus/nautilus-cd-burner/makefile.patch b/recipes/nautilus/nautilus-cd-burner/makefile.patch deleted file mode 100644 index ece201e25d..0000000000 --- a/recipes/nautilus/nautilus-cd-burner/makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- nautilus-cd-burner-2.8.5/Makefile.am 2004-10-20 15:52:13.000000000 -0700 -+++ nautilus-cd-burner-2.8.5.new/Makefile.am 2004-11-15 16:57:16.530130640 -0700 -@@ -52,6 +51,8 @@ - CLEANFILES = $(desktop_in_files:.desktop.in=.desktop) \ - $(schema_DATA) $(CDRECMARSHALFILES) - -+DISTCLEANFILES = intltool-extract intltool-merge intltool-update -+ - modulesconfdir=$(sysconfdir)/gnome-vfs-2.0/modules - modulesconf_DATA = mapping-modules.conf - modulesdir = $(libdir)/gnome-vfs-2.0/modules -@@ -109,6 +110,12 @@ - mapping-protocol.c \ - $(NULL) - -+# we set this so that Automake will use different file names when -+# compiling, so that the copy of mapping-method.o compiled for -+# libmapping.la doesn't conflict with the copy compiled for -+# mapping-daemon (the library one should be PIC code). -+libmapping_la_CFLAGS = -+ - libmapping_la_LDFLAGS = $(module_flags) - libmapping_la_LIBADD = $(MAPPING_LIBS) - -@@ -142,12 +149,11 @@ - - if LIBSTDCXX_HACK - AM_CXXFLAGS = -fno-exceptions -fno-rtti --CXXLD=--tag=CC $(CXX) --else --# If we don't set it, it doesn't seem to appear in the Makefile at all --# and we can't recursively set it, hence --CXXLD=$(CXX) --endif -+CXX_LINK_TAG = --tag=CC -+endif -+CXXLINK = $(LIBTOOL) --mode=link $(CXX_LINK_TAG) $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ - - libnautilus_burn_la_LIBADD = $(BURN_LIBS) - libnautilus_burnincludedir = $(includedir)/libnautilus-burn/ diff --git a/recipes/nautilus/nautilus-cd-burner_2.24.0.bb b/recipes/nautilus/nautilus-cd-burner_2.24.0.bb new file mode 100644 index 0000000000..71a8b6de53 --- /dev/null +++ b/recipes/nautilus/nautilus-cd-burner_2.24.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Easy To Use GNOME CD/DVD Burning Application" +LICENSE = "LGPL GPL" +SECTION = "x11/gnome" +inherit gnome + +DEPENDS="dbus-glib eel glib-2.0 gtk+ hal libglade libgnomeui nautilus" +# recipe does not exist yet: +#DEPENDS += "gnome-mount" +# FIXME: recipes are missing +#RDEPENDS = "genisoimage growisofs wodim" + +do_stage() { + autotools_stage_all +} diff --git a/recipes/nautilus/nautilus-cd-burner_2.8.5.bb b/recipes/nautilus/nautilus-cd-burner_2.8.5.bb deleted file mode 100644 index 71f0a5c44e..0000000000 --- a/recipes/nautilus/nautilus-cd-burner_2.8.5.bb +++ /dev/null @@ -1,30 +0,0 @@ -# nautilus-cd-burner OE build file -# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -inherit gnome -LICENSE="GPL" - -DEPENDS="nautilus" - -SRC_URI += "file://makefile.patch;patch=1" - -EXTRA_OECONF = "--disable-gtk-doc" - -PACKAGES += "libnautilus-burn" - -FILES_${PN} = "/usr/share/* /usr/bin/* /etc /usr/lib/gnome-vfs-2.0/* \ - /usr/lib/nautilus/*" -FILES_libnautilus-burn="/usr/lib/*.so*" - -headers="bacon-cd-selection.h cd-drive.h cd-recorder.h" -hdir="${STAGING_INCDIR}/libnautilus-burn" - -do_stage() { - install -d ${hdir} - for file in ${headers}; do - install -m 0644 $file ${hdir}/$file - done - - oe_libinstall libnautilus-burn ${STAGING_LIBDIR} -} -- cgit v1.2.3 From 9c6c2eca5fc3c3a556652181d0308be725a8ea81 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sat, 18 Apr 2009 23:47:31 +0200 Subject: zaurus-updater: force PARALLEL_MAKE = "" - fix do_stage error during rebuild from packaged-staging --- recipes/zaurus-updater/zaurus-updater.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes') diff --git a/recipes/zaurus-updater/zaurus-updater.bb b/recipes/zaurus-updater/zaurus-updater.bb index 6ed1c5fdd4..ab32d7fe29 100644 --- a/recipes/zaurus-updater/zaurus-updater.bb +++ b/recipes/zaurus-updater/zaurus-updater.bb @@ -35,3 +35,4 @@ do_deploy() { } addtask deploy before do_build after do_compile +PARALLEL_MAKE = "" -- cgit v1.2.3 From 90deb9f866f17181f3cc4296e0b8d5de5187609e Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 19 Apr 2009 02:24:54 +0200 Subject: squashfs-tools: Added release 4.0 (for SquashFS 4.0 in Linux 2.6.29). Added with DEFAULT_PREFERENCE -1. Be aware that squashfs release 4.0 is now upstream in Linux 2.6.29. The filesystem layout has changed from the 3.x releases. Distro's need to carefully select the (cross and native) version depending on the kernel release, which again might be different for the machines supported. Signed-off-by: Leon Woestenberg --- .../squashfs-tools-4.0/Makefile.patch | 60 ++++++++++++++++++++++ .../squashfs-tools/squashfs-tools-native_4.0.bb | 11 ++++ recipes/squashfs-tools/squashfs-tools_4.0.bb | 12 +++++ 3 files changed, 83 insertions(+) create mode 100644 recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch create mode 100644 recipes/squashfs-tools/squashfs-tools-native_4.0.bb create mode 100644 recipes/squashfs-tools/squashfs-tools_4.0.bb (limited to 'recipes') diff --git a/recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch b/recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch new file mode 100644 index 0000000000..2c88aba2ae --- /dev/null +++ b/recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch @@ -0,0 +1,60 @@ +Index: squashfs-tools/Makefile +=================================================================== +--- squashfs-tools.orig/Makefile 2009-04-19 01:47:43.000000000 +0200 ++++ squashfs-tools/Makefile 2009-04-19 01:52:36.000000000 +0200 +@@ -1,36 +1,48 @@ + INSTALL_DIR = /usr/local/bin + + INCLUDEDIR = . ++CFLAGS_R = -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ++LIBS = -lz -lpthread + + CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 + + all: mksquashfs unsquashfs + + mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o +- $(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@ + + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + sort.o: sort.c squashfs_fs.h global.h sort.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + swap.o: swap.c Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + pseudo.o: pseudo.c pseudo.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o +- $(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@ + +-unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile ++unsquashfs.o: unsquashfs.c unsquashfs.h squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h Makefile ++unsquash-1.o: unsquash-1.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++unsquash-2.o: unsquash-2.c unsquashfs.h unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h Makefile ++unsquash-3.o: unsquash-3.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h Makefile ++unsquash-4.o: unsquash-4.c unsquashfs.h squashfs_fs.h squashfs_swap.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + clean: + -rm -f *.o mksquashfs unsquashfs diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb new file mode 100644 index 0000000000..87ba761ce4 --- /dev/null +++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb @@ -0,0 +1,11 @@ +require squashfs-tools_${PV}.bb +PR = "r0" + +inherit native + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" + +do_stage () { + install -m 0755 mksquashfs ${STAGING_BINDIR}/ +} diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb new file mode 100644 index 0000000000..8299cd6fdf --- /dev/null +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -0,0 +1,12 @@ +require squashfs-tools.inc +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +# some release have .tgz, some have .tar.gz, so keep that outside the .inc file + +#http://ovh.dl.sourceforge.net/sourceforge/squashfs/squashfs4.0.tar.gz + +SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \ +file://Makefile.patch;patch=1" + -- cgit v1.2.3