diff options
22 files changed, 302 insertions, 39 deletions
diff --git a/packages/enca/.mtn2git_empty b/packages/enca/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/enca/.mtn2git_empty diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb new file mode 100644 index 0000000000..2c0b1a4f86 --- /dev/null +++ b/packages/enca/enca_1.9.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Enca is an Extremely Naive Charset Analyser" +LICENSE = "GPL2" +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://trific.ath.cx/software/enca/" +MAINTAINER = "John Bloom <johnxx@gmail.com>" + +SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \ + file://configure-hack.patch;patch=1 \ + file://dont-run-tests.patch;patch=1 " + +inherit autotools + +do_compile() { + cd ${S}/tools && oe_runmake CC=${BUILD_CC} + oe_runmake +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/enca/files/.mtn2git_empty b/packages/enca/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/enca/files/.mtn2git_empty diff --git a/packages/enca/files/configure-hack.patch b/packages/enca/files/configure-hack.patch new file mode 100644 index 0000000000..85abcdcf02 --- /dev/null +++ b/packages/enca/files/configure-hack.patch @@ -0,0 +1,12 @@ +--- enca-1.9/configure.ac.orig 2006-02-15 00:57:39.000000000 -0800 ++++ enca-1.9/configure.ac 2006-02-15 00:57:46.000000000 -0800 +@@ -92,9 +92,6 @@ + dnl And for gtk-doc + gtk_CHECK_GTK_DOC + +-dnl Check for good random number sources +-AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) +- + dnl Dirty path hack. Helps some people with badly set up search paths. + if test "$prefix" = "NONE"; then + LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" diff --git a/packages/enca/files/dont-run-tests.patch b/packages/enca/files/dont-run-tests.patch new file mode 100644 index 0000000000..321d1e6201 --- /dev/null +++ b/packages/enca/files/dont-run-tests.patch @@ -0,0 +1,13 @@ +Index: enca-1.9/Makefile.am +=================================================================== +--- enca-1.9.orig/Makefile.am 2005-11-24 11:21:32.000000000 +0100 ++++ enca-1.9/Makefile.am 2006-04-11 11:14:21.832502904 +0200 +@@ -2,7 +2,7 @@ + if MAINTAINER_MODE + SUBDIRS = tools data script lib src devel-docs test + else +-SUBDIRS = tools script lib src devel-docs test ++SUBDIRS = tools script lib src devel-docs + endif + man_MANS = man/enca.1 + diff --git a/packages/fbreader/.mtn2git_empty b/packages/fbreader/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fbreader/.mtn2git_empty diff --git a/packages/fbreader/fbreader_0.7.3b.bb b/packages/fbreader/fbreader_0.7.3b.bb new file mode 100644 index 0000000000..fded05925d --- /dev/null +++ b/packages/fbreader/fbreader_0.7.3b.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "FBreader is an ebook reader" +LICENSE = "GPL2" +HOMEPAGE = "http://only.mawhrin.net/fbreader/" +SECTION = "x11/utils" +PRIORITY = "optional" +DEPENDS = "gtk+ enca expat" +MAINTAINER = "John Bloom <johnxx@gmail.com>" + +SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \ + file://hack-makefile.patch;patch=1 \ + file://set-target.patch;patch=1 \ + file://change-desktop.patch;patch=1" + +FILES_${PN} += "/usr/share/FBReader" + +inherit autotools pkgconfig + +do_install_append() { + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/pdaxrom/usr/share/applications/FBReader.desktop ${D}${datadir}/applications/fbreader.desktop + install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/icons/34x28/FBReader.png ${D}${datadir}/pixmaps/fbreader.png +} diff --git a/packages/fbreader/files/.mtn2git_empty b/packages/fbreader/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fbreader/files/.mtn2git_empty diff --git a/packages/fbreader/files/change-desktop.patch b/packages/fbreader/files/change-desktop.patch new file mode 100644 index 0000000000..875c7775fe --- /dev/null +++ b/packages/fbreader/files/change-desktop.patch @@ -0,0 +1,11 @@ +--- fbreader-0.7.1b/fbreader/pdaxrom/usr/share/applications/FBReader.desktop.orig 2006-02-15 01:52:31.000000000 -0800 ++++ fbreader-0.7.1b/fbreader/pdaxrom/usr/share/applications/FBReader.desktop 2006-02-15 01:53:10.000000000 -0800 +@@ -2,7 +2,7 @@ + Name=FBReader + Comment=E-Book Reader + Exec=FBReader +-Icon=FBReader/FBReader.png ++Icon=fbreader.png + Terminal=0 + Type=Application + Categories=Application;Office;WordProcessor; diff --git a/packages/fbreader/files/hack-makefile.patch b/packages/fbreader/files/hack-makefile.patch new file mode 100644 index 0000000000..3859363607 --- /dev/null +++ b/packages/fbreader/files/hack-makefile.patch @@ -0,0 +1,24 @@ +--- fbreader-0.7.1b/makefiles/arch/desktop.mk.orig 2005-12-06 14:29:15.000000000 -0800 ++++ fbreader-0.7.1b/makefiles/arch/desktop.mk 2006-02-15 01:16:49.000000000 -0800 +@@ -1,16 +1,16 @@ + include $(ROOTDIR)/makefiles/arch/dummy.mk + +-INSTALLDIR=/usr/local ++INSTALLDIR=/usr + +-CC = gcc ++CC = $(CCLD) $(TARGET_CFLAGS) + AR = ar rsu +-LD = g++ ++LD = $(CXX) + + DEPGEN = $(CC) -MM + CFLAGS = -pipe $(DUMMY_SECTIONS) -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DINSTALLDIR=\"$(INSTALLDIR)\" + +-MOC = moc-qt3 +-QTINCLUDE = -I /usr/include/qt3 ++#MOC = moc-qt3 ++#QTINCLUDE = -I /usr/include/qt3 + + GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0) + diff --git a/packages/fbreader/files/set-target.patch b/packages/fbreader/files/set-target.patch new file mode 100644 index 0000000000..5a3b87d422 --- /dev/null +++ b/packages/fbreader/files/set-target.patch @@ -0,0 +1,13 @@ +--- fbreader-0.7.1b/makefiles/target.mk.orig 2005-12-06 14:29:15.000000000 -0800 ++++ fbreader-0.7.1b/makefiles/target.mk 2006-02-15 01:16:33.000000000 -0800 +@@ -10,8 +10,8 @@ + TARGET_ARCH = maemo + UI_TYPE = maemo + +-#TARGET_ARCH = desktop +-#UI_TYPE = gtk ++TARGET_ARCH = desktop ++UI_TYPE = gtk + #UI_TYPE = qt + + #TARGET_ARCH = zaurus diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 7fa23a2438..62bacda147 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "GPL" BINV = "3.4.4" PV = "3.4.4+csl-arm-2005q3" -PR = "r0" +PR = "r1" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" @@ -12,7 +12,8 @@ inherit autotools gettext include gcc-package.inc -SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2" +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ + file://gcc_optab_arm.patch;patch=1" do_unpack2() { cd ${WORKDIR} diff --git a/packages/gnome/orbit2-native_2.14.0.bb b/packages/gnome/orbit2-native_2.14.0.bb index c10afb58db..2d52ab7eee 100644 --- a/packages/gnome/orbit2-native_2.14.0.bb +++ b/packages/gnome/orbit2-native_2.14.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "CORBA ORB" LICENSE = "LGPL GPL" SECTION = "x11/gnome/libs" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \ +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ file://configure-lossage.patch;patch=1;pnum=1 \ file://gtk-doc.m4 \ file://gtk-doc.make" diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb index 474858856c..ef7f20e4ac 100644 --- a/packages/gtk+/gtk+_2.8.16.bb +++ b/packages/gtk+/gtk+_2.8.16.bb @@ -17,13 +17,13 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://hardcoded_libtool.patch;patch=1 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ - file://gtktreeview-316689.patch;patch=1" + file://gtktreeview-316689.patch;patch=1 \ # file://menu-deactivate.patch;patch=1 \ # file://xsettings.patch;patch=1 \ # file://scroll-timings.patch;patch=1 \ # file://small-gtkfilesel.patch;patch=1 \ # file://migration.patch;patch=1;pnum=0 \ -# file://no-demos.patch;patch=1 \ + file://no-demos.patch;patch=1" # file://gtk+-handhelds.patch;patch=1 \ # file://single-click.patch;patch=1" diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 41bc5c7755..5e95ba38df 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r0" +PR = "r1" QTVER = "qt-x11-opensource-src-4.1.1" @@ -12,6 +12,8 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ file://linux-oe-qmake.conf" S = "${WORKDIR}/${QTVER}" +# we need the real target system here +CROSS_SYS := "${TARGET_SYS}" inherit autotools native export QTDIR = "${S}" @@ -29,8 +31,8 @@ do_configure() { QMAKESPEC= PLATFORM=${HOST_OS}-oe-g++ export PLATFORM - oenote ./configure ${EXTRA_OECONF} - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed" + # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" } do_compile() { diff --git a/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch new file mode 100644 index 0000000000..e927df9c7d --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch @@ -0,0 +1,102 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec ++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(OE_QMAKE_CC) + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -16,19 +16,19 @@ + QMAKE_YACCFLAGS_MANGLE = -p $base -b $base + QMAKE_YACC_HEADER = $base.tab.h + QMAKE_YACC_SOURCE = $base.tab.c +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w +-QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CFLAGS_RELEASE = -O2 + QMAKE_CFLAGS_DEBUG = -g + QMAKE_CFLAGS_SHLIB = -fPIC + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ +-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +@@ -41,37 +41,37 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) ++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = + +-QMAKE_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS = ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) ++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) + QMAKE_LIBS_NIS = -lnsl + QMAKE_LIBS_OPENGL = -lGLU -lGL + QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_THREAD = -lpthread + +-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -83,7 +83,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = $(OE_QMAKE_STRIP) + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb index 2b90cb9df0..6c32026f38 100644 --- a/packages/qt/qt4-x11-free_4.1.1.bb +++ b/packages/qt/qt4-x11-free_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r0" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://cross-compile.patch;patch=1 \ @@ -14,10 +14,10 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz file://no-tools.patch;patch=1 \ file://no-qmake.patch;patch=1 \ file://gcc4_1.patch;patch=1 \ - file://configurable-cpu-extensions.patch;patch=1" + file://configurable-cpu-extensions.patch;patch=1 \ + file://fix-mkspecs.patch;patch=1" S = "${WORKDIR}/qt-x11-opensource-src-${PV}" -# TODO: make it not look in /usr and /usr/include for its tests! PARALLEL_MAKE = "" inherit qmake-base qt4x11 pkgconfig @@ -28,12 +28,14 @@ export ARCH = "${TARGET_ARCH}" export ARCH_i686 = "x86" EXTRA_OEMAKE = "-e" -# FIXME: add missing options +# FIXME: +# * add missing options +# * auto stl detection is broken, so we disable it QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ -nosse \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -verbose -stl" + -verbose -no-stl -no-accessibility" EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ @@ -45,13 +47,15 @@ do_configure() { echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri echo "DEFINES += QT_NO_XIM" >>src/qbase.pri unset QMAKESPEC + #export QMAKESPEC="linux-oe-g++" ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake - echo yes | ./configure -v -prefix ${prefix} -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ + #rm -rf ./mkspecs + #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs + echo yes | ./configure -prefix / -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql } # FIXME: Might want to compile the cross tools for the -dev packages as well... - do_compile() { unset CFLAGS CXXFLAGS install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc @@ -64,15 +68,14 @@ do_compile() { PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml" do_stage() { - install -d ${STAGING_QT_DIR} - for part in ${PARTS} - do - oe_libinstall -so -C lib libQt$part ${STAGING_QT_DIR} - done - oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -pPR include/* ${STAGING_INCDIR}/ + oe_runmake install INSTALL_ROOT=/ + install -m 0755 ${STAGING_BINDIR}/rcc4 ${STAGING_QT_DIR}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${STAGING_QT_DIR}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${STAGING_QT_DIR}/bin/uic + } +# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... do_install() { install -d ${D}${libdir} install -d ${D}${bindir} @@ -90,11 +93,16 @@ do_install() { do install -m 0755 $binary ${D}${bindir}/qt4-examples/ done + install -d ${D}${bindir}/qt4-demos + for binary in `find demos -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-demos/ + done } PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ libqtdesigner4 libqtdesignercomponents4 \ - qt4-assistant qt4-designer qt4-examples qt4-linguist \ + qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" FILES_libqtcore4 = "${libdir}/libQtCore.so*" @@ -117,4 +125,6 @@ FILES_qt4-assistant = "${bindir}/*assistant*" FILES_qt4-designer = "${bindir}/*designer*" FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" +FILES_qt4-common = "${bindir}/qtconfig" FILES_qt4-examples = "${bindir}/qt4-examples/*" +FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" diff --git a/packages/texmaker/.mtn2git_empty b/packages/texmaker/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/texmaker/.mtn2git_empty diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb new file mode 100644 index 0000000000..0ca09032cb --- /dev/null +++ b/packages/texmaker/texmaker_1.3.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor" +HOMEPAGE = "http://www.xm1math.net/texmaker" +SECTION = "x11/apps" +LICENSE = "GPL" +DEPENDS = "qt4x11" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" + +SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2" + +inherit qmake qt4x11 + +do_install() { + install -d ${D}${bindir} + install -m 0755 texmaker ${D}${bindir}/texmaker +} + diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch index 17836802a6..0e5d3ff153 100644 --- a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch +++ b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch @@ -1,6 +1,19 @@ ---- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 -@@ -176,7 +176,7 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit-cleanup.patch ++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp +@@ -40,6 +40,7 @@ + + #include <unistd.h> + #include <stdlib.h> ++#include <stdint.h> + #include <sys/ioctl.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -176,7 +177,7 @@ MAP_SHARED, fd, 0); data += dataoffset; @@ -9,7 +22,7 @@ perror("mapping /dev/fb0"); qWarning("Error: failed to map framebuffer device to memory."); return FALSE; -@@ -737,7 +737,7 @@ +@@ -737,7 +738,7 @@ psize += 8; // for alignment psize &= ~0x7; // align @@ -18,8 +31,8 @@ pos += psize; entryp = ((int *)pos); lowest = ((unsigned int *)pos)+1; ---- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 +--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit-cleanup.patch ++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp @@ -31,6 +31,7 @@ **********************************************************************/ @@ -37,8 +50,8 @@ return FALSE; else return TRUE; ---- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 +--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit-cleanup.patch ++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp @@ -107,6 +107,7 @@ #include <locale.h> #include <errno.h> @@ -79,8 +92,8 @@ else QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); } ---- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 +--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit-cleanup.patch ++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp @@ -49,6 +49,7 @@ #include "qgfx_qws.h" #include "qtextengine_p.h" @@ -98,8 +111,8 @@ // look for the requested font in the engine data cache engineData = QFontCache::instance->findEngineData( key ); ---- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 +--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit-cleanup.patch ++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp @@ -32,6 +32,7 @@ #include "qwsdisplay_qws.h" #include "qwsregionmanager_qws.h" @@ -117,8 +130,8 @@ #else int dataSize = sizeof(QWSRegionHeader) // header + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index ---- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 +--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit-cleanup.patch ++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp @@ -53,6 +53,7 @@ #include "qwsmanager_qws.h" #include "qwsregionmanager_qws.h" diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb index 142b3997e0..d75b9c889b 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.5.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -4,12 +4,11 @@ SECTION = "devel" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL QPL" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \ file://no-examples.patch;patch=1 \ file://64bit-cleanup.patch;patch=1" - S = "${WORKDIR}/qt-embedded-free-${PV}" inherit native qmake-base qt3e diff --git a/site/arm-linux b/site/arm-linux index dbed723cc0..4747c1fd89 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -366,3 +366,6 @@ jm_cv_func_working_readdir=yes # dpkg dpkg_cv_va_copy=${ac_cv_va_copy=no} dpkg_cv___va_copy=${ac_cv___va_copy=yes} + +# enca +yeti_cv_func_scanf_modif_size_t=yes |