diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-01-07 22:28:23 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-01-07 22:28:23 +0000 |
| commit | 0c82949168aaee0b2dcfff621dab5abd5e5b0116 (patch) | |
| tree | 7e05aa75eb42e2cfd975dd195490cc84b62c35e9 | |
| parent | ecff50f02bd9522581e48a0b81f06d5589b54224 (diff) | |
| parent | c1472054e4510147a63ed424542c0b6b77a76da7 (diff) | |
merge of '031a650eb799f1540b4d16dd84e63a11ea58463c'
and '199b94068183639a7d0f5c71711782b991bb9812'
| -rw-r--r-- | packages/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/packages/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch b/packages/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch new file mode 100644 index 0000000000..530edc7f18 --- /dev/null +++ b/packages/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch @@ -0,0 +1,50 @@ +diff -ur fbreader-0.7.4q.org/makefiles/arch/openzaurus.mk fbreader-0.7.4q/makefiles/arch/openzaurus.mk +--- fbreader-0.7.4q.org/makefiles/arch/openzaurus.mk 2006-12-05 10:47:51.000000000 +0000 ++++ fbreader-0.7.4q/makefiles/arch/openzaurus.mk 2007-01-07 04:58:17.000000000 +0000 +@@ -15,7 +15,7 @@ + RM = rm -rvf + RM_QUIET = rm -rf + QTINCLUDE = -I $(INCPATH)/qt2 +-GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0 ++GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/cairo -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0 + MOC = $(TOOLSPATH)/moc + CC = $(TOOLSPATH)/arm-linux-gcc + AR = $(TOOLSPATH)/arm-linux-ar rsu +@@ -26,10 +26,10 @@ + BZIP2LIBS = -lbz2 + + ifeq "$(UI_TYPE)" "opie" +- UILIBS = -lqte -lqpe ++ 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 -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 +-LDFLAGS = -Wl,-rpath,$(LIBDIR) ++CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti $(OE_CFLAGS) ++LDFLAGS = -Wl,-rpath,$(LIBDIR) -Wl,-rpath,$(LIBPATH) +diff -ur fbreader-0.7.4q.org/makefiles/target.mk fbreader-0.7.4q/makefiles/target.mk +--- fbreader-0.7.4q.org/makefiles/target.mk 2006-12-05 10:47:51.000000000 +0000 ++++ fbreader-0.7.4q/makefiles/target.mk 2007-01-07 04:16:20.000000000 +0000 +@@ -1,6 +1,6 @@ +-#TARGET_ARCH = openzaurus ++TARGET_ARCH = openzaurus + #UI_TYPE = opie +-#UI_TYPE = gpe ++UI_TYPE = gpe + + #TARGET_ARCH = opensimpad-0.9.0 + #UI_TYPE = opie +@@ -11,8 +11,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 |