Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2014-03-11 17:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leechcraft" Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2014-02-25 07:32:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2014-03-11 17:27:32.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 7 17:53:34 UTC 2014 - [email protected] + +- Removed velvetbird bcond because of purple + already built for all OBS archs. +- Added leechcraft-0.6.60-monocle-arm.patch to prevent + arm6-7 build failures, upstream url: + https://github.com/0xd34df00d/leechcraft/commit/ef3fdc +- Added gstreamer-1_0 define against oS >= 13.2 and + versioned gst "BuildConflicts" to build lmp with the + same gst as QtWebKit was built to prevent runtime freeze. + +------------------------------------------------------------------- New: ---- leechcraft-0.6.60-monocle-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.1Zrmn6/_old 2014-03-11 17:27:33.000000000 +0100 +++ /var/tmp/diff_new_pack.1Zrmn6/_new 2014-03-11 17:27:33.000000000 +0100 @@ -21,10 +21,10 @@ %define settings_dir %{_datadir}/%{name}/settings %define azoth_dir %{_datadir}/%{name}/azoth -%ifarch %ix86 x86_64 ppc ppc64 %arm aarch64 -%bcond_without velvetbird +%if 0%{?suse_version} > 1310 +%define lmp_gstreamer_1_0 1 %else -%bcond_with velvetbird +%define lmp_gstreamer_1_0 0 %endif Name: leechcraft @@ -38,6 +38,10 @@ # PATCH-FIX-OPENSUSE to prevent oS 12.2' gcc build issue: # "error: the value of 'w' is not usable in a constant expression". Patch1: leechcraft-azoth-gcc47.patch +# PATCH-FIX-UPSTREAM to prevent arm6-7 build issue: +# "error: no matching function for call to 'max(double&, qreal)'"; +# https://github.com/0xd34df00d/leechcraft/commit/ef3fdc +Patch2: leechcraft-0.6.60-monocle-arm.patch BuildRequires: Qross-devel %if 0%{?suse_version} > 1230 @@ -84,15 +88,19 @@ BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libspectre) BuildRequires: pkgconfig(phonon) -%if %{with velvetbird} BuildRequires: pkgconfig(purple) -%endif BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(taglib) -%if 0%{?suse_version} > 1230 +%if 0%{?lmp_gstreamer_1_0} BuildRequires: pkgconfig(gstreamer-app-1.0) +BuildConflicts: gstreamer-0_10-devel +BuildConflicts: gstreamer-0_10-plugins-base-devel +BuildConflicts: libgstapp-0_10 +BuildConflicts: libgstinterfaces-0_10 +BuildConflicts: libgstreamer-0_10 %else BuildRequires: pkgconfig(gstreamer-interfaces-0.10) +BuildConflicts: libgstreamer-1_0-0 %endif BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(kqoauth) @@ -598,7 +606,6 @@ * Grouping contacts. -%if %{with velvetbird} %package azoth-velvetbird Summary: LeechCraft Azoth - LibPurple Module License: BSL-1.0 @@ -610,7 +617,7 @@ This package provides a LibPurple plugin for LeechCraft Azoth. It supportes various protocols provided by Purple library. -%endif + %package azoth-woodpecker Summary: LeechCraft Twitter Client Module @@ -1273,7 +1280,7 @@ Recommends: %{name}-scrobbler Recommends: %{name}-musiczombie = %{version} Recommends: ffmpeg -%if 0%{?suse_version} > 1230 +%if %{lmp_gstreamer_1_0} Requires: gstreamer-plugins-base >= 1.0 Requires: gstreamer-plugins-good >= 1.0 Recommends: gstreamer-plugins-bad >= 1.0 @@ -2074,6 +2081,7 @@ %if 0%{?suse_version} <= 1220 %patch1 -p1 %endif +%patch2 -p1 #removing non-free icons rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default @@ -2104,11 +2112,7 @@ %endif -DENABLE_AZOTH_OTROID=True \ -DENABLE_AZOTH_SHX=True \ -%ifarch %ix86 x86_64 ppc ppc64 %arm aarch -DENABLE_AZOTH_VELVETBIRD=True \ -%else - -DENABLE_AZOTH_VELVETBIRD=False \ -%endif -DENABLE_AZOTH_ZHEET=True \ -DENABLE_MEDIACALLS=True \ -DENABLE_BLACKDASH=False \ @@ -2147,7 +2151,7 @@ %endif -DENABLE_LMP_MPRIS=True \ -DENABLE_LMP_MTPSYNC=True \ -%if 0%{?suse_version} > 1230 +%if 0%{?lmp_gstreamer_1_0} -DUSE_GSTREAMER_10=True \ %endif -DENABLE_MONOCLE=True \ @@ -2434,11 +2438,9 @@ %{_datadir}/%{name}/settings/azothvadersettings.xml %{plugin_dir}/*%{name}_azoth_vader.so -%if %{with velvetbird} %files azoth-velvetbird %defattr(-,root,root) %{_libdir}/%{name}/plugins/*%{name}_azoth_velvetbird.so -%endif %files azoth-woodpecker %defattr(-,root,root) ++++++ leechcraft-0.6.60-monocle-arm.patch ++++++ commit ef3fdcc214fa884b3b917555db5d22dabadd9a81 Author: 0xd34df00d <[email protected]> Date: Fri Mar 7 21:14:01 2014 +0400 [Monocle] Fix ARM build. diff --git a/src/plugins/monocle/pageslayoutmanager.cpp b/src/plugins/monocle/pageslayoutmanager.cpp index 1c929cd..cf6e8e1 100644 --- a/src/plugins/monocle/pageslayoutmanager.cpp +++ b/src/plugins/monocle/pageslayoutmanager.cpp @@ -270,9 +270,9 @@ namespace Monocle item->SetScale (scale, scale); } - double currentY = 0; - double lastWidth = 0; - double lastHeight = 0; + qreal currentY = 0; + qreal lastWidth = 0; + qreal lastHeight = 0; for (int i = 0, pagesCount = Pages_.size (); i < pagesCount; ++i) { auto page = Pages_ [i]; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
