From 3499e5b252d8e4b118f6ea6cc406be7e8c22765a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Oct 2009 11:37:26 +0200
Subject: package bbclass: don't strip static libs so aggressively

---
 classes/package.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 046351a415..7a9b987c7c 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -159,7 +159,7 @@ def runstrip(file, d):
     if ret:
         bb.error("runstrip: 'file %s' failed (forced strip)" % file)
 
-    if "not stripped" not in result and not file.endswith(".a"):
+    if "not stripped" not in result:
         bb.debug(1, "runstrip: skip %s" % file)
         return 0
 
@@ -183,6 +183,9 @@ def runstrip(file, d):
         extraflags = "--remove-section=.comment --remove-section=.note --strip-unneeded"
     elif "shared" in result or "executable" in result:
         extraflags = "--remove-section=.comment --remove-section=.note"
+    elif file.endswith(".a"):
+        extraflags = "--remove-section=.comment --strip-debug"
+
 
     bb.mkdirhier(os.path.join(os.path.dirname(file), ".debug"))
     debugfile=os.path.join(os.path.dirname(file), ".debug", os.path.basename(file))
@@ -393,7 +396,7 @@ python populate_packages () {
 		for root, dirs, files in os.walk(dvar):
 			for f in files:
 				file = os.path.join(root, f)
-				if not os.path.islink(file) and not os.path.isdir(file) and (isexec(file) or ".a" in file):
+				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
 					runstrip(file, d)
 
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
-- 
cgit v1.2.3


From 6de8a003f930bfade8502cf80617009a9c96c278 Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Sun, 25 Oct 2009 10:55:35 +0000
Subject: xfce46.bbclass: Add a helper class for XFCE 4.6 (based on the
 existing xfce.bbclass).

---
 classes/xfce46.bbclass | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 classes/xfce46.bbclass

(limited to 'classes')

diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
new file mode 100644
index 0000000000..84b73cda56
--- /dev/null
+++ b/classes/xfce46.bbclass
@@ -0,0 +1,28 @@
+# xfce46.bbclass
+
+# Global class to help maintain XFCE 4.6.* packages
+
+HOMEPAGE = "http://www.xfce.org"
+LICENSE = "LGPLv2"
+
+DEPENDS += "startup-notification"
+
+SECTION ?= "x11/xfce"
+
+XFCE_VERSION = ${PV}
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+
+inherit autotools gtk-icon-cache pkgconfig
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/"
+
+# FIXME:  Put icons in their own package too?
+
+FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*"
+FILES_${PN}-doc += "${datadir}/xfce4/doc"
+
+FILES_${PN}-dev += "${libdir}/xfce4/*/*.la"
+FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug"
-- 
cgit v1.2.3


From 599bbb2eaff6f0827b04ab5b2665303a22ea072e Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Sun, 25 Oct 2009 11:02:48 +0000
Subject: XFCE: Import all the 4.6.1 recipes (and a newer version of
 xfce-terminal).

---
 classes/xfce46.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
index 84b73cda56..c24dfa4d8c 100644
--- a/classes/xfce46.bbclass
+++ b/classes/xfce46.bbclass
@@ -11,7 +11,7 @@ SECTION ?= "x11/xfce"
 
 XFCE_VERSION = ${PV}
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
 
 inherit autotools gtk-icon-cache pkgconfig
 
-- 
cgit v1.2.3