From 242abf96b40376f72d24380f2b1e6b87d97e5492 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 10:30:31 +0000 Subject: fbreader: Get rid of iconv crap --- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch | 2 +- packages/fbreader/fbreader_0.8.2a.bb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch index ecb60a2108..858a713125 100644 --- a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch +++ b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch @@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk fbreader-0.8.2a/make + 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 -liconv ++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget endif -CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -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 diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index c932d21bdc..ca25bdc620 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -40,8 +40,6 @@ FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary" CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr" EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'" -LDFLAGS_append = " -liconv" - inherit pkgconfig do_configure() { -- cgit v1.2.3 From 2e2d762a296bdc3b5ac6f6a0df1278872c93d9f8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 12:43:52 +0000 Subject: xserver-common: Add 1.18, drop some older versions. --- packages/xserver-common/xserver-common_1.10.bb | 12 ------------ packages/xserver-common/xserver-common_1.17.bb | 16 ---------------- packages/xserver-common/xserver-common_1.18.bb | 16 ++++++++++++++++ packages/xserver-common/xserver-common_1.3.bb | 3 --- packages/xserver-common/xserver-common_1.8.bb | 10 ---------- packages/xserver-common/xserver-common_1.9.bb | 12 ------------ 6 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 packages/xserver-common/xserver-common_1.10.bb delete mode 100644 packages/xserver-common/xserver-common_1.17.bb create mode 100644 packages/xserver-common/xserver-common_1.18.bb delete mode 100644 packages/xserver-common/xserver-common_1.3.bb delete mode 100644 packages/xserver-common/xserver-common_1.8.bb delete mode 100644 packages/xserver-common/xserver-common_1.9.bb diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb deleted file mode 100644 index 69e92ecdf3..0000000000 --- a/packages/xserver-common/xserver-common_1.10.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xserver-common.inc - -PR = "r2" - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.17.bb b/packages/xserver-common/xserver-common_1.17.bb deleted file mode 100644 index a30a37c893..0000000000 --- a/packages/xserver-common/xserver-common_1.17.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r0" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh " - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb new file mode 100644 index 0000000000..a30a37c893 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.18.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh " + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb deleted file mode 100644 index af2fb894b5..0000000000 --- a/packages/xserver-common/xserver-common_1.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xserver-common.inc - -PR = "r1" diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb deleted file mode 100644 index 249576f6da..0000000000 --- a/packages/xserver-common/xserver-common_1.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xserver-common.inc - -PR = "r2" - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb deleted file mode 100644 index a8343a8548..0000000000 --- a/packages/xserver-common/xserver-common_1.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xserver-common.inc - -PR = "r2" - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1 \ - file://rxvt-less-pink.diff;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} -- cgit v1.2.3