Remove gnome-vfs completely

PATCH Applied [email protected] 3 participants 7 messages Sep 28, 2011

lore

Share & tools

lore

[email protected]

author

2011-09-28 05:12 UTC #0 lore raw

cover Remove gnome-vfs completely

From: Zhai Edwin <[email protected]>

All,
gnome-vfs need to be removed and taken place by gio. These patches remove the dependece on it, and obsolete recipes that need it.

Pls. help to pull.

Thanks,
Edwin

The following changes since commit e3c5d7a90ae179af0ac128ea4dfc1a5a6602c2e4:

libtool: Fix an issue where unnecessary rpaths were being injected (2011-09-26 17:56:44 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (4):
oprofileui: remove dependence on gnome-vfs
libgsf: remove dependence on gnome-vfs
tables: remove it as obsolete recipe
gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS

 .../recipes-gnome/libgsf/libgsf_1.14.5.bb          |    8 ++-
 meta-demoapps/recipes-graphics/clutter/table.inc   |   13 -----
 .../recipes-graphics/clutter/table/fixes.patch     |   16 ------
 .../recipes-graphics/clutter/table_git.bb          |   15 ------
 .../conf/distro/include/distro_tracking_fields.inc |   11 ----
 meta/conf/multilib.conf                            |    1 -
 .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |   13 -----
 .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |   53 --------------------
 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb       |   50 ------------------
 meta/recipes-kernel/oprofile/oprofileui.inc        |    2 +-
 10 files changed, 7 insertions(+), 175 deletions(-)
 delete mode 100644 meta-demoapps/recipes-graphics/clutter/table.inc
 delete mode 100644 meta-demoapps/recipes-graphics/clutter/table/fixes.patch
 delete mode 100644 meta-demoapps/recipes-graphics/clutter/table_git.bb
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb

[email protected]

author

2011-09-28 05:12 UTC #1 lore raw

PATCH 1/4 oprofileui: remove dependence on gnome-vfs

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 meta/recipes-kernel/oprofile/oprofileui.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-kernel/oprofile/oprofileui.inc +1 -1

index 5170357..ab14c38 100644
@@ -8,7 +8,7 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi-ui gconf"
+DEPENDS = "glib-2.0 gtk+ libglade libxml2 avahi-ui gconf"
 
 inherit autotools pkgconfig gtk-icon-cache

Signature · 1 line

1.7.1

[email protected]

author

2011-09-28 05:12 UTC #2 lore raw

PATCH 2/4 libgsf: remove dependence on gnome-vfs

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../recipes-gnome/libgsf/libgsf_1.14.5.bb          |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +6 -2

index 3ac7d6e..bf1b1ad 100644
@@ -1,10 +1,14 @@
 DESCRIPTION = "GNOME Structured File Library"
 LICENSE = "GPL"
 SECTION = "libs"
-PR = "r1"
+PR = "r2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
+                    file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \
+                    file://gsf/gsf.h;endline=25;md5=15cf6d31ad023167779ab5f0bbb76f49"
 
 DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
-RDEPENDS_${PN} = "gconf gnome-vfs"
+RDEPENDS_${PN} = "gconf"
 
 
 PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "

Signature · 1 line

1.7.1

[email protected]

author

2011-09-28 05:12 UTC #3 lore raw

PATCH 3/4 tables: remove it as obsolete recipe

In reply to [email protected]

From: Zhai Edwin <[email protected]>

tables depends on obsolete gnome-vfs, and is not maintained in clutter git repo

Signed-off-by Zhai Edwin <[email protected]>

---
 meta-demoapps/recipes-graphics/clutter/table.inc   |   13 -------------
 .../recipes-graphics/clutter/table/fixes.patch     |   16 ----------------
 .../recipes-graphics/clutter/table_git.bb          |   15 ---------------
 3 files changed, 0 insertions(+), 44 deletions(-)
 delete mode 100644 meta-demoapps/recipes-graphics/clutter/table.inc
 delete mode 100644 meta-demoapps/recipes-graphics/clutter/table/fixes.patch
 delete mode 100644 meta-demoapps/recipes-graphics/clutter/table_git.bb

meta-demoapps/recipes-graphics/clutter/table.inc deleted +0 ~~-13~~

deleted file mode 100644
index 937ad56..0000000
@@ -1,13 +0,0 @@
-DESCRIPTION = "Table Clutter Demo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1 & GPLv2"
-
-DEPENDS = "clutter-gst-1.4 gnome-vfs"
-
-inherit autotools pkgconfig
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 ${S}/table ${D}${bindir}/table
-}
-

meta-demoapps/recipes-graphics/clutter/table/fixes.patch deleted +0 ~~-16~~

