I have made the following changes intended for : CE:Apps / fribidi CE:Apps / liblinebreak CE:Apps / fbreader
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7213 Thank You, Islam Amer [This message was auto-generated] --- Request # 7213: Messages from BOSS: State: review at 2012-10-30T23:53:25 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:iamer:CE:Apps / fribidi -> CE:Apps / fribidi changes files: -------------- ++++++ new changes file: --- fribidi.changes +++ fribidi.changes @@ -0,0 +1,5 @@ +* Wed Oct 31 2012 Islam Amer <[email protected]> - 0.19.4 +- Initial import + +* Thu Apr 02 2009 Arjan van de Ven <[email protected]> - 0.19.2 +- Initial import new: ---- fribidi-0.19.4.tar.bz2 fribidi.changes fribidi.spec fribidi.yaml spec files: ----------- ++++++ new spec file: --- fribidi.spec +++ fribidi.spec @@ -0,0 +1,96 @@ +# +# Do not Edit! Generated by: +# spectacle version 0.13~pre +# +# >> macros +# << macros + +Name: fribidi +Summary: Library implementing the Unicode Bidirectional Algorithm +Version: 0.19.4 +Release: 1 +Group: System/Libraries +License: LGPLv2+ +URL: http://fribidi.org +Source0: http://fribidi.org/download/%{name}-%{version}.tar.bz2 +Source100: fribidi.yaml +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: pkgconfig + +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +A library to handle bidirectional scripts (for example Hebrew, Arabic), +so that the display is done in the proper way; while the text data itself +is always written in logical order. + + + +%package devel +Summary: Libraries and include files for FriBidi +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Include files and libraries needed for developing applications which use +FriBidi. + + + +%prep +%setup -q -n %{name}-%{version} +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%configure --disable-static +# Call make instruction with smp support +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +# << install post + +%clean +rm -rf %{buildroot} + + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + + +%files +%defattr(-,root,root,-) +# >> files +%doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO +%{_bindir}/fribidi +%{_libdir}/libfribidi.so.* +# << files + + +%files devel +%defattr(-,root,root,-) +# >> files devel +%{_includedir}/fribidi +%{_libdir}/libfribidi.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/%{name}_*.gz +# << files devel + other changes: -------------- ++++++ fribidi-0.19.4.tar.bz2 (new) ++++++ fribidi.yaml (new) --- fribidi.yaml +++ fribidi.yaml @@ -0,0 +1,27 @@ +Name: fribidi +Summary: Library implementing the Unicode Bidirectional Algorithm +Version: 0.19.4 +Release: 1 +Group: System/Libraries +License: LGPLv2+ +URL: http://fribidi.org +Sources: + - http://fribidi.org/download/%{name}-%{version}.tar.bz2 +Description: | + A library to handle bidirectional scripts (for example Hebrew, Arabic), + so that the display is done in the proper way; while the text data itself + is always written in logical order. + +PkgBR: + - automake + - autoconf + - libtool + - pkgconfig +SubPackages: + - Name: devel + Summary: Libraries and include files for FriBidi + Group: Development/Libraries + Description: | + Include files and libraries needed for developing applications which use + FriBidi. + submit: home:iamer:CE:Apps / liblinebreak -> CE:Apps / liblinebreak changes files: -------------- ++++++ new changes file: --- liblinebreak.changes +++ liblinebreak.changes @@ -0,0 +1,32 @@ +* Wed Oct 31 2012 Islam Amer <[email protected]> - 2.1 +- Latest upstream release + +* Mon Jan 31 2011 alex barakin <[email protected]> - 2.0-1.mezon.1.0 +- meego port + +* Sat Jul 3 2010 Michel Salim <[email protected]> - 2.0-1 +- Update to 2.0 + +* Fri Jul 24 2009 Fedora Release Engineering <[email protected]> - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 2 2009 Michel Salim <[email protected]> - 1.2-1 +- Update to 1.2 +- Build as dynamic library, instead of static + +* Wed Feb 25 2009 Fedora Release Engineering <[email protected]> - 0.9.6-0.5.20080421cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 31 2008 Michel Salim <[email protected]> - 0.9.6-0.4.20080421cvs%{?dist} +- Rename package to liblinebreak, providing -{devel,static} + +* Mon Jul 14 2008 Michel Alexandre Salim <[email protected]> - 0.9.6-0.3.20080421cvs +- Change versioning scheme +- Updated checkout instructions + +* Mon Jun 9 2008 Michel Alexandre Salim <[email protected]> - 0.9.6-0.2 +- Rename to liblinebreak-devel, provides liblinebreak-static + +* Wed Jun 4 2008 Michel Alexandre Salim <[email protected]> - 0.9.6-0.1 +- Initial package + new: ---- liblinebreak-2.1.tar.gz liblinebreak.changes liblinebreak.spec spec files: ----------- ++++++ new spec file: --- liblinebreak.spec +++ liblinebreak.spec @@ -0,0 +1,63 @@ +Name: liblinebreak +Version: 2.1 +Release: 1 +Summary: A Unicode line-breaking library + +Group: Development/Libraries +License: zlib +Vendor: Nemo +URL: http://sourceforge.net/projects/vimgadgets/ +Source0: http://downloads.sourceforge.net/vimgadgets/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: autoconf automake libtool + +%description +liblinebreak is an implementation of the line breaking algorithm as +described in Unicode 5.0.0 Standard Annex 14, Revision 19, available +at http://www.unicode.org/reports/tr14/tr14-19.html + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q +%configure --disable-static + + +%build +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc ChangeLog LICENCE NEWS README +%{_libdir}/*.so.* + +%files devel +%{_includedir}/* +%{_libdir}/*.so + other changes: -------------- ++++++ liblinebreak-2.1.tar.gz (new) submit: home:iamer:CE:Apps / fbreader -> CE:Apps / fbreader changes files: -------------- ++++++ new changes file: --- fbreader.changes +++ fbreader.changes @@ -0,0 +1,93 @@ +* Sun Oct 28 2012 Islam Amer <[email protected]> - 0.99.5+37.g7e187f7 +- Build from upstream git mobile_0.99.5-37-g7e187f7 +- Use meego and qml release build +- Fix crasher when opening a book due to double free (from [email protected]) + +* Sun Nov 18 2007 Nikolay Pultsin <[email protected]> - 0.8.8-1 +- new upstream version +- excluded keynames.patch + +* Sun Nov 18 2007 Nikolay Pultsin <[email protected]> - 0.8.7b-1 +- new upstream version +- excluded rpath.patch +- spec file cleanup + +* Sun Jun 3 2007 Nikolay Pultsin <[email protected]> - 0.8.4-1 +- new upstream version +- removed gcc.patch +- added keynames.patch +- fixed homepage link + +* Sat May 19 2007 Mikhail Sobolev <[email protected]> - 0.8.3d-1 +- new upstream version + +* Mon May 14 2007 Mikhail Sobolev <[email protected]> - 0.8.3c-1 +- new upstream version +- fixed day of week in changelog + +* Sun May 12 2007 Mikhail Sobolev <[email protected]> - 0.8.3b-1 +- new upstream version + +* Thu May 10 2007 Mikhail Sobolev <[email protected]> - 0.8.3-1 +- new upstream version + +* Mon Apr 9 2007 Mikhail Sobolev <[email protected]> - 0.8.1d-1 +- new upstream version + +* Wed Mar 26 2007 Mikhail Sobolev <[email protected]> - 0.8.1c-1 +- new upstream version + +* Wed Mar 26 2007 Mikhail Sobolev <[email protected]> - 0.8.1b-1 +- new upstream version + +* Wed Mar 26 2007 Mikhail Sobolev <[email protected]> - 0.8.1a-1 +- new upstream version +- fixed wrong .so name for zlibrary +- added application pixmap to the list of included files +- added pixmap dir to the list of automatically included stuff +- desktop version now has its own .desktop file: include it, do not generate our own one +- now really include it + +* Tue Dec 5 2006 Mikhail Sobolev <[email protected]> - 0.7.4q-1 +- new upstream version + +* Mon Nov 27 2006 Mikhail Sobolev <[email protected]> - 0.7.4p-1 +- new upstream version + +* Tue Nov 21 2006 Mikhail Sobolev <[email protected]> - 0.7.4o-1 +- new upstream version + +* Mon Nov 06 2006 Mikhail Sobolev <[email protected]> - 0.7.4n-3 +- Introduced pepper_pad_2 variable that should indicate whether we build for Pepper Pad 2 +- Cleaned up BuildRequires + +* Mon Nov 06 2006 Mikhail Sobolev <[email protected]> - 0.7.4n-2 +- Merged the changes done by Victor Rehorst <[email protected]> to support Pepper Pad 2 + +* Sun Nov 05 2006 Mikhail Sobolev <[email protected]> - 0.7.4n-1 +- Trying new upstream version + +* Sat Nov 04 2006 Mikhail Sobolev <[email protected]> - 0.7.4m-3 +- Included execution of ldconfig + +* Sat Nov 04 2006 Mikhail Sobolev <[email protected]> - 0.7.4m-2 +- Updated based on Kad's comments + +* Sat Nov 04 2006 Mikhail Sobolev <[email protected]> - 0.7.4m-1 +- Upgraded to version 0.7.4m + +* Sat Nov 04 2006 Mikhail Sobolev <[email protected]> - 0.7.4-2 +- Modified spec to support gtk+ instead of qt + +* Fri May 26 2006 Dries Verachtert <[email protected]> - 0.7.4-1 - 4419+/dries +- Updated to release 0.7.4. + +* Sun Mar 26 2006 Dries Verachtert <[email protected]> - 0.7.3-1 +- Updated to release 0.7.3. + +* Fri Feb 17 2006 Dries Verachtert <[email protected]> - 0.7.2-1 +- Updated to release 0.7.2. + +* Wed Dec 07 2005 Dries Verachtert <[email protected]> - 0.7.1-0.b +- Initial package. + new: ---- double-deletion-fix.patch fbreader-0.99.5+37.g7e187f7.tar.gz fbreader.changes fbreader.spec fix-build-nemo.patch spec files: ----------- ++++++ new spec file: --- fbreader.spec +++ fbreader.spec @@ -0,0 +1,76 @@ +# Upstream: Nikolay Pultsin <[email protected]> + +%define desktop_vendor rpmforge + +Summary: E-book reader +Name: fbreader +Version: 0.99.5+37.g7e187f7 +Release: 1 +License: GPL +Group: Applications/Multimedia +URL: http://www.fbreader.org/ + +Source: http://www.fbreader.org/%{name}-%{version}.tar.gz +Patch01: fix-build-nemo.patch +Patch02: double-deletion-fix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(libpng) +BuildRequires: desktop-file-utils +BuildRequires: bzip2-devel +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(expat) +BuildRequires: libjpeg-devel +BuildRequires: liblinebreak-devel +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtDeclarative) +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(libresourceqt1) + +Requires: libqtdeclarative4-gestures + +%description +FBReader is an e-book reader for Linux PDAs and desktop computers. +FBReader supports several e-book formats: plucker, palmdoc, zTXT, +HTML, fb2, plain text, etc. + +%prep +%setup -q +%patch01 -p1 +%patch02 -p1 + +%build +%{__make} %{?_smp_mflags} INSTALLDIR=%{_prefix} TARGET_ARCH=meego UI_TYPE=qml TARGET_STATUS=release +#TARGET_STATUS=debug + +%install +%{__rm} -rf %{buildroot} +%makeinstall INSTALLDIR=%{_prefix} TARGET_ARCH=meego UI_TYPE=qml DESTDIR=%{buildroot} TARGET_STATUS=release +#TARGET_STATUS=debug + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%{_bindir}/FBReader +%{_datadir}/FBReader +%{_datadir}/applications/FBReader.desktop +%{_libdir}/libzlcore.so.* +%{_libdir}/libzltext.so.* +%{_libdir}/zlibrary +%{_datadir}/zlibrary +%{_datadir}/icons/hicolor/16x16/apps/FBReader.png +%{_datadir}/icons/hicolor/26x26/apps/FBReader.png +%{_datadir}/icons/hicolor/48x48/apps/FBReader.png +%{_datadir}/icons/hicolor/64x64/apps/FBReader.png +%{_datadir}/icons/hicolor/80x80/apps/FBReader.png + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + other changes: -------------- ++++++ double-deletion-fix.patch (new) --- double-deletion-fix.patch +++ double-deletion-fix.patch @@ -0,0 +1,47 @@ +commit 27ff9aaaecaf3ae9ee1661c2a2c6ffee5af596ae +Author: Richard Braakman <[email protected]> +Date: Mon Oct 29 04:12:26 2012 +0200 + + Fix double-deletion bug in ZLQmlDialogContent + +diff --git a/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.cpp b/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.cpp +index 5eed967..ce77d14 100644 +--- a/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.cpp ++++ b/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.cpp +@@ -19,6 +19,7 @@ + + #include <QtGui/QApplication> + #include <QtGui/QDesktopWidget> ++#include <QtCore/QEvent> + #include <QtGui/QWidget> + #include <QtGui/QLayout> + +@@ -36,6 +37,15 @@ ZLQmlDialogContent::~ZLQmlDialogContent() { + emit itemsChanged(myItems); + } + ++bool ZLQmlDialogContent::event(QEvent *e) { ++ // Ignore delete events from the Qt/QML side. ++ // Since this object has a dual role as a ZLDialogContent, its ++ // life cycle is regulated by the shared_ptr from that side. ++ if (e->type() == QEvent::DeferredDelete) ++ return true; ++ return QObject::event(e); ++} ++ + void ZLQmlDialogContent::addOption(const std::string &name, const std::string &tooltip, ZLOptionEntry *option) { + createViewByEntry(name, tooltip, option, 0, 12); + ++myRowCounter; +diff --git a/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.h b/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.h +index 9eeef87..5a6582f 100644 +--- a/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.h ++++ b/zlibrary/ui/src/qml/dialogs/ZLQmlDialogContent.h +@@ -34,6 +34,8 @@ public: + ZLQmlDialogContent(const ZLResource &resource); + ~ZLQmlDialogContent(); + ++ virtual bool event(QEvent *e); ++ + void addOption(const std::string &name, const std::string &tooltip, ZLOptionEntry *option); + void addOptions(const std::string &name0, const std::string &tooltip0, ZLOptionEntry *option0, + const std::string &name1, const std::string &tooltip1, ZLOptionEntry *option1); ++++++ fbreader-0.99.5+37.g7e187f7.tar.gz (new) ++++++ fix-build-nemo.patch (new) --- fix-build-nemo.patch +++ fix-build-nemo.patch @@ -0,0 +1,51 @@ +diff --git a/makefiles/arch/meego.mk b/makefiles/arch/meego.mk +index d7cc966..fb98dc5 100644 +--- a/makefiles/arch/meego.mk ++++ b/makefiles/arch/meego.mk +@@ -16,6 +16,6 @@ RM_QUIET = rm -rf + LD = g++ + CFLAGS = -DMEEGO_VERSION_MAJOR=1 -DMEEGO_VERSION_MINOR=2 -DMEEGO_VERSION_PATCH=0 -DMEEGO_EDITION=harmattan -DMEEGO_EDITION_HARMATTAN + CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG +-MOC = moc-qt4 ++MOC = moc + QTINCLUDE = -I/usr/include/qt4 -I/usr/include/qt4/QtDeclarative -I/usr/include/qt4/QtScript -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtOpenGL -I/usr/include/resource/qt4 + UILIBS = -lQtCore -lQtGui -lQtDeclarative -lQtOpenGL -lresourceqt +diff --git a/zlibrary/ui/Makefile b/zlibrary/ui/Makefile +index 72b7ea5..39e9a3f 100644 +--- a/zlibrary/ui/Makefile ++++ b/zlibrary/ui/Makefile +@@ -49,7 +49,7 @@ ifeq "$(UI_TYPE)" "qt4" + endif + + ifeq "$(UI_TYPE)" "qml" +- QTSUBDIRS = src/qml/time src/qml/dialogs src/qml/view src/qml/image src/qml/util src/qml/filesystem src/qml/library src/unix/message src/qml/application src/qml/network ++ QTSUBDIRS = src/qml/time src/qml/dialogs src/qml/view src/qml/image src/qml/util src/qml/filesystem src/qml/library src/unix/message src/qml/application src/qt4/network + endif + + ifeq "$(UI_TYPE)" "qtwidgets" +diff --git a/zlibrary/ui/src/qml/library/ZLibrary.cpp b/zlibrary/ui/src/qml/library/ZLibrary.cpp +index fc9250f..d33e4fd 100644 +--- a/zlibrary/ui/src/qml/library/ZLibrary.cpp ++++ b/zlibrary/ui/src/qml/library/ZLibrary.cpp +@@ -31,7 +31,7 @@ + #include "../dialogs/ZLQmlDialogManager.h" + #include "../image/ZLQtImageManager.h" + #include "../view/ZLQmlPaintContext.h" +-#include "../network/ZLQtNetworkManager.h" ++#include "../../qt4/network/ZLQtNetworkManager.h" + #include "../../unix/message/ZLUnixMessage.h" + #include "../../../../core/src/util/ZLKeyUtil.h" + #include "../../../../core/src/unix/xmlconfig/XMLConfig.h" +diff --git a/zlibrary/ui/src/qml/view/ZLQmlNetworkAccessFactory.cpp b/zlibrary/ui/src/qml/view/ZLQmlNetworkAccessFactory.cpp +index 0de7fb9..edba287 100644 +--- a/zlibrary/ui/src/qml/view/ZLQmlNetworkAccessFactory.cpp ++++ b/zlibrary/ui/src/qml/view/ZLQmlNetworkAccessFactory.cpp +@@ -18,7 +18,7 @@ + */ + + #include "ZLQmlNetworkAccessFactory.h" +-#include "../network/ZLQtNetworkManager.h" ++#include "../../qt4/network/ZLQtNetworkManager.h" + + ZLQmlNetworkAccessFactory::ZLQmlNetworkAccessFactory() { + }
