merge of '1adc26104e5b3839a7f67202324e1fa246a20443'

     and '6113cd3aa82bcb47774f0a89d931aedfe73e26ac'

7 files changed, 1 insertions, 40 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() {
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.18.bb
index a30a37c893..a30a37c893 100644
--- a/packages/xserver-common/xserver-common_1.17.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
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"
-}