From c33f385e0a9a5506a3335527bc3280d20b5fce1c Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 18:14:03 +0000 Subject: wrt-imagetools: Fix do_fetch by taking svn snapshot until OE can handle SVN by itself. Fixes 1735. --- packages/wrt/wrt-imagetools-native.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/wrt/wrt-imagetools-native.bb b/packages/wrt/wrt-imagetools-native.bb index cd5d802765..f9f459eea6 100644 --- a/packages/wrt/wrt-imagetools-native.bb +++ b/packages/wrt/wrt-imagetools-native.bb @@ -1,4 +1,5 @@ -SRC_URI = "cvs://anonymous@openwrt.org/openwrt;module=openwrt/target/utils/src;tag=TESTED" +#SRC_URI = "svn://svn.openwrt.org/openwrt;module=trunk/tools/firmware-utils/src;proto=https" +SRC_URI = ${SOURCEFORGE_MIRROR}/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2 S = "${WORKDIR}/src/" inherit native @@ -13,4 +14,4 @@ do_stage() { install -m 0755 ${S}/trx ${STAGING_BINDIR} install -m 0755 ${S}/motorola-bin ${STAGING_BINDIR} install -m 0755 ${S}/addpattern ${STAGING_BINDIR} -} \ No newline at end of file +} -- cgit v1.2.3 From bca3fadbbd1272719a5bb92b2effb3b7582997bd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 20:49:32 +0000 Subject: icewm: update to version 1.2.30 --- packages/icewm/icewm-1.2.26/.mtn2git_empty | 0 packages/icewm/icewm-1.2.26/configure.patch | 22 ---------------------- packages/icewm/icewm-1.2.26/makefile.patch | 26 -------------------------- packages/icewm/icewm-1.2.30/.mtn2git_empty | 0 packages/icewm/icewm-1.2.30/configure.patch | 22 ++++++++++++++++++++++ packages/icewm/icewm-1.2.30/makefile.patch | 26 ++++++++++++++++++++++++++ packages/icewm/icewm_1.2.26.bb | 25 ------------------------- packages/icewm/icewm_1.2.30.bb | 23 +++++++++++++++++++++++ 8 files changed, 71 insertions(+), 73 deletions(-) delete mode 100644 packages/icewm/icewm-1.2.26/.mtn2git_empty delete mode 100644 packages/icewm/icewm-1.2.26/configure.patch delete mode 100644 packages/icewm/icewm-1.2.26/makefile.patch create mode 100644 packages/icewm/icewm-1.2.30/.mtn2git_empty create mode 100644 packages/icewm/icewm-1.2.30/configure.patch create mode 100644 packages/icewm/icewm-1.2.30/makefile.patch delete mode 100644 packages/icewm/icewm_1.2.26.bb create mode 100644 packages/icewm/icewm_1.2.30.bb (limited to 'packages') diff --git a/packages/icewm/icewm-1.2.26/.mtn2git_empty b/packages/icewm/icewm-1.2.26/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/icewm/icewm-1.2.26/configure.patch b/packages/icewm/icewm-1.2.26/configure.patch deleted file mode 100644 index ade427d5e0..0000000000 --- a/packages/icewm/icewm-1.2.26/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- icewm-1.2.26/configure.in.orig 2006-07-18 15:16:37.024817360 -0600 -+++ icewm-1.2.26/configure.in 2006-07-18 15:17:32.889324664 -0600 -@@ -426,14 +426,11 @@ - AC_MSG_ERROR("xfreetype or core fonts must be enabled") - fi - if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then -- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) -- if test "${XFT_CONFIG}" == ""; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config) -- if test "${PKG_CONFIG}" != ""; then -- ${PKG_CONFIG} xft 2>/dev/null -- if test $? -eq 0 ; then -- XFT_CONFIG='pkg-config xft' -- fi -+ AC_PATH_PROG(PKG_CONFIG, pkg-config) -+ if test "${PKG_CONFIG}" != ""; then -+ ${PKG_CONFIG} xft 2>/dev/null -+ if test $? -eq 0 ; then -+ XFT_CONFIG='pkg-config xft' - fi - fi - if test "${XFT_CONFIG}" != ""; then diff --git a/packages/icewm/icewm-1.2.26/makefile.patch b/packages/icewm/icewm-1.2.26/makefile.patch deleted file mode 100644 index 9473c9b2a9..0000000000 --- a/packages/icewm/icewm-1.2.26/makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100 -+++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100 -@@ -206,10 +206,21 @@ - %.o: %.cc - @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< -- --genpref $(BINARIES): -+ -+HOSTCXX=g++ -+HOSTLD=g++ -+ -+genpref.o: genpref.cc -+ @echo " HOSTCXX " $@ -+ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< -+ -+$(BINARIES): - @echo " LD " $@ - @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) -+ -+genpref: -+ @echo " HOSTLD " $@ -+ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) - - ################################################################################ - diff --git a/packages/icewm/icewm-1.2.30/.mtn2git_empty b/packages/icewm/icewm-1.2.30/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/icewm/icewm-1.2.30/configure.patch b/packages/icewm/icewm-1.2.30/configure.patch new file mode 100644 index 0000000000..ade427d5e0 --- /dev/null +++ b/packages/icewm/icewm-1.2.30/configure.patch @@ -0,0 +1,22 @@ +--- icewm-1.2.26/configure.in.orig 2006-07-18 15:16:37.024817360 -0600 ++++ icewm-1.2.26/configure.in 2006-07-18 15:17:32.889324664 -0600 +@@ -426,14 +426,11 @@ + AC_MSG_ERROR("xfreetype or core fonts must be enabled") + fi + if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then +- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) +- if test "${XFT_CONFIG}" == ""; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config) +- if test "${PKG_CONFIG}" != ""; then +- ${PKG_CONFIG} xft 2>/dev/null +- if test $? -eq 0 ; then +- XFT_CONFIG='pkg-config xft' +- fi ++ AC_PATH_PROG(PKG_CONFIG, pkg-config) ++ if test "${PKG_CONFIG}" != ""; then ++ ${PKG_CONFIG} xft 2>/dev/null ++ if test $? -eq 0 ; then ++ XFT_CONFIG='pkg-config xft' + fi + fi + if test "${XFT_CONFIG}" != ""; then diff --git a/packages/icewm/icewm-1.2.30/makefile.patch b/packages/icewm/icewm-1.2.30/makefile.patch new file mode 100644 index 0000000000..9473c9b2a9 --- /dev/null +++ b/packages/icewm/icewm-1.2.30/makefile.patch @@ -0,0 +1,26 @@ +--- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100 ++++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100 +@@ -206,10 +206,21 @@ + %.o: %.cc + @echo " CXX " $@ + @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< +- +-genpref $(BINARIES): ++ ++HOSTCXX=g++ ++HOSTLD=g++ ++ ++genpref.o: genpref.cc ++ @echo " HOSTCXX " $@ ++ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< ++ ++$(BINARIES): + @echo " LD " $@ + @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) ++ ++genpref: ++ @echo " HOSTLD " $@ ++ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) + + ################################################################################ + diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb deleted file mode 100644 index 47d4fc8189..0000000000 --- a/packages/icewm/icewm_1.2.26.bb +++ /dev/null @@ -1,25 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "IceWM Window Manager" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ - file://makefile.patch;patch=1 \ - file://configure.patch;patch=1" - -S = "${WORKDIR}/icewm-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \ - --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \ - --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir" - -pkg_postinst() { -update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager /usr/bin/icewm-session -} diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb new file mode 100644 index 0000000000..5266b0adb9 --- /dev/null +++ b/packages/icewm/icewm_1.2.30.bb @@ -0,0 +1,23 @@ +SECTION = "x11/wm" +DESCRIPTION = "IceWM Window Manager" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ + file://makefile.patch;patch=1 \ + file://configure.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \ + --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \ + --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir" + +pkg_postinst() { +update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10 +} + +pkg_postrm() { +update-alternatives --remove x-window-manager /usr/bin/icewm-session +} -- cgit v1.2.3 From 6c067d922445e9138fbe365be3bdd95b10e57326 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 21:22:38 +0000 Subject: qt-x11-free: Put those debug files into their proper place --- packages/qt/qt-x11-free-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc index d21787786f..cb4ed12f8d 100644 --- a/packages/qt/qt-x11-free-common.inc +++ b/packages/qt/qt-x11-free-common.inc @@ -76,7 +76,7 @@ do_install() { } 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 qt-x11-plugins-debug" + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so" FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so" FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so" @@ -84,4 +84,4 @@ FILES_qt-x11-designer = "${bindir}/designer" FILES_qt-x11-assistant = "${bindir}/assistant" FILES_qt-x11-qvfb = "${bindir}/qvfb" FILES_qt-x11-qtconfig = "${bindir}/qtconfig" -FILES_qt-x11-plugins-debug += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug" +FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug" -- cgit v1.2.3