diff -ur fbreader-0.12.10/build_packages.sh fbreader-0.12.10.hacked-harmattan/build_packages.sh --- fbreader-0.12.10/build_packages.sh 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/build_packages.sh 2011-07-18 21:59:14.000000000 +0300 @@ -86,10 +86,14 @@ /scratchbox/login sb-conf se CHINOOK_ARMEL /scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2 ;; - maemo5) + maemo5_old) /scratchbox/login sb-conf se FREMANTLE_ARMEL /scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2 ;; + maemo5) + /scratchbox/login sb-conf se HARMATTAN_ARMEL + /scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2 + ;; *) $make_package ARCHITECTURE=$1 $2 ;; Only in fbreader-0.12.10.hacked-harmattan: build-stamp Only in fbreader-0.12.10.hacked-harmattan: core Only in fbreader-0.12.10.hacked-harmattan: debian diff -ur fbreader-0.12.10/distributions/debian/desktop/control fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop/control --- fbreader-0.12.10/distributions/debian/desktop/control 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop/control 2011-07-18 22:05:47.000000000 +0300 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Nikolay Pultsin Standards-Version: 3.8.0 -Build-Depends: debhelper (>= 5), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev, liblinebreak-dev (>= 1.0-1), libjpeg-dev, libfribidi-dev, libcurl-dev, quilt (>= 0.40), libsqlite3-dev +Build-Depends: debhelper (>= 5), libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev, liblinebreak-dev (>= 1.0-1), libjpeg-dev, libfribidi-dev, libcurl-dev, quilt (>= 0.40), libsqlite3-dev Package: fbreader Priority: optional Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: fbreader Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: fbreader.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: fbreader.postinst.debhelper Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: fbreader.postrm.debhelper Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: fbreader.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: files Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore-dev Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore-dev.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore-dev.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore.postinst.debhelper Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore.postrm.debhelper Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlcore.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext-dev Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext-dev.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext-dev.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext.postinst.debhelper Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext.postrm.debhelper Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzltext.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-gtk Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-gtk.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-gtk.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-qt Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-qt4 Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-qt4.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-qt4.substvars Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-qt.debhelper.log Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: libzlui-qt.substvars diff -ur fbreader-0.12.10/distributions/debian/desktop/rules fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop/rules --- fbreader-0.12.10/distributions/debian/desktop/rules 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop/rules 2011-07-18 22:05:27.000000000 +0300 @@ -11,8 +11,8 @@ dh_testdir $(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy $(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy - $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk - $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt + #$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk + #$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy touch build-stamp @@ -27,8 +27,8 @@ $(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext do_install $(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzlcore-dev do_install_dev $(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext-dev do_install_dev - $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk DESTDIR=$(DEB_DIR)/libzlui-gtk do_install - $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt DESTDIR=$(DEB_DIR)/libzlui-qt do_install + #$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk DESTDIR=$(DEB_DIR)/libzlui-gtk do_install + #$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt DESTDIR=$(DEB_DIR)/libzlui-qt do_install $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 DESTDIR=$(DEB_DIR)/libzlui-qt4 do_install $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/fbreader do_install touch install-stamp Only in fbreader-0.12.10.hacked-harmattan/distributions/debian/desktop: stamp-patched diff -ur fbreader-0.12.10/fbreader/data/default/external.desktop.xml fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.desktop.xml --- fbreader-0.12.10/fbreader/data/default/external.desktop.xml 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.desktop.xml 2011-07-19 20:49:13.000000000 +0300 @@ -3,7 +3,7 @@
-
diff -ur fbreader-0.12.10/fbreader/data/default/external.opensimpad-0.9.0.xml fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.opensimpad-0.9.0.xml --- fbreader-0.12.10/fbreader/data/default/external.opensimpad-0.9.0.xml 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.opensimpad-0.9.0.xml 2011-07-19 20:49:13.000000000 +0300 @@ -3,7 +3,7 @@
-
diff -ur fbreader-0.12.10/fbreader/data/default/external.openzaurus.xml fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.openzaurus.xml --- fbreader-0.12.10/fbreader/data/default/external.openzaurus.xml 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.openzaurus.xml 2011-07-19 20:49:13.000000000 +0300 @@ -3,7 +3,7 @@
-
diff -ur fbreader-0.12.10/fbreader/data/default/external.pdaxrom.xml fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.pdaxrom.xml --- fbreader-0.12.10/fbreader/data/default/external.pdaxrom.xml 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.pdaxrom.xml 2011-07-19 20:49:13.000000000 +0300 @@ -3,7 +3,7 @@
-
diff -ur fbreader-0.12.10/fbreader/data/default/external.qvfb.xml fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.qvfb.xml --- fbreader-0.12.10/fbreader/data/default/external.qvfb.xml 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/data/default/external.qvfb.xml 2011-07-19 20:49:13.000000000 +0300 @@ -3,7 +3,7 @@
-
diff -ur fbreader-0.12.10/fbreader/desktop/desktop fbreader-0.12.10.hacked-harmattan/fbreader/desktop/desktop --- fbreader-0.12.10/fbreader/desktop/desktop 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/desktop/desktop 2011-07-19 07:03:11.000000000 +0300 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=E-book reader +Name=FBReader Name[ar]=قارئ الكتب الإلكترونية Name[es]=Lector de Libros Name[ru]=Чтение электронных книг @@ -15,9 +15,12 @@ Comment[ru]=FBReader, программа для чтения электронных книг Comment[zh_CN]=FBReader 电子书阅读器 TryExec=FBReader -Exec=FBReader %F +Exec=/usr/bin/FBReader %F StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png +Icon=/usr/share/icons/hicolor/64x64/apps/FBReader.png Categories=Office;Viewer;Literature; +OnlyShowIn=X-MeeGo;GNOME;X-MEEGO-HS; +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=applications/x-executable diff -ur fbreader-0.12.10/fbreader/desktop/Makefile fbreader-0.12.10.hacked-harmattan/fbreader/desktop/Makefile --- fbreader-0.12.10/fbreader/desktop/Makefile 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/desktop/Makefile 2011-07-19 07:02:45.000000000 +0300 @@ -8,8 +8,8 @@ install: @install -d $(DESTDIR)/usr/share/applications @install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop - @install -d $(DESTDIR)$(IMAGEDIR) - @install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png + @install -d $(DESTDIR)/usr/share/icons/hicolor/64x64/apps + @install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)/usr/share/icons/hicolor/64x64/apps/FBReader.png @install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml @install -m 0644 ../data/default/keymap.desktop.xml $(SHARE_FBREADER)/default/keymap.xml @install -m 0644 ../data/default/styles.desktop.xml $(SHARE_FBREADER)/default/styles.xml diff -ur fbreader-0.12.10/fbreader/pepperpad3/desktop fbreader-0.12.10.hacked-harmattan/fbreader/pepperpad3/desktop --- fbreader-0.12.10/fbreader/pepperpad3/desktop 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/pepperpad3/desktop 2011-07-19 07:03:11.000000000 +0300 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=E-book reader +Name=FBReader Name[ar]=قارئ الكتب الإلكترونية Name[es]=Lector de Libros Name[ru]=Чтение электронных книг @@ -15,9 +15,12 @@ Comment[ru]=FBReader, программа для чтения электронных книг Comment[zh_CN]=FBReader 电子书阅读器 TryExec=FBReader -Exec=FBReader %F +Exec=/usr/bin/FBReader %F StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png +Icon=/usr/share/icons/hicolor/64x64/apps/FBReader.png Categories=Office;Viewer;Literature; +OnlyShowIn=X-MeeGo;GNOME;X-MEEGO-HS; +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=applications/x-executable diff -ur fbreader-0.12.10/fbreader/pepperpad3/Makefile fbreader-0.12.10.hacked-harmattan/fbreader/pepperpad3/Makefile --- fbreader-0.12.10/fbreader/pepperpad3/Makefile 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/fbreader/pepperpad3/Makefile 2011-07-19 07:02:45.000000000 +0300 @@ -8,8 +8,8 @@ install: @install -d $(DESTDIR)/usr/share/applications @install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop - @install -d $(DESTDIR)$(IMAGEDIR) - @install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png + @install -d $(DESTDIR)/usr/share/icons/hicolor/64x64/apps + @install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)/usr/share/icons/hicolor/64x64/apps/FBReader.png @install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml @install -m 0644 ../data/default/keymap.desktop.xml $(SHARE_FBREADER)/default/keymap.xml @install -m 0644 ../data/default/styles.desktop.xml $(SHARE_FBREADER)/default/styles.xml Only in fbreader-0.12.10.hacked-harmattan: install-stamp diff -ur fbreader-0.12.10/makefiles/arch/maemo.mk fbreader-0.12.10.hacked-harmattan/makefiles/arch/maemo.mk --- fbreader-0.12.10/makefiles/arch/maemo.mk 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/makefiles/arch/maemo.mk 2011-07-18 21:58:57.000000000 +0300 @@ -13,6 +13,12 @@ LD = g++ ifeq "$(UI_TYPE)" "maemo5" + CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG + MOC = moc-qt4 + QTINCLUDE = -I /usr/include/qt4 + UILIBS = -lQtGui + +else ifeq "$(UI_TYPE)" "maemo5_old" CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -DMAEMO_VERSION=5 GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic diff -ur fbreader-0.12.10/makefiles/target.mk fbreader-0.12.10.hacked-harmattan/makefiles/target.mk --- fbreader-0.12.10/makefiles/target.mk 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/makefiles/target.mk 2011-07-18 21:56:58.000000000 +0300 @@ -12,14 +12,15 @@ #UI_TYPE = maemo2 #UI_TYPE = maemo4 #UI_TYPE = maemo5 +#UI_TYPE = maemo6 #TARGET_ARCH = ebr #UI_TYPE = nanoX TARGET_ARCH = desktop -UI_TYPE = gtk +#UI_TYPE = gtk #UI_TYPE = qt -#UI_TYPE = qt4 +UI_TYPE = qt4 #TARGET_ARCH = pepperpad3 #UI_TYPE = gtk Only in fbreader-0.12.10.hacked-harmattan: .pc diff -ur fbreader-0.12.10/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.12.10.hacked-harmattan/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp --- fbreader-0.12.10/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2010-04-01 16:14:24.000000000 +0300 +++ fbreader-0.12.10.hacked-harmattan/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2011-07-19 20:48:48.000000000 +0300 @@ -75,6 +75,7 @@ const std::string iconFileName = ZLibrary::ImageDirectory() + ZLibrary::FileNameDelimiter + ZLibrary::ApplicationName() + ".png"; QPixmap icon(iconFileName.c_str()); setWindowIcon(icon); + setWindowFlags(Qt::Window); myWindowToolBar = new QToolBar(this); myWindowToolBar->setFocusPolicy(Qt::NoFocus);