summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/fbreader/fbreader_0.7.3d.bb24
-rw-r--r--packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch158
-rw-r--r--packages/fbreader/files/set-target.patch5
-rw-r--r--packages/irda-utils/irdadump_0.9.16.bb22
-rw-r--r--packages/mysql/files/.mtn2git_empty (renamed from packages/mysql/mysql-4.1.16/.mtn2git_empty)0
-rw-r--r--packages/mysql/files/autofoo.patch (renamed from packages/mysql/mysql-4.1.16/autofoo.patch)0
-rw-r--r--packages/mysql/files/gen_lex_hash.patch (renamed from packages/mysql/mysql-4.1.16/gen_lex_hash.patch)0
-rw-r--r--packages/mysql/mysql-native_4.1.18.bb (renamed from packages/mysql/mysql-native_4.1.16.bb)0
-rw-r--r--packages/mysql/mysql_4.1.18.bb (renamed from packages/mysql/mysql_4.1.16.bb)0
-rw-r--r--packages/wpa-supplicant/wpa-gui_0.4.8.bb20
-rw-r--r--packages/x11-apps/app-common.inc4
-rw-r--r--site/arm-linux-gnueabi8
12 files changed, 238 insertions, 3 deletions
diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb
new file mode 100644
index 0000000000..a75d2b0de6
--- /dev/null
+++ b/packages/fbreader/fbreader_0.7.3d.bb
@@ -0,0 +1,24 @@
+
+DESCRIPTION = "FBreader is an ebook reader"
+LICENSE = "GPL2"
+HOMEPAGE = "http://only.mawhrin.net/fbreader/"
+SECTION = "x11/utils"
+PRIORITY = "optional"
+DEPENDS = "gtk+ enca expat"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+
+SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
+ file://fbreader-0.7.3d_buildsys_oe.patch;patch=1"
+
+FILES_${PN} += "${datadir}/FBReader"
+
+CFLAGS_append = " RESOLUTION=240x320 INSTALLDIR=/usr"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/openzaurus/gpe/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/fbreader-0.7.3d_buildsys_oe.patch b/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch
new file mode 100644
index 0000000000..44efdd8583
--- /dev/null
+++ b/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch
@@ -0,0 +1,158 @@
+diff -urd fbreader-0.7.3d_orig/fbreader/Makefile fbreader-0.7.3d/fbreader/Makefile
+--- fbreader-0.7.3d_orig/fbreader/Makefile 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/fbreader/Makefile 2006-05-04 12:02:42.000000000 +0200
+@@ -47,7 +47,7 @@
+ @$(LD) $(LDFLAGS) -o $(TARGET) `find common -name *.o` $(TARGET_ARCH)/$(UI_TYPE)/*.o $(LIBS)
+ @echo " OK"
+
+-install: all .really-install
++install: .really-install
+
+ .really-install:
+ @cd $(TARGET_ARCH); make install
+Nur in fbreader-0.7.3d/fbreader: Makefile~.
+diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop
+--- fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-05 09:42:06.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=FBReader
+ Comment=E-Book Reader
+ Exec=FBReader
+-Icon=fbreader/FBReader
++Icon=FBReader
+ Type=Application
+ Terminal=0
+ Categories=Application;Utility
+diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile fbreader-0.7.3d/fbreader/openzaurus/Makefile
+--- fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/fbreader/openzaurus/Makefile 2006-05-05 12:32:28.000000000 +0200
+@@ -1,5 +1,6 @@
+ ROOTDIR = $(PWD)/../..
+ include $(ROOTDIR)/makefiles/platforms.mk
++include $(ROOTDIR)/makefiles/config.mk
+
+ ifeq "$(UI_TYPE)" "opie"
+ BASEDIR = data/opt/QtPalmtop
+@@ -7,7 +8,7 @@
+ APPDIR = $(BASEDIR)/apps/Applications
+ STYLE = $(RESOLUTION)
+ else # UI_TYPE == gpe
+- BASEDIR = data/usr
++ BASEDIR = /usr
+ PICSDIR = $(BASEDIR)/share/pixmaps/fbreader
+ APPDIR = $(BASEDIR)/share/applications
+ STYLE = gpe$(RESOLUTION)
+@@ -34,7 +35,23 @@
+ @make .cleandir
+
+ install:
+-
++ @install -d $(DESTDIR)$(INSTALLDIR)/bin
++ @install -s ../FBReader $(DESTDIR)$(INSTALLDIR)/bin
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html
++ @install -m 0644 ../share/FBReader/formats/html/html.ent $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader
++ @install -m 0644 ../icons/$(ICONSIZE)/FBReader.png $(DESTDIR)$(INSTALLDIR)/share/pixmaps/
++ @install -m 0644 $(wildcard ../icons/$(ICONSIZE)/FBReader/*) $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader/
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings
++ @install -m 0644 $(wildcard ../share/FBReader/encodings/*) $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings
++ @install -m 0644 $(wildcard ../share/FBReader/*.zip) $(DESTDIR)$(INSTALLDIR)/share/FBReader
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/help
++ @install -m 0644 ../data/help/HowToStart.brownish.$(RESOLUTION).fb2 $(DESTDIR)$(INSTALLDIR)/share/FBReader/help/HowToStart.fb2
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/default
++ @install -m 0644 ../data/default/keymap.pdaxrom.xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/keymap.xml
++ @install -m 0644 ../data/default/styles.$(STYLE).xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/styles.xml
++
+ clean: .cleandir
+ @rm -f *.ipk
+
+Nur in fbreader-0.7.3d/fbreader/openzaurus: Makefile~.
+diff -urd fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk fbreader-0.7.3d/makefiles/arch/openzaurus.mk
+--- fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/makefiles/arch/openzaurus.mk 2006-05-05 12:05:29.000000000 +0200
+@@ -1,28 +1,28 @@
+ include $(ROOTDIR)/makefiles/arch/dummy.mk
+
+-BASEDIR = /opt/openzaurus-3.5.4/usr/local/arm/oe
+-TOOLSDIR = $(BASEDIR)/bin
+-INCDIR = $(BASEDIR)/arm-linux/include
+-LIBDIR = $(BASEDIR)/arm-linux/lib
++INSTALLDIR=/usr/
+
+-RM = rm -rvf
+-RM_QUIET = rm -rf
+-QTINCLUDE = -I $(INCDIR)/qt2
+-GTKINCLUDE = -I$(LIBDIR)/glib-2.0/include -I$(LIBDIR)/gtk-2.0/include -I$(INCDIR)/glib-2.0 -I$(INCDIR)/gtk-2.0 -I$(INCDIR)/pango-1.0 -I$(INCDIR)/atk-1.0
+-MOC = $(TOOLSDIR)/moc
+-CC = $(TOOLSDIR)/arm-linux-gcc
+-AR = $(TOOLSDIR)/arm-linux-ar rsu
+-LD = $(TOOLSDIR)/arm-linux-g++
++CC = $(CCLD) $(TARGET_CFLAGS)
++AR = ar rsu
++LD = $(CXX)
+
+-EXPATLIBS = -lexpat
+-ENCALIBS = -lenca
+-BZIP2LIBS = -lbz2
++DEPGEN = $(CC) -MM
++CFLAGS = -pipe $(DUMMY_SECTIONS) -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DINSTALLDIR=\"$(INSTALLDIR)\"
+
+-ifeq "$(UI_TYPE)" "opie"
+- UILIBS = -lqte -lqpe
++#MOC = moc-qt3
++#QTINCLUDE = -I /usr/include/qt3
++
++GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0)
++
++ifeq "$(UI_TYPE)" "qt"
++ UILIBS = -lqt-mt
+ else
+- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
+ endif
+
+-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG $(DUMMY_SECTIONS) -DINSTALLDIR=\"$(INSTALLDIR)\" -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
+-DEPGEN = $(CC) -MM
++EXPATLIBS = -lexpat
++ENCALIBS = -lenca
++BZIP2LIBS = -lbz2
++
++RM = rm -rvf
++RM_QUIET = rm -rf
+diff -urd fbreader-0.7.3d_orig/makefiles/config.mk fbreader-0.7.3d/makefiles/config.mk
+--- fbreader-0.7.3d_orig/makefiles/config.mk 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/makefiles/config.mk 2006-05-04 10:13:13.000000000 +0200
+@@ -7,7 +7,7 @@
+ CFLAGS += -DLIBICONV_PLUG
+
+ ifeq "$(TARGET_STATUS)" "release"
+- CFLAGS += -O3
++ CFLAGS += -Os
+ LDFLAGS += -s
+ endif
+ ifeq "$(TARGET_STATUS)" "debug"
+diff -urd fbreader-0.7.3d_orig/makefiles/target.mk fbreader-0.7.3d/makefiles/target.mk
+--- fbreader-0.7.3d_orig/makefiles/target.mk 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/makefiles/target.mk 2006-05-04 10:25:20.000000000 +0200
+@@ -1,6 +1,7 @@
+-#TARGET_ARCH = openzaurus
++TARGET_ARCH = openzaurus
+ #UI_TYPE = opie
+-#UI_TYPE = gpe
++UI_TYPE = gpe
++RESOLUTION = 240x320
+
+ #TARGET_ARCH = opensimpad-0.9.0
+ #UI_TYPE = opie
+@@ -8,8 +9,8 @@
+ #TARGET_ARCH = qvfb
+ #UI_TYPE = opie
+
+-TARGET_ARCH = maemo
+-UI_TYPE = maemo
++#TARGET_ARCH = maemo
++#UI_TYPE = maemo
+
+ #TARGET_ARCH = desktop
+ #UI_TYPE = gtk
diff --git a/packages/fbreader/files/set-target.patch b/packages/fbreader/files/set-target.patch
index 5a3b87d422..504e44aae0 100644
--- a/packages/fbreader/files/set-target.patch
+++ b/packages/fbreader/files/set-target.patch
@@ -1,3 +1,4 @@
+
--- 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 @@
@@ -6,8 +7,8 @@
-#TARGET_ARCH = desktop
-#UI_TYPE = gtk
-+TARGET_ARCH = desktop
-+UI_TYPE = gtk
++TARGET_ARCH = openzaurus
++UI_TYPE = gpe
#UI_TYPE = qt
#TARGET_ARCH = zaurus
diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb
new file mode 100644
index 0000000000..98d28b60a3
--- /dev/null
+++ b/packages/irda-utils/irdadump_0.9.16.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Utility to dump IrDA traffic."
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "glib-1.2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz"
+
+S="${WORKDIR}/irda-utils-${PV}/irdadump"
+
+EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/"
+EXTRA_LDFLAGS += "-lglib"
+
+inherit autotools
+
+do_compile() {
+ oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/shell/.libs/irdadump ${D}${bindir}
+}
diff --git a/packages/mysql/mysql-4.1.16/.mtn2git_empty b/packages/mysql/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mysql/mysql-4.1.16/.mtn2git_empty
+++ b/packages/mysql/files/.mtn2git_empty
diff --git a/packages/mysql/mysql-4.1.16/autofoo.patch b/packages/mysql/files/autofoo.patch
index f2d5354572..f2d5354572 100644
--- a/packages/mysql/mysql-4.1.16/autofoo.patch
+++ b/packages/mysql/files/autofoo.patch
diff --git a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch b/packages/mysql/files/gen_lex_hash.patch
index c398d048dc..c398d048dc 100644
--- a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch
+++ b/packages/mysql/files/gen_lex_hash.patch
diff --git a/packages/mysql/mysql-native_4.1.16.bb b/packages/mysql/mysql-native_4.1.18.bb
index c871a8f9da..c871a8f9da 100644
--- a/packages/mysql/mysql-native_4.1.16.bb
+++ b/packages/mysql/mysql-native_4.1.18.bb
diff --git a/packages/mysql/mysql_4.1.16.bb b/packages/mysql/mysql_4.1.18.bb
index fe8c42dd88..fe8c42dd88 100644
--- a/packages/mysql/mysql_4.1.16.bb
+++ b/packages/mysql/mysql_4.1.18.bb
diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
new file mode 100644
index 0000000000..0908a5c995
--- /dev/null
+++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Qt interface for choosing which configured network to connect \
+to. It also provides a method for browsing 802.11 SSID scan results, an event \
+history log of messages generated by wpa_supplicant, and a method to add or \
+edit wpa_supplicant networks."
+SECTION = "network"
+LICENSE = "GPL BSD"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz "
+
+S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/"
+
+inherit qmake qt3x11
+
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
+
+do_install () {
+ install -d ${D}${sbindir}
+ install -m 755 wpa_gui ${D}${sbindir}
+}
diff --git a/packages/x11-apps/app-common.inc b/packages/x11-apps/app-common.inc
index 04daf02b59..9d668cd9b2 100644
--- a/packages/x11-apps/app-common.inc
+++ b/packages/x11-apps/app-common.inc
@@ -2,7 +2,9 @@ DESCRIPTION = "X application"
SECTION = "x11/apps"
LICENSE= "MIT-X"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
+
+S = ${WORKDIR}/${PN}-X11R7.0-${PV}
inherit autotools pkgconfig
diff --git a/site/arm-linux-gnueabi b/site/arm-linux-gnueabi
index aff569c013..7c9fb85d0b 100644
--- a/site/arm-linux-gnueabi
+++ b/site/arm-linux-gnueabi
@@ -367,3 +367,11 @@ with_broken_putenv=${with_broken_putenv=no}
# xffm
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
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 01:24:42 +0000