Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2012-09-20 14:57:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra-doc.changes 2012-08-07 21:27:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra-doc.changes 2012-09-20 14:57:23.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 13 11:51:31 UTC 2012 - [email protected] + +- Add calligra-marblewidget.patch to fix compilation against new + marble + +------------------------------------------------------------------- calligra.changes: same change New: ---- calligra-marblewidget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.PdAlpR/_old 2012-09-20 14:57:27.000000000 +0200 +++ /var/tmp/diff_new_pack.PdAlpR/_new 2012-09-20 14:57:27.000000000 +0200 @@ -33,6 +33,7 @@ # PATCH-FIX-OPENSUSE remove_python_shebangs.patch [email protected] -- Remove python shebangs from various scripts (fixes rpmlint warning "non-executable-script") Patch0: remove_python_shebangs.patch Patch1: bnc733534-calligra-msword-overflow-fix.diff +Patch2: calligra-marblewidget.patch BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel %if 0%{?suse_version} > 1210 @@ -319,6 +320,7 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build %cmake_kde4 -d build -- -DBUILD_mobile=false -DBUILD_active=false -DIHAVEPATCHEDQT=TRUE ++++++ calligra-marblewidget.patch ++++++ Index: calligra-2.4.3/plugins/reporting/maps/KoReportItemMaps.h =================================================================== --- calligra-2.4.3.orig/plugins/reporting/maps/KoReportItemMaps.h +++ calligra-2.4.3/plugins/reporting/maps/KoReportItemMaps.h @@ -29,7 +29,7 @@ #include <kdebug.h> #include <klocalizedstring.h> #include <kglobalsettings.h> -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> #include <RdfForward.h> #include <QMap> Index: calligra-2.4.3/plugins/reporting/maps/KoReportItemMaps.cpp =================================================================== --- calligra-2.4.3.orig/plugins/reporting/maps/KoReportItemMaps.cpp +++ calligra-2.4.3/plugins/reporting/maps/KoReportItemMaps.cpp @@ -25,8 +25,8 @@ #include <QBuffer> #include <kcodecs.h> #include <renderobjects.h> -#include <MarbleWidget.h> -#include <MarbleModel.h> +#include <marble/MarbleWidget.h> +#include <marble/MarbleModel.h> #include <QImage> #include <QPixmap> #include <sys/socket.h> Index: calligra-2.4.3/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp =================================================================== --- calligra-2.4.3.orig/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp +++ calligra-2.4.3/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp @@ -19,7 +19,7 @@ #include "MapBrowserWidget.h" -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> #include <QPointF> #include <KDebug> Index: calligra-2.4.3/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h =================================================================== --- calligra-2.4.3.orig/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h +++ calligra-2.4.3/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h @@ -21,7 +21,7 @@ #ifndef MAPBROWSERWIDGET_H #define MAPBROWSERWIDGET_H -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> #include "widgetfactory.h" #include "container.h" Index: calligra-2.4.3/plugins/mapshape/MapShapeCommandChangeProjection.cpp =================================================================== --- calligra-2.4.3.orig/plugins/mapshape/MapShapeCommandChangeProjection.cpp +++ calligra-2.4.3/plugins/mapshape/MapShapeCommandChangeProjection.cpp @@ -21,7 +21,7 @@ #include "MapShapeCommandChangeProjection.h" #include "MapShape.h" -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> MapShapeCommandChangeProjection::MapShapeCommandChangeProjection(MapShape * shape, Marble::Projection projection, KUndo2Command *parent) : KUndo2Command(parent) Index: calligra-2.4.3/plugins/mapshape/MapShapeCommandContentChange.cpp =================================================================== --- calligra-2.4.3.orig/plugins/mapshape/MapShapeCommandContentChange.cpp +++ calligra-2.4.3/plugins/mapshape/MapShapeCommandContentChange.cpp @@ -20,7 +20,7 @@ #include "MapShapeCommandContentChange.h" #include "MapShape.h" -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> #include <QPointF> @@ -55,4 +55,4 @@ void MapShapeCommandContentChange::redo( m_shape->marbleWidget()->centerOn(m_old_value.x(), m_old_value.y()); m_shape->update(); } -} \ No newline at end of file +} Index: calligra-2.4.3/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp =================================================================== --- calligra-2.4.3.orig/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp +++ calligra-2.4.3/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp @@ -21,7 +21,7 @@ #include "MapShapeCommandSetMapThemeId.h" #include "MapShape.h" -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> MapShapeCommandSetMapThemeId::MapShapeCommandSetMapThemeId(MapShape * shape, const QString& mapThemeId, KUndo2Command *parent) : KUndo2Command(parent) Index: calligra-2.4.3/plugins/mapshape/MapShapeCommandZoom.cpp =================================================================== --- calligra-2.4.3.orig/plugins/mapshape/MapShapeCommandZoom.cpp +++ calligra-2.4.3/plugins/mapshape/MapShapeCommandZoom.cpp @@ -21,7 +21,7 @@ #include "MapShapeCommandZoom.h" #include "MapShape.h" -#include <MarbleWidget.h> +#include <marble/MarbleWidget.h> MapShapeCommandZoom::MapShapeCommandZoom(MapShape * shape, signed int value, KUndo2Command *parent) Index: calligra-2.4.3/plugins/mapshape/MapShape.cpp =================================================================== --- calligra-2.4.3.orig/plugins/mapshape/MapShape.cpp +++ calligra-2.4.3/plugins/mapshape/MapShape.cpp @@ -21,8 +21,8 @@ #include "MapShape.h" -#include <MarbleWidget.h> -#include <MarbleModel.h> +#include <marble/MarbleWidget.h> +#include <marble/MarbleModel.h> #include <KoImageData.h> #include <KoXmlNS.h> #include <KoXmlReader.h> Index: calligra-2.4.3/plugins/mapshape/MapTool.cpp =================================================================== --- calligra-2.4.3.orig/plugins/mapshape/MapTool.cpp +++ calligra-2.4.3/plugins/mapshape/MapTool.cpp @@ -41,8 +41,8 @@ #include <KoShapeManager.h> #include <KoPointerEvent.h> -#include <MarbleControlBox.h> -#include <MarbleWidget.h> +#include <marble/MarbleControlBox.h> +#include <marble/MarbleWidget.h> #include <GeoDataLatLonAltBox.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
