From dbf6ae23f89f1382acd48968b2131b031ad57f70 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Oct 2005 12:47:21 +0000 Subject: rxvt-unicode (5.6 and cvs): Add desktop file and icon --- packages/rxvt-unicode/files/rxvt.desktop | 10 ++++++++++ packages/rxvt-unicode/files/rxvt.png | Bin 0 -> 2847 bytes packages/rxvt-unicode/rxvt-unicode_5.6.bb | 17 +++++++++++++++-- packages/rxvt-unicode/rxvt-unicode_cvs.bb | 15 ++++++++++++++- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 packages/rxvt-unicode/files/rxvt.desktop create mode 100644 packages/rxvt-unicode/files/rxvt.png diff --git a/packages/rxvt-unicode/files/rxvt.desktop b/packages/rxvt-unicode/files/rxvt.desktop new file mode 100644 index 0000000000..f372b28e97 --- /dev/null +++ b/packages/rxvt-unicode/files/rxvt.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Terminal +Exec=/usr/bin/rxvt +Icon=rxvt.png +Terminal=false +Type=Application +Categories=Utility +StartupNotify=false + diff --git a/packages/rxvt-unicode/files/rxvt.png b/packages/rxvt-unicode/files/rxvt.png new file mode 100644 index 0000000000..e56fa2e9cd Binary files /dev/null and b/packages/rxvt-unicode/files/rxvt.png differ diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb index 92915bf872..2f3f56c2cc 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -8,8 +8,10 @@ same time, including Xft fonts." LICENSE = "GPL" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch;patch=1 \ - file://signedchar.patch;patch=1" -PR = "r2" + file://signedchar.patch;patch=1 \ + file://rxvt.desktop \ + file://rxvt.png" +PR = "r3" inherit autotools update-alternatives @@ -53,3 +55,14 @@ do_compile () { # docs need "yodl" and I have no idea what that is oe_runmake -C src "LIBTOOL=$LIBTOOL" } + +do_install_append () { + install -d ${D}/${datadir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps/ + + install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications +} + +FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb index ceee7cd51a..45278534e5 100644 --- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb +++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb @@ -10,7 +10,9 @@ LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.schmorp.de/schmorpforge;module=rxvt-unicode \ file://xwc.patch;patch=1 \ file://signedchar.patch;patch=1 \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1 \ + file://rxvt.desktop \ + file://rxvt.png" inherit autotools update-alternatives @@ -56,3 +58,14 @@ do_compile () { # docs need "yodl" and I have no idea what that is oe_runmake -C src "LIBTOOL=$LIBTOOL" } + +do_install_append () { + install -d ${D}/${datadir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps/ + + install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications +} + +FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" -- cgit v1.2.3 From 32ac7b11cea1fa71dbcab59cfe6fd95c9792a018 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Oct 2005 12:58:52 +0000 Subject: openzaurus.conf, opensimpad.conf: Remove the mistakenly added udev devfs rules. devfs is dead. --- conf/distro/opensimpad.conf | 1 - conf/distro/openzaurus.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/conf/distro/opensimpad.conf b/conf/distro/opensimpad.conf index f6f8c18976..dc66621768 100644 --- a/conf/distro/opensimpad.conf +++ b/conf/distro/opensimpad.conf @@ -7,6 +7,5 @@ TARGET_OS ?= "linux" TARGET_FPU ?= "soft" PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index 9020d55217..a935ed4ac2 100644 --- a/conf/distro/openzaurus.conf +++ b/conf/distro/openzaurus.conf @@ -9,6 +9,5 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" -- cgit v1.2.3 From ed232daf1fafcca0bd6a1f1d6b96e3a9dd339a74 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Oct 2005 13:39:22 +0000 Subject: disapproval of revision 2d151a396c36bdb08948d221edbf6c5391eaf067 --- packages/rxvt-unicode/files/rxvt.desktop | 10 ---------- packages/rxvt-unicode/files/rxvt.png | Bin 2847 -> 0 bytes packages/rxvt-unicode/rxvt-unicode_5.6.bb | 17 ++--------------- packages/rxvt-unicode/rxvt-unicode_cvs.bb | 15 +-------------- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 packages/rxvt-unicode/files/rxvt.desktop delete mode 100644 packages/rxvt-unicode/files/rxvt.png diff --git a/packages/rxvt-unicode/files/rxvt.desktop b/packages/rxvt-unicode/files/rxvt.desktop deleted file mode 100644 index f372b28e97..0000000000 --- a/packages/rxvt-unicode/files/rxvt.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Terminal -Exec=/usr/bin/rxvt -Icon=rxvt.png -Terminal=false -Type=Application -Categories=Utility -StartupNotify=false - diff --git a/packages/rxvt-unicode/files/rxvt.png b/packages/rxvt-unicode/files/rxvt.png deleted file mode 100644 index e56fa2e9cd..0000000000 Binary files a/packages/rxvt-unicode/files/rxvt.png and /dev/null differ diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb index 2f3f56c2cc..92915bf872 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -8,10 +8,8 @@ same time, including Xft fonts." LICENSE = "GPL" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch;patch=1 \ - file://signedchar.patch;patch=1 \ - file://rxvt.desktop \ - file://rxvt.png" -PR = "r3" + file://signedchar.patch;patch=1" +PR = "r2" inherit autotools update-alternatives @@ -55,14 +53,3 @@ do_compile () { # docs need "yodl" and I have no idea what that is oe_runmake -C src "LIBTOOL=$LIBTOOL" } - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications -} - -FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb index 45278534e5..ceee7cd51a 100644 --- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb +++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb @@ -10,9 +10,7 @@ LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.schmorp.de/schmorpforge;module=rxvt-unicode \ file://xwc.patch;patch=1 \ file://signedchar.patch;patch=1 \ - file://makefile.patch;patch=1 \ - file://rxvt.desktop \ - file://rxvt.png" + file://makefile.patch;patch=1" inherit autotools update-alternatives @@ -58,14 +56,3 @@ do_compile () { # docs need "yodl" and I have no idea what that is oe_runmake -C src "LIBTOOL=$LIBTOOL" } - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications -} - -FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" -- cgit v1.2.3 From 8365820bf11a91b1dd7fa68b34ce344c0c746d58 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 10 Oct 2005 16:13:52 +0000 Subject: geda-gsymcheck: add 20050820 release --- packages/geda/geda-gsymcheck_20050820.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/geda/geda-gsymcheck_20050820.bb diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-gsymcheck_20050820.bb new file mode 100644 index 0000000000..aec9007906 --- /dev/null +++ b/packages/geda/geda-gsymcheck_20050820.bb @@ -0,0 +1,12 @@ +MAINTAINER = "Koen Kooi " +LICENSE = "GPLv2" +HOMEPAGE = "http://geda.seul.org" +PR = "r0" +FILES_${PN} += "${datadir}/gEDA" + +DEPENDS = "gtk+ libgeda" + +SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz" + +inherit autotools pkgconfig + -- cgit v1.2.3 From a541e9aa2814f298d47bd52e1c0e9387df422563 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 10 Oct 2005 17:12:44 +0000 Subject: geda: add .desktop for geda-20050820 --- packages/geda/files/.mtn2git_empty | 0 packages/geda/files/gEDA.desktop | 8 ++++++++ packages/geda/geda_20050820.bb | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/geda/files/.mtn2git_empty create mode 100644 packages/geda/files/gEDA.desktop diff --git a/packages/geda/files/.mtn2git_empty b/packages/geda/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/geda/files/gEDA.desktop b/packages/geda/files/gEDA.desktop new file mode 100644 index 0000000000..6f6f0c6e38 --- /dev/null +++ b/packages/geda/files/gEDA.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=gEDA +Comment=GPL suite of Electronic Design Automation tools +Exec=geda +Terminal=0 +Type=Application +Icon=/usr/share/gEDA/bitmap/gschem-net.xpm +Categories=Utility diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb index 65356724d5..84918d63b2 100644 --- a/packages/geda/geda_20050820.bb +++ b/packages/geda/geda_20050820.bb @@ -3,11 +3,17 @@ MAINTAINER = "Koen Kooi " LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" FILES_${PN} += "${datadir}/gEDA" -PR ="r1" +PR ="r2" DEPENDS = "libgeda gtk+" RRECOMMENDS = "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols" -SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz" +SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz \ + file://gEDA.desktop" inherit autotools pkgconfig + +do_install_append() { +install -d ${D}${datadir}/applications/ +install -m 644 ${WORKDIR}/gEDA.desktop ${D}${datadir}/applications/ +} -- cgit v1.2.3 From 62ad45c05d779ecebc96d385bd3f80dd39efb439 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 10 Oct 2005 18:05:42 +0000 Subject: efl, e-wm: Add a sed fix for X11 system headers --- classes/efl.bbclass | 1 + packages/e17/e-wm_0.16.999.015.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 964748e85c..b438ca61b4 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -40,6 +40,7 @@ export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' } do_stage_append () { diff --git a/packages/e17/e-wm_0.16.999.015.bb b/packages/e17/e-wm_0.16.999.015.bb index 7a7291a156..c39b2ab9e1 100644 --- a/packages/e17/e-wm_0.16.999.015.bb +++ b/packages/e17/e-wm_0.16.999.015.bb @@ -36,6 +36,7 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" -- cgit v1.2.3 From 1e871e2689ece1b8d16815f97171b9cb612705ba Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 10 Oct 2005 21:29:16 +0000 Subject: libgsf: add 1.13.2 --- packages/libgsf/libgsf_1.13.2.bb | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 packages/libgsf/libgsf_1.13.2.bb diff --git a/packages/libgsf/libgsf_1.13.2.bb b/packages/libgsf/libgsf_1.13.2.bb new file mode 100644 index 0000000000..02e95718dd --- /dev/null +++ b/packages/libgsf/libgsf_1.13.2.bb @@ -0,0 +1,47 @@ +LICENSE = "GPL" +SECTION = "libs" +PR = "r0" + +DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" + +PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " + +FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" +FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" + +inherit autotools pkgconfig gnome + +libgsf_includes = "gsf-doc-meta-data.h gsf-infile.h gsf-input-textline.h \ + gsf-outfile-zip.h gsf-output-stdio.h gsf-impl-utils.h \ + gsf-input-bzip.h gsf-input.h gsf-outfile.h gsf-output.h \ + gsf-infile-impl.h gsf-input-gzip.h gsf-libxml.h \ + gsf-output-bzip.h gsf-structured-blob.h gsf-infile-msole.h \ + gsf-input-impl.h gsf-msole-utils.h gsf-output-gzip.h \ + gsf-timestamp.h gsf-infile-msvba.h gsf-input-iochannel.h \ + gsf-outfile-impl.h gsf-output-impl.h gsf-utils.h \ + gsf-infile-stdio.h gsf-input-memory.h gsf-outfile-msole.h \ + gsf-output-iochannel.h gsf.h gsf-infile-zip.h gsf-input-stdio.h \ + gsf-outfile-stdio.h gsf-output-memory.h gsf-output-csv.h \ + gsf-output-iconv.h gsf-meta-names.h " + +libgsf_gnome_includes = "gsf-input-gnomevfs.h \ + gsf-output-gnomevfs.h \ + gsf-input-bonobo.h \ + gsf-output-bonobo.h \ + gsf-shared-bonobo-stream.h" + +do_stage() { + oe_libinstall -so -C gsf libgsf-1 ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf/ + for i in ${libgsf_includes}; do + install -m 0644 gsf/$i ${STAGING_INCDIR}/libgsf-1/gsf/$i + done + + oe_libinstall -so -C gsf-gnome libgsf-gnome-1 ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf-gnome/ + for i in ${libgsf_gnome_includes}; do + install -m 0644 gsf-gnome/$i ${STAGING_INCDIR}/libgsf-1/gsf-gnome/$i + done +} -- cgit v1.2.3 From f8055b256eb749bf4216d0d8a6268c63758309dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 10 Oct 2005 21:35:27 +0000 Subject: goffice: add 0.1.0 --- packages/gnome/goffice_0.1.0.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/gnome/goffice_0.1.0.bb diff --git a/packages/gnome/goffice_0.1.0.bb b/packages/gnome/goffice_0.1.0.bb new file mode 100644 index 0000000000..db26a617a5 --- /dev/null +++ b/packages/gnome/goffice_0.1.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION="Gnome Office Library" +LICENSE="GPLv2" +PR="r0" + +DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" + +inherit gnome pkgconfig + + + +do_stage() { + gnome_stage_includes + oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} +} + +python populate_packages_prepend () { + goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) + + do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) +} + -- cgit v1.2.3 From aa2d62a99f829a0972b9a7cb7d1d40935c051d5e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 10 Oct 2005 21:49:14 +0000 Subject: libgsf: use autotools_stage_all --- packages/libgsf/libgsf_1.13.2.bb | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/packages/libgsf/libgsf_1.13.2.bb b/packages/libgsf/libgsf_1.13.2.bb index 02e95718dd..caeb4e4dc9 100644 --- a/packages/libgsf/libgsf_1.13.2.bb +++ b/packages/libgsf/libgsf_1.13.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" @@ -11,37 +11,7 @@ FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-g inherit autotools pkgconfig gnome -libgsf_includes = "gsf-doc-meta-data.h gsf-infile.h gsf-input-textline.h \ - gsf-outfile-zip.h gsf-output-stdio.h gsf-impl-utils.h \ - gsf-input-bzip.h gsf-input.h gsf-outfile.h gsf-output.h \ - gsf-infile-impl.h gsf-input-gzip.h gsf-libxml.h \ - gsf-output-bzip.h gsf-structured-blob.h gsf-infile-msole.h \ - gsf-input-impl.h gsf-msole-utils.h gsf-output-gzip.h \ - gsf-timestamp.h gsf-infile-msvba.h gsf-input-iochannel.h \ - gsf-outfile-impl.h gsf-output-impl.h gsf-utils.h \ - gsf-infile-stdio.h gsf-input-memory.h gsf-outfile-msole.h \ - gsf-output-iochannel.h gsf.h gsf-infile-zip.h gsf-input-stdio.h \ - gsf-outfile-stdio.h gsf-output-memory.h gsf-output-csv.h \ - gsf-output-iconv.h gsf-meta-names.h " - -libgsf_gnome_includes = "gsf-input-gnomevfs.h \ - gsf-output-gnomevfs.h \ - gsf-input-bonobo.h \ - gsf-output-bonobo.h \ - gsf-shared-bonobo-stream.h" do_stage() { - oe_libinstall -so -C gsf libgsf-1 ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf/ - for i in ${libgsf_includes}; do - install -m 0644 gsf/$i ${STAGING_INCDIR}/libgsf-1/gsf/$i - done - - oe_libinstall -so -C gsf-gnome libgsf-gnome-1 ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf-gnome/ - for i in ${libgsf_gnome_includes}; do - install -m 0644 gsf-gnome/$i ${STAGING_INCDIR}/libgsf-1/gsf-gnome/$i - done +autotools_stage_all } -- cgit v1.2.3 From b129daef2319b67bd58fa9b5dd2da1d12aabd576 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 10 Oct 2005 21:56:04 +0000 Subject: gnumeric: add 1.6.0 --- packages/gnumeric/gnumeric_1.6.0.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gnumeric/gnumeric_1.6.0.bb diff --git a/packages/gnumeric/gnumeric_1.6.0.bb b/packages/gnumeric/gnumeric_1.6.0.bb new file mode 100644 index 0000000000..3f19f36757 --- /dev/null +++ b/packages/gnumeric/gnumeric_1.6.0.bb @@ -0,0 +1,18 @@ +LICENSE = "GPL" +SECTION = "x11/utils" +S = "${WORKDIR}/gnumeric-${PV}" +MAINTAINER = "Koen Kooi " +DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" +DESCRIPTION = "Gnumeric spreadsheet for GNOME" + +inherit gnome flow-lossage + +SRC_URI += "file://remove-docs.patch;patch=1" + +EXTRA_OECONF=" --without-perl " + +python populate_packages_prepend () { + gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) + + do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) +} -- cgit v1.2.3 From 27276da79d08bd88360ecde39db40d60d4ade820 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 11 Oct 2005 04:32:46 +0000 Subject: php: Add version 5.0.5 and 2 patches for it - the current libxml2 build will not allow PHP5 to compile. --without-schemas has to be removes --- packages/php/php-5.0.5/.mtn2git_empty | 0 packages/php/php-5.0.5/autotools.patch | 90 +++++++++++++++++++++++++++++++++ packages/php/php-5.0.5/endianness.patch | 10 ++++ packages/php/php_5.0.5.bb | 62 +++++++++++++++++++++++ 4 files changed, 162 insertions(+) create mode 100644 packages/php/php-5.0.5/.mtn2git_empty create mode 100644 packages/php/php-5.0.5/autotools.patch create mode 100644 packages/php/php-5.0.5/endianness.patch create mode 100644 packages/php/php_5.0.5.bb diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/php/php-5.0.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/php/php-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch new file mode 100644 index 0000000000..7e466a425e --- /dev/null +++ b/packages/php/php-5.0.5/autotools.patch @@ -0,0 +1,90 @@ +diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4 +--- php-5.0.5~/acinclude.m4 2005-10-10 19:56:46.000000000 -0700 ++++ php-5.0.5/acinclude.m4 2005-10-10 19:56:55.000000000 -0700 +@@ -781,10 +781,10 @@ + OVERALL_TARGET=[]ifelse($1,,php,$1) + php_c_pre='$(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post=' && echo > $[@]' ++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_cxx_pre='$(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post=' && echo > $[@]' ++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_lo=o + + case $with_pic in +@@ -1531,6 +1531,7 @@ + + dnl even newer glibcs have a different seeker definition... + ++ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, + AC_TRY_RUN([ + #define _GNU_SOURCE + #include +@@ -1560,8 +1561,8 @@ + } + + ], +- [ cookie_io_functions_use_off64_t=yes ], +- [ ] ) ++ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ], ++ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) + + else + dnl older glibc versions (up to 2.1.2 ?) +diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in +--- php-5.0.5~/configure.in 2005-10-10 19:56:46.000000000 -0700 ++++ php-5.0.5/configure.in 2005-10-10 19:56:55.000000000 -0700 +@@ -247,7 +247,7 @@ + sinclude(Zend/acinclude.m4) + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) +- ++sinclude(TSRM/threads.m4) + + + divert(2) +diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4 +--- php-5.0.5~/scripts/phpize.m4 2005-10-10 19:56:46.000000000 -0700 ++++ php-5.0.5/scripts/phpize.m4 2005-10-10 19:56:55.000000000 -0700 +@@ -1,7 +1,5 @@ + dnl This file becomes configure.in for self-contained extensions. + +-AC_INIT(config.m4) +- + PHP_INIT_BUILD_SYSTEM + + AC_DEFUN([PHP_WITH_PHP_CONFIG],[ +@@ -55,8 +53,6 @@ + PHP_PROG_RE2C + AC_PROG_AWK + +-sinclude(config.m4) +- + enable_static=no + enable_shared=yes + +diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4 +--- php-5.0.5~/TSRM/threads.m4 2005-10-10 19:56:40.000000000 -0700 ++++ php-5.0.5/TSRM/threads.m4 2005-10-10 19:57:11.000000000 -0700 +@@ -86,7 +86,7 @@ + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4 +--- php-5.0.5~/TSRM/tsrm.m4 2005-10-10 19:56:40.000000000 -0700 ++++ php-5.0.5/TSRM/tsrm.m4 2005-10-10 19:56:55.000000000 -0700 +@@ -68,7 +68,6 @@ + ]) + + sinclude(threads.m4) +-sinclude(TSRM/threads.m4) + + AC_DEFUN([TSRM_CHECK_PTHREADS],[ + diff --git a/packages/php/php-5.0.5/endianness.patch b/packages/php/php-5.0.5/endianness.patch new file mode 100644 index 0000000000..0231727c33 --- /dev/null +++ b/packages/php/php-5.0.5/endianness.patch @@ -0,0 +1,10 @@ +--- php-5.0.5/Zend/zend_strtod.c~ 2005-10-10 19:58:06.000000000 -0700 ++++ php-5.0.5/Zend/zend_strtod.c 2005-10-10 20:21:35.000000000 -0700 +@@ -130,6 +130,7 @@ + * but the word order is big endian. + */ + #define IEEE_BIG_ENDIAN ++#undef IEEE_LITTLE_ENDIAN + #endif + + #ifdef __vax__ diff --git a/packages/php/php_5.0.5.bb b/packages/php/php_5.0.5.bb new file mode 100644 index 0000000000..953f9c08e0 --- /dev/null +++ b/packages/php/php_5.0.5.bb @@ -0,0 +1,62 @@ +SECTION = "console/network" +DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." +MAINTAINER = "Chris Larson " +LICENSE = "PHP" +DEPENDS = "zlib libxml2 mysql" +SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \ + file://autotools.patch;patch=1 \ + file://endianness.patch;patch=1" +S = "${WORKDIR}/php-${PV}" + +# NOTE: You MUST remove --without-schemas from the libxml2 bb file (and recompile and reinstall it) to compile and use php5 + +inherit autotools + +CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ + --with-mysql=${STAGING_LIBDIR}/.. \ + --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ + --without-libpng --without-libjpeg \ + --with-config-file-path=${sysconfdir}/php5 \ + --cache-file=config.cache \ + --disable-debug \ + --disable-rpath \ + --enable-bcmath \ + --enable-calendar \ + --enable-maintainer-zts \ + --enable-embed=shared \ + --enable-force-cgi-redirect \ + --enable-ftp \ + --enable-inline-optimization \ + --enable-magic-quotes \ + --enable-memory-limit \ + --enable-pic \ + --enable-safe-mode \ + --enable-sockets \ + --enable-track-vars \ + --enable-trans-sid \ + --enable-wddx \ + --sysconfdir=/etc/appWeb \ + --with-exec-dir=/etc/appWeb/exec \ + --with-db \ + --with-regex=system \ + --with-pear \ + --with-xml \ + --with-xmlrpc \ + --with-zlib \ + --without-iconv" + +EXTRA_OECONF += " --without-pear" +# Uncomment the following two lines, and comment the above to enable PEAR +#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" +#DEPENDS += " php-native" + +acpaths = "" + +do_configure_prepend() { + find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' +} + +do_install () { + oe_runmake 'INSTALL_ROOT=${D}' install +} -- cgit v1.2.3 From 5024dd28e3b074907df7cab0b5a3096035930a67 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 11 Oct 2005 05:28:18 +0000 Subject: appweb: Add version 2.0.4 and patches - The init script currently does not work (I assume it's using RedHat semantics) --- packages/appweb/appweb-2.0.4/.mtn2git_empty | 0 packages/appweb/appweb-2.0.4/init.d.patch | 14 ++++ packages/appweb/appweb-2.0.4/makerules.patch | 30 +++++++ packages/appweb/appweb_2.0.4.bb | 117 +++++++++++++++++++++++++++ 4 files changed, 161 insertions(+) create mode 100644 packages/appweb/appweb-2.0.4/.mtn2git_empty create mode 100644 packages/appweb/appweb-2.0.4/init.d.patch create mode 100644 packages/appweb/appweb-2.0.4/makerules.patch create mode 100644 packages/appweb/appweb_2.0.4.bb diff --git a/packages/appweb/appweb-2.0.4/.mtn2git_empty b/packages/appweb/appweb-2.0.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/appweb/appweb-2.0.4/init.d.patch b/packages/appweb/appweb-2.0.4/init.d.patch new file mode 100644 index 0000000000..d646b1f434 --- /dev/null +++ b/packages/appweb/appweb-2.0.4/init.d.patch @@ -0,0 +1,14 @@ +--- appWeb-2.0.4/appWeb/package/files/LINUX/appWeb.files~ 2005-10-10 22:16:58.000000000 -0700 ++++ appWeb-2.0.4/appWeb/package/files/LINUX/appWeb.files 2005-10-10 22:16:43.000000000 -0700 +@@ -23,9 +23,9 @@ + SrcD=${BLD_TOP}/${BLD_PRODUCT}/package/LINUX + if [ "${BLD_ROOT_PREFIX}" = "/" ] + then +- DestD=/etc/rc.d ++ DestD=/etc + else +- DestD=${BLD_ROOT_PREFIX}/etc/rc.d ++ DestD=${BLD_ROOT_PREFIX}/etc + fi + + makeDir "${DestD}" diff --git a/packages/appweb/appweb-2.0.4/makerules.patch b/packages/appweb/appweb-2.0.4/makerules.patch new file mode 100644 index 0000000000..422154da17 --- /dev/null +++ b/packages/appweb/appweb-2.0.4/makerules.patch @@ -0,0 +1,30 @@ +--- appWeb-2.0.4/make.rules~ 2005-07-05 09:09:38.000000000 -0700 ++++ appWeb-2.0.4/make.rules 2005-10-10 21:55:10.000000000 -0700 +@@ -61,25 +61,20 @@ + for i in $$D "" ; \ + do [ -z "$$i" ] && continue ;\ + [ -d "$$i" ] || continue ;\ +- home=`pwd` ; \ +- cd "$$i" >/dev/null ; \ +- if [ -f Makefile ] ; then \ ++ if [ -f $$i/Makefile ] ; then \ + echo ; \ +- echo " cd $$i" ; \ + set +e ; \ + unset COMPILE_SHARED EXPORT_OBJECTS _LDPATH ; \ + set -e ; \ + echo -e "\n \# $(MAKE) $$T" ; \ +- $(MAKE) --no-print-directory -S $$T ; \ ++ $(MAKE) -C $$i --no-print-directory -S $$T ; \ + code=$$? ; \ + if [ $$code != 0 ] ; then \ + echo "\#WARNING: Makefile error in `pwd`" ; \ + exit 255 ; \ + fi ; \ + echo ; \ +- echo " cd $$home" ; \ + fi ; \ +- cd "$$home" >/dev/null ;\ + done + + DO_RECURSE=[ -z "$$D" ] || $(RECURSE) diff --git a/packages/appweb/appweb_2.0.4.bb b/packages/appweb/appweb_2.0.4.bb new file mode 100644 index 0000000000..a559b13ef3 --- /dev/null +++ b/packages/appweb/appweb_2.0.4.bb @@ -0,0 +1,117 @@ +DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind." +SECTION = "console/network" +LICENSE = "GPL" +SRC_URI = "http://www.mbedthis.com/software/appWeb-src-${PV}-1.tar.gz \ + file://makerules.patch;patch=1 \ + file://init.d.patch;patch=1" +S = "${WORKDIR}/appWeb-${PV}" + +APPWEB_HOST = "${@get_appweb_host(d, bb)}" +APPWEB_BUILD = "${BUILD_SYS}" + +def get_appweb_host(d, bb): + host = bb.data.getVar('HOST_SYS', d, 1) + return host.replace('-linux-uclibc', '-linux') + + +# --buildNumber=NUMBER Set the build number part of the version (1.0.0.X). +# --name=NAME Set the full product name (BLD_NAME define). +# --port=PORT Set the default HTTP port to use for the product. +# --product=NAME Set the one word (no spaces) name of the product. +# --setLibVersion=X.X.X Set the shared library version number. +# --setVersion=X.X.X Set the product version number. +# --sslPort=PORT Set the default SSL port to use for the product. +# --type=BUILD Set the build type (DEBUG|RELEASE). +# +# --enable-access-log Enable logging of requests to the AppWeb access log. +# --enable-assert Build with assert checking. +# --enable-config Build with the ability to parse Apache-style config +# --enable-cookie Build with cookie handling support. +# --enable-digest-auth Build with digest authentication support. +# --enable-fast-malloc Build with the Mbedthis fast malloc. +# --enable-if-modified Build with HTTP If-Modified checking. +# --enable-keep-alive Build with HTTP Keep-Alive support. +# --enable-log Build with the AppWeb trace log facility. +# --enable-modules Build with the dynamically loaded modules capability. +# --enable-multi-thread Build AppWeb multi-threaded. +# --disable-multi-thread Build AppWeb single threaded. +# --enable-rom-fs Build with the ability to load web pages from ROM. +# --enable-run-as-service Build with the ability to run as a service/daemon. +# --disable-run-as-service Do not include the ability to run as a service. +# --enable-safe-strings Enforce safe string handling. +# --enable-session Build with HTTP session support. +# --enable-shared Build an appWeb shared library and program. [default] +# --enable-shared-libc Link with the shared versions of libc. +# --disable-shared-libc Link with the static versions of libc. +# --enable-squeeze Build in squeeze mode for minimal memory footprint. +# --disable-squeeze Build for speed. +# --enable-static Build a static appWeb library and program. [default] +# --disable-static Do not build a static appWeb library and program. +# +# --with-admin Include the admin handler. +# --with-auth Include the authorization handler. +# --with-c_api Include the C API. +# --with-cgi Include the CGI handler. +# --with-gacompat Include GoAhead WebServer API compatibility. +# --with-copy Build support for the copy handler. +# --with-egi Include the EGI handler. +# --with-esp Include the ESP handler. +# --with-ssl Build support for the SSL protocol. +# --with-upload Build with the file upload handler +# --with-xdb Build with XDB +# Supported PACKAGE names: openssl, php4, php5 +# --with-PACKAGE=[builtin|, module] +# Include support for the PACKAGE. Link into appWeb +# statically and/or build as a module +# --with-PACKAGE-dir=DIR Set the source directory of the package +# --with-PACKAGE-libs=libs Set a list of libraries to use when linking with +# the PACKAGE +# --without-PACKAGE Do not include support for the PACKAGE +EXTRA_OECONF = "--prefix=${prefix} \ + --docDir=${docdir}/${P} \ + --incDir=${includedir} \ + --libDir=${libdir} \ + --sbinDir=${sbindir} \ + --webDir=${localstatedir}/www \ + --build=${APPWEB_BUILD} \ + --host=${APPWEB_HOST} \ + --enable-keep-alive \ + --enable-multi-thread \ + --with-cgi=builtin \ + --enable-cookie \ + --enable-config-parse \ + --enable-config-save \ + --enable-digest-auth \ + --without-ssl" + +export IFLAGS = "${CPPFLAGS}" +export CC_FOR_BUILD = "${BUILD_CC}" +export LD_FOR_BUILD = "${BUILD_LD}" + +LD_LIBRARY_PATH_prepend = "${S}/lib:" +LD_LIBRARY_PATH[export] = "1" +do_configure () { + ./configure ${EXTRA_OECONF} +} + +do_compile () { + oe_runmake build + oe_runmake compile +} + +do_stage () { + : +} + +do_install () { + oe_runmake 'ROOT_DIR=${D}' install-all +} + +#do_install () { +# install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \ +# ${D}${libexecdir}/appWeb ${D}${libdir} +# install -m 0755 appWeb/appWeb ${D}${sbindir}/ +# install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/ +# install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/ +# install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/ +#} -- cgit v1.2.3 From 2707ca240b69538f1dfebe668c913aec8cd6842c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 11 Oct 2005 08:57:04 +0000 Subject: libopieobex0: added missing DEPENDS on openobex-apps - this will close bug #392 --- packages/libopieobex/libopieobex0.inc | 2 +- packages/libopieobex/libopieobex0_1.2.1.bb | 1 + packages/libopieobex/libopieobex0_cvs.bb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc index 40475cf8c3..c1bab9062b 100644 --- a/packages/libopieobex/libopieobex0.inc +++ b/packages/libopieobex/libopieobex0.inc @@ -3,7 +3,7 @@ SECTION = "opie/libs" PRIORITY = "optional" MAINTAINER = "Team Opie " LICENSE = "LGPL" -DEPENDS = "opie-taskbar" +DEPENDS = "opie-taskbar openobex-apps" RDEPENDS = "openobex-apps" APPNAME = "obex" diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb index f5a2b1bc45..d80a2a664f 100644 --- a/packages/libopieobex/libopieobex0_1.2.1.bb +++ b/packages/libopieobex/libopieobex0_1.2.1.bb @@ -1,5 +1,6 @@ include libopieobex0.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index 3ea7522aa5..3f97b816c4 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,6 +1,7 @@ include libopieobex0.inc PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ ${HANDHELDS_CVS};module=opie/pics" -- cgit v1.2.3