From b9c1fc3a50ed2a06cf9c5425942cbf69ea9bdf61 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 May 2006 12:02:56 +0000 Subject: add albumshaper (qt3x11), open source application for organizing, annotating, framing, enhancing, stylizing, and sharing your digital photos --- packages/albumshaper/.mtn2git_empty | 0 packages/albumshaper/albumshaper_2.1.bb | 19 +++++++++++ packages/albumshaper/files/.mtn2git_empty | 0 packages/albumshaper/files/fixpaths.patch | 53 +++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 packages/albumshaper/.mtn2git_empty create mode 100644 packages/albumshaper/albumshaper_2.1.bb create mode 100644 packages/albumshaper/files/.mtn2git_empty create mode 100644 packages/albumshaper/files/fixpaths.patch diff --git a/packages/albumshaper/.mtn2git_empty b/packages/albumshaper/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/albumshaper/albumshaper_2.1.bb b/packages/albumshaper/albumshaper_2.1.bb new file mode 100644 index 0000000000..6bfd7e6812 --- /dev/null +++ b/packages/albumshaper/albumshaper_2.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Album Shaper strives to be the most friendly, easy to use, open source application for \ +organizing, annotating, framing, enhancing, stylizing, and sharing your digital photos. \ +Album Shaper embraces open formats like XML, JPEG, and XSLT, while supporting Windows, Mac OS X, and Unix \ +users who speak a multitude of languages around the world." +HOMEPAGE = "http://albumshaper.sourceforge.net" +AUTHOR = "Will Stokes" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +DEPENDS = "libxml2 libxslt jpeg" + +SRC_URI = "${SOURCEFORGE_MIRROR}/albumshaper/albumshaper_${PV}.tar.bz2 \ + file://fixpaths.patch;patch=1" +S = "${WORKDIR}/albumshaper_2.1_src" + +inherit qmake qt3x11 + +do_install() { + oe_runmake install INSTALL_ROOT="${D}" +} diff --git a/packages/albumshaper/files/.mtn2git_empty b/packages/albumshaper/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/albumshaper/files/fixpaths.patch b/packages/albumshaper/files/fixpaths.patch new file mode 100644 index 0000000000..34ca2e3804 --- /dev/null +++ b/packages/albumshaper/files/fixpaths.patch @@ -0,0 +1,53 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- albumshaper_2.1_src/Makefile~fixpaths ++++ albumshaper_2.1_src/Makefile +@@ -1,6 +1,6 @@ + ############################################################################# + # Makefile for building: bin/AlbumShaper.bin +-# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May 9 12:09:27 2006 ++# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May 9 13:58:45 2006 + # Project: AlbumShaper.pro + # Template: app + # Command: $(QMAKE) -spec /local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -after "CONFIG+=thread" -o Makefile AlbumShaper.pro +@@ -12,14 +12,14 @@ + CXX = $(OE_QMAKE_CXX) + LEX = flex + YACC = yacc +-CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT +-CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT ++CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT ++CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT + LEXFLAGS = + YACCFLAGS= -d + INCPATH = -I/local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -I. -I$(OE_QMAKE_INCDIR_QT) -Itmp/ + LINK = $(OE_QMAKE_LINK) + LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -s -Wl,-rpath-link,$(OE_QMAKE_LIBDIR_QT) +-LIBS = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/usr/lib -lxslt -lxml2 -lz -lm -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread ++LIBS = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxslt -lxml2 -lz -lm -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread + AR = $(OE_QMAKE_AR) cqs + RANLIB = + MOC = $(OE_QMAKE_MOC) +@@ -1377,7 +1377,7 @@ + + install_scripts: all + @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/" +- cp -f bin/AlbumShaper /usr/bin/AlbumShaper; ++ cp -f bin/AlbumShaper $(INSTALL_ROOT)//usr/bin/AlbumShaper; + + + install: install_target install_images install_text install_themes install_translations install_xmlConversion install_scripts +--- albumshaper_2.1_src/AlbumShaper.pro~fixpaths ++++ albumshaper_2.1_src/AlbumShaper.pro +@@ -272,7 +272,7 @@ + + #--------- Launcher Script (Linux/FreeBSD) ------------ + !mac:unix:scripts.path = $${BIN_DIR} +-!mac:unix:scripts.commands = cp -f bin/AlbumShaper $${BIN_DIR}/AlbumShaper; ++!mac:unix:scripts.commands = cp -f bin/AlbumShaper $(INSTALL_ROOT)/$${BIN_DIR}/AlbumShaper; + + + #=========================================================================================== -- cgit v1.2.3 From f8f6eb3b7a59af56021570e69a09b4f738dc57be Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 May 2006 12:14:58 +0000 Subject: add mkbot, a modular IRC bot written in C++, using the Qt 4 toolkit. --- packages/mkbot/.mtn2git_empty | 0 packages/mkbot/mkbot_0.3.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 packages/mkbot/.mtn2git_empty create mode 100644 packages/mkbot/mkbot_0.3.bb diff --git a/packages/mkbot/.mtn2git_empty b/packages/mkbot/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mkbot/mkbot_0.3.bb b/packages/mkbot/mkbot_0.3.bb new file mode 100644 index 0000000000..dd75418fdb --- /dev/null +++ b/packages/mkbot/mkbot_0.3.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "MKbot is a modular IRC bot written in C++, using the Qt 4 toolkit. \ +It currently works on networks running hybrid-ircd such as Freenode, and the unreal3 ircd" +HOMEPAGE = "http://fredemmott.co.uk/index.php?page=mkbot" +AUTHOR = "Fred Emmott" +LICENSE = "GPL" +SECTION = "network" +MAINTAINER = "Michael 'Mickey' Lauer " + +SRC_URI = "http://files.fredemmott.co.uk/mkbot-${PV}.tar.bz2" +S = "${WORKDIR}/MKbot-0.3" + +inherit qmake qt4x11 + +#FIXME: lacks packaging -- cgit v1.2.3 From c272706abf5527025d1d84ca064d03cec71cd118 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 May 2006 12:28:20 +0000 Subject: apr: upgrade to 0.9.12, fix staging apr-util: upgrade to 0.9.12, fix staging NOTE: it's not enough to stage the library, you need to stage includes as well NOTE: alternatively, call autotools_stage_all --- packages/apr/apr-util_0.9.12.bb | 24 ++++++++++++++++++++++++ packages/apr/apr-util_0.9.7.bb | 25 ------------------------- packages/apr/apr_0.9.12.bb | 18 ++++++++++++++++++ packages/apr/apr_0.9.7.bb | 19 ------------------- 4 files changed, 42 insertions(+), 44 deletions(-) create mode 100644 packages/apr/apr-util_0.9.12.bb delete mode 100644 packages/apr/apr-util_0.9.7.bb create mode 100644 packages/apr/apr_0.9.12.bb delete mode 100644 packages/apr/apr_0.9.7.bb diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb new file mode 100644 index 0000000000..e88298fafe --- /dev/null +++ b/packages/apr/apr-util_0.9.12.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Apache Portable Runtime (APR) companion library" +SECTION = "libs" +DEPENDS = "apr expat gdbm" +MAINTAINER = "Mustafa Yuecel " +LICENSE = "Apache" +HOMEPAGE = "http://apr.apache.org" +PR = "r0" + +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ + file://gen_uri_delims.patch;patch=1 \ + file://uri_delims.h" + +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" + +inherit autotools lib_package binconfig + +do_configure() { + cp ${S}/../uri_delims.h ${S}/uri/. + oe_runconf +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/apr/apr-util_0.9.7.bb b/packages/apr/apr-util_0.9.7.bb deleted file mode 100644 index 597c0ee93d..0000000000 --- a/packages/apr/apr-util_0.9.7.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Apache Portable Runtime (APR) companion library" -SECTION = "libs" -DEPENDS = "apr expat gdbm" -MAINTAINER = "Mustafa Yuecel " -LICENSE = "Apache" -HOMEPAGE = "http://apr.apache.org" - -PR = "r0" - -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ - file://gen_uri_delims.patch;patch=1 \ - file://uri_delims.h" - -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" - -inherit autotools lib_package binconfig - -do_configure() { - cp ${S}/../uri_delims.h ${S}/uri/. - oe_runconf -} - -do_stage() { - oe_libinstall -a -so -C .libs libaprutil-0 ${STAGING_LIBDIR} -} diff --git a/packages/apr/apr_0.9.12.bb b/packages/apr/apr_0.9.12.bb new file mode 100644 index 0000000000..5c287ace0f --- /dev/null +++ b/packages/apr/apr_0.9.12.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Apache Portable Runtime (APR) library" +SECTION = "libs" +MAINTAINER = "Mustafa Yuecel " +LICENSE = "Apache" +HOMEPAGE = "http://apr.apache.org" +PR = "r0" + +SRC_URI = "${APACHE_MIRROR}/apr/apr-${PV}.tar.bz2" + +inherit autotools lib_package binconfig + +do_configure() { + oe_runconf +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/apr/apr_0.9.7.bb b/packages/apr/apr_0.9.7.bb deleted file mode 100644 index 4c236109bb..0000000000 --- a/packages/apr/apr_0.9.7.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Apache Portable Runtime (APR) library" -SECTION = "libs" -MAINTAINER = "Mustafa Yuecel " -LICENSE = "Apache" -HOMEPAGE = "http://apr.apache.org" - -PR = "r0" - -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" - -inherit autotools lib_package binconfig - -do_configure() { - oe_runconf -} - -do_stage() { - oe_libinstall -a -so -C .libs libapr-0 ${STAGING_LIBDIR} -} -- cgit v1.2.3 From d2355d4ce22e938e111d618c4f599e64ecc24977 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 May 2006 12:29:17 +0000 Subject: base.bbclass: fix showing MT revision by using rindex instead of index to get the position of the MT directory --- classes/base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 56008e66cc..c0741a86aa 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -513,7 +513,8 @@ python base_eventhandler() { if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 ) - path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )] + print "path_to_bbfiles = ", path_to_bbfiles + path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )] monotone_revision = "" try: monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip() -- cgit v1.2.3