deleted file mode 100644
index 323bf13..0000000
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-Index: table/Makefile
-===================================================================
---- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100
-+++ table/Makefile	2007-07-10 13:28:10.000000000 +0100
-@@ -8,7 +8,7 @@ all: table
- 
- 
- table: table.o clutter-dominatrix.o clutter-video-player.o
--	$(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
-+	$(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
- 
- clean:
- 	rm -fr *.o table
-\ No newline at end of file

meta-demoapps/recipes-graphics/clutter/table_git.bb deleted +0 ~~-15~~

deleted file mode 100644
index d0ae184..0000000
@@ -1,15 +0,0 @@
-require table.inc
-
-LIC_FILES_CHKSUM = "file://fluttr/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://script-viewer/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-SRCREV = "4b267533ce16656cba4104fc39dc12709c1bdddf"
-PV = "0.3.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git \
-           file://fixes.patch;patch=1"
-
-S = "${WORKDIR}/git/table"
-
-

Signature · 1 line

1.7.1

[email protected]

author

2011-09-28 05:12 UTC #4 lore raw

PATCH 4/4 gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |   11 ----
 meta/conf/multilib.conf                            |    1 -
 .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |   13 -----
 .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |   53 --------------------
 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb       |   50 ------------------
 5 files changed, 0 insertions(+), 128 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb

meta/conf/distro/include/distro_tracking_fields.inc +0 ~~-11~~

index c1f15e1..c08a1c8 100644
@@ -4609,17 +4609,6 @@ RECIPE_COMMENTS_pn-libx11-trim = ""
 RECIPE_LAST_UPDATE_pn-libx11-trim = "Jul 9, 2010"
 RECIPE_MAINTAINER_pn-libx11-trim = "Dexuan Cui <[email protected]>"
 
-RECIPE_STATUS_pn-gnome-vfs = "green"
-RECIPE_DEPENDENCY_CHECK_pn-gnome-vfs = "not done"
-RECIPE_LATEST_VERSION_pn-gnome-vfs = "2.24.4"
-RECIPE_NO_OF_PATCHES_pn-gnome-vfs = "2"
-RECIPE_INTEL_SECTION_pn-gnome-vfs = "gnome/lib"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gnome-vfs = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-gnome-vfs = "Sep 28, 2010"
-RECIPE_COMMENTS_pn-gnome-vfs = ""
-RECIPE_LAST_UPDATE_pn-gnome-vfs = "Nov 24, 2010"
-RECIPE_MAINTAINER_pn-gnome-vfs = "Dexuan Cui <[email protected]>"
-
 RECIPE_STATUS_pn-xcb-util = "green"
 RECIPE_DEPENDENCY_CHECK_pn-xcb-util = "not done"
 RECIPE_LATEST_VERSION_pn-xcb-util = "0.3.8"

meta/conf/multilib.conf +0 -1

index 3133bf1..db2f6f5 100644
@@ -118,7 +118,6 @@ BBCLASSEXTEND_append_pn-gnome-doc-utils = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnome-keyring = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnome-mime-data = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnome-mime-data = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-gnome-vfs = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnutls = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-grep = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-groff = " ${MULTILIBS}"

meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch deleted +0 ~~-13~~

deleted file mode 100644
index 0f52136..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- gnome-vfs-2.6.0/configure.in~	2004-03-22 12:36:23.000000000 +0000
-+++ gnome-vfs-2.6.0/configure.in	2004-06-07 16:04:34.000000000 +0100
-@@ -154,7 +154,7 @@
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
- 
- if test x"$GCONFTOOL" = xno; then
--  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-+  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
- fi
- 
- AM_GCONF_SOURCE_2

meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch deleted +0 ~~-53~~

53 lines not on this page · raw message

meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb deleted +0 ~~-50~~

50 lines not on this page · raw message

Signature · 1 line

1.7.1

Richard Purdie

2011-09-28 11:04 UTC #5 lore raw

Re: [PATCH 4/4] gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS

Quoted 13 lines · On Wed, 2011-09-28 at 13:02 +0800, [email protected] wrote:

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |   11 ----
 meta/conf/multilib.conf                            |    1 -
 .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |   13 -----
 .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |   53 --------------------
 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb       |   50 ------------------
 5 files changed, 0 insertions(+), 128 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb

I certainly think this is a good candidate for removal from OE-Core so I will take the patch.

Do we want to move this recipe into meta-oe?

I'm holding off in case the answer is yes and we want a smooth transition.

Cheers,

Richard

Saul Wold

Applied

2011-09-28 16:47 UTC #6 lore raw

In reply to [email protected]

Quoted 44 lines · On 09/27/2011 10:02 PM, [email protected] wrote:

From: Zhai Edwin<[email protected]>
All,
gnome-vfs need to be removed and taken place by gio. These patches remove the dependece on it, and obsolete recipes that need it.
Pls. help to pull.
Thanks,
Edwin
The following changes since commit e3c5d7a90ae179af0ac128ea4dfc1a5a6602c2e4:
libtool: Fix an issue where unnecessary rpaths were being injected (2011-09-26 17:56:44 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2
Zhai Edwin (4):
oprofileui: remove dependence on gnome-vfs
libgsf: remove dependence on gnome-vfs
tables: remove it as obsolete recipe
gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS
  .../recipes-gnome/libgsf/libgsf_1.14.5.bb          |    8 ++-
  meta-demoapps/recipes-graphics/clutter/table.inc   |   13 -----
  .../recipes-graphics/clutter/table/fixes.patch     |   16 ------
  .../recipes-graphics/clutter/table_git.bb          |   15 ------
  .../conf/distro/include/distro_tracking_fields.inc |   11 ----
  meta/conf/multilib.conf                            |    1 -
  .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |   13 -----
  .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |   53 --------------------
  meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb       |   50 ------------------
  meta/recipes-kernel/oprofile/oprofileui.inc        |    2 +-
  10 files changed, 7 insertions(+), 175 deletions(-)
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table.inc delete mode 100644 meta-demoapps/recipes-graphics/clutter/table/fixes.patch delete mode 100644 meta-demoapps/recipes-graphics/clutter/table_git.bb delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core, except as noted about gnome-vfs possibly transferring to meta-oe as part of this.

Thanks
Sau!