From 4d1890d58cf6a5bf7fabd8d70d35482645247793 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 16 Jan 2007 03:01:25 +0000 Subject: uim: update to 1.3.1 --- packages/uim/uim-native_1.2.1.bb | 3 - packages/uim/uim-native_1.3.1.bb | 3 + packages/uim/uim_1.2.1.bb | 142 --------------------------------------- packages/uim/uim_1.3.1.bb | 142 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 145 deletions(-) delete mode 100644 packages/uim/uim-native_1.2.1.bb create mode 100644 packages/uim/uim-native_1.3.1.bb delete mode 100644 packages/uim/uim_1.2.1.bb create mode 100644 packages/uim/uim_1.3.1.bb diff --git a/packages/uim/uim-native_1.2.1.bb b/packages/uim/uim-native_1.2.1.bb deleted file mode 100644 index 5249ac6394..0000000000 --- a/packages/uim/uim-native_1.2.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require uim.inc -DEPENDS = "gtk+ anthy intltool-native" -inherit native autotools pkgconfig diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb new file mode 100644 index 0000000000..5249ac6394 --- /dev/null +++ b/packages/uim/uim-native_1.3.1.bb @@ -0,0 +1,3 @@ +require uim.inc +DEPENDS = "gtk+ anthy intltool-native" +inherit native autotools pkgconfig diff --git a/packages/uim/uim_1.2.1.bb b/packages/uim/uim_1.2.1.bb deleted file mode 100644 index 5d82945df7..0000000000 --- a/packages/uim/uim_1.2.1.bb +++ /dev/null @@ -1,142 +0,0 @@ -require uim.inc -DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses" - -SRC_URI += "file://uim-module-manager.patch;patch=1" - -S = "${WORKDIR}/uim-${PV}" - -do_stage() { - autotools_stage_all -} - -inherit autotools pkgconfig - -PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev" - -LEAD_SONAME = "libuim.so.1" -RDEPENDS_uim = "libuim0" - -DESCRIPTION_libuim-dev = "Development files for uim" -FILES_libuim-dev = "${libdir}/libuim*.a \ - ${libdir}/libuim*.la \ - ${libdir}/libuim*.so \ - ${includedir}/uim \ - ${libdir}/pkgconfig/uim.pc" - -DESCRIPTION_libuim0 = "Simple and flexible input method collection and library" -FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ - ${libdir}/libuim-custom.so.* \ - ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ - ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ - ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ - ${libdir}/libuim.so.*" - -DESCRIPTION_uim-anthy = "Anthy plugin for uim" -FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ - ${datadir}/uim/anthy*.scm" - -pkg_postinst_uim-anthy() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --register anthy --path /etc/uim -fi -} - -pkg_postrm_uim-anthy() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --path /etc/uim --unregister anthy -fi -} - -pkg_prerm_uim-anthy() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --register anthy --path /etc/uim -fi -} - -DESCRIPTION_uim-fep = "uim Front End Processor" -FILES_uim-fep = "${bindir}/uim-fep*" - -DESCRIPTION_uim-gtk2.0 = "GTK+2.x immodule for uim" -FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ - ${bindir}/uim-toolbar-gtk* \ - ${bindir}/uim-*-gtk \ - ${bindir}/uim-input-pad-ja \ - ${datadir}/uim/helperdata/uim-dict-ui.xml" - -pkg_postinst_uim-gtk2.0() { -#! /bin/sh -set -e -gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - -#pkg_postrm_uim-gtk2.0() { -##! /bin/sh -#set -e -#/usr/sbin/update-gtk-immodules -#} - -DESCRIPTION_uim-skk = "SKK plugin for uim" -FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ - ${datadir}/uim/skk*.scm" - -pkg_postinst_uim-skk() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --register skk --path /etc/uim -fi -} - -pkg_postrm_uim-skk() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --path /etc/uim --unregister skk -fi -} - -DESCRIPTION_uim-utils = "Utilities for uim" -FILES_uim-utils = "${bindir}/uim-sh \ - ${bindir}/uim-module-manager \ - ${libexecdir}/uim-helper-server" - -DESCRIPTION_uim-xim = "A bridge between uim and XIM" -FILES_uim-xim = "${bindir}/uim-xim \ - ${libexecdir}/uim-candwin-gtk \ - ${datadir}/man/man1/uim-xim.1 \ - ${sysconfdir}/X11/xinit/xinput.d/uim*" - -# to .xinitrc, or .xsession -#pkg_postinst_uim-xim() { -#GTK_IM_MODULE=uim ; export GTK_IM_MODULE -#QT_IM_MODULE=uim ; export QT_IM_MODULE -#uim-xim & -#XMODIFIERS=@im=uim ; export XMODIFIERS -#} - -DESCRIPTION_uim-common = "Common files for uim" -FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ - ${datadir}/uim" -pkg_postinst_uim-common() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --path /etc/uim --register \ - tutcode tcode hangul viqr ipa-x-sampa latin byeoru -fi -} - -pkg_prerm_uim-common() { -#! /bin/sh -set -e -if [ -f /usr/bin/uim-module-manager ]; then - /usr/bin/uim-module-manager --path /etc/uim --register \ - tutcode tcode hangul viqr ipa-x-sampa latin byeoru -fi -} diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb new file mode 100644 index 0000000000..5d82945df7 --- /dev/null +++ b/packages/uim/uim_1.3.1.bb @@ -0,0 +1,142 @@ +require uim.inc +DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses" + +SRC_URI += "file://uim-module-manager.patch;patch=1" + +S = "${WORKDIR}/uim-${PV}" + +do_stage() { + autotools_stage_all +} + +inherit autotools pkgconfig + +PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev" + +LEAD_SONAME = "libuim.so.1" +RDEPENDS_uim = "libuim0" + +DESCRIPTION_libuim-dev = "Development files for uim" +FILES_libuim-dev = "${libdir}/libuim*.a \ + ${libdir}/libuim*.la \ + ${libdir}/libuim*.so \ + ${includedir}/uim \ + ${libdir}/pkgconfig/uim.pc" + +DESCRIPTION_libuim0 = "Simple and flexible input method collection and library" +FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ + ${libdir}/libuim-custom.so.* \ + ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ + ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ + ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ + ${libdir}/libuim.so.*" + +DESCRIPTION_uim-anthy = "Anthy plugin for uim" +FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ + ${datadir}/uim/anthy*.scm" + +pkg_postinst_uim-anthy() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --register anthy --path /etc/uim +fi +} + +pkg_postrm_uim-anthy() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --path /etc/uim --unregister anthy +fi +} + +pkg_prerm_uim-anthy() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --register anthy --path /etc/uim +fi +} + +DESCRIPTION_uim-fep = "uim Front End Processor" +FILES_uim-fep = "${bindir}/uim-fep*" + +DESCRIPTION_uim-gtk2.0 = "GTK+2.x immodule for uim" +FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ + ${bindir}/uim-toolbar-gtk* \ + ${bindir}/uim-*-gtk \ + ${bindir}/uim-input-pad-ja \ + ${datadir}/uim/helperdata/uim-dict-ui.xml" + +pkg_postinst_uim-gtk2.0() { +#! /bin/sh +set -e +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} + +#pkg_postrm_uim-gtk2.0() { +##! /bin/sh +#set -e +#/usr/sbin/update-gtk-immodules +#} + +DESCRIPTION_uim-skk = "SKK plugin for uim" +FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ + ${datadir}/uim/skk*.scm" + +pkg_postinst_uim-skk() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --register skk --path /etc/uim +fi +} + +pkg_postrm_uim-skk() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --path /etc/uim --unregister skk +fi +} + +DESCRIPTION_uim-utils = "Utilities for uim" +FILES_uim-utils = "${bindir}/uim-sh \ + ${bindir}/uim-module-manager \ + ${libexecdir}/uim-helper-server" + +DESCRIPTION_uim-xim = "A bridge between uim and XIM" +FILES_uim-xim = "${bindir}/uim-xim \ + ${libexecdir}/uim-candwin-gtk \ + ${datadir}/man/man1/uim-xim.1 \ + ${sysconfdir}/X11/xinit/xinput.d/uim*" + +# to .xinitrc, or .xsession +#pkg_postinst_uim-xim() { +#GTK_IM_MODULE=uim ; export GTK_IM_MODULE +#QT_IM_MODULE=uim ; export QT_IM_MODULE +#uim-xim & +#XMODIFIERS=@im=uim ; export XMODIFIERS +#} + +DESCRIPTION_uim-common = "Common files for uim" +FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ + ${datadir}/uim" +pkg_postinst_uim-common() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --path /etc/uim --register \ + tutcode tcode hangul viqr ipa-x-sampa latin byeoru +fi +} + +pkg_prerm_uim-common() { +#! /bin/sh +set -e +if [ -f /usr/bin/uim-module-manager ]; then + /usr/bin/uim-module-manager --path /etc/uim --register \ + tutcode tcode hangul viqr ipa-x-sampa latin byeoru +fi +} -- cgit v1.2.3 From 5f7d57bae80dc3ac3da0c1781a7eb1a8d58831a7 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 16 Jan 2007 13:52:51 +0000 Subject: lame: link libmp3lame with -lm --- packages/lame/lame_3.96.1.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/lame/lame_3.96.1.bb b/packages/lame/lame_3.96.1.bb index edb4265f13..0c5c245829 100644 --- a/packages/lame/lame_3.96.1.bb +++ b/packages/lame/lame_3.96.1.bb @@ -1,10 +1,11 @@ SECTION = "console/utils" DESCRIPTION = "Not an MP3 encoder" LICENSE = "LGPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ - file://no-gtk1.patch;patch=1" + file://no-gtk1.patch;patch=1 \ + file://Makefile-lm.patch;patch=1" inherit autotools -- cgit v1.2.3 From 899938af012159b28ca9b695b3cffd4cbf2de6f4 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 16 Jan 2007 14:31:48 +0000 Subject: lame: add -lm to final link for libmp3lame --- packages/lame/lame/Makefile-lm.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/lame/lame/Makefile-lm.patch diff --git a/packages/lame/lame/Makefile-lm.patch b/packages/lame/lame/Makefile-lm.patch new file mode 100644 index 0000000000..cbbb1706ce --- /dev/null +++ b/packages/lame/lame/Makefile-lm.patch @@ -0,0 +1,22 @@ +--- lame-3.96.1/libmp3lame/Makefile.am.old 2007-01-16 13:41:48.000000000 +0000 ++++ lame-3.96.1/libmp3lame/Makefile.am 2007-01-16 13:41:53.000000000 +0000 +@@ -18,7 +18,7 @@ + decoder_ldadd = + endif + +-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) ++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm + libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ + -no-undefined + +--- lame-3.96.1/libmp3lame/Makefile.in.old 2007-01-16 13:47:17.000000000 +0000 ++++ lame-3.96.1/libmp3lame/Makefile.in 2007-01-16 13:47:29.000000000 +0000 +@@ -177,7 +177,7 @@ + @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la + @LIB_WITH_DECODER_FALSE@decoder_ldadd = + +-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) ++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm + libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ + -no-undefined + -- cgit v1.2.3 From eb485afd8f028a7d128d500f05418d88260e9c95 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 16 Jan 2007 17:52:59 +0000 Subject: xorg-xserver: also depend on mkfontscale-native --- packages/xorg-xserver/xorg-xserver-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index e6c81841b7..2b174d3d7f 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -12,7 +12,7 @@ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ -libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" +libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" RDEPENDS="rgb" -- cgit v1.2.3 From 1774f75a2a4e80dbcb4995bf88bea9d2bd6b469b Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 16 Jan 2007 19:32:08 +0000 Subject: zudoku: add LDFLAGS += "-lstdc++". Fixes build failure reported in bug 1279. Kudos to gfeller for the patch. --- packages/zudoku/zudoku_1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb index 46c64ebb6e..e9eb09741a 100644 --- a/packages/zudoku/zudoku_1.1.bb +++ b/packages/zudoku/zudoku_1.1.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" SECTION = "opie/games" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}" +PR = "r1" SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \ file://zudoku.html \ @@ -13,6 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \ inherit opie EXTRA_QMAKEVARS_POST += "TARGET=zudoku" +LDFLAGS += "-lstdc++" do_install() { install -d ${D}${palmtopdir}/help/en/html -- cgit v1.2.3 From 7208e562aa9f9a1982e3856d1892be8c84c8a156 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:14:58 +0000 Subject: bogofilter: Obey latest volatiles file syntax. --- packages/bogofilter/bogofilter_0.96.0.bb | 2 +- packages/bogofilter/files/volatiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb index dba0893b2b..72cec9be3c 100644 --- a/packages/bogofilter/bogofilter_0.96.0.bb +++ b/packages/bogofilter/bogofilter_0.96.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham ( by a statistical analysis of the message's header and content (body). \ The program is able to learn from the user's classifications and corrections." LICENSE = "GPL" -PR = "r6" +PR = "r7" PRIORITY = "optional" SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ diff --git a/packages/bogofilter/files/volatiles b/packages/bogofilter/files/volatiles index 04960ff2d3..f460c91fea 100644 --- a/packages/bogofilter/files/volatiles +++ b/packages/bogofilter/files/volatiles @@ -1 +1 @@ -d spam filter 0770 /var/spool/filter +d spam filter 0770 /var/spool/filter none -- cgit v1.2.3 From 2298a3f226034bb59fd5263f75e8b8960fd70697 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:15:41 +0000 Subject: cyrus-imapd: Obey latest volatiles file syntax. --- packages/cyrus-imapd/cyrus-imapd_2.2.12.bb | 2 +- packages/cyrus-imapd/files/volatiles | 122 ++++++++++++++--------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb index 14fb728304..e72253d4eb 100644 --- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb +++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "cyrus-sasl virtual/db" LICENSE = "BSD" -PR = "r9" +PR = "r10" DEPENDS += "install-native" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \ diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles index e0a55493b3..a95841c53c 100644 --- a/packages/cyrus-imapd/files/volatiles +++ b/packages/cyrus-imapd/files/volatiles @@ -1,63 +1,63 @@ -d cyrus mail 0755 /var/lib/cyrus -d cyrus root 0755 /var/lib/cyrus/db -d cyrus mail 0755 /var/lib/cyrus/proc -d cyrus mail 0755 /var/lib/cyrus/sieve +d cyrus mail 0755 /var/lib/cyrus none +d cyrus root 0755 /var/lib/cyrus/db none +d cyrus mail 0755 /var/lib/cyrus/proc none +d cyrus mail 0755 /var/lib/cyrus/sieve none # if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z} -d cyrus mail 0755 /var/lib/cyrus/sieve/a -d cyrus mail 0755 /var/lib/cyrus/sieve/b -d cyrus mail 0755 /var/lib/cyrus/sieve/c -d cyrus mail 0755 /var/lib/cyrus/sieve/d -d cyrus mail 0755 /var/lib/cyrus/sieve/e -d cyrus mail 0755 /var/lib/cyrus/sieve/f -d cyrus mail 0755 /var/lib/cyrus/sieve/g -d cyrus mail 0755 /var/lib/cyrus/sieve/h -d cyrus mail 0755 /var/lib/cyrus/sieve/i -d cyrus mail 0755 /var/lib/cyrus/sieve/j -d cyrus mail 0755 /var/lib/cyrus/sieve/k -d cyrus mail 0755 /var/lib/cyrus/sieve/l -d cyrus mail 0755 /var/lib/cyrus/sieve/m -d cyrus mail 0755 /var/lib/cyrus/sieve/n -d cyrus mail 0755 /var/lib/cyrus/sieve/o -d cyrus mail 0755 /var/lib/cyrus/sieve/p -d cyrus mail 0755 /var/lib/cyrus/sieve/q -d cyrus mail 0755 /var/lib/cyrus/sieve/r -d cyrus mail 0755 /var/lib/cyrus/sieve/s -d cyrus mail 0755 /var/lib/cyrus/sieve/t -d cyrus mail 0755 /var/lib/cyrus/sieve/u -d cyrus mail 0755 /var/lib/cyrus/sieve/v -d cyrus mail 0755 /var/lib/cyrus/sieve/w -d cyrus mail 0755 /var/lib/cyrus/sieve/x -d cyrus mail 0755 /var/lib/cyrus/sieve/y -d cyrus mail 0755 /var/lib/cyrus/sieve/z -d cyrus root 0755 /var/lib/cyrus/socket -d cyrus mail 0755 /var/lib/cyrus/user +d cyrus mail 0755 /var/lib/cyrus/sieve/a none +d cyrus mail 0755 /var/lib/cyrus/sieve/b none +d cyrus mail 0755 /var/lib/cyrus/sieve/c none +d cyrus mail 0755 /var/lib/cyrus/sieve/d none +d cyrus mail 0755 /var/lib/cyrus/sieve/e none +d cyrus mail 0755 /var/lib/cyrus/sieve/f none +d cyrus mail 0755 /var/lib/cyrus/sieve/g none +d cyrus mail 0755 /var/lib/cyrus/sieve/h none +d cyrus mail 0755 /var/lib/cyrus/sieve/i none +d cyrus mail 0755 /var/lib/cyrus/sieve/j none +d cyrus mail 0755 /var/lib/cyrus/sieve/k none +d cyrus mail 0755 /var/lib/cyrus/sieve/l none +d cyrus mail 0755 /var/lib/cyrus/sieve/m none +d cyrus mail 0755 /var/lib/cyrus/sieve/n none +d cyrus mail 0755 /var/lib/cyrus/sieve/o none +d cyrus mail 0755 /var/lib/cyrus/sieve/p none +d cyrus mail 0755 /var/lib/cyrus/sieve/q none +d cyrus mail 0755 /var/lib/cyrus/sieve/r none +d cyrus mail 0755 /var/lib/cyrus/sieve/s none +d cyrus mail 0755 /var/lib/cyrus/sieve/t none +d cyrus mail 0755 /var/lib/cyrus/sieve/u none +d cyrus mail 0755 /var/lib/cyrus/sieve/v none +d cyrus mail 0755 /var/lib/cyrus/sieve/w none +d cyrus mail 0755 /var/lib/cyrus/sieve/x none +d cyrus mail 0755 /var/lib/cyrus/sieve/y none +d cyrus mail 0755 /var/lib/cyrus/sieve/z none +d cyrus root 0755 /var/lib/cyrus/socket none +d cyrus mail 0755 /var/lib/cyrus/user none # if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z} -d cyrus mail 0755 /var/lib/cyrus/user/a -d cyrus mail 0755 /var/lib/cyrus/user/b -d cyrus mail 0755 /var/lib/cyrus/user/c -d cyrus mail 0755 /var/lib/cyrus/user/d -d cyrus mail 0755 /var/lib/cyrus/user/e -d cyrus mail 0755 /var/lib/cyrus/user/f -d cyrus mail 0755 /var/lib/cyrus/user/g -d cyrus mail 0755 /var/lib/cyrus/user/h -d cyrus mail 0755 /var/lib/cyrus/user/i -d cyrus mail 0755 /var/lib/cyrus/user/j -d cyrus mail 0755 /var/lib/cyrus/user/k -d cyrus mail 0755 /var/lib/cyrus/user/l -d cyrus mail 0755 /var/lib/cyrus/user/m -d cyrus mail 0755 /var/lib/cyrus/user/n -d cyrus mail 0755 /var/lib/cyrus/user/o -d cyrus mail 0755 /var/lib/cyrus/user/p -d cyrus mail 0755 /var/lib/cyrus/user/q -d cyrus mail 0755 /var/lib/cyrus/user/r -d cyrus mail 0755 /var/lib/cyrus/user/s -d cyrus mail 0755 /var/lib/cyrus/user/t -d cyrus mail 0755 /var/lib/cyrus/user/u -d cyrus mail 0755 /var/lib/cyrus/user/v -d cyrus mail 0755 /var/lib/cyrus/user/w -d cyrus mail 0755 /var/lib/cyrus/user/x -d cyrus mail 0755 /var/lib/cyrus/user/y -d cyrus mail 0755 /var/lib/cyrus/user/z -d root root 0755 /var/spool/cyrus -d cyrus mail 0750 /var/spool/cyrus/mail -d cyrus mail 0750 /var/spool/cyrus/news +d cyrus mail 0755 /var/lib/cyrus/user/a none +d cyrus mail 0755 /var/lib/cyrus/user/b none +d cyrus mail 0755 /var/lib/cyrus/user/c none +d cyrus mail 0755 /var/lib/cyrus/user/d none +d cyrus mail 0755 /var/lib/cyrus/user/e none +d cyrus mail 0755 /var/lib/cyrus/user/f none +d cyrus mail 0755 /var/lib/cyrus/user/g none +d cyrus mail 0755 /var/lib/cyrus/user/h none +d cyrus mail 0755 /var/lib/cyrus/user/i none +d cyrus mail 0755 /var/lib/cyrus/user/j none +d cyrus mail 0755 /var/lib/cyrus/user/k none +d cyrus mail 0755 /var/lib/cyrus/user/l none +d cyrus mail 0755 /var/lib/cyrus/user/m none +d cyrus mail 0755 /var/lib/cyrus/user/n none +d cyrus mail 0755 /var/lib/cyrus/user/o none +d cyrus mail 0755 /var/lib/cyrus/user/p none +d cyrus mail 0755 /var/lib/cyrus/user/q none +d cyrus mail 0755 /var/lib/cyrus/user/r none +d cyrus mail 0755 /var/lib/cyrus/user/s none +d cyrus mail 0755 /var/lib/cyrus/user/t none +d cyrus mail 0755 /var/lib/cyrus/user/u none +d cyrus mail 0755 /var/lib/cyrus/user/v none +d cyrus mail 0755 /var/lib/cyrus/user/w none +d cyrus mail 0755 /var/lib/cyrus/user/x none +d cyrus mail 0755 /var/lib/cyrus/user/y none +d cyrus mail 0755 /var/lib/cyrus/user/z none +d root root 0755 /var/spool/cyrus none +d cyrus mail 0750 /var/spool/cyrus/mail none +d cyrus mail 0750 /var/spool/cyrus/news none -- cgit v1.2.3 From 353d82eaf8c9ab6ea3b8da08689912832d4dbc05 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:16:16 +0000 Subject: davfs2: Obey latest volatiles file syntax. --- packages/davfs2/davfs2_0.2.8.bb | 2 +- packages/davfs2/files/volatiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb index ecb7034042..e49c4af424 100644 --- a/packages/davfs2/davfs2_0.2.8.bb +++ b/packages/davfs2/davfs2_0.2.8.bb @@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5" RDEPENDS_${PN} = "kernel-module-coda" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \ file://Makefile.in.patch;patch=1 \ diff --git a/packages/davfs2/files/volatiles b/packages/davfs2/files/volatiles index 51405429d1..169fda7c3d 100644 --- a/packages/davfs2/files/volatiles +++ b/packages/davfs2/files/volatiles @@ -1 +1 @@ -d root users 0775 /var/run/mount.davfs +d root users 0775 /var/run/mount.davfs none -- cgit v1.2.3 From f3945a743c6a1b579a28490b0586eb2dd4b67dc3 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:16:52 +0000 Subject: networkmanager: Obey latest volatiles file syntax. --- packages/networkmanager/files/99_networkmanager | 2 +- packages/networkmanager/networkmanager_0.6.4.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/networkmanager/files/99_networkmanager b/packages/networkmanager/files/99_networkmanager index b3e7f94657..20cbcc1bca 100644 --- a/packages/networkmanager/files/99_networkmanager +++ b/packages/networkmanager/files/99_networkmanager @@ -1 +1 @@ -d root root 0700 /var/run/NetworkManager +d root root 0700 /var/run/NetworkManager none diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index 95e85002b0..e14230aadc 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r4" +PR = "r5" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ -- cgit v1.2.3 From ccbc3685b5baf90cd59e5eefeccbee784b9967ee Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:22:58 +0000 Subject: initscripts: Correct description. Speed enhancement in previous change as side effect of making linksource a non optional field. --- packages/initscripts/initscripts-1.0/volatiles | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 2bc7d82fbd..4320485663 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -3,14 +3,14 @@ # # Every line must either be a comment starting with # # or a definition of format: -# [] +# # where the items are separated by whitespace ! # # : d|f|l : (d)irectory|(f)ile|(l)ink # # A linking example: # l root root 0777 /var/test /tmp/testfile -# f root root 0644 /var/test +# f root root 0644 /var/test none # # Understanding links: # When populate-volatile is to verify/create a directory or file, it will first -- cgit v1.2.3 From 3ece40d97404fee166524620420ae2f051b384d2 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:30:07 +0000 Subject: postfix: Updating and improving configuration. This should cut off about 75% typical spamload before it enters the system. --- packages/postfix/files/internal_recipient | 2 + packages/postfix/files/main.cf_2.0 | 63 +++++++++++++++++++++++++++++++ packages/postfix/files/volatiles | 30 +++++++-------- packages/postfix/postfix_2.0.20.bb | 4 +- 4 files changed, 83 insertions(+), 16 deletions(-) create mode 100644 packages/postfix/files/internal_recipient diff --git a/packages/postfix/files/internal_recipient b/packages/postfix/files/internal_recipient new file mode 100644 index 0000000000..0d11944beb --- /dev/null +++ b/packages/postfix/files/internal_recipient @@ -0,0 +1,2 @@ +root@ permit_mynetworks,reject + diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0 index 002f681217..1a6ddabbf3 100644 --- a/packages/postfix/files/main.cf_2.0 +++ b/packages/postfix/files/main.cf_2.0 @@ -2,6 +2,7 @@ cat < Date: Tue, 16 Jan 2007 21:37:24 +0000 Subject: initscripts: Comments are for code functionality. --- packages/initscripts/initscripts-1.0/populate-volatile.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index c5692fea7f..3bb3d94de6 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -114,7 +114,6 @@ apply_cfgfile() { cat ${CFGFILE} | grep -v "^#" | \ while read LINE; do - # This is a hell of a lot faster than using cut or awk 5 times eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"` [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." -- cgit v1.2.3 From b0b9841b2d8b63afb7fbc97b4bd968724101b88d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:50:52 +0000 Subject: xfce.bbclass: provide bz2 extension for 4.33.99.2 (4.4-rc2) release --- classes/xfce.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index 793348597f..8124dc877c 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -7,7 +7,13 @@ HOMEPAGE = "http://www.xfce.org" LICENSE = "LGPL-2" -SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz" +def xfce_extension(ver): + ext = "gz" + if ver == "4.3.99.2": + ext = "bz2" + return ext + +SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.${@xfce_extension("${PV}")}" inherit autotools -- cgit v1.2.3 From 8184b4f960827cc9c42ed14109d6ec562b21099b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:51:50 +0000 Subject: libxfcemcs: added 4.4-rc2 (4.3.99.2) --- packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb diff --git a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb new file mode 100644 index 0000000000..07d7a95ae1 --- /dev/null +++ b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb @@ -0,0 +1,5 @@ +# libxfce4mcs OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 94b9177e4f4f69e76cd8dc524c4aa52e4277aa14 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:17 +0000 Subject: libxfce4util: added 4.4-rc2 (4.3.99.2) --- packages/libxfce4util/libxfce4util_4.3.99.2.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/libxfce4util/libxfce4util_4.3.99.2.bb diff --git a/packages/libxfce4util/libxfce4util_4.3.99.2.bb b/packages/libxfce4util/libxfce4util_4.3.99.2.bb new file mode 100644 index 0000000000..d1c29197d6 --- /dev/null +++ b/packages/libxfce4util/libxfce4util_4.3.99.2.bb @@ -0,0 +1,22 @@ +require ${PN}.inc + +SRC_URI += "\ +http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-depends.m4 \ +http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-features.m4 \ +http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 \ +http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-python.m4 \ +http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-xfce.m4" + + +MACROS="m4/xdt*.m4" + +XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ + i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ + xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ + xfce-fileutils.h xfce-rc.h xfce-utf8.h \ + xfce-license.h xfce-i18n.h libxfce4util-enum-types.h" + +do_configure_prepend() { + install -m 0755 -d ${S}/m4/ + install -m 0644 ${WORKDIR}/xdt-*.m4 ${S}/m4/ +} -- cgit v1.2.3 From 4ddd516bfe80d8c0145c616bc90175b83f967c60 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:23 +0000 Subject: libxfcegui4: added 4.4-rc2 (4.3.99.2) --- packages/libxfcegui4/libxfcegui4_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/libxfcegui4/libxfcegui4_4.3.99.2.bb diff --git a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb new file mode 100644 index 0000000000..2def53685a --- /dev/null +++ b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb @@ -0,0 +1,5 @@ +# libxfcegui4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 60f2729e0ddeeaad2e3173677463cb32b131208f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:31 +0000 Subject: xfce-mcs-manager: added 4.4-rc2 (4.3.99.2) --- packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb new file mode 100644 index 0000000000..de5cf2b012 --- /dev/null +++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfce-mcs-manager OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 6ddf0d40ccb882e947f8bbdbac77f7fe734bc649 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:37 +0000 Subject: xfce-mcs-plugins: added 4.4-rc2 (4.3.99.2) --- packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb new file mode 100644 index 0000000000..02ad97e860 --- /dev/null +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfce-mcs-plugins OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From b6092fdbc424553174f259d9f73214bc72c2214a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:45 +0000 Subject: xfce-utils: added 4.4-rc2 (4.3.99.2) --- packages/xfce-utils/xfce-utils_4.3.99.2.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/xfce-utils/xfce-utils_4.3.99.2.bb diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb new file mode 100644 index 0000000000..57909f2c2d --- /dev/null +++ b/packages/xfce-utils/xfce-utils_4.3.99.2.bb @@ -0,0 +1,6 @@ +# xfce-utils OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +PR = "r1" +require ${PN}.inc -- cgit v1.2.3 From 865826852b3d5937042041b43e4d7bda4e5fc8a0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:52 +0000 Subject: xfce4-goodies: added 4.4-rc2 (4.3.99.2) --- packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb new file mode 100644 index 0000000000..f7c97970d5 --- /dev/null +++ b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfce4-appfinder build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 60cb329f2514845b9271cc4ee084016cc8357dd8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:53:58 +0000 Subject: xfce4-goodies: added 4.4-rc2 (4.3.99.2) --- packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb diff --git a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb new file mode 100644 index 0000000000..6dd3c0565b --- /dev/null +++ b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfce-mixer-plugin OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 45c990290c3ca8e826c7f651bb69278e44afc515 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:54:05 +0000 Subject: xffm: added 4.4-rc2 (4.3.99.2) --- packages/xffm/xffm_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xffm/xffm_4.3.99.2.bb diff --git a/packages/xffm/xffm_4.3.99.2.bb b/packages/xffm/xffm_4.3.99.2.bb new file mode 100644 index 0000000000..c098e1c96b --- /dev/null +++ b/packages/xffm/xffm_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xffm OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From e5375d2095438c1bf4a31a2cab51ee7c2133974c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:54:12 +0000 Subject: xfce4-panel: added 4.4-rc2 (4.3.99.2) --- packages/xfce4-panel/xfce4-panel_4.3.99.2.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/xfce4-panel/xfce4-panel_4.3.99.2.bb diff --git a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb new file mode 100644 index 0000000000..18dce6fa3c --- /dev/null +++ b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb @@ -0,0 +1,6 @@ +# xfce4-panel OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +PR="r1" +require ${PN}.inc -- cgit v1.2.3 From 4693c8ab28f246ce11a0b80b27ab6127aea14c52 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:54:19 +0000 Subject: xfdesktop: added 4.4-rc2 (4.3.99.2) --- packages/xfdesktop/xfdesktop_4.3.99.2.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/xfdesktop/xfdesktop_4.3.99.2.bb diff --git a/packages/xfdesktop/xfdesktop_4.3.99.2.bb b/packages/xfdesktop/xfdesktop_4.3.99.2.bb new file mode 100644 index 0000000000..d7af836791 --- /dev/null +++ b/packages/xfdesktop/xfdesktop_4.3.99.2.bb @@ -0,0 +1,6 @@ +# xfdesktop OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +PR = "r1" +require ${PN}.inc -- cgit v1.2.3 From 5a321dc04fe4788a0ff17f810dccbcc1c0525a0b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:54:25 +0000 Subject: xfprint: added 4.4-rc2 (4.3.99.2) --- packages/xfprint/xfprint_4.3.99.2.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/xfprint/xfprint_4.3.99.2.bb diff --git a/packages/xfprint/xfprint_4.3.99.2.bb b/packages/xfprint/xfprint_4.3.99.2.bb new file mode 100644 index 0000000000..7e349ce881 --- /dev/null +++ b/packages/xfprint/xfprint_4.3.99.2.bb @@ -0,0 +1,9 @@ +# xfprint OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Print Manager" +SECTION = "x11/base" + +DEPENDS="libxfcegui4" +inherit xfce -- cgit v1.2.3 From 9df2e0a67f0da3a8a69157bbc4dfed6f73782a88 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:54:39 +0000 Subject: xfwm4: added 4.4-rc2 (4.3.99.2) --- packages/xfwm4/xfwm4_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xfwm4/xfwm4_4.3.99.2.bb diff --git a/packages/xfwm4/xfwm4_4.3.99.2.bb b/packages/xfwm4/xfwm4_4.3.99.2.bb new file mode 100644 index 0000000000..e1feff01f1 --- /dev/null +++ b/packages/xfwm4/xfwm4_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfwm4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 0546738750a06b4ee2ffdb44fcba90565de42ae2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 08:54:49 +0000 Subject: xfwm4-themes: added 4.4-rc2 (4.3.99.2) --- packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb diff --git a/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb new file mode 100644 index 0000000000..9f67ad2ed9 --- /dev/null +++ b/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfwm4-themes OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc -- cgit v1.2.3 From 3a5963076c86e1c994d300dd0a439fbbda1451a0 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Jan 2007 11:39:39 +0000 Subject: add openchrome --- classes/xorg-module.bbclass | 31 ++++++++++++++++++++++++++ packages/openchrome/.mtn2git_empty | 0 packages/openchrome/configure.patch | 42 +++++++++++++++++++++++++++++++++++ packages/openchrome/openchrome_svn.bb | 16 +++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 classes/xorg-module.bbclass create mode 100644 packages/openchrome/.mtn2git_empty create mode 100644 packages/openchrome/configure.patch create mode 100644 packages/openchrome/openchrome_svn.bb diff --git a/classes/xorg-module.bbclass b/classes/xorg-module.bbclass new file mode 100644 index 0000000000..135ca31c16 --- /dev/null +++ b/classes/xorg-module.bbclass @@ -0,0 +1,31 @@ +python populate_packages_prepend () { + import re, os.path + + new_packages = [] + + def the_hook(file, pkg, pattern, format, basename): + new_packages.append(pkg) + + do_split_packages(d, root=bb.data.expand('${libdir}/xorg/modules/drivers', d), file_regex='(.*)_drv\.so', output_pattern='xorg-driver-%s', description='xorg %s driver', extra_depends='xserver-xorg', hook=the_hook) + + packages = bb.data.getVar('PACKAGES', d, 1).split() + + so_to_la_re = "\.so$" + + # fish out any debug or devel files corresponding to the new packages + for p in new_packages: + packages.append("%s-dbg" % p) + packages.append("%s-dev" % p) + + files = bb.data.getVar("FILES_%s" % p, d).split() + dev_files = [] + dbg_files = [] + for f in files: + dev_files.append(re.sub(so_to_la_re, ".la", f)) + (dir, file) = os.path.split(f) + dbg_files.append(os.path.join(dir, ".debug", file)) + bb.data.setVar("FILES_%s-dbg" % p, " ".join(dbg_files), d) + bb.data.setVar("FILES_%s-dev" % p, " ".join(dev_files), d) + + bb.data.setVar('PACKAGES', ' '.join(packages), d) +} diff --git a/packages/openchrome/.mtn2git_empty b/packages/openchrome/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openchrome/configure.patch b/packages/openchrome/configure.patch new file mode 100644 index 0000000000..a2f236470d --- /dev/null +++ b/packages/openchrome/configure.patch @@ -0,0 +1,42 @@ +--- trunk/configure.ac 2007-01-16 16:58:44.000000000 +0000 ++++ trunk/configure.ac 2007-01-16 18:09:26.000000000 +0000 +@@ -69,11 +69,11 @@ + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], ++ AC_CHECK_BUILD_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], ++ AC_CHECK_BUILD_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ AC_CHECK_BUILD_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) + fi + +@@ -113,7 +113,7 @@ + + AM_CONDITIONAL(XVMC, test x$XVMC = xyes) + +-AC_CHECK_FILE([${sdkdir}/xf86Module.h], ++AC_CHECK_BUILD_FILE([${sdkdir}/xf86Module.h], + [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) + + # Check the ABI_VIDEODRV_VERSION +--- /dev/null 2003-09-15 14:40:47.000000000 +0100 ++++ trunk/m4/check-build.m4 2007-01-16 18:07:37.000000000 +0000 +@@ -0,0 +1,13 @@ ++# Check for the existence of FILE. ++AC_DEFUN([AC_CHECK_BUILD_FILE], ++[AS_VAR_PUSHDEF([ac_File], [ac_cv_file_$1])dnl ++AC_CACHE_CHECK([for $1], ac_File, ++[if test -r "$1"; then ++ AS_VAR_SET(ac_File, yes) ++else ++ AS_VAR_SET(ac_File, no) ++fi]) ++AS_IF([test AS_VAR_GET(ac_File) = yes], [$2], [$3])[]dnl ++AS_VAR_POPDEF([ac_File])dnl ++])# AC_CHECK_BUILD_FILE ++ diff --git a/packages/openchrome/openchrome_svn.bb b/packages/openchrome/openchrome_svn.bb new file mode 100644 index 0000000000..b73414ff78 --- /dev/null +++ b/packages/openchrome/openchrome_svn.bb @@ -0,0 +1,16 @@ +SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http \ + file://configure.patch;patch=1" +S = "${WORKDIR}/trunk" + +PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc" + +FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*" +FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*" +FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la" +FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la" +FILES_libviaXvMC-dbg = "${libdir}/.debug/libviaXvMC.so.*" +FILES_libviaXvMCPro-dbg = "${libdir}/.debug/libviaXvMCPro.so.*" + +DEPENDS = "xserver-xorg" + +inherit autotools xorg-module -- cgit v1.2.3 From d442239bd7c826305a45ec891e37b75865986ee9 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Jan 2007 11:53:24 +0000 Subject: openchrome: add forgotten staging bits --- packages/openchrome/openchrome_svn.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/openchrome/openchrome_svn.bb b/packages/openchrome/openchrome_svn.bb index b73414ff78..d5de8afce9 100644 --- a/packages/openchrome/openchrome_svn.bb +++ b/packages/openchrome/openchrome_svn.bb @@ -14,3 +14,7 @@ FILES_libviaXvMCPro-dbg = "${libdir}/.debug/libviaXvMCPro.so.*" DEPENDS = "xserver-xorg" inherit autotools xorg-module + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From e3509c0cf1288d32bc44b204cf994c945fc0f3d7 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Jan 2007 14:45:57 +0000 Subject: qt3x11: add opengl variable defs --- classes/qt3x11.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 24e824d06f..95ed4f538a 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -11,5 +11,5 @@ export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" - - +export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu" +export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu" -- cgit v1.2.3 From 09bc29575b10dec0d98a051dd2dc22261329a258 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Jan 2007 14:49:44 +0000 Subject: qmake: add gl definitions to linux-oe-g++ configuration --- packages/qmake/files/linux-oe-qmake.conf | 3 ++- packages/qmake/qmake-native_1.07a.bb | 2 +- packages/qmake/qmake2-native_2.00a.bb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf index 287dbeba19..205b693fda 100644 --- a/packages/qmake/files/linux-oe-qmake.conf +++ b/packages/qmake/files/linux-oe-qmake.conf @@ -56,7 +56,8 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt -QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_OPENGL = $(OE_QMAKE_LIBS_OPENGL) +QMAKE_LIBS_OPENGL_QT = $(OE_QMAKE_LIBS_OPENGL_QT) QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $(OE_QMAKE_MOC) diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb index a5c164c08a..29f736dea1 100644 --- a/packages/qmake/qmake-native_1.07a.bb +++ b/packages/qmake/qmake-native_1.07a.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r3" +PR = "r4" QTEVER = "qt-embedded-free-3.3.5" diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 2dcabe3261..306891e9af 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r1" +PR = "r2" QTVER = "qt-x11-opensource-src-4.1.1" -- cgit v1.2.3 From 3a508238c49e86e0476319bfe71a24fdfdd56b66 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Jan 2007 14:52:17 +0000 Subject: qt-x11-free: enable opengl --- packages/qt/qt-x11-free/configure.patch | 9 --------- packages/qt/qt-x11-free_3.3.6.bb | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/qt/qt-x11-free/configure.patch b/packages/qt/qt-x11-free/configure.patch index a56c621abb..9d6c1e8ef7 100644 --- a/packages/qt/qt-x11-free/configure.patch +++ b/packages/qt/qt-x11-free/configure.patch @@ -5,15 +5,6 @@ --- qt-x11-free-3.3.2/configure~configure.patch +++ qt-x11-free-3.3.2/configure -@@ -219,7 +219,7 @@ - # licensed modules depend on type of commercial license - MODULES="styles tools kernel widgets dialogs iconview workspace" - [ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network" --[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql" -+[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml sql" - CFG_MODULES_AVAILABLE=$MODULES - QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\"" - QMAKE_VARS="$QMAKE_VARS \"styles += windows motif mac platinum sgi cde motifplus\"" @@ -1754,21 +1754,14 @@ CFG_FREETYPE=yes fi diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb index 5a1c014e6d..51228b4d30 100644 --- a/packages/qt/qt-x11-free_3.3.6.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -3,9 +3,9 @@ SECTION = "x11/libs" PRIORITY = "optional" LICENSE = "GPL QPL" HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql" +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" PROVIDES = "qt3x11" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ -- cgit v1.2.3 From f3b5d4ff15231c4fea35f9c92e681c00832640c4 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Jan 2007 15:26:35 +0000 Subject: qt-x11-free: update to 3.3.7 --- packages/qt/qt-x11-free-common.inc | 86 ++++++++++++++++++++++++++++++++++++++ packages/qt/qt-x11-free_3.3.6.bb | 85 +------------------------------------ packages/qt/qt-x11-free_3.3.7.bb | 10 +++++ 3 files changed, 97 insertions(+), 84 deletions(-) create mode 100644 packages/qt/qt-x11-free-common.inc create mode 100644 packages/qt/qt-x11-free_3.3.7.bb diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc new file mode 100644 index 0000000000..b15dc270ee --- /dev/null +++ b/packages/qt/qt-x11-free-common.inc @@ -0,0 +1,86 @@ +DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" + +S = "${WORKDIR}/qt-x11-free-${PV}" + +inherit qmake-base qt3x11 + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' + +do_configure() { + echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql + # force regenerate + rm -f src/qtmain.pro + cat Makefile >makefile + find . -name "Makefile"|xargs rm -f + (cd src && qmake -spec ${QMAKESPEC} ) + (cd plugins/src && qmake -spec ${QMAKESPEC} ) + (cd tools && qmake -spec ${QMAKESPEC} ) + (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) +} + +do_compile() { + unset CFLAGS + unset CXXFLAGS + oe_runmake -C src ${EXTRA_ENV} + oe_runmake -C plugins/src ${EXTRA_ENV} + oe_runmake -C tools ${EXTRA_ENV} + oe_runmake -C tools/qvfb ${EXTRA_ENV} +} + +do_stage() { + install -d ${STAGING_QT_DIR}/bin + ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc + ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic + ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake + install -d ${STAGING_QT_DIR}/lib + oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib + install -d ${STAGING_QT_DIR}/include/private + for f in include/*.h + do + install -m 0644 $f ${STAGING_QT_DIR}/include/ + done + for f in include/private/*.h + do + install -m 0644 $f ${STAGING_QT_DIR}/include/private + done + for f in lib/*.prl + do + install -m 0644 $f ${STAGING_QT_DIR}/lib + done +} + +do_install() { + install -d ${D}${libdir}/ + oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ + install -d ${D}${bindir}/ + install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} + install -d ${D}${prefix}/plugins/ + cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ +} + +PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" +FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" +FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" +FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" +FILES_qt-x11-designer = "${bindir}/designer" +FILES_qt-x11-assistant = "${bindir}/assistant" +FILES_qt-x11-qvfb = "${bindir}/qvfb" +FILES_qt-x11-qtconfig = "${bindir}/qtconfig" diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb index 51228b4d30..d5df55cbb4 100644 --- a/packages/qt/qt-x11-free_3.3.6.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -1,8 +1,3 @@ -DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -HOMEPAGE = "http://www.trolltech.com" DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" PROVIDES = "qt3x11" PR = "r1" @@ -11,83 +6,5 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://no-examples.patch;patch=1 \ file://gcc4_1-HACK.patch;patch=1" -S = "${WORKDIR}/qt-x11-free-${PV}" -inherit qmake-base qt3x11 - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" -ARCH_i686 = "x86" -EXTRA_OEMAKE = "-e" - -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" - -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' - -do_configure() { - echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql - # force regenerate - rm -f src/qtmain.pro - cat Makefile >makefile - find . -name "Makefile"|xargs rm -f - (cd src && qmake -spec ${QMAKESPEC} ) - (cd plugins/src && qmake -spec ${QMAKESPEC} ) - (cd tools && qmake -spec ${QMAKESPEC} ) - (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) -} - -do_compile() { - unset CFLAGS - unset CXXFLAGS - oe_runmake -C src ${EXTRA_ENV} - oe_runmake -C plugins/src ${EXTRA_ENV} - oe_runmake -C tools ${EXTRA_ENV} - oe_runmake -C tools/qvfb ${EXTRA_ENV} -} - -do_stage() { - install -d ${STAGING_QT_DIR}/bin - ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc - ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic - ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake - install -d ${STAGING_QT_DIR}/lib - oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib - install -d ${STAGING_QT_DIR}/include/private - for f in include/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/ - done - for f in include/private/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/private - done - for f in lib/*.prl - do - install -m 0644 $f ${STAGING_QT_DIR}/lib - done -} - -do_install() { - install -d ${D}${libdir}/ - oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ - install -d ${D}${bindir}/ - install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} - install -d ${D}${prefix}/plugins/ - cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ -} - -PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ - qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" -FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" -FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" -FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" -FILES_qt-x11-designer = "${bindir}/designer" -FILES_qt-x11-assistant = "${bindir}/assistant" -FILES_qt-x11-qvfb = "${bindir}/qvfb" -FILES_qt-x11-qtconfig = "${bindir}/qtconfig" +require qt-x11-free-common.inc diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb new file mode 100644 index 0000000000..3c8533e608 --- /dev/null +++ b/packages/qt/qt-x11-free_3.3.7.bb @@ -0,0 +1,10 @@ +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" +PROVIDES = "qt3x11" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://no-examples.patch;patch=1 \ + file://gcc4_1-HACK.patch;patch=1" + +require qt-x11-free-common.inc -- cgit v1.2.3 From 36ecaee66eeb977fd8031107286975a496504136 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 17 Jan 2007 15:53:28 +0000 Subject: busybox: Remove slugos-specific DEFAULT_PREFERENCE --- packages/busybox/busybox_1.3.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index b04cd86677..a42a87c50d 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,7 +1,6 @@ require busybox.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_slugos = "1" SRC_URI = "file://defconfig" -- cgit v1.2.3 From b4ec03df90824ca0f7c1130ef19f40724b800c3b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jan 2007 19:59:10 +0000 Subject: ruby: rename dir to give patches for ruby-native