diff options
66 files changed, 688 insertions, 243 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" 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 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/ruby/ruby-1.8.5/.mtn2git_empty b/packages/alsa/alsa-lib/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ruby/ruby-1.8.5/.mtn2git_empty +++ b/packages/alsa/alsa-lib/.mtn2git_empty diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..59b3b6d150 --- /dev/null +++ b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch @@ -0,0 +1,13 @@ +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include <time.h> + + #ifdef __cplusplus diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 987a5901f4..8b6b7af409 100644 --- a/packages/alsa/alsa-lib_1.0.13.bb +++ b/packages/alsa/alsa-lib_1.0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r0" +PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, @@ -10,7 +10,8 @@ PR = "r0" #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index c7ac97d2e5..95fb0cf0c6 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r26" +PR = "r27" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -52,6 +52,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ pango-module-basic-x \ pango-module-basic-fc \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \ " RDEPENDS_angstrom-gpe-task-pim := "\ 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 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" 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 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 diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb index a617f5b45b..ad42b0868b 100644 --- a/packages/ezx/opentapi_svn.bb +++ b/packages/ezx/opentapi_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Open implementation of motorola's tapisrc" LICENSE = "GPLv2" PV = "0.0+svn${SRCDATE}" +PR = "r1" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ file://opentapi.init \ @@ -10,7 +11,7 @@ SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http inherit update-rc.d INITSCRIPT_NAME = "opentapi" -INITSCRIPT_PARAMS = "defaults" +INITSCRIPT_PARAMS = "start 04 S ." S = "${WORKDIR}/${PN}" 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}-." 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: -# <type> <owner> <group> <mode> <path> [<linksource>] +# <type> <owner> <group> <mode> <path> <linksource> # where the items are separated by whitespace ! # # <type> : 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 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 + 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 diff --git a/packages/lcdproc/lcdproc_0.5.1.bb b/packages/lcdproc/lcdproc_0.5.1.bb new file mode 100644 index 0000000000..e769e0053f --- /dev/null +++ b/packages/lcdproc/lcdproc_0.5.1.bb @@ -0,0 +1,118 @@ +DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \ +shipped with this package can be used to acquire various kinds of system stats." +HOMEPAGE = "http://lcdproc.org" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "utils" +PR="r1" + +DEPENDS = "libusb ncurses libg15 g15daemon libg15render" +RRECOMMENDS_lcdproc = "lcdd" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz" + +inherit autotools update-rc.d + +PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15" + +CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" +CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf" + +FILES_lcdd = "${CONFFILES_lcdd} \ + ${sbindir}/LCDd \ + ${sysconfdir}/init.d/lcdd" + +FILES_lcdproc = "${CONFFILES_lcdproc} \ + ${bindir}/lcdproc \ + ${sysconfdir}/init.d/lcdproc" + +# Driver packages + +FILES_lcdd-driver-cfontz = "${libdir}/lcdproc/CFontz*.so" +FILES_lcdd-driver-bayrad = "${libdir}/lcdproc/bayrad.so" +FILES_lcdd-driver-hd44780nousb = "${libdir}/lcdproc/hd44780nousb.so" +FILES_lcdd-driver-hd44780 = "${libdir}/lcdproc/hd44780.so" +FILES_lcdd-driver-mtxorb = "${libdir}/lcdproc/MtxOrb.so" +FILES_lcdd-driver-serialvfd = "${libdir}/lcdproc/serialVFD.so" +FILES_lcdd-driver-curses = "${libdir}/lcdproc/curses.so" +FILES_lcdd-driver-text = "${libdir}/lcdproc/text.so" +FILES_lcdd-driver-sed = "${libdir}/lcdproc/sed*.so" +FILES_lcdd-driver-cwlnx = "${libdir}/lcdproc/CwLnx.so" +FILES_lcdd-driver-glk = "${libdir}/lcdproc/glk.so" +FILES_lcdd-driver-icp-a106 = "${libdir}/lcdproc/icp_a106.so" +FILES_lcdd-driver-imon = "${libdir}/lcdproc/imon.so" +FILES_lcdd-driver-joy = "${libdir}/lcdproc/joy.so" +FILES_lcdd-driver-lb216 = "${libdir}/lcdproc/lb216.so" +FILES_lcdd-driver-lcdm001 = "${libdir}/lcdproc/lcdm001.so" +FILES_lcdd-driver-lcterm = "${libdir}/lcdproc/lcterm.so" +FILES_lcdd-driver-ms6931 = "${libdir}/lcdproc/ms6931.so" +FILES_lcdd-driver-mtc-s16209x = "${libdir}/lcdproc/mtc_s16209x.so" +FILES_lcdd-driver-noritakevfd = "${libdir}/lcdproc/NoritakeVFD.so" +FILES_lcdd-driver-pyramid = "${libdir}/lcdproc/pyramid.so" +FILES_lcdd-driver-sli = "${libdir}/lcdproc/sli.so" +FILES_lcdd-driver-stv5730 = "${libdir}/lcdproc/stv5730.so" +FILES_lcdd-driver-t6963 = "${libdir}/lcdproc/t6963.so" +FILES_lcdd-driver-tyan = "${libdir}/lcdproc/tyan.so" +FILES_lcdd-driver-g15 = "${libdir}/lcdproc/g15.so" + + +# Install-all-drivers-hack: + +DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15" + +# USB / no USB trickery + +CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" +CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" + +INITSCRIPT_PACKAGES = "lcdd lcdproc" +INITSCRIPT_NAME_lcdd = "lcdd" +INITSCRIPT_NAME_lcdproc = "lcdproc" +INITSCRIPT_PARAMS_lcdd = "defaults 70 21" +INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" + +EXTRA_OECONF = "--enable-drivers=all --enable-libusb" + +do_install () { + # binaries + install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd + install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc + + # init scripts + install -d ${D}${sysconfdir}/init.d + # so far, not fixed :-( and now even uglier :-(( + cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd + chmod 0755 ${D}${sysconfdir}/init.d/lcdd + # prevent lcdproc from starting if no SCREENS are set. + # will be fixed in next upstream release + cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc + chmod 0755 ${D}${sysconfdir}/init.d/lcdproc + + # configuration files + install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf + # don't start lcdproc by default + # will be fixed in next upstream release + cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf + chmod 0644 ${D}${sysconfdir}/lcdproc.conf + + # driver library files + install -d ${D}${libdir}/lcdproc + for i in server/drivers/*.so; do + install -m 0644 $i ${D}${libdir}/lcdproc/ + done +} + diff --git a/packages/libg15render/.mtn2git_empty b/packages/libg15render/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libg15render/.mtn2git_empty diff --git a/packages/libg15render/libg15render_1.2.bb b/packages/libg15render/libg15render_1.2.bb new file mode 100644 index 0000000000..2adb511eea --- /dev/null +++ b/packages/libg15render/libg15render_1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "This is a library to render text and shapes into a buffer usable by the Logitech G15 Gaming Keyboard." +HOMEPAGE = "http://g15tools.sourceforge.net" +LICENSE = "GPLv2" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libg15" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15render-${PV}.tar.bz2" + +inherit autotools + +do_stage () { + oe_libinstall -a -so libg15render ${STAGING_LIBDIR} + for i in libg15render.h; do + install -m 0644 ${S}/$i ${STAGING_INCDIR}/ + done +} + 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 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/ +} 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 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 \ diff --git a/packages/openchrome/.mtn2git_empty b/packages/openchrome/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openchrome/.mtn2git_empty 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..d5de8afce9 --- /dev/null +++ b/packages/openchrome/openchrome_svn.bb @@ -0,0 +1,20 @@ +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 + +do_stage() { + autotools_stage_all +} 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 <<EOF # Configure your domain and accounts mydomain=sample.com +mynetworks = 127.0.0.1/32 192.168.1.0/24 virtual_mailbox_domains = sample.com, other.net virtual_mailbox_maps = hash:/etc/postfix/virtual @@ -35,4 +36,66 @@ debug_peer_level = 2 sendmail_path = /usr/sbin/sendmail newaliases_path = /usr/bin/newaliases mailq_path = /usr/bin/mailq + +smtpd_data_restrictions = + permit_mynetworks, + reject_unauth_pipelining, + permit + +smtpd_client_restrictions = + permit_mynetworks, + # reject_unknown_client, # This can cause a lot of false rejects. + reject_invalid_hostname, + reject_rbl_client list.dsbl.org, + reject_rbl_client sbl.spamhaus.org, + reject_rbl_client cbl.abuseat.org, + reject_rbl_client dul.dnsbl.sorbs.net, + permit + +smtpd_helo_required = yes +smtpd_helo_restrictions = + permit_mynetworks, + reject_unauth_pipelining, + # reject_non_fqdn_hostname, # This can cause a lot of false rejects. + # reject_unknown_hostname, # This can cause a lot of false rejects. + reject_invalid_hostname, + permit + +smtpd_sender_restrictions = + permit_mynetworks, + reject_non_fqdn_sender, + # check_sender_access hash:/etc/postfix/access_domains, + reject_unknown_sender_domain, + permit + +smtpd_recipient_restrictions = + permit_mynetworks, + permit_sasl_authenticated, + reject_unauth_destination, + + # check_recipient_access pcre:/etc/postfix/recipient_checks.pcre, + # check_helo_access pcre:/etc/postfix/helo_checks.pcre, + + # check_client_access hash:/etc/postfix/maps/access_client, + # check_client_access hash:/etc/postfix/maps/exceptions_client, + # check_helo_access hash:/etc/postfix/maps/access_helo, + # check_helo_access hash:/etc/postfix/maps/verify_helo, + # check_sender_access hash:/etc/postfix/maps/access_sender, + # check_sender_access hash:/etc/postfix/maps/verify_sender, + # check_recipient_access hash:/etc/postfix/maps/access_recipient, + + # reject_multi_recipient_bounce, + reject_non_fqdn_recipient, + reject_unknown_recipient_domain, + # reject_unlisted_recipient, + #check_policy_service unix:private/policy, + + # check_sender_access hash:/etc/postfix/maps/no_verify_sender, + # check_sender_access hash:/etc/postfix/access_domains, + # reject_unverified_sender, + # reject_unverified_recipient + check_recipient_access hash:/etc/postfix/internal_recipient + +disable_vrfy_command = yes + EOF diff --git a/packages/postfix/files/volatiles b/packages/postfix/files/volatiles index cb111cd4c0..bc330c99bd 100644 --- a/packages/postfix/files/volatiles +++ b/packages/postfix/files/volatiles @@ -1,15 +1,15 @@ -d postfix nogroup 2755 /var/spool/mail -d root postfix 0755 /var/spool/postfix -d postfix root 0700 /var/spool/postfix/active -d postfix root 0700 /var/spool/postfix/bounce -d postfix root 0700 /var/spool/postfix/corrupt -d postfix root 0700 /var/spool/postfix/defer -d postfix root 0700 /var/spool/postfix/deferred -d postfix root 0700 /var/spool/postfix/flush -d postfix root 0700 /var/spool/postfix/hold -d postfix root 0700 /var/spool/postfix/incoming -d postfix postdrop 0730 /var/spool/postfix/maildrop -d root root 0755 /var/spool/postfix/pid -d postfix root 0700 /var/spool/postfix/private -d postfix postdrop 0710 /var/spool/postfix/public -d root root 0755 /var/spool/vmail +d postfix nogroup 2755 /var/spool/mail none +d root postfix 0755 /var/spool/postfix none +d postfix root 0700 /var/spool/postfix/active none +d postfix root 0700 /var/spool/postfix/bounce none +d postfix root 0700 /var/spool/postfix/corrupt none +d postfix root 0700 /var/spool/postfix/defer none +d postfix root 0700 /var/spool/postfix/deferred none +d postfix root 0700 /var/spool/postfix/flush none +d postfix root 0700 /var/spool/postfix/hold none +d postfix root 0700 /var/spool/postfix/incoming none +d postfix postdrop 0730 /var/spool/postfix/maildrop none +d root root 0755 /var/spool/postfix/pid none +d postfix root 0700 /var/spool/postfix/private none +d postfix postdrop 0710 /var/spool/postfix/public none +d root root 0755 /var/spool/vmail none diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index 117fd2fc61..280f073333 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "virtual/db libpcre postfix-native" LICENSE = "IPL" -PR = "r10" +PR = "r11" SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ file://${FILESDIR}/makedefs.patch;patch=1 \ @@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV file://main.cf_2.0 \ file://volatiles \ file://postfix \ + file://internal_recipient \ " S = "${WORKDIR}/postfix-${PV}" @@ -47,6 +48,7 @@ do_install () { install -m 755 ${WORKDIR}/main.cf_2.0 ${D}${localstatedir}/tmp/main_cf.sh install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix + install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient mv ${D}${sbindir}/sendmail ${D}${sbindir}/sendmail.${PN} } 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" 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/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..d5df55cbb4 100644 --- a/packages/qt/qt-x11-free_3.3.6.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -1,93 +1,10 @@ -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" +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 \ 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 diff --git a/packages/ruby/files/.mtn2git_empty b/packages/ruby/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ruby/files/.mtn2git_empty diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/files/disable_wide_getaddrinfo_check.patch index 82137896b9..82137896b9 100644 --- a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch +++ b/packages/ruby/files/disable_wide_getaddrinfo_check.patch diff --git a/packages/ruby/ruby-1.8.5/extmk_run.patch b/packages/ruby/files/extmk_run.patch index 57926f51b0..57926f51b0 100644 --- a/packages/ruby/ruby-1.8.5/extmk_run.patch +++ b/packages/ruby/files/extmk_run.patch diff --git a/packages/ruby/ruby-native_1.8.5.bb b/packages/ruby/ruby-native_1.8.5.bb index d5ccae8262..e4d2a3361e 100644 --- a/packages/ruby/ruby-native_1.8.5.bb +++ b/packages/ruby/ruby-native_1.8.5.bb @@ -1,3 +1,2 @@ -include ruby_${PV}.bb +require ruby.inc inherit native -DEPENDS = "" diff --git a/packages/ruby/ruby.inc b/packages/ruby/ruby.inc new file mode 100644 index 0000000000..9fe8333f6f --- /dev/null +++ b/packages/ruby/ruby.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Ruby is an interpreted scripting language \ +for quick and easy object-oriented programming." +SECTION = "devel/ruby" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ + file://extmk_run.patch;patch=1 \ + file://disable_wide_getaddrinfo_check.patch;patch=1" + +S = "${WORKDIR}/ruby-${PV}" + +inherit autotools + +# This snippet lets compiled extensions which rely on external libraries, +# such as zlib, compile properly. If we don't do this, then when extmk.rb +# runs, it uses the native libraries instead of the target libraries, and so +# none of the linking operations succeed -- which makes extconf.rb think +# that the libraries aren't available and hence that the extension can't be +# built. + +do_configure_prepend() { + sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk + rm -rf ${S}/ruby/ +} diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb index 972d56e14c..d06e9e0943 100644 --- a/packages/ruby/ruby_1.8.5.bb +++ b/packages/ruby/ruby_1.8.5.bb @@ -1,25 +1,2 @@ -DESCRIPTION = "Ruby is an interpreted scripting language \ -for quick and easy object-oriented programming." -SECTION = "devel/ruby" +require ruby.inc DEPENDS = "ruby-native zlib openssl" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ - file://extmk_run.patch;patch=1 \ - file://disable_wide_getaddrinfo_check.patch;patch=1" - -S = "${WORKDIR}/ruby-${PV}" - -inherit autotools - -# This snippet lets compiled extensions which rely on external libraries, -# such as zlib, compile properly. If we don't do this, then when extmk.rb -# runs, it uses the native libraries instead of the target libraries, and so -# none of the linking operations succeed -- which makes extconf.rb think -# that the libraries aren't available and hence that the extension can't be -# built. - -do_configure_prepend() { - sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk -} diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index 71aec2a8b0..bd6841f025 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -3,12 +3,13 @@ # Released under the MIT license (see packages/COPYING) DESCRIPTION = "All packages required for an base XFCE installation" +LICENSE = "MIT" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PR = "r1" +PR = "r2" RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ - xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \ + xfce4-panel-mcs-plugins \ xfdesktop-mcs-plugins" -LICENSE = "MIT" +RRECOMMENDS = "xfce-utils-mcs-plugins" diff --git a/packages/uim/uim-native_1.2.1.bb b/packages/uim/uim-native_1.3.1.bb index 5249ac6394..5249ac6394 100644 --- a/packages/uim/uim-native_1.2.1.bb +++ b/packages/uim/uim-native_1.3.1.bb diff --git a/packages/uim/uim_1.2.1.bb b/packages/uim/uim_1.3.1.bb index 5d82945df7..5d82945df7 100644 --- a/packages/uim/uim_1.2.1.bb +++ b/packages/uim/uim_1.3.1.bb diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce-mcs-manager/xfce-mcs-manager.inc index d913910d69..c50bf0ca64 100644 --- a/packages/xfce-mcs-manager/xfce-mcs-manager.inc +++ b/packages/xfce-mcs-manager/xfce-mcs-manager.inc @@ -5,6 +5,7 @@ DESCRIPTION="XFCE4 Settings manager." DEPENDS="libxfcegui4 libxfce4mcs" SECTION = "x11" +PR = "r1" inherit xfce @@ -20,5 +21,5 @@ do_stage() { do_stage_append () { install -d ${PKG_CONFIG_PATH} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc + sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/xfce-mcs-manager.pc } 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 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 diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc index 3de7625940..0b191194d7 100644 --- a/packages/xfce-utils/xfce-utils.inc +++ b/packages/xfce-utils/xfce-utils.inc @@ -6,21 +6,24 @@ DESCRIPTION="XFCE4 Utilities" DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" inherit xfce -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html" -PACKAGES += "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "/usr/lib/xfce4/mcs-plugins/" +PACKAGES =+ "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" # NOTE: This package takes a --with-browser for the default browser # NOTE: Works with gdm also gtkhtml 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..472ba68a14 --- /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 = "r2" +require ${PN}.inc 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 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 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 diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc index 380832d7c3..e3e64ef355 100644 --- a/packages/xfdesktop/xfdesktop.inc +++ b/packages/xfdesktop/xfdesktop.inc @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" inherit xfce PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" @@ -12,5 +12,3 @@ PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" - - 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 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 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 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 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 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" 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 